diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index aa4e17c5e..7843e9cbc 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -9,6 +9,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.transmitters.TransmissionType; import mekanism.common.capabilities.Capabilities; +import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -90,7 +91,7 @@ public final class GasTransmission */ public static boolean canConnect(TileEntity tileEntity, EnumFacing side) { - if(tileEntity instanceof ITubeConnection && (!(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) || TransmissionType.checkTransmissionType(tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()), TransmissionType.GAS))) + if(tileEntity instanceof ITubeConnection && (!MekanismUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || TransmissionType.checkTransmissionType(MekanismUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()), TransmissionType.GAS))) { if(((ITubeConnection)tileEntity).canTubeConnect(side.getOpposite())) { diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 72d19fe5c..52f9b0bd4 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -24,9 +24,9 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor EnergyAcceptorWrapper wrapper = null; - if(tileEntity.hasCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null)) + if(MekanismUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null)) { - wrapper = new MekanismAcceptor(tileEntity.getCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null)); + wrapper = new MekanismAcceptor(MekanismUtils.getCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null)); } else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver) { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 9767517c8..00eb13448 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -19,6 +19,8 @@ import mekanism.common.content.transporter.TransporterPathfinder.Pathfinder.Dest import mekanism.common.content.transporter.TransporterStack.Path; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.MekanismUtils; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -72,7 +74,7 @@ public final class TransporterPathfinder return new Destination(ret, true, null, 0).setPathType(Path.NONE); } else { - Destination newPath = TransporterPathfinder.getNewBasePath(start.getTileEntity(worldObj).getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null), transportStack, 0); + Destination newPath = TransporterPathfinder.getNewBasePath(MekanismUtils.getCapability(start.getTileEntity(worldObj), Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null), transportStack, 0); if(newPath != null && TransporterManager.didEmit(transportStack.itemStack, newPath.rejected)) { @@ -188,9 +190,9 @@ public final class TransporterPathfinder { TileEntity tile = location.getTileEntity(world); - if(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) + if(MekanismUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) { - score += tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null).getCost(); + score += MekanismUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null).getCost(); } } @@ -270,12 +272,12 @@ public final class TransporterPathfinder { TileEntity tile = path.get(i).getTileEntity(world); - if(!tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) + if(!MekanismUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) { return false; } - ILogisticalTransporter transporter = tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null); + ILogisticalTransporter transporter = MekanismUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null); if(transporter == null || (transporter.getColor() != null && transporter.getColor() != stack.color)) { @@ -473,7 +475,7 @@ public final class TransporterPathfinder if(transportStack.canInsertToTransporter(neighbor.getTileEntity(worldObj), direction)) { TileEntity tile = neighbor.getTileEntity(worldObj); - double tentativeG = gScore.get(currentNode) + tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, direction.getOpposite()).getCost(); + double tentativeG = gScore.get(currentNode) + MekanismUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, direction.getOpposite()).getCost(); if(closedSet.contains(neighbor)) { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 45e77b9ad..da8a2d917 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -12,6 +12,7 @@ import mekanism.common.base.ILogisticalTransporter; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterPathfinder.Destination; import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -304,14 +305,14 @@ public class TransporterStack public boolean canInsertToTransporter(TileEntity tileEntity, EnumFacing from) { - if(!(tileEntity.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()))) + if(!(MekanismUtils.hasCapability(tileEntity, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()))) { return false; } - ILogisticalTransporter transporter = tileEntity.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()); + ILogisticalTransporter transporter = MekanismUtils.getCapability(tileEntity, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()); - if(!tileEntity.getCapability(Capabilities.BLOCKABLE_CONNECTION_CAPABILITY, from.getOpposite()).canConnectMutual(from.getOpposite())) + if(!MekanismUtils.getCapability(tileEntity, Capabilities.BLOCKABLE_CONNECTION_CAPABILITY, from.getOpposite()).canConnectMutual(from.getOpposite())) { return false; } diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index b02bf255b..2969edf5e 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -11,6 +11,7 @@ import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.common.capabilities.Capabilities; +import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -39,11 +40,11 @@ public class ItemNetworkReader extends ItemEnergized if(getEnergy(stack) >= ENERGY_PER_USE && tileEntity != null) { - if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) + if(MekanismUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE); - IGridTransmitter transmitter = tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); + IGridTransmitter transmitter = MekanismUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkSize())); @@ -80,9 +81,9 @@ public class ItemNetworkReader extends ItemEnergized TileEntity tile = coord.getTileEntity(world); - if(tile != null && tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite())) + if(tile != null && MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite())) { - IGridTransmitter transmitter = tile.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite()); + IGridTransmitter transmitter = MekanismUtils.getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite()); if(transmitter.getTransmitterNetwork().possibleAcceptors.containsKey(coord.offset(iterSide.getOpposite())) && !iteratedNetworks.contains(transmitter.getTransmitterNetwork())) { diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index 7aa371482..347c8035b 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -8,6 +8,8 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.capabilities.Capabilities; import mekanism.common.transmitters.Transmitter; +import mekanism.common.util.MekanismUtils; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.util.EnumFacing; @@ -53,9 +55,9 @@ public class MultipartTransmitter> extends Tran return null; } - if(potentialTransmitterTile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) + if(MekanismUtils.hasCapability(potentialTransmitterTile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { - IGridTransmitter transmitter = potentialTransmitterTile.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); + IGridTransmitter transmitter = MekanismUtils.getCapability(potentialTransmitterTile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType())) { @@ -98,9 +100,9 @@ public class MultipartTransmitter> extends Tran { TileEntity tile = from.getTileEntity(world()); - if(tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + if(MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { - IGridTransmitter transmitter = tile.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + IGridTransmitter transmitter = MekanismUtils.getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType())); { diff --git a/src/main/java/mekanism/common/multipart/MultipartTransporter.java b/src/main/java/mekanism/common/multipart/MultipartTransporter.java index 5e07107d5..f02c73a01 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransporter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransporter.java @@ -93,7 +93,7 @@ public class MultipartTransporter extends MultipartTransmitter())), (EntityPlayerMP)player); } } @@ -923,7 +923,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return data; } - public ArrayList getSmallPacket(ArrayList data) + public ArrayList getSmallPacket(ArrayList data) { super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 4ff595f82..f5b2638da 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -370,7 +370,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i public double injectEnergy(EnumFacing direction, double amount, double voltage) { TileEntity tile = getWorld().getTileEntity(getPos().offset(direction)); - if(tile == null || tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite())) + if(tile == null || MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite())) { return amount; } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 74e86d60a..825fe660c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -387,7 +387,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement public double injectEnergy(EnumFacing direction, double amount, double voltage) { TileEntity tile = getWorld().getTileEntity(getPos().offset(direction)); - if(tile == null || tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite())) + if(tile == null || MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite())) { return amount; } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 348fe102f..469571a23 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -91,7 +91,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen TileEntity back = Coord4D.get(this).offset(facing.getOpposite()).getTileEntity(worldObj); TileEntity front = Coord4D.get(this).offset(facing).getTileEntity(worldObj); - if(back instanceof IInventory && (front != null && front.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()) || front instanceof IInventory)) + if(back instanceof IInventory && (front != null && MekanismUtils.hasCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()) || front instanceof IInventory)) { IInventory inventory = InventoryUtils.checkChestInv((IInventory)back); @@ -177,9 +177,9 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { ItemStack used = null; - if(front.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) + if(MekanismUtils.hasCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) { - ILogisticalTransporter transporter = front.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()); + ILogisticalTransporter transporter = MekanismUtils.getCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()); if(!roundRobin) { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index bbc626c99..c5a45495f 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -28,16 +28,16 @@ public final class CableUtils { public static boolean isEnergyAcceptor(TileEntity tileEntity) { - return tileEntity != null && (tileEntity.hasCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null) || + return tileEntity != null && (MekanismUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null) || (MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) || (MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver)); } public static boolean isCable(TileEntity tileEntity) { - if(tileEntity != null && tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + if(tileEntity != null && MekanismUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { - return TransmissionType.checkTransmissionType(tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null), TransmissionType.ENERGY); + return TransmissionType.checkTransmissionType(MekanismUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null), TransmissionType.ENERGY); } return false; } @@ -115,7 +115,7 @@ public final class CableUtils public static boolean isOutputter(TileEntity tileEntity, EnumFacing side) { return tileEntity != null && ( - (tileEntity.hasCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()) && tileEntity.getCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) || + (MekanismUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()) && MekanismUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) || (MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) || (MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())) ); @@ -123,14 +123,14 @@ public final class CableUtils public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, EnumFacing side) { - if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) + if(MekanismUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { return false; } - if(tileEntity.hasCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite())) + if(MekanismUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite())) { - if(tileEntity.getCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite()).canReceiveEnergy(side.getOpposite())) + if(MekanismUtils.getCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite()).canReceiveEnergy(side.getOpposite())) { return true; } @@ -142,9 +142,9 @@ public final class CableUtils return true; } } - else if(tileEntity.hasCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite())) + else if(MekanismUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite())) { - if(tileEntity.getCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) + if(MekanismUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) { return true; } @@ -235,9 +235,9 @@ public final class CableUtils { double sent = 0; - if(tileEntity.hasCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite())) + if(MekanismUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite())) { - IStrictEnergyAcceptor acceptor = tileEntity.getCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite()); + IStrictEnergyAcceptor acceptor = MekanismUtils.getCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite()); if(acceptor.canReceiveEnergy(side.getOpposite())) { diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index b8fdd1741..57c0dc4f7 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -23,7 +23,7 @@ public class HeatUtils source.transferHeatTo(-heatToTransfer); sink.transferHeatTo(heatToTransfer); - if(!(sink instanceof ICapabilityProvider && ((ICapabilityProvider)sink).hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))) + if(!(sink instanceof ICapabilityProvider && MekanismUtils.hasCapability((ICapabilityProvider)sink, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))) { heatTransferred[0] += heatToTransfer; } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index a04db8bda..054c67543 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -84,6 +84,9 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityManager; +import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -1601,6 +1604,20 @@ public final class MekanismUtils return false; } + public static boolean hasCapability(ICapabilityProvider provider, Capability cap, EnumFacing side) + { + if(provider == null || cap == null) return false; + + return provider.hasCapability(cap, side); + } + + public static T getCapability(ICapabilityProvider provider, Capability cap, EnumFacing side) + { + if(provider == null || cap == null) return null; + + return provider.getCapability(cap, side); + } + public static enum ResourceType { GUI("gui"), diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index e8fff7bd2..71be406c8 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -22,7 +22,7 @@ public final class PipeUtils public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side) { - if(tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IFluidHandler)) + if(MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IFluidHandler)) return false; IFluidHandler container = (IFluidHandler)tile; diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index e5aec1bbb..e1e73ebe1 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -37,9 +37,9 @@ public final class TransporterUtils { TileEntity tile = tileEntity.coord().offset(orientation).getTileEntity(tileEntity.world()); - if(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, orientation.getOpposite())) + if(MekanismUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, orientation.getOpposite())) { - ILogisticalTransporter otherTransporter = tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, orientation.getOpposite()); + ILogisticalTransporter otherTransporter = MekanismUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, orientation.getOpposite()); if(otherTransporter.getColor() == null || tileEntity.getColor() == null || otherTransporter.getColor() == tileEntity.getColor()) { @@ -53,7 +53,7 @@ public final class TransporterUtils public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side) { - if(tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IInventory)) + if(MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IInventory)) { return false; } @@ -150,7 +150,7 @@ public final class TransporterUtils { TileEntity inventory = transporter.coord().offset(orientation).getTileEntity(transporter.world()); - if(inventory instanceof IInventory && !(inventory.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, orientation.getOpposite()))) + if(inventory instanceof IInventory && !(MekanismUtils.hasCapability(inventory, Capabilities.GRID_TRANSMITTER_CAPABILITY, orientation.getOpposite()))) { inventories[orientation.ordinal()] = (IInventory)inventory; }