Improve and fix some DoubleChest behaviour

ChestShop-authors · Jan 11, 2025 · 10d4507 · 10d4507
1 parent 481f630
commit 10d4507
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/Player/PlayerInventory.java b/src/main/java/com/Acrobot/ChestShop/Listeners/Player/PlayerInventory.java
@@ -22,6 +22,8 @@
 import java.util.List;
 
 import static com.Acrobot.Breeze.Utils.ImplementationAdapter.getHolder;
+import static com.Acrobot.Breeze.Utils.ImplementationAdapter.getLeftSide;
+import static com.Acrobot.Breeze.Utils.ImplementationAdapter.getRightSide;
 
 /**
  * @author Acrobot
@@ -46,11 +48,11 @@ public static void onInventoryOpen(InventoryOpenEvent event) {
         List<Block> containers = new ArrayList<>();
 
         if (holder instanceof DoubleChest) {
-            InventoryHolder leftSide = ((DoubleChest) holder).getLeftSide();
+            InventoryHolder leftSide = getLeftSide((DoubleChest) holder, false);
             if (leftSide instanceof BlockState) {
                 containers.add(((BlockState) leftSide).getBlock());
             }
-            InventoryHolder rightSide = ((DoubleChest) holder).getRightSide();
+            InventoryHolder rightSide = getRightSide((DoubleChest) holder, false);
             if (rightSide instanceof BlockState) {
                 containers.add(((BlockState) rightSide).getBlock());
             }

diff --git a/src/main/java/com/Acrobot/ChestShop/Utils/uBlock.java b/src/main/java/com/Acrobot/ChestShop/Utils/uBlock.java
@@ -18,6 +18,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.Acrobot.Breeze.Utils.ImplementationAdapter.getLeftSide;
+import static com.Acrobot.Breeze.Utils.ImplementationAdapter.getRightSide;
 import static com.Acrobot.Breeze.Utils.ImplementationAdapter.getState;
 
 /**
@@ -178,15 +180,15 @@ public static List<Sign> findConnectedShopSigns(InventoryHolder chestShopInvento
         List<Sign> result = new ArrayList<>();
 
         if (chestShopInventoryHolder instanceof DoubleChest) {
-            BlockState leftChestSide = (BlockState) ((DoubleChest) chestShopInventoryHolder).getLeftSide();
-            BlockState rightChestSide = (BlockState) ((DoubleChest) chestShopInventoryHolder).getRightSide();
+            InventoryHolder leftChestSide = getLeftSide((DoubleChest) chestShopInventoryHolder, false);
+            InventoryHolder rightChestSide = getRightSide((DoubleChest) chestShopInventoryHolder, false);
 
-            if (leftChestSide == null || rightChestSide == null) {
+            if (!(leftChestSide instanceof BlockState) || !(rightChestSide instanceof BlockState)) {
                 return result;
             }
 
-            Block leftChest = leftChestSide.getBlock();
-            Block rightChest = rightChestSide.getBlock();
+            Block leftChest = ((BlockState) leftChestSide).getBlock();
+            Block rightChest = ((BlockState) rightChestSide).getBlock();
 
             if (ChestShopSign.isShopBlock(leftChest)) {
                 result.addAll(uBlock.findConnectedShopSigns(leftChest));
@@ -318,6 +320,6 @@ public static boolean couldBeShopContainer(Block block) {
 
     public static boolean couldBeShopContainer(InventoryHolder holder) {
         return (holder instanceof Container && couldBeShopContainer(((Container) holder).getBlock()))
-                    || (holder instanceof DoubleChest && couldBeShopContainer(((DoubleChest) holder).getLeftSide()));
+                    || (holder instanceof DoubleChest && couldBeShopContainer(getLeftSide((DoubleChest) holder, false)));
     }
 }