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