From 8302ac71f2f59c04179a188bea30b0d7986fc588 Mon Sep 17 00:00:00 2001
From: HiveGames-OSS <youri+hivegamesoss@hivemc.com>
Date: Wed, 18 Dec 2024 12:54:28 +0000
Subject: [PATCH] Fix redstone wire connection logic not matching Java

---
 .../BedrockRedstonePreTransformHandler.java   | 22 +++++++++++++++++++
 ...JavaLegacyRedstonePreTransformHandler.java | 22 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/cli/src/main/java/com/hivemc/chunker/conversion/encoding/bedrock/base/reader/pretransform/handlers/BedrockRedstonePreTransformHandler.java b/cli/src/main/java/com/hivemc/chunker/conversion/encoding/bedrock/base/reader/pretransform/handlers/BedrockRedstonePreTransformHandler.java
index 44ab91d..5e0077b 100644
--- a/cli/src/main/java/com/hivemc/chunker/conversion/encoding/bedrock/base/reader/pretransform/handlers/BedrockRedstonePreTransformHandler.java
+++ b/cli/src/main/java/com/hivemc/chunker/conversion/encoding/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/cli/src/main/java/com/hivemc/chunker/conversion/encoding/java/base/reader/pretransform/legacy/handlers/JavaLegacyRedstonePreTransformHandler.java b/cli/src/main/java/com/hivemc/chunker/conversion/encoding/java/base/reader/pretransform/legacy/handlers/JavaLegacyRedstonePreTransformHandler.java
index 40c9ddc..a009833 100644
--- a/cli/src/main/java/com/hivemc/chunker/conversion/encoding/java/base/reader/pretransform/legacy/handlers/JavaLegacyRedstonePreTransformHandler.java
+++ b/cli/src/main/java/com/hivemc/chunker/conversion/encoding/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;
     }