Port to 25w03a

sakura-ryoko · Jan 17, 2025 · 75ee3d3 · 75ee3d3
1 parent 2e93aeb
commit 75ee3d3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,13 +12,13 @@ mod_file_name = litematica-fabric
 mod_version = 0.21.999-dev
 
 # Required malilib version
-malilib_version = 7565079dbc
+malilib_version = a87e26d8cf
 
 # Minecraft, Fabric Loader and API and mappings versions
-minecraft_version_out = 25w02a
-minecraft_version = 25w02a
-mappings_version = 25w02a+build.9
+minecraft_version_out = 25w03a
+minecraft_version = 25w03a
+mappings_version = 25w03a+build.2
 
 fabric_loader_version = 0.16.10
-mod_menu_version = 13.0.0-beta.1
-# fabric_api_version = 0.114.1+1.21.5
+mod_menu_version = 13.0.0
+# fabric_api_version = 0.114.4+1.21.5
diff --git a/src/main/java/fi/dy/masa/litematica/schematic/conversion/WallStateFixer.java b/src/main/java/fi/dy/masa/litematica/schematic/conversion/WallStateFixer.java
@@ -74,15 +74,10 @@ private BlockState getWallSideConnections(BlockState blockState,
                                                      VoxelShape shapeAbove)
     {
         return blockState
-                        // TODO
-                        // NORTH
-                       .with(WallBlock.field_55816, this.getConnectionShape(canConnectNorth, shapeAbove, SHAPE_NORTH))
-                        // EAST
-                       .with(WallBlock.field_55815,  this.getConnectionShape(canConnectEast, shapeAbove, SHAPE_EAST))
-                        // SOUTH
-                       .with(WallBlock.field_55817, this.getConnectionShape(canConnectSouth, shapeAbove, SHAPE_SOUTH))
-                        // WEST
-                       .with(WallBlock.field_55818,  this.getConnectionShape(canConnectWest, shapeAbove, SHAPE_WEST));
+                       .with(WallBlock.NORTH_WALL_SHAPE, this.getConnectionShape(canConnectNorth, shapeAbove, SHAPE_NORTH))
+                       .with(WallBlock.EAST_WALL_SHAPE,  this.getConnectionShape(canConnectEast, shapeAbove, SHAPE_EAST))
+                       .with(WallBlock.SOUTH_WALL_SHAPE, this.getConnectionShape(canConnectSouth, shapeAbove, SHAPE_SOUTH))
+                       .with(WallBlock.WEST_WALL_SHAPE,  this.getConnectionShape(canConnectWest, shapeAbove, SHAPE_WEST));
     }
 
     private boolean shouldConnectTo(BlockState state, boolean faceFullSquare, Direction side)
@@ -105,15 +100,10 @@ private boolean shouldConnectUp(BlockState blockState, BlockState stateUp, Voxel
         }
         else
         {
-            // TODO
-            // NORTH
-            WallShape shapeNorth = blockState.get(WallBlock.field_55816);
-            // SOUTH
-            WallShape shapeSouth = blockState.get(WallBlock.field_55817);
-            // EAST
-            WallShape shapeEast  = blockState.get(WallBlock.field_55815);
-            // WEST
-            WallShape shapeWest  = blockState.get(WallBlock.field_55818);
+            WallShape shapeNorth = blockState.get(WallBlock.NORTH_WALL_SHAPE);
+            WallShape shapeSouth = blockState.get(WallBlock.SOUTH_WALL_SHAPE);
+            WallShape shapeEast  = blockState.get(WallBlock.EAST_WALL_SHAPE);
+            WallShape shapeWest  = blockState.get(WallBlock.WEST_WALL_SHAPE);
             boolean unconnectedNorth = shapeNorth == WallShape.NONE;
             boolean unconnectedSouth = shapeSouth == WallShape.NONE;
             boolean unconnectedEast  = shapeEast == WallShape.NONE;