Merge remote-tracking branch 'lordIcocain/check_fluid_connected' into…

… dev
GTNewHorizons · Dec 26, 2024 · 97489a1 · 97489a1
2 parents 895e40e + 61a656d
commit 97489a1
Showing 1 changed file with 24 additions and 8 deletions.
diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java
@@ -44,7 +44,9 @@
 import appeng.util.inv.IInventoryDestination;
 import appeng.util.inv.ItemSlot;
 import cofh.api.transport.IItemDuct;
+import crazypants.enderio.conduit.ConnectionMode;
 import crazypants.enderio.conduit.item.IItemConduit;
+import crazypants.enderio.conduit.liquid.ILiquidConduit;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
@@ -274,14 +276,19 @@ public boolean containsItems() {
         boolean anyValid = false;
         for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
             // Avoid sending stuff into itself me network
-            if (checkValidSide(this.posInterface.getOffSet(dir).getTileEntity(), dir)
-                    && !isItemConduit(this.posInterface.getOffSet(dir).getTileEntity())) {
-                final int result = checkItemFluids(this.getSideFluid(dir), this.getSideItem(dir), dir.getOpposite());
-                if (result == 1) {
-                    return true;
-                }
-                if (result != 2) {
-                    anyValid = true;
+            TileEntity te = this.posInterface.getOffSet(dir).getTileEntity();
+            if (te != null && checkValidSide(te, dir)) {
+                if (!isConduit(te) || (!isItemConduit(te) && isFluidConduitConnected(te, dir))) {
+                    final int result = checkItemFluids(
+                            this.getSideFluid(dir),
+                            this.getSideItem(dir),
+                            dir.getOpposite());
+                    if (result == 1) {
+                        return true;
+                    }
+                    if (result != 2) {
+                        anyValid = true;
+                    }
                 }
             }
         }
@@ -356,6 +363,15 @@ private boolean isGTMachine(Object o) {
         return false;
     }
 
+    private boolean isFluidConduitConnected(TileEntity te, ForgeDirection dir) {
+        try {
+            ILiquidConduit liquidConduit = (ILiquidConduit) eioTypeCheck.invoke(te, ILiquidConduit.class);
+            return liquidConduit.getConnectionMode(dir.getOpposite()) != ConnectionMode.DISABLED;
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            return false;
+        }
+    }
+
     private boolean isItemConduit(TileEntity te) {
         if (ModAndClassUtil.EIO && conduitClazz.isInstance(te)) {
             try {