Merge pull request LXYan2333#65 from Bunnui/origin_1.20

update to 1.20
bunnyi116 · Jun 11, 2023 · b567a4d · b567a4d
2 parents cc32c82 + 41fa428
commit b567a4d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -14,12 +14,12 @@ org.gradle.jvmargs=-Xmx1G
 
 # # Dependencies
 
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.2
-loader_version=0.14.19
+minecraft_version=1.20
+yarn_mappings=1.20+build.1
+loader_version=0.14.21
 
 #Fabric api
-fabric_version=0.78.0+1.19.4
+fabric_version=0.83.0+1.20
 
 ## 代理
 #systemProp.http.proxyHost=127.0.0.1

diff --git a/src/main/java/yan/lx/bedrockminer/utils/CheckingEnvironment.java b/src/main/java/yan/lx/bedrockminer/utils/CheckingEnvironment.java
@@ -16,13 +16,13 @@
 public class CheckingEnvironment {
 
     public static BlockPos findNearbyFlatBlockToPlaceRedstoneTorch(ClientWorld world, BlockPos blockPos) {
-        if ((sideCoversSmallSquare(world, blockPos.east(), Direction.UP) && (world.getBlockState(blockPos.east().up()).getMaterial().isReplaceable()) || world.getBlockState(blockPos.east().up()).isOf(Blocks.REDSTONE_TORCH))) {
+        if ((sideCoversSmallSquare(world, blockPos.east(), Direction.UP) && (world.getBlockState(blockPos.east().up()).isReplaceable()) || world.getBlockState(blockPos.east().up()).isOf(Blocks.REDSTONE_TORCH))) {
             return blockPos.east();
-        } else if ((sideCoversSmallSquare(world, blockPos.west(), Direction.UP) && (world.getBlockState(blockPos.west().up()).getMaterial().isReplaceable()) || world.getBlockState(blockPos.west().up()).isOf(Blocks.REDSTONE_TORCH))) {
+        } else if ((sideCoversSmallSquare(world, blockPos.west(), Direction.UP) && (world.getBlockState(blockPos.west().up()).isReplaceable()) || world.getBlockState(blockPos.west().up()).isOf(Blocks.REDSTONE_TORCH))) {
             return blockPos.west();
-        } else if ((sideCoversSmallSquare(world, blockPos.north(), Direction.UP) && (world.getBlockState(blockPos.north().up()).getMaterial().isReplaceable()) || world.getBlockState(blockPos.north().up()).isOf(Blocks.REDSTONE_TORCH))) {
+        } else if ((sideCoversSmallSquare(world, blockPos.north(), Direction.UP) && (world.getBlockState(blockPos.north().up()).isReplaceable()) || world.getBlockState(blockPos.north().up()).isOf(Blocks.REDSTONE_TORCH))) {
             return blockPos.north();
-        } else if ((sideCoversSmallSquare(world, blockPos.south(), Direction.UP) && (world.getBlockState(blockPos.south().up()).getMaterial().isReplaceable()) || world.getBlockState(blockPos.south().up()).isOf(Blocks.REDSTONE_TORCH))) {
+        } else if ((sideCoversSmallSquare(world, blockPos.south(), Direction.UP) && (world.getBlockState(blockPos.south().up()).isReplaceable()) || world.getBlockState(blockPos.south().up()).isOf(Blocks.REDSTONE_TORCH))) {
             return blockPos.south();
         }
         return null;
@@ -31,7 +31,7 @@ public static BlockPos findNearbyFlatBlockToPlaceRedstoneTorch(ClientWorld world
     public static BlockPos findPossibleSlimeBlockPos(ClientWorld world, BlockPos blockPos) {
         for (Direction direction :Direction.Type.HORIZONTAL){
             BlockPos newBlockPos = blockPos.offset(direction);
-            if (!world.getBlockState(newBlockPos).getMaterial().isReplaceable()){
+            if (!world.getBlockState(newBlockPos).isReplaceable()){
                 continue;
             }
             if (CheckingEnvironment.isBlocked(newBlockPos)){
@@ -49,7 +49,7 @@ public static boolean has2BlocksOfPlaceToPlacePiston(ClientWorld world, BlockPos
         if (isBlocked(blockPos.up())) {
             return false;
         }
-        return world.getBlockState(blockPos.up().up()).getMaterial().isReplaceable();
+        return world.getBlockState(blockPos.up().up()).isReplaceable();
     }
 
     public static ArrayList<BlockPos> findNearbyRedstoneTorch(ClientWorld world, BlockPos pistonBlockPos) {

diff --git a/src/main/resources/bedrock-miner.json → src/main/resources/bedrock-miner.mixins.json b/src/main/resources/bedrock-miner.json → src/main/resources/bedrock-miner.mixins.json
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -22,12 +22,12 @@
     ]
   },
   "mixins": [
-    "bedrock-miner.json"
+    "bedrock-miner.mixins.json"
   ],
 
   "depends": {
-    "fabricloader": ">=0.14.7",
-    "minecraft": "1.19.x",
+    "fabricloader": ">=0.14.21",
+    "minecraft": "1.20.x",
     "java": ">=17"
   },
   "suggests": {