diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java index 27a533aa..ee636592 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java @@ -11,7 +11,6 @@ import com.glodblock.github.client.textures.FCPartsTexture; import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.common.parts.base.FCSharedFluidBus; -import com.glodblock.github.inventory.FluidConvertingInventoryAdaptor; import com.google.common.collect.ImmutableSet; import appeng.api.config.Actionable; @@ -270,7 +269,7 @@ public class PartFluidExportBus extends FCSharedFluidBus implements ICraftingReq } protected InventoryAdaptor getHandler(TileEntity target) { - return target != null ? FluidConvertingInventoryAdaptor.wrap(target, this.getSide().getOpposite()) : null; + return target != null ? InventoryAdaptor.getAdaptor(target, getSide().getOpposite()) : null; } @Override diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java b/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java index 81765841..f4f50547 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidInterface.java @@ -224,7 +224,6 @@ public class TileFluidInterface extends TileInterface implements IDualHost { @Override public void getDrops(World w, int x, int y, int z, List drops) { this.fluidDuality.addDrops(drops); - this.fluidDuality.convertDrops(drops, this.getInterfaceDuality().getWaitingToSend()); super.getDrops(w, x, y, z, drops); } } diff --git a/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java b/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java index c8ff2d1e..ebd48a06 100644 --- a/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java +++ b/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java @@ -8,7 +8,6 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; -import com.glodblock.github.coremod.transform.DualityInterfaceTransformer; import com.glodblock.github.coremod.transform.ExternalStorageRegistryTransformer; import com.glodblock.github.coremod.transform.GuiCraftingTransformer; import com.glodblock.github.coremod.transform.NEITransformer; @@ -22,7 +21,6 @@ public class FCClassTransformer implements IClassTransformer { public byte[] transform(String name, String transformedName, byte[] basicClass) { ClassMapper tform; switch (transformedName) { - case "appeng.helpers.DualityInterface" -> tform = DualityInterfaceTransformer.INSTANCE; case "appeng.client.gui.implementations.GuiCraftingCPU", "appeng.client.gui.implementations.GuiCraftConfirm", "net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftConfirm", "appeng.client.gui.widgets.GuiCraftingTree" -> tform = GuiCraftingTransformer.INSTANCE; case "appeng.integration.modules.NEI" -> tform = NEITransformer.INSTANCE; case "appeng.core.features.registries.ExternalStorageRegistry" -> tform = ExternalStorageRegistryTransformer.INSTANCE; diff --git a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java index f9b48a1f..4130ce06 100644 --- a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java +++ b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java @@ -1,29 +1,18 @@ package com.glodblock.github.coremod.hooker; -import javax.annotation.Nullable; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import com.glodblock.github.client.gui.GuiFluidCraftConfirm; import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.inventory.FluidConvertingInventoryAdaptor; import appeng.api.storage.data.IAEItemStack; import appeng.client.gui.IGuiTooltipHandler; -import appeng.util.InventoryAdaptor; public class CoreModHooks { - @Nullable - public static InventoryAdaptor wrapInventory(@Nullable TileEntity tile, ForgeDirection face) { - return tile != null ? FluidConvertingInventoryAdaptor.wrap(tile, face) : null; - } - public static ItemStack displayFluid(IAEItemStack aeStack) { if (aeStack.getItemStack() != null && aeStack.getItemStack().getItem() instanceof ItemFluidDrop) { FluidStack fluid = ItemFluidDrop.getFluidStack(aeStack.getItemStack()); diff --git a/src/main/java/com/glodblock/github/coremod/transform/DualityInterfaceTransformer.java b/src/main/java/com/glodblock/github/coremod/transform/DualityInterfaceTransformer.java deleted file mode 100644 index 4e9d6725..00000000 --- a/src/main/java/com/glodblock/github/coremod/transform/DualityInterfaceTransformer.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.glodblock.github.coremod.transform; - -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; - -import com.glodblock.github.coremod.FCClassTransformer; - -public class DualityInterfaceTransformer extends FCClassTransformer.ClassMapper { - - public static final DualityInterfaceTransformer INSTANCE = new DualityInterfaceTransformer(); - - private DualityInterfaceTransformer() { - // NO-OP - } - - @Override - protected ClassVisitor getClassMapper(ClassVisitor downstream) { - return new TransformDualityInterface(Opcodes.ASM5, downstream); - } - - private static class TransformDualityInterface extends ClassVisitor { - - TransformDualityInterface(int api, ClassVisitor cv) { - super(api, cv); - } - - @Override - public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - return switch (name) { - case "pushItemsOut", "pushPattern", "isBusy" -> new TransformInvAdaptorCalls( - api, - super.visitMethod(access, name, desc, signature, exceptions)); - default -> super.visitMethod(access, name, desc, signature, exceptions); - }; - } - } - - private static class TransformInvAdaptorCalls extends MethodVisitor { - - private TransformInvAdaptorCalls(int api, MethodVisitor mv) { - super(api, mv); - } - - @Override - public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) { - if (opcode == Opcodes.INVOKESTATIC && owner.equals("appeng/util/InventoryAdaptor") - && name.equals("getAdaptor")) { - super.visitMethodInsn( - Opcodes.INVOKESTATIC, - "com/glodblock/github/coremod/hooker/CoreModHooks", - "wrapInventory", - "(Lnet/minecraft/tileentity/TileEntity;Lnet/minecraftforge/common/util/ForgeDirection;)Lappeng/util/InventoryAdaptor;", - false); - } else { - super.visitMethodInsn(opcode, owner, name, desc, itf); - } - } - } -} diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java deleted file mode 100644 index baff13b0..00000000 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ /dev/null @@ -1,540 +0,0 @@ -package com.glodblock.github.inventory; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; - -import javax.annotation.Nullable; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - -import com.glodblock.github.common.Config; -import com.glodblock.github.common.item.ItemFluidDrop; -import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.common.parts.PartFluidExportBus; -import com.glodblock.github.common.parts.PartFluidInterface; -import com.glodblock.github.common.parts.PartFluidP2PInterface; -import com.glodblock.github.common.tile.TileFluidInterface; -import com.glodblock.github.util.Ae2Reflect; -import com.glodblock.github.util.BlockPos; -import com.glodblock.github.util.ModAndClassUtil; -import com.glodblock.github.util.Util; - -import appeng.api.config.FuzzyMode; -import appeng.api.config.InsertionMode; -import appeng.api.config.Upgrades; -import appeng.api.parts.IPart; -import appeng.helpers.DualityInterface; -import appeng.helpers.IInterfaceHost; -import appeng.me.GridAccessException; -import appeng.me.helpers.AENetworkProxy; -import appeng.parts.p2p.PartP2PLiquids; -import appeng.tile.misc.TileInterface; -import appeng.tile.networking.TileCableBus; -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; - -public class FluidConvertingInventoryAdaptor extends InventoryAdaptor { - - // facing is the target TE direction - // |T|-facing->|I| - public FluidConvertingInventoryAdaptor(TileEntity te, @Nullable InventoryAdaptor invItems, - @Nullable IFluidHandler invFluids, ForgeDirection facing, BlockPos pos, boolean isOnmi) { - this.invItems = invItems; - this.invFluids = invFluids; - this.side = facing; - this.posInterface = pos; - this.onmi = isOnmi; - this.selfInterface = getInterfaceTE(pos.getTileEntity(), facing.getOpposite()); - this.targetInterface = getInterfaceTE(te, facing); - } - - private final InventoryAdaptor invItems; - private final IFluidHandler invFluids; - private final ForgeDirection side; - private final BlockPos posInterface; - @Nullable - private final IInterfaceHost targetInterface; - @Nullable - private final IInterfaceHost selfInterface; - private final boolean onmi; - private static Method eioTypeCheck; - private static Class conduitClazz; - - static { - if (ModAndClassUtil.EIO) { - try { - conduitClazz = Class.forName("crazypants.enderio.conduit.TileConduitBundle"); - eioTypeCheck = conduitClazz.getDeclaredMethod("getConduit", Class.class); - } catch (ClassNotFoundException | NoSuchMethodException e) { - eioTypeCheck = null; - } - } else { - eioTypeCheck = null; - } - } - - public static InventoryAdaptor wrap(TileEntity capProvider, ForgeDirection face) { - TileEntity inter = capProvider.getWorldObj().getTileEntity( - capProvider.xCoord + face.offsetX, - capProvider.yCoord + face.offsetY, - capProvider.zCoord + face.offsetZ); - if (!Config.noFluidPacket && !(inter instanceof TileFluidInterface - || Util.getPart(inter, face.getOpposite()) instanceof PartFluidInterface - || Util.getPart(inter, face.getOpposite()) instanceof PartFluidExportBus - || Util.getPart(inter, face.getOpposite()) instanceof PartFluidP2PInterface)) - return InventoryAdaptor.getAdaptor(capProvider, face); - if (InventoryAdaptor.getAdaptor(capProvider, face) == null - && !(ModAndClassUtil.EIO && capProvider instanceof IItemDuct)) { - if (capProvider instanceof IFluidHandler tank) { - if (tank.getTankInfo(face) == null || !(tank.getTankInfo(face).length > 0)) return null; - } else { - return null; - } - } - InventoryAdaptor item = InventoryAdaptor.getAdaptor(capProvider, face); - IFluidHandler fluid = capProvider instanceof IFluidHandler ? (IFluidHandler) capProvider : null; - boolean onmi = false; - if (inter instanceof TileInterface in) { - onmi = in.getTargets().size() > 1; - } - return new FluidConvertingInventoryAdaptor(capProvider, item, fluid, face, new BlockPos(inter), onmi); - } - - public ItemStack addItems(ItemStack toBeAdded, InsertionMode insertionMode) { - FluidStack fluid = Util.getFluidFromVirtual(toBeAdded); - if (!this.onmi) { - if (!checkValidSide( - this.posInterface.getOffSet(this.side.getOpposite()).getTileEntity(), - this.side.getOpposite())) { - return toBeAdded; - } - if (fluid != null) { - int filled = fillSideFluid(fluid, this.invFluids, this.side, true); - fluid.amount -= filled; - return ItemFluidDrop.newStack(fluid); - } else { - ItemStack notFilled = fillSideItem(toBeAdded, this.invItems, insertionMode, true); - if (notFilled != null) { - // Fill EIO Conduit at last. - return fillEIOConduit( - notFilled, - this.posInterface.getOffSet(this.side.getOpposite()).getTileEntity(), - this.side); - } - return null; - } - } else { - if (fluid != null) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (fluid.amount <= 0) { - return null; - } - if (!checkValidSide(this.posInterface.getOffSet(dir).getTileEntity(), dir)) { - continue; - } - int filled = fillSideFluid(fluid, getSideFluid(dir), dir.getOpposite(), true); - fluid.amount -= filled; - } - return ItemFluidPacket.newStack(fluid); - } else { - ItemStack item = toBeAdded.copy(); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (item == null || item.stackSize <= 0) { - return null; - } - if (!checkValidSide(this.posInterface.getOffSet(dir).getTileEntity(), dir)) { - continue; - } - item = fillSideItem(item, getSideItem(dir), insertionMode, true); - } - // Fill EIO Conduit at last. - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (item == null || item.stackSize <= 0) { - return null; - } - if (!checkValidSide(this.posInterface.getOffSet(dir).getTileEntity(), dir)) { - continue; - } - item = fillEIOConduit(item, this.posInterface.getOffSet(dir).getTileEntity(), dir.getOpposite()); - } - return item; - } - } - } - - @Override - public ItemStack addItems(ItemStack toBeAdded) { - return addItems(toBeAdded, InsertionMode.DEFAULT); - } - - @Override - public ItemStack simulateAdd(ItemStack toBeSimulated) { - return simulateAdd(toBeSimulated, InsertionMode.DEFAULT); - } - - @Override - public ItemStack simulateAdd(ItemStack toBeSimulated, InsertionMode insertionMode) { - FluidStack fluid = Util.getFluidFromVirtual(toBeSimulated); - if (!this.onmi) { - if (!checkValidSide( - this.posInterface.getOffSet(this.side.getOpposite()).getTileEntity(), - this.side.getOpposite())) { - return toBeSimulated; - } - if (fluid != null) { - int filled = fillSideFluid(fluid, this.invFluids, this.side, false); - fluid.amount -= filled; - return ItemFluidPacket.newStack(fluid); - } else { - // Assert EIO conduit can hold all item, as it is the origin practice in AE2 - if (isConduit(this.posInterface.getOffSet(this.side.getOpposite()).getTileEntity())) { - return null; - } else { - return fillSideItem(toBeSimulated, this.invItems, insertionMode, false); - } - } - } else { - // In onmi mode, fluid/item only need to be partly inserted. - boolean sus = false; - if (fluid != null) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (!checkValidSide(this.posInterface.getOffSet(dir).getTileEntity(), dir)) { - continue; - } - int filled = fillSideFluid(fluid, getSideFluid(dir), dir.getOpposite(), false); - if (filled > 0) { - sus = true; - break; - } - } - } else { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (!checkValidSide(this.posInterface.getOffSet(dir).getTileEntity(), dir)) { - continue; - } - // Assert EIO conduit can hold all item, as it is the origin practice in AE2 - if (isConduit(this.posInterface.getOffSet(dir).getTileEntity())) { - return null; - } - ItemStack notFilled = fillSideItem(toBeSimulated, getSideItem(dir), insertionMode, false); - if (notFilled == null || notFilled.stackSize < toBeSimulated.stackSize) { - sus = true; - break; - } - } - } - return sus ? null : toBeSimulated; - } - } - - @Override - public ItemStack removeItems(int amount, ItemStack filter, IInventoryDestination destination) { - return invItems != null ? invItems.removeItems(amount, filter, destination) : null; - } - - @Override - public ItemStack simulateRemove(int amount, ItemStack filter, IInventoryDestination destination) { - return invItems != null ? invItems.simulateRemove(amount, filter, destination) : null; - } - - @Override - public ItemStack removeSimilarItems(int amount, ItemStack filter, FuzzyMode fuzzyMode, - IInventoryDestination destination) { - return invItems != null ? invItems.removeSimilarItems(amount, filter, fuzzyMode, destination) : null; - } - - @Override - public ItemStack simulateSimilarRemove(int amount, ItemStack filter, FuzzyMode fuzzyMode, - IInventoryDestination destination) { - return invItems != null ? invItems.simulateSimilarRemove(amount, filter, fuzzyMode, destination) : null; - } - - @Override - public boolean containsItems() { - if (!this.onmi) { - // If there is no fluid tank or item inventory, it shouldn't send stuff here. - return checkItemFluids(this.invFluids, this.invItems, this.side) > 0; - } - boolean anyValid = false; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - // Avoid sending stuff into itself me network - 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; - } - } - } - } - // Same here. if there is no fluid tank or item inventory existed, it shouldn't send stuff here. - return !anyValid; - } - - public boolean hasSlots() { - return (invFluids != null && invFluids.getTankInfo(side).length > 0) || (invItems != null); - } - - @Override - public Iterator iterator() { - FluidTankInfo[] info = null; - if (invFluids != null) { - info = invFluids.getTankInfo(side); - } - // Null check is needed because some tank infos return null (EIO conduits...) - if (info == null) { - info = new FluidTankInfo[0]; - } - return new SlotIterator(info, invItems != null ? invItems.iterator() : Collections.emptyIterator()); - } - - private IFluidHandler getSideFluid(ForgeDirection direction) { - TileEntity te = this.posInterface.getOffSet(direction).getTileEntity(); - if (te instanceof IFluidHandler) { - return (IFluidHandler) te; - } - return null; - } - - private int fillSideFluid(FluidStack fluid, IFluidHandler tank, ForgeDirection direction, boolean doFill) { - if (tank != null) { - return tank.fill(direction, fluid, doFill); - } - return 0; - } - - // EIO conduit isn't considered here - private ItemStack fillSideItem(ItemStack item, InventoryAdaptor inv, InsertionMode mode, boolean doFill) { - if (inv != null) { - if (doFill) { - return inv.addItems(item, mode); - } else { - return inv.simulateAdd(item, mode); - } - } - return item; - } - - private int gtMachineCircuitCheck(InventoryAdaptor ad) { - if (ad == null) { - return 0; - } - for (ItemSlot i : ad) { - ItemStack is = i.getItemStack(); - if (is == null || Objects.requireNonNull(is.getItem()).getUnlocalizedName().equals("gt.integrated_circuit")) - continue; - return 1; - } - return 0; - } - - private boolean isGTMachine(Object o) { - if (!(ModAndClassUtil.GT5 || ModAndClassUtil.GT5NH)) return false; - - if (o instanceof TileEntity te) { - return te.getBlockType().getUnlocalizedName().equals("gt.blockmachines"); - } - - return false; - } - - private boolean isFluidConduitConnected(TileEntity te, ForgeDirection dir) { - try { - ILiquidConduit liquidConduit = (ILiquidConduit) eioTypeCheck.invoke(te, ILiquidConduit.class); - return liquidConduit != null - && liquidConduit.getConnectionMode(dir.getOpposite()) != ConnectionMode.DISABLED; - } catch (IllegalAccessException | InvocationTargetException e) { - return false; - } - } - - private boolean isItemConduit(TileEntity te) { - if (isConduit(te)) { - try { - return eioTypeCheck.invoke(te, IItemConduit.class) != null; - } catch (InvocationTargetException | IllegalAccessException e) { - return false; - } - } - return false; - } - - private boolean isConduit(TileEntity te) { - return ModAndClassUtil.EIO && conduitClazz.isInstance(te); - } - - private ItemStack fillEIOConduit(ItemStack item, TileEntity te, ForgeDirection direction) { - if (isConduit(te)) { - return ((IItemDuct) te).insertItem(direction, item); - } - return item; - } - - private InventoryAdaptor getSideItem(ForgeDirection direction) { - TileEntity te = this.posInterface.getOffSet(direction).getTileEntity(); - return InventoryAdaptor.getAdaptor(te, direction.getOpposite()); - } - - // 0 - It is empty - // 1 - It contains item/fluid - // 2 - It doesn't exist - private int checkItemFluids(IFluidHandler tank, InventoryAdaptor inv, ForgeDirection direction) { - if (tank == null && inv == null) { - return 2; - } - if (targetInterface != null && targetInterface.getInstalledUpgrades(Upgrades.ADVANCED_BLOCKING) > 0 - && targetInterface instanceof IDualHost - && !((IDualHost) targetInterface).getDualityFluid().getFluidInventory().getStorageList().isEmpty()) { - return 1; - } - if (tank != null && tank.getTankInfo(direction) != null) { - List tankInfos = new LinkedList<>(); - if (Util.getPart(tank, direction) instanceof PartP2PLiquids invFluidsP2P) { - // read other ends of p2p for blocking mode - try { - Iterator it = invFluidsP2P.getOutputs().iterator(); - boolean checkedInput = false; - while (it.hasNext() || !checkedInput) { - PartP2PLiquids p2p; - if (it.hasNext()) { - p2p = it.next(); - } else { - p2p = invFluidsP2P.getInput(); - checkedInput = true; - } - if (p2p == invFluidsP2P || p2p == null) continue; - IFluidHandler target = Ae2Reflect.getP2PLiquidTarget(p2p); - if (target == null) continue; - FluidTankInfo[] info = target.getTankInfo(p2p.getSide().getOpposite()); - if (info != null) { - tankInfos.add(info); - } - } - } catch (GridAccessException ignore) {} - } else { - tankInfos.add(tank.getTankInfo(direction)); - } - boolean hasTank = false; - for (FluidTankInfo[] tankInfoArray : tankInfos) { - for (FluidTankInfo tankInfo : tankInfoArray) { - hasTank = true; - FluidStack fluid = tankInfo.fluid; - if (fluid != null && fluid.amount > 0) { - return 1; - } - } - } - if (!hasTank && inv == null) { - return 2; - } - } - if (isGTMachine(tank)) { - return gtMachineCircuitCheck(inv); - } - return inv != null && inv.containsItems() ? 1 : 0; - } - - private boolean checkValidSide(TileEntity te, ForgeDirection direction) { - if (isGTMachine(te)) { - return checkGTPipeConnection(te, direction.getOpposite()); - } - return isDifferentGrid(getInterfaceTE(te, direction.getOpposite())); - } - - private boolean checkGTPipeConnection(TileEntity te, ForgeDirection direction) { - if (te instanceof IGregTechTileEntity) { - IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); - if (mte instanceof MetaPipeEntity) { - return ((MetaPipeEntity) mte).isConnectedAtSide(direction); - } - } - return true; - } - - private static IInterfaceHost getInterfaceTE(TileEntity te, ForgeDirection face) { - if (te instanceof IInterfaceHost) { - return (IInterfaceHost) te; - } else if (te instanceof TileCableBus) { - IPart part = ((TileCableBus) te).getPart(face); - if (part instanceof IInterfaceHost) { - return (IInterfaceHost) part; - } - } - return null; - } - - private boolean isDifferentGrid(IInterfaceHost target) { - if (this.selfInterface != null && target != null) { - DualityInterface other = target.getInterfaceDuality(); - DualityInterface self = this.selfInterface.getInterfaceDuality(); - try { - AENetworkProxy proxy1 = Ae2Reflect.getInterfaceProxy(other); - AENetworkProxy proxy2 = Ae2Reflect.getInterfaceProxy(self); - if (proxy1.getGrid() == proxy2.getGrid()) { - return false; - } - } catch (GridAccessException e) { - return true; - } - } - return true; - } - - private static class SlotIterator implements Iterator { - - private final FluidTankInfo[] tanks; - private final Iterator itemSlots; - private int nextSlotIndex = 0; - - SlotIterator(FluidTankInfo[] tanks, Iterator itemSlots) { - this.tanks = tanks; - this.itemSlots = itemSlots; - } - - @Override - public boolean hasNext() { - return itemSlots.hasNext() || nextSlotIndex < tanks.length; - } - - @Override - public ItemSlot next() { - if (nextSlotIndex < tanks.length) { - FluidStack fluid = tanks[nextSlotIndex].fluid; - ItemSlot slot = new ItemSlot(); - slot.setSlot(nextSlotIndex++); - slot.setItemStack(fluid != null ? ItemFluidPacket.newStack(fluid) : null); - Ae2Reflect.setItemSlotExtractable(slot, false); - return slot; - } else { - ItemSlot slot = itemSlots.next(); - slot.setSlot(nextSlotIndex++); - return slot; - } - } - } -} diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryCrafting.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryCrafting.java deleted file mode 100644 index 515dbe3c..00000000 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryCrafting.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.glodblock.github.inventory; - -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import com.glodblock.github.common.item.ItemFluidDrop; -import com.glodblock.github.common.item.ItemFluidPacket; - -public class FluidConvertingInventoryCrafting extends InventoryCrafting { - - public FluidConvertingInventoryCrafting(Container container, int width, int height) { - super(container, width, height); - } - - @Override - public void setInventorySlotContents(int index, ItemStack stack) { - if (stack != null && stack.getItem() instanceof ItemFluidDrop) { - FluidStack fluid = ItemFluidDrop.getFluidStack(stack); - if (fluid != null) { - super.setInventorySlotContents(index, ItemFluidPacket.newStack(new FluidStack(fluid, stack.stackSize))); - } else { - super.setInventorySlotContents( - index, - ItemFluidPacket.newStack(new FluidStack(FluidRegistry.WATER, 1000))); - } - } else { - super.setInventorySlotContents(index, stack); - } - } -}