Fix redstone wire connection logic not matching Java

HiveGamesOSS · Dec 18, 2024 · 8302ac7 · 8302ac7
1 parent 8954ff0
commit 8302ac7
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 0 deletions.
diff --git a/...ncoding/bedrock/base/reader/pretransform/handlers/BedrockRedstonePreTransformHandler.java b/...ncoding/bedrock/base/reader/pretransform/handlers/BedrockRedstonePreTransformHandler.java
@@ -41,6 +41,28 @@ public ChunkerBlockIdentifier handle(ChunkerColumn column, Map<Edge, ChunkerColu
             blockIdentifier = blockIdentifier.copyWith(state, redstoneConnection);
         }
 
+        // Get the states which were applied
+        boolean north = blockIdentifier.getState(VanillaBlockStates.REDSTONE_NORTH) != RedstoneConnection.NONE;
+        boolean east = blockIdentifier.getState(VanillaBlockStates.REDSTONE_EAST) != RedstoneConnection.NONE;
+        boolean south = blockIdentifier.getState(VanillaBlockStates.REDSTONE_SOUTH) != RedstoneConnection.NONE;
+        boolean west = blockIdentifier.getState(VanillaBlockStates.REDSTONE_WEST) != RedstoneConnection.NONE;
+        boolean northSouthNone = !north && !south;
+        boolean eastWestNone = !east && !west;
+
+        // Apply any additional connections (based on Java edition logic)
+        if (!north && eastWestNone) {
+            blockIdentifier = blockIdentifier.copyWith(VanillaBlockStates.REDSTONE_NORTH, RedstoneConnection.SIDE);
+        }
+        if (!east && northSouthNone) {
+            blockIdentifier = blockIdentifier.copyWith(VanillaBlockStates.REDSTONE_EAST, RedstoneConnection.SIDE);
+        }
+        if (!south && eastWestNone) {
+            blockIdentifier = blockIdentifier.copyWith(VanillaBlockStates.REDSTONE_SOUTH, RedstoneConnection.SIDE);
+        }
+        if (!west && northSouthNone) {
+            blockIdentifier = blockIdentifier.copyWith(VanillaBlockStates.REDSTONE_WEST, RedstoneConnection.SIDE);
+        }
+
         // Return the block identifier to be updated
         return blockIdentifier;
     }

diff --git a/.../java/base/reader/pretransform/legacy/handlers/JavaLegacyRedstonePreTransformHandler.java b/.../java/base/reader/pretransform/legacy/handlers/JavaLegacyRedstonePreTransformHandler.java
@@ -41,6 +41,28 @@ public ChunkerBlockIdentifier handle(ChunkerColumn column, Map<Edge, ChunkerColu
             blockIdentifier = blockIdentifier.copyWith(state, redstoneConnection);
         }
 
+        // Get the states which were applied
+        boolean north = blockIdentifier.getState(VanillaBlockStates.REDSTONE_NORTH) != RedstoneConnection.NONE;
+        boolean east = blockIdentifier.getState(VanillaBlockStates.REDSTONE_EAST) != RedstoneConnection.NONE;
+        boolean south = blockIdentifier.getState(VanillaBlockStates.REDSTONE_SOUTH) != RedstoneConnection.NONE;
+        boolean west = blockIdentifier.getState(VanillaBlockStates.REDSTONE_WEST) != RedstoneConnection.NONE;
+        boolean northSouthNone = !north && !south;
+        boolean eastWestNone = !east && !west;
+
+        // Apply any additional connections (based on Java edition logic)
+        if (!north && eastWestNone) {
+            blockIdentifier = blockIdentifier.copyWith(VanillaBlockStates.REDSTONE_NORTH, RedstoneConnection.SIDE);
+        }
+        if (!east && northSouthNone) {
+            blockIdentifier = blockIdentifier.copyWith(VanillaBlockStates.REDSTONE_EAST, RedstoneConnection.SIDE);
+        }
+        if (!south && eastWestNone) {
+            blockIdentifier = blockIdentifier.copyWith(VanillaBlockStates.REDSTONE_SOUTH, RedstoneConnection.SIDE);
+        }
+        if (!west && northSouthNone) {
+            blockIdentifier = blockIdentifier.copyWith(VanillaBlockStates.REDSTONE_WEST, RedstoneConnection.SIDE);
+        }
+
         // Return the block identifier to be updated
         return blockIdentifier;
     }