fix: Redstone Wire Dot Block State from previous DataVersions

sakura-ryoko · Jul 5, 2024 · 47d9a9f · 47d9a9f
1 parent 7a39879
commit 47d9a9f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ author = masa
 mod_file_name = litematica-fabric
 
 # Current mod version
-mod_version = 0.18.999-sakura.13
+mod_version = 0.18.999-sakura.14
 
 # Required malilib version
 malilib_version = 0.19.999-sakura.6

diff --git a/src/main/java/fi/dy/masa/litematica/schematic/conversion/SchematicConversionFixers.java b/src/main/java/fi/dy/masa/litematica/schematic/conversion/SchematicConversionFixers.java
@@ -47,7 +47,13 @@
 public class SchematicConversionFixers
 {
     private static final BooleanProperty[] HORIZONTAL_CONNECTING_BLOCK_PROPS = new BooleanProperty[] { null, null, HorizontalConnectingBlock.NORTH, HorizontalConnectingBlock.SOUTH, HorizontalConnectingBlock.WEST, HorizontalConnectingBlock.EAST };
-    private static final BlockState REDSTONE_WIRE_DOT = Blocks.REDSTONE_WIRE.getDefaultState();
+    private static final BlockState REDSTONE_WIRE_DOT_OLD = Blocks.REDSTONE_WIRE.getDefaultState();
+    private static final BlockState REDSTONE_WIRE_DOT = Blocks.REDSTONE_WIRE.getDefaultState()
+                          .with(RedstoneWireBlock.POWER, 0)
+                          .with(RedstoneWireBlock.WIRE_CONNECTION_NORTH, WireConnection.NONE)
+                          .with(RedstoneWireBlock.WIRE_CONNECTION_EAST, WireConnection.NONE)
+                          .with(RedstoneWireBlock.WIRE_CONNECTION_SOUTH, WireConnection.NONE)
+                          .with(RedstoneWireBlock.WIRE_CONNECTION_WEST, WireConnection.NONE);
     private static final BlockState REDSTONE_WIRE_CROSS = Blocks.REDSTONE_WIRE.getDefaultState()
                           .with(RedstoneWireBlock.WIRE_CONNECTION_NORTH, WireConnection.SIDE)
                           .with(RedstoneWireBlock.WIRE_CONNECTION_EAST, WireConnection.SIDE)
@@ -342,7 +348,7 @@ public class SchematicConversionFixers
         state = ((IMixinRedstoneWireBlock) wire).litematicaGetPlacementState(reader, state, pos);
 
         // Turn all old dots into crosses, while keeping the power level
-        if (state.with(RedstoneWireBlock.POWER, 0) == REDSTONE_WIRE_DOT)
+        if (state.equals(REDSTONE_WIRE_DOT) == false && state.with(RedstoneWireBlock.POWER, 0) == REDSTONE_WIRE_DOT_OLD)
         {
             state = REDSTONE_WIRE_CROSS.with(RedstoneWireBlock.POWER, state.get(RedstoneWireBlock.POWER));
         }