From fc6f964a5a05e18e88a9f32099ae71ad9f3e55ad Mon Sep 17 00:00:00 2001 From: lordIcocain Date: Thu, 28 Nov 2024 02:40:01 +0200 Subject: [PATCH] first commit --- .../FluidConvertingInventoryAdaptor.java | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java index 875b9b1d..20dc181c 100644 --- 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.InventoryAdaptor; 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,15 +276,16 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { 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) + || (isConduit(te) && (isItemConduit(te) || !isFluidConduitConnected(te, dir)))) + continue; + final int result = checkItemFluids(this.getSideFluid(dir), this.getSideItem(dir), dir.getOpposite()); + if (result == 1) { + return true; + } + if (result != 2) { + anyValid = true; } } // Same here. if there is no fluid tank or item inventory existed, it shouldn't send stuff here. @@ -356,6 +359,15 @@ public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { 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 {