From fd0bdd4da8d0083bc2163cd5744a6bdfb0529e0c Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 18 Dec 2014 22:52:45 +0000 Subject: [PATCH 1/2] Efficiency of isValidAcceptor methods. --- .../multipart/PartLogisticalTransporter.java | 2 +- .../common/multipart/PartMechanicalPipe.java | 4 +-- .../common/multipart/PartUniversalCable.java | 2 +- .../java/mekanism/common/util/CableUtils.java | 16 ++++++++++-- .../java/mekanism/common/util/PipeUtils.java | 26 +++++++++++++++++++ .../common/util/TransporterUtils.java | 20 ++++++++++++++ 6 files changed, 64 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 4e67a1bb2..0d769f975 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -170,7 +170,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti @Override public boolean isValidAcceptor(TileEntity tile, ForgeDirection side) { - return TransporterUtils.getConnections(this)[side.ordinal()]; + return TransporterUtils.isValidAcceptorOnSide(tile, side); } @Override diff --git a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java index 4b79ff796..27e5031d0 100644 --- a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java +++ b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java @@ -230,9 +230,9 @@ public class PartMechanicalPipe extends PartTransmitter implements } @Override - public boolean isValidAcceptor(TileEntity tile, ForgeDirection side) + public boolean isValidAcceptor(TileEntity acceptor, ForgeDirection side) { - return PipeUtils.getConnections(tile())[side.ordinal()]; + return PipeUtils.isValidAcceptorOnSide(acceptor, side); } @Override diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 08d8afff1..7513df1b4 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -222,7 +222,7 @@ public class PartUniversalCable extends PartTransmitter implement @Override public boolean isValidAcceptor(TileEntity acceptor, ForgeDirection side) { - return CableUtils.getConnections(tile())[side.ordinal()]; + return CableUtils.isValidAcceptorOnSide(tile(), acceptor, side); } @Override diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 3590cd0a0..10fd74bde 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -109,14 +109,26 @@ public final class CableUtils { TileEntity tile = coord.getFromSide(side).getTileEntity(tileEntity.getWorldObj()); - connectable[side.ordinal()] |= isEnergyAcceptor(tile) && isConnectable(tileEntity, tile, side); + connectable[side.ordinal()] = isValidAcceptorOnSide(tileEntity, tile, side); connectable[side.ordinal()] |= isCable(tile); - connectable[side.ordinal()] |= isOutputter(tile, side); } return connectable; } + /** + * Gets the adjacent connections to a TileEntity, from a subset of its sides. + * @param cableEntity - TileEntity that's trying to connect + * @param side - side to check + * @return boolean whether the acceptor is valid + */ + public static boolean isValidAcceptorOnSide(TileEntity cableEntity, TileEntity tile, ForgeDirection side) + { + if(isEnergyAcceptor(tile) && isConnectable(cableEntity, tile, side)) + return true; + return isOutputter(tile, side); + } + /** * Gets all the connected cables around a specific tile entity. * @param tileEntity - center tile entity diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index e712eb443..33a8e46a9 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -38,6 +38,32 @@ public final class PipeUtils return pipes; } + public static boolean isValidAcceptorOnSide(TileEntity tile, ForgeDirection side) + { + if(tile instanceof IGridTransmitter || !(tile instanceof IFluidHandler)) + return false; + + IFluidHandler container = (IFluidHandler)tile; + FluidTankInfo[] infoArray = container.getTankInfo(side.getOpposite()); + + if(container.canDrain(side.getOpposite(), FluidRegistry.WATER) + || container.canFill(side.getOpposite(), FluidRegistry.WATER)) //I hesitate to pass null to these. + { + return true; + } + else if(infoArray != null && infoArray.length > 0) + { + for(FluidTankInfo info : infoArray) + { + if(info != null) + { + return true; + } + } + } + return false; + } + /** * Gets all the adjacent connections to a TileEntity. * @param tileEntity - center TileEntity diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index 1310a120a..b3be80805 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.IFluidHandler; public final class TransporterUtils { @@ -52,6 +53,25 @@ public final class TransporterUtils return transporters; } + public static boolean isValidAcceptorOnSide(TileEntity tile, ForgeDirection side) + { + if(tile instanceof IGridTransmitter || !(tile instanceof IInventory)) + return false; + + IInventory inventory = (IInventory)tile; + + if(inventory.getSizeInventory() > 0) + { + if(!(inventory instanceof ISidedInventory)) + return true; + + int[] slots = ((ISidedInventory)inventory).getAccessibleSlotsFromSide(side.getOpposite().ordinal()); + + return (slots != null && slots.length > 0); + } + return false; + } + /** * Gets all the adjacent connections to a TileEntity. * @param tileEntity - center TileEntity From 1ce56d09e21d92fe91545ffae45fec7c1bf1f2d8 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 18 Dec 2014 22:53:24 +0000 Subject: [PATCH 2/2] Fix Portable Tank NPE --- src/main/java/mekanism/common/tile/TileEntityPortableTank.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java index 763c56c65..1b043418d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java @@ -554,7 +554,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { if(fluidTank != null) { - if(fluid == null || fluidTank.getFluid().getFluid() == fluid) + if(fluid == null || fluidTank.getFluid() == null || fluidTank.getFluid().getFluid() == fluid) { if(isActive) {