diff --git a/src/main/java/mekanism/api/Capabilities.java b/src/main/java/mekanism/api/Capabilities.java deleted file mode 100644 index 5da12dab5..000000000 --- a/src/main/java/mekanism/api/Capabilities.java +++ /dev/null @@ -1,22 +0,0 @@ -package mekanism.api; - -import mekanism.api.energy.ICableOutputter; -import mekanism.api.energy.IStrictEnergyAcceptor; -import mekanism.api.energy.IStrictEnergyStorage; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.CapabilityInject; - -/** - * Created by ben on 30/04/16. - */ -public class Capabilities -{ - @CapabilityInject(IStrictEnergyStorage.class) - public static Capability ENERGY_STORAGE_CAPABILITY = null; - - @CapabilityInject(IStrictEnergyAcceptor.class) - public static Capability ENERGY_ACCEPTOR_CAPABILITY = null; - - @CapabilityInject(ICableOutputter.class) - public static Capability CABLE_OUTPUTTER_CAPABILITY = null; -} diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index f7e54ed9b..aa4e17c5e 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -7,8 +7,9 @@ import java.util.Collections; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmissionType; +import mekanism.common.capabilities.Capabilities; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -89,7 +90,7 @@ public final class GasTransmission */ public static boolean canConnect(TileEntity tileEntity, EnumFacing side) { - if(tileEntity instanceof ITubeConnection && (!(tileEntity instanceof ITransmitterTile) || TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), TransmissionType.GAS))) + 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(((ITubeConnection)tileEntity).canTubeConnect(side.getOpposite())) { diff --git a/src/main/java/mekanism/api/transmitters/ITransmitterTile.java b/src/main/java/mekanism/api/transmitters/ITransmitterTile.java deleted file mode 100644 index 3940b71a6..000000000 --- a/src/main/java/mekanism/api/transmitters/ITransmitterTile.java +++ /dev/null @@ -1,6 +0,0 @@ -package mekanism.api.transmitters; - -public interface ITransmitterTile> -{ - public IGridTransmitter getTransmitter(); -} diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index a208577fe..9317ba994 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -16,9 +16,6 @@ import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; -import mekanism.api.energy.ICableOutputter; -import mekanism.api.energy.IStrictEnergyAcceptor; -import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasNetwork.GasTransferEvent; import mekanism.api.gas.GasRegistry; @@ -48,6 +45,7 @@ import mekanism.common.base.IModule; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.CableOutputter; +import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.StrictEnergyAcceptor; import mekanism.common.capabilities.StrictEnergyStorage; import mekanism.common.chunkloading.ChunkManager; @@ -1305,7 +1303,7 @@ public class Mekanism InfuseRegistry.registerInfuseType(new InfuseType("BIO", "mekanism:infuse/Bio").setUnlocalizedName("bio")); InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", "mekanism:infuse/Obsidian").setUnlocalizedName("obsidian")); - registerCapabilities(); + Capabilities.registerCapabilities(); } @EventHandler @@ -1418,56 +1416,6 @@ public class Mekanism logger.info("Hooking complete."); } - - public void registerCapabilities() - { - CapabilityManager.INSTANCE.register(IStrictEnergyStorage.class, new IStorage() { - @Override - public NBTBase writeNBT(Capability capability, IStrictEnergyStorage instance, EnumFacing side) - { - NBTTagCompound tag = new NBTTagCompound(); - tag.setDouble("maxEnergy", instance.getMaxEnergy()); - tag.setDouble("energyStored", instance.getEnergy()); - return tag; - } - - @Override - public void readNBT(Capability capability, IStrictEnergyStorage instance, EnumFacing side, NBTBase nbt) - { - if(nbt instanceof NBTTagCompound) - instance.setEnergy(((NBTTagCompound)nbt).getDouble("energyStored")); - } - }, StrictEnergyStorage.class); - CapabilityManager.INSTANCE.register(IStrictEnergyAcceptor.class, new IStorage() { - @Override - public NBTBase writeNBT(Capability capability, IStrictEnergyAcceptor instance, EnumFacing side) - { - NBTTagCompound tag = new NBTTagCompound(); - tag.setDouble("maxEnergy", instance.getMaxEnergy()); - tag.setDouble("energyStored", instance.getEnergy()); - return tag; - } - - @Override - public void readNBT(Capability capability, IStrictEnergyAcceptor instance, EnumFacing side, NBTBase nbt) - { - if(nbt instanceof NBTTagCompound) - instance.setEnergy(((NBTTagCompound)nbt).getDouble("energyStored")); - } - }, StrictEnergyAcceptor.class); - CapabilityManager.INSTANCE.register(ICableOutputter.class, new IStorage() { - @Override - public NBTBase writeNBT(Capability capability, ICableOutputter instance, EnumFacing side) - { - return new NBTTagCompound(); - } - - @Override - public void readNBT(Capability capability, ICableOutputter instance, EnumFacing side, NBTBase nbt) - { - } - }, CableOutputter.class); - } @SubscribeEvent public void onEnergyTransferred(EnergyTransferEvent event) diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 450991409..72d19fe5c 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -2,7 +2,7 @@ package mekanism.common.base; import ic2.api.energy.tile.IEnergySink; -import mekanism.api.Capabilities; +import mekanism.common.capabilities.Capabilities; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; diff --git a/src/main/java/mekanism/common/base/ITransporterTile.java b/src/main/java/mekanism/common/base/ITransporterTile.java deleted file mode 100644 index 7ddf2d38d..000000000 --- a/src/main/java/mekanism/common/base/ITransporterTile.java +++ /dev/null @@ -1,12 +0,0 @@ -package mekanism.common.base; - - -import mekanism.api.transmitters.IBlockableConnection; -import mekanism.api.transmitters.ITransmitterTile; -import mekanism.common.InventoryNetwork; -import net.minecraft.inventory.IInventory; - -public interface ITransporterTile extends ITransmitterTile, IBlockableConnection -{ - public ILogisticalTransporter getTransmitter(); -} diff --git a/src/main/java/mekanism/common/capabilities/CableOutputter.java b/src/main/java/mekanism/common/capabilities/CableOutputter.java index 7f34ebe0f..c732b3712 100644 --- a/src/main/java/mekanism/common/capabilities/CableOutputter.java +++ b/src/main/java/mekanism/common/capabilities/CableOutputter.java @@ -1,8 +1,12 @@ package mekanism.common.capabilities; import mekanism.api.energy.ICableOutputter; +import mekanism.common.capabilities.StorageHelper.NullStorage; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.CapabilityManager; +import net.minecraftforge.common.util.INBTSerializable; /** * Created by ben on 30/04/16. @@ -14,4 +18,9 @@ public class CableOutputter implements ICableOutputter { return true; } + + public static void register() + { + CapabilityManager.INSTANCE.register(ICableOutputter.class, new NullStorage<>(), CableOutputter.class); + } } diff --git a/src/main/java/mekanism/common/capabilities/Capabilities.java b/src/main/java/mekanism/common/capabilities/Capabilities.java new file mode 100644 index 000000000..ac6c6ca47 --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/Capabilities.java @@ -0,0 +1,66 @@ +package mekanism.common.capabilities; + +import mekanism.api.IAlloyInteraction; +import mekanism.api.IConfigurable; +import mekanism.api.IHeatTransfer; +import mekanism.api.energy.ICableOutputter; +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.api.gas.IGasHandler; +import mekanism.api.transmitters.IBlockableConnection; +import mekanism.api.transmitters.IGridTransmitter; +import mekanism.common.base.ILogisticalTransporter; +import mekanism.common.base.ITileNetwork; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; + + +/** + * Created by ben on 30/04/16. + */ +public class Capabilities +{ + @CapabilityInject(IStrictEnergyStorage.class) + public static Capability ENERGY_STORAGE_CAPABILITY = null; + + @CapabilityInject(IStrictEnergyAcceptor.class) + public static Capability ENERGY_ACCEPTOR_CAPABILITY = null; + + @CapabilityInject(ICableOutputter.class) + public static Capability CABLE_OUTPUTTER_CAPABILITY = null; + + @CapabilityInject(IConfigurable.class) + public static Capability CONFIGURABLE_CAPABILITY = null; + + @CapabilityInject(IGasHandler.class) + public static Capability GAS_HANDLER_CAPABILITY = null; + + @CapabilityInject(IHeatTransfer.class) + public static Capability HEAT_TRANSFER_CAPABILITY = null; + + @CapabilityInject(IBlockableConnection.class) + public static Capability BLOCKABLE_CONNECTION_CAPABILITY = null; + + @CapabilityInject(IGridTransmitter.class) + public static Capability GRID_TRANSMITTER_CAPABILITY = null; + + @CapabilityInject(ILogisticalTransporter.class) + public static Capability LOGISTICAL_TRANSPORTER_CAPABILITY = null; + + @CapabilityInject(IAlloyInteraction.class) + public static Capability ALLOY_INTERACTION_CAPABILITY = null; + + @CapabilityInject(ITileNetwork.class) + public static Capability TILE_NETWORK_CAPABILITY = null; + + public static void registerCapabilities() + { + StrictEnergyStorage.register(); + StrictEnergyAcceptor.register(); + CableOutputter.register(); + + GridTransmitterTile.register(); + LogisticalTransporter.register(); + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/common/capabilities/GridTransmitterTile.java b/src/main/java/mekanism/common/capabilities/GridTransmitterTile.java new file mode 100644 index 000000000..18bb51e5d --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/GridTransmitterTile.java @@ -0,0 +1,168 @@ +package mekanism.common.capabilities; + +import java.util.Collection; + +import mekanism.api.Coord4D; +import mekanism.api.transmitters.DynamicNetwork; +import mekanism.api.transmitters.IGridTransmitter; +import mekanism.api.transmitters.TransmissionType; +import mekanism.common.capabilities.StorageHelper.NullStorage; + +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.CapabilityManager; + +/** + * Created by ben on 03/05/16. + */ +public class GridTransmitterTile> implements IGridTransmitter +{ + @Override + public boolean hasTransmitterNetwork() + { + return false; + } + + @Override + public N getTransmitterNetwork() + { + return null; + } + + @Override + public void setTransmitterNetwork(N network) + { + + } + + @Override + public int getTransmitterNetworkSize() + { + return 0; + } + + @Override + public int getTransmitterNetworkAcceptorSize() + { + return 0; + } + + @Override + public String getTransmitterNetworkNeeded() + { + return null; + } + + @Override + public String getTransmitterNetworkFlow() + { + return null; + } + + @Override + public String getTransmitterNetworkBuffer() + { + return null; + } + + @Override + public double getTransmitterNetworkCapacity() + { + return 0; + } + + @Override + public int getCapacity() + { + return 0; + } + + @Override + public World world() + { + return null; + } + + @Override + public Coord4D coord() + { + return null; + } + + @Override + public Coord4D getAdjacentConnectableTransmitterCoord(EnumFacing side) + { + return null; + } + + @Override + public A getAcceptor(EnumFacing side) + { + return null; + } + + @Override + public boolean isValid() + { + return false; + } + + @Override + public boolean isOrphan() + { + return false; + } + + @Override + public void setOrphan(boolean orphaned) + { + + } + + @Override + public N createEmptyNetwork() + { + return null; + } + + @Override + public N mergeNetworks(Collection toMerge) + { + return null; + } + + @Override + public N getExternalNetwork(Coord4D from) + { + return null; + } + + @Override + public void takeShare() + { + + } + + @Override + public void updateShare() + { + + } + + @Override + public Object getBuffer() + { + return null; + } + + @Override + public TransmissionType getTransmissionType() + { + return null; + } + + public static void register() + { + CapabilityManager.INSTANCE.register(IGridTransmitter.class, new NullStorage<>(), GridTransmitterTile.class); + } +} diff --git a/src/main/java/mekanism/common/capabilities/LogisticalTransporter.java b/src/main/java/mekanism/common/capabilities/LogisticalTransporter.java new file mode 100644 index 000000000..53141a660 --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/LogisticalTransporter.java @@ -0,0 +1,234 @@ +package mekanism.common.capabilities; + +import java.util.Collection; + +import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.api.transmitters.TransmissionType; +import mekanism.common.InventoryNetwork; +import mekanism.common.base.ILogisticalTransporter; +import mekanism.common.capabilities.StorageHelper.NullStorage; +import mekanism.common.content.transporter.TransporterStack; +import mekanism.common.tile.TileEntityLogisticalSorter; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.CapabilityManager; + +/** + * Created by ben on 03/05/16. + */ +public class LogisticalTransporter implements ILogisticalTransporter +{ + @Override + public ItemStack insert(Coord4D original, ItemStack itemStack, EnumColor color, boolean doEmit, int min) + { + return null; + } + + @Override + public ItemStack insertRR(TileEntityLogisticalSorter outputter, ItemStack itemStack, EnumColor color, boolean doEmit, int min) + { + return null; + } + + @Override + public void entityEntering(TransporterStack stack, int progress) + { + + } + + @Override + public EnumColor getColor() + { + return null; + } + + @Override + public void setColor(EnumColor c) + { + + } + + @Override + public boolean canEmitTo(TileEntity tileEntity, EnumFacing side) + { + return false; + } + + @Override + public boolean canReceiveFrom(TileEntity tileEntity, EnumFacing side) + { + return false; + } + + @Override + public double getCost() + { + return 0; + } + + @Override + public boolean canConnectMutual(EnumFacing side) + { + return false; + } + + @Override + public boolean canConnect(EnumFacing side) + { + return false; + } + + @Override + public boolean hasTransmitterNetwork() + { + return false; + } + + @Override + public InventoryNetwork getTransmitterNetwork() + { + return null; + } + + @Override + public void setTransmitterNetwork(InventoryNetwork network) + { + + } + + @Override + public int getTransmitterNetworkSize() + { + return 0; + } + + @Override + public int getTransmitterNetworkAcceptorSize() + { + return 0; + } + + @Override + public String getTransmitterNetworkNeeded() + { + return null; + } + + @Override + public String getTransmitterNetworkFlow() + { + return null; + } + + @Override + public String getTransmitterNetworkBuffer() + { + return null; + } + + @Override + public double getTransmitterNetworkCapacity() + { + return 0; + } + + @Override + public int getCapacity() + { + return 0; + } + + @Override + public World world() + { + return null; + } + + @Override + public Coord4D coord() + { + return null; + } + + @Override + public Coord4D getAdjacentConnectableTransmitterCoord(EnumFacing side) + { + return null; + } + + @Override + public IInventory getAcceptor(EnumFacing side) + { + return null; + } + + @Override + public boolean isValid() + { + return false; + } + + @Override + public boolean isOrphan() + { + return false; + } + + @Override + public void setOrphan(boolean orphaned) + { + + } + + @Override + public InventoryNetwork createEmptyNetwork() + { + return null; + } + + @Override + public InventoryNetwork mergeNetworks(Collection toMerge) + { + return null; + } + + @Override + public InventoryNetwork getExternalNetwork(Coord4D from) + { + return null; + } + + @Override + public void takeShare() + { + + } + + @Override + public void updateShare() + { + + } + + @Override + public Object getBuffer() + { + return null; + } + + @Override + public TransmissionType getTransmissionType() + { + return null; + } + + public static void register() + { + CapabilityManager.INSTANCE.register(ILogisticalTransporter.class, new NullStorage<>(), LogisticalTransporter.class); + } +} diff --git a/src/main/java/mekanism/common/capabilities/StorageHelper.java b/src/main/java/mekanism/common/capabilities/StorageHelper.java new file mode 100644 index 000000000..a355d0db5 --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/StorageHelper.java @@ -0,0 +1,51 @@ +package mekanism.common.capabilities; + +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.Capability.IStorage; +import net.minecraftforge.common.util.INBTSerializable; + +/** + * Created by ben on 03/05/16. + */ +public class StorageHelper +{ + public static class DefaultStorage implements IStorage + { + @Override + public NBTBase writeNBT(Capability capability, T instance, EnumFacing side) + { + if(instance instanceof INBTSerializable) + return ((INBTSerializable)instance).serializeNBT(); + return new NBTTagCompound(); + } + + @Override + public void readNBT(Capability capability, T instance, EnumFacing side, NBTBase nbt) + { + if(instance instanceof INBTSerializable) + { + Class nbtClass = ((INBTSerializable)instance).serializeNBT().getClass(); + + if(nbtClass.isInstance(nbt)) + { + ((INBTSerializable)instance).deserializeNBT(nbtClass.cast(nbt)); + } + } + } + } + + public static class NullStorage implements IStorage + { + @Override + public NBTBase writeNBT(Capability capability, T instance, EnumFacing side) + { + return new NBTTagCompound(); + } + + @Override + public void readNBT(Capability capability, T instance, EnumFacing side, NBTBase nbt) {} + } +} diff --git a/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java b/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java index 3f50b6b4e..9514b324a 100644 --- a/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java +++ b/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java @@ -1,14 +1,23 @@ package mekanism.common.capabilities; import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.common.capabilities.StorageHelper.DefaultStorage; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.CapabilityManager; +import net.minecraftforge.common.util.INBTSerializable; /** * Created by ben on 30/04/16. */ -public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrictEnergyAcceptor +public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrictEnergyAcceptor, INBTSerializable { + public StrictEnergyAcceptor() + { + this(0); + } + public StrictEnergyAcceptor(double capacity) { super(capacity); @@ -27,4 +36,23 @@ public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrict { return true; } + + @Override + public NBTTagCompound serializeNBT() + { + return super.serializeNBT(); + } + + @Override + public void deserializeNBT(NBTTagCompound nbt) + { + super.deserializeNBT(nbt); + } + + public static void register() + { + CapabilityManager.INSTANCE.register(IStrictEnergyAcceptor.class, new DefaultStorage<>(), StrictEnergyAcceptor.class); + + } + } diff --git a/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java b/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java index 04e8a4063..2263f5664 100644 --- a/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java +++ b/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java @@ -1,14 +1,24 @@ package mekanism.common.capabilities; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.common.capabilities.StorageHelper.DefaultStorage; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.capabilities.CapabilityManager; +import net.minecraftforge.common.util.INBTSerializable; /** * Created by ben on 30/04/16. */ -public class StrictEnergyStorage implements IStrictEnergyStorage +public class StrictEnergyStorage implements IStrictEnergyStorage, INBTSerializable { - double energyStored = 0; - double maxEnergy; + private double energyStored = 0; + private double maxEnergy; + + public StrictEnergyStorage() + { + this(0); + } public StrictEnergyStorage(double capacity) { @@ -32,4 +42,26 @@ public class StrictEnergyStorage implements IStrictEnergyStorage { return maxEnergy; } + + @Override + public NBTTagCompound serializeNBT() + { + NBTTagCompound tag = new NBTTagCompound(); + tag.setDouble("maxEnergy", getMaxEnergy()); + tag.setDouble("energyStored", getEnergy()); + return tag; + } + + @Override + public void deserializeNBT(NBTTagCompound nbt) + { + setEnergy(nbt.getDouble("energyStored")); + maxEnergy = nbt.getDouble("maxEnergy"); + } + + public static void register() + { + CapabilityManager.INSTANCE.register(IStrictEnergyStorage.class, new DefaultStorage<>(), StrictEnergyStorage.class); + + } } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index ccfd9835d..8825678a3 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -13,7 +13,7 @@ import mekanism.api.Coord4D; import mekanism.common.InventoryNetwork; import mekanism.common.InventoryNetwork.AcceptorData; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.base.ITransporterTile; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.PathfinderCache.PathData; import mekanism.common.content.transporter.TransporterPathfinder.Pathfinder.DestChecker; import mekanism.common.content.transporter.TransporterStack.Path; @@ -72,7 +72,7 @@ public final class TransporterPathfinder return new Destination(ret, true, null, 0).setPathType(Path.NONE); } else { - Destination newPath = TransporterPathfinder.getNewBasePath(((ITransporterTile)start.getTileEntity(worldObj)).getTransmitter(), transportStack, 0); + Destination newPath = TransporterPathfinder.getNewBasePath(start.getTileEntity(worldObj).getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null), transportStack, 0); if(newPath != null && TransporterManager.didEmit(transportStack.itemStack, newPath.rejected)) { @@ -188,9 +188,9 @@ public final class TransporterPathfinder { TileEntity tile = location.getTileEntity(world); - if(tile instanceof ITransporterTile) + if(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) { - score += ((ITransporterTile)tile).getTransmitter().getCost(); + score += tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null).getCost(); } } @@ -270,14 +270,14 @@ public final class TransporterPathfinder { TileEntity tile = path.get(i).getTileEntity(world); - if(!(tile instanceof ITransporterTile)) + if(!tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) { return false; } - ITransporterTile transporterTile = (ITransporterTile)tile; + ILogisticalTransporter transporter = tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null); - if(transporterTile.getTransmitter() == null || (transporterTile.getTransmitter().getColor() != null && transporterTile.getTransmitter().getColor() != stack.color)) + if(transporter == null || (transporter.getColor() != null && transporter.getColor() != stack.color)) { return false; } @@ -473,7 +473,7 @@ public final class TransporterPathfinder if(transportStack.canInsertToTransporter(neighbor.getTileEntity(worldObj), direction)) { TileEntity tile = neighbor.getTileEntity(worldObj); - double tentativeG = gScore.get(currentNode) + ((ITransporterTile)tile).getTransmitter().getCost(); + double tentativeG = gScore.get(currentNode) + tile.getCapability(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 1c40f4136..45e77b9ad 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -9,7 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.PacketHandler; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.base.ITransporterTile; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterPathfinder.Destination; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.TransporterUtils; @@ -304,14 +304,14 @@ public class TransporterStack public boolean canInsertToTransporter(TileEntity tileEntity, EnumFacing from) { - if(!(tileEntity instanceof ITransporterTile)) + if(!(tileEntity.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()))) { return false; } - ILogisticalTransporter transporter = ((ITransporterTile)tileEntity).getTransmitter(); + ILogisticalTransporter transporter = tileEntity.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()); - if(!((ITransporterTile)tileEntity).canConnectMutual(from.getOpposite())) + if(!tileEntity.getCapability(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 ef86c0dca..b02bf255b 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -9,8 +9,9 @@ import mekanism.api.IHeatTransfer; import mekanism.api.MekanismAPI; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmitterNetworkRegistry; +import mekanism.common.capabilities.Capabilities; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -36,13 +37,13 @@ public class ItemNetworkReader extends ItemEnergized TileEntity tileEntity = world.getTileEntity(pos); boolean drain = !player.capabilities.isCreativeMode; - if(getEnergy(stack) >= ENERGY_PER_USE) + if(getEnergy(stack) >= ENERGY_PER_USE && tileEntity != null) { - if(tileEntity instanceof ITransmitterTile) + if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE); - IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter(); + IGridTransmitter transmitter = tileEntity.getCapability(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())); @@ -67,7 +68,7 @@ public class ItemNetworkReader extends ItemEnergized return true; } - else if(tileEntity != null) + else { if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE); @@ -76,10 +77,12 @@ public class ItemNetworkReader extends ItemEnergized for(EnumFacing iterSide : EnumFacing.VALUES) { Coord4D coord = Coord4D.get(tileEntity).offset(iterSide); + + TileEntity tile = coord.getTileEntity(world); - if(coord.getTileEntity(world) instanceof ITransmitterTile) + if(tile != null && tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite())) { - IGridTransmitter transmitter = ((ITransmitterTile)coord.getTileEntity(world)).getTransmitter(); + IGridTransmitter transmitter = tile.getCapability(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/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 8235bee3d..f07a4ea76 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -1,12 +1,8 @@ package mekanism.common.multipart; -import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.transmitters.DynamicNetwork; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; @@ -16,13 +12,11 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; //import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.settings.GameSettings; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index 6845107e1..7aa371482 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -5,14 +5,13 @@ import java.util.Collection; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmissionType; +import mekanism.common.capabilities.Capabilities; import mekanism.common.transmitters.Transmitter; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.util.EnumFacing; -import mcmultipart.block.TileMultipart; import mcmultipart.multipart.IMultipartContainer; public class MultipartTransmitter> extends Transmitter @@ -54,9 +53,9 @@ public class MultipartTransmitter> extends Tran return null; } - if(potentialTransmitterTile instanceof ITransmitterTile) + if(potentialTransmitterTile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { - IGridTransmitter transmitter = ((ITransmitterTile)potentialTransmitterTile).getTransmitter(); + IGridTransmitter transmitter = potentialTransmitterTile.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType())) { @@ -99,9 +98,9 @@ public class MultipartTransmitter> extends Tran { TileEntity tile = from.getTileEntity(world()); - if(tile instanceof ITransmitterTile) + if(tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { - IGridTransmitter transmitter = ((ITransmitterTile)tile).getTransmitter(); + IGridTransmitter transmitter = tile.getCapability(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 b3bc9059d..5e07107d5 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransporter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransporter.java @@ -10,7 +10,7 @@ import mekanism.common.HashList; import mekanism.common.InventoryNetwork; import mekanism.common.Mekanism; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.base.ITransporterTile; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.content.transporter.TransporterStack.Path; @@ -93,8 +93,8 @@ public class MultipartTransporter extends MultipartTransmitter implements ITransporterTile +public class PartLogisticalTransporter extends PartTransmitter { public Tier.TransporterTier tier = Tier.TransporterTier.BASIC; @@ -121,7 +118,7 @@ public class PartLogisticalTransporter extends PartTransmitter capability, EnumFacing side) + { + return capability == Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY) + return (T) getTransmitter(); + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index e65255567..3c11747f3 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -3,12 +3,8 @@ package mekanism.common.multipart; import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; -import java.util.EnumSet; -import java.util.HashSet; import java.util.List; -import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -16,17 +12,15 @@ import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.client; import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.ITransmitter; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmissionType; -import mekanism.client.render.RenderPartTransmitter; import mekanism.common.MekanismItems; import mekanism.common.Tier; import mekanism.common.base.ITileNetwork; +import mekanism.common.capabilities.Capabilities; import mekanism.common.multipart.TransmitterType.Size; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; -import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -40,7 +34,6 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; //import net.minecraft.util.IIcon; import net.minecraft.util.ITickable; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; /*import codechicken.lib.data.MCDataInput; @@ -63,17 +56,11 @@ import codechicken.multipart.TSlottedPart;*/ import mcmultipart.block.TileMultipart; import mcmultipart.multipart.IMultipart; import mcmultipart.multipart.IOccludingPart; -import mcmultipart.multipart.ISlottedPart; -import mcmultipart.multipart.ISlottedPart.ISlotOccludingPart; import mcmultipart.multipart.Multipart; -import mcmultipart.multipart.PartSlot; import mcmultipart.raytrace.PartMOP; import mcmultipart.raytrace.RayTraceUtils; import mcmultipart.raytrace.RayTraceUtils.RayTraceResultPart; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - public abstract class PartSidedPipe extends Multipart implements IOccludingPart, /*ISlotOccludingPart, ISidedHollowConnect, JIconHitEffects, INeighborTileChange,*/ ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable { public static AxisAlignedBB[] smallSides = new AxisAlignedBB[7]; @@ -281,7 +268,9 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, { TileEntity tileEntity = getWorld().getTileEntity(getPos().offset(side)); - if(tileEntity instanceof ITransmitterTile && TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), getTransmitterType().getTransmission()) && isValidTransmitter(tileEntity)) + if(tileEntity != null && tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) + && TransmissionType.checkTransmissionType(tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()), getTransmitterType().getTransmission()) + && isValidTransmitter(tileEntity)) { connections |= 1 << side.ordinal(); } @@ -333,7 +322,9 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, { TileEntity tileEntity = getWorld().getTileEntity(getPos().offset(side)); - if(tileEntity instanceof ITransmitterTile && TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), getTransmitterType().getTransmission()) && isValidTransmitter(tileEntity)) + if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) + && TransmissionType.checkTransmissionType(tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()), getTransmitterType().getTransmission()) + && isValidTransmitter(tileEntity)) { return true; } diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index 7bdad3b82..fd77101a9 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -8,15 +8,15 @@ import java.util.LinkedHashSet; import mekanism.api.Coord4D; import mekanism.api.IAlloyInteraction; import mekanism.api.transmitters.DynamicNetwork; -import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmitterNetworkRegistry; +import mekanism.common.capabilities.Capabilities; + import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.Capability; import net.minecraft.util.EnumFacing; -public abstract class PartTransmitter> extends PartSidedPipe implements ITransmitterTile, IAlloyInteraction +public abstract class PartTransmitter> extends PartSidedPipe implements IAlloyInteraction { public MultipartTransmitter transmitterDelegate; @@ -27,7 +27,6 @@ public abstract class PartTransmitter> extends transmitterDelegate = new MultipartTransmitter<>(this); } - @Override public MultipartTransmitter getTransmitter() { return transmitterDelegate; @@ -194,4 +193,18 @@ public abstract class PartTransmitter> extends public abstract void takeShare(); public abstract void updateShare(); + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.GRID_TRANSMITTER_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.GRID_TRANSMITTER_CAPABILITY) + return (T) getTransmitter(); + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 942ed6edc..d71f79cff 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -5,15 +5,12 @@ import ic2.api.energy.tile.IEnergySource; import java.util.Collection; import java.util.List; -import mekanism.api.Capabilities; -import mekanism.api.MekanismConfig.client; +import mekanism.common.capabilities.Capabilities; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergyStack; -import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.transmitters.TransmissionType; -import mekanism.client.render.RenderPartTransmitter; import mekanism.common.EnergyNetwork; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; @@ -38,8 +35,6 @@ import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class PartUniversalCable extends PartTransmitter implements IStrictEnergyAcceptor, IEnergyHandler { diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index a19e01c56..10c2381a7 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -6,10 +6,10 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; +import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMultiblock; @@ -39,9 +39,9 @@ public class PacketDataRequest implements IMessageHandler)transmitter).getTransmitterNetwork(); diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index 008f4d3bb..1188874bc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -5,6 +5,7 @@ import mekanism.api.Coord4D; import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.base.IAdvancedBoundingBlock; +import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.util.InventoryUtils; import net.minecraft.entity.player.EntityPlayer; @@ -18,6 +19,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import cofh.api.energy.IEnergyHandler; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @@ -469,4 +471,21 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return getInv().getDataType(); } + + @Override + public boolean hasCapability(Capability capability, EnumFacing facing) + { + return capability == Capabilities.ENERGY_STORAGE_CAPABILITY + || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY + || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(Capability capability, EnumFacing facing) + { + if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY) + return (T) this; + return super.getCapability(capability, facing); + } + } diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 772868fa9..a21d47511 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -13,7 +13,7 @@ import mekanism.common.PacketHandler; import mekanism.common.Tier.BinTier; import mekanism.common.base.IActiveState; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.base.ITransporterTile; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.item.ItemBlockBasic; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -31,7 +31,7 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; -import io.netty.buffer.ByteBuf; + import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import net.minecraftforge.fml.common.Optional.Interface; @@ -197,11 +197,11 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento { if(bottomStack != null && isActive) { - TileEntity tile = Coord4D.get(this).offset(EnumFacing.getFront(0)).getTileEntity(worldObj); + TileEntity tile = Coord4D.get(this).offset(EnumFacing.DOWN).getTileEntity(worldObj); - if(tile instanceof ITransporterTile) + if(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP)) { - ILogisticalTransporter transporter = ((ITransporterTile)tile).getTransmitter(); + ILogisticalTransporter transporter = tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP); ItemStack rejects = TransporterUtils.insert(this, transporter, bottomStack, null, true, 0); diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 90731ff1e..f326768f2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -23,9 +23,9 @@ import mekanism.common.base.IActiveState; import mekanism.common.base.IAdvancedBoundingBlock; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; -import mekanism.common.base.ITransporterTile; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.miner.MItemStackFilter; import mekanism.common.content.miner.MOreDictFilter; import mekanism.common.content.miner.MinerFilter; @@ -301,9 +301,9 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I getTopEject(true, remains); } - else if(getEjectInv() instanceof ITransporterTile) + else if(getEjectInv().hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) { - ItemStack rejected = TransporterUtils.insert(getEjectTile(), ((ITransporterTile)getEjectInv()).getTransmitter(), getTopEject(false, null), null, true, 0); + ItemStack rejected = TransporterUtils.insert(getEjectTile(), getEjectInv().getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()), getTopEject(false, null), null, true, 0); if(TransporterManager.didEmit(getTopEject(false, null), rejected)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 8fffd8a27..4ff595f82 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -10,11 +10,8 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.api.Capabilities; -import mekanism.api.Coord4D; +import mekanism.common.capabilities.Capabilities; import mekanism.api.MekanismConfig.general; -import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.common.base.IEnergyWrapper; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; @@ -372,7 +369,8 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "IC2") public double injectEnergy(EnumFacing direction, double amount, double voltage) { - if(Coord4D.get(this).offset(direction).getTileEntity(worldObj) instanceof ITransmitterTile) + TileEntity tile = getWorld().getTileEntity(getPos().offset(direction)); + if(tile == null || tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite())) { return amount; } @@ -402,17 +400,20 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - public boolean hasCapability(net.minecraftforge.common.capabilities.Capability capability, net.minecraft.util.EnumFacing facing) + public boolean hasCapability(Capability capability, EnumFacing facing) { return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY + || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, net.minecraft.util.EnumFacing facing) + public T getCapability(Capability capability, EnumFacing facing) { - if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY) + if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY) + return (T) this; + if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) return (T) this; return super.getCapability(capability, facing); } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index 3d4163a68..003c10f41 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import mekanism.api.Capabilities; +import mekanism.common.capabilities.Capabilities; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java index 7a515ef9c..42a243194 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import mekanism.api.Capabilities; +import mekanism.common.capabilities.Capabilities; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Tier.InductionCellTier; import mekanism.common.util.LangUtils; @@ -99,5 +99,4 @@ public class TileEntityInductionCell extends TileEntityBasicBlock implements ISt return (T) this; return super.getCapability(capability, facing); } - } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index a2cb223eb..74e86d60a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -10,13 +10,12 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.api.Capabilities; +import mekanism.common.capabilities.Capabilities; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IEnergyWrapper; @@ -387,7 +386,8 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Method(modid = "IC2") public double injectEnergy(EnumFacing direction, double amount, double voltage) { - if(Coord4D.get(this).offset(direction).getTileEntity(worldObj) instanceof ITransmitterTile) + TileEntity tile = getWorld().getTileEntity(getPos().offset(direction)); + if(tile == null || tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite())) { return amount; } @@ -469,17 +469,21 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } @Override - public boolean hasCapability(net.minecraftforge.common.capabilities.Capability capability, net.minecraft.util.EnumFacing facing) + public boolean hasCapability(Capability capability, EnumFacing facing) { - return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing); + return capability == Capabilities.ENERGY_STORAGE_CAPABILITY + || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY + || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY + || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, net.minecraft.util.EnumFacing facing) + public T getCapability(Capability capability, EnumFacing facing) { - if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY) + if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY) + return (T) this; + if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) return (T) this; return super.getCapability(capability, facing); } - } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index b00473bc9..e3b5baf63 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import mekanism.api.Capabilities; +import mekanism.common.capabilities.Capabilities; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.ICableOutputter; @@ -346,15 +346,19 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } @Override - public boolean hasCapability(net.minecraftforge.common.capabilities.Capability capability, net.minecraft.util.EnumFacing facing) + public boolean hasCapability(Capability capability, EnumFacing facing) { - return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing); + return capability == Capabilities.ENERGY_STORAGE_CAPABILITY + || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY + || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, net.minecraft.util.EnumFacing facing) + public T getCapability(Capability capability, EnumFacing facing) { - if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY) + if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY) + return (T) this; + if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) return (T) this; return super.getCapability(capability, facing); } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index d45c925ee..348fe102f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -15,8 +15,8 @@ import mekanism.common.base.IActiveState; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; -import mekanism.common.base.ITransporterTile; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.Finder.FirstFinder; import mekanism.common.content.transporter.InvStack; import mekanism.common.content.transporter.StackSearcher; @@ -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 instanceof ITransporterTile || front instanceof IInventory)) + if(back instanceof IInventory && (front != null && front.hasCapability(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 instanceof ITransporterTile) + if(front.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) { - ILogisticalTransporter transporter = ((ITransporterTile)front).getTransmitter(); + ILogisticalTransporter transporter = front.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()); if(!roundRobin) { diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index 4a5e1032f..415c41d4e 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -17,7 +17,7 @@ import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; import mekanism.common.base.ITileComponent; -import mekanism.common.base.ITransporterTile; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; @@ -190,13 +190,13 @@ public class TileComponentEjector implements ITileComponent TileEntity tile = Coord4D.get(tileEntity).offset(side).getTileEntity(tileEntity.getWorld()); ItemStack prev = stack.copy(); - if(tile instanceof IInventory && !(tile instanceof ITransporterTile)) + if(tile instanceof IInventory && !(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()))) { stack = InventoryUtils.putStackInInventory((IInventory)tile, stack, side, false); } - else if(tile instanceof ITransporterTile) + else if(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite())) { - ItemStack rejects = TransporterUtils.insert(tileEntity, ((ITransporterTile)tile).getTransmitter(), stack, outputColor, true, 0); + ItemStack rejects = TransporterUtils.insert(tileEntity, tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()), stack, outputColor, true, 0); if(TransporterManager.didEmit(stack, rejects)) { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 2d8c7c3ed..bbc626c99 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -9,12 +9,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import mekanism.api.Capabilities; +import mekanism.common.capabilities.Capabilities; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; -import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.transmitters.TransmissionType; import mekanism.common.base.IEnergyWrapper; import net.minecraft.tileentity.TileEntity; @@ -37,9 +35,9 @@ public final class CableUtils public static boolean isCable(TileEntity tileEntity) { - if(tileEntity instanceof ITransmitterTile) + if(tileEntity != null && tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { - return TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), TransmissionType.ENERGY); + return TransmissionType.checkTransmissionType(tileEntity.getCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, null), TransmissionType.ENERGY); } return false; } @@ -116,14 +114,16 @@ public final class CableUtils public static boolean isOutputter(TileEntity tileEntity, EnumFacing side) { - return (tileEntity instanceof ICableOutputter && ((ICableOutputter)tileEntity).canOutputTo(side.getOpposite())) || + return tileEntity != null && ( + (tileEntity.hasCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()) && tileEntity.getCapability(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())); + (MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())) + ); } public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, EnumFacing side) { - if(tileEntity instanceof ITransmitterTile) + if(tileEntity.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { return false; } @@ -142,9 +142,9 @@ public final class CableUtils return true; } } - else if(tileEntity instanceof ICableOutputter) + else if(tileEntity.hasCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite())) { - if(((ICableOutputter)tileEntity).canOutputTo(side.getOpposite())) + if(tileEntity.getCapability(Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) { return true; } diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index f9801d02c..b8fdd1741 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -1,8 +1,10 @@ package mekanism.common.util; import mekanism.api.IHeatTransfer; -import mekanism.api.transmitters.ITransmitterTile; +import mekanism.common.capabilities.Capabilities; + import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.ICapabilityProvider; public class HeatUtils { @@ -21,7 +23,7 @@ public class HeatUtils source.transferHeatTo(-heatToTransfer); sink.transferHeatTo(heatToTransfer); - if(!(sink instanceof ITransmitterTile)) + if(!(sink instanceof ICapabilityProvider && ((ICapabilityProvider)sink).hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))) { heatTransferred[0] += heatToTransfer; } diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index c437c7143..e8fff7bd2 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -5,8 +5,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import mekanism.api.Coord4D; -import mekanism.api.transmitters.ITransmitterTile; +import mekanism.common.capabilities.Capabilities; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -22,7 +22,7 @@ public final class PipeUtils public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side) { - if(tile instanceof ITransmitterTile || !(tile instanceof IFluidHandler)) + if(tile.hasCapability(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 052a60705..e5aec1bbb 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -5,10 +5,9 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.api.util.ListUtils; import mekanism.common.base.ILogisticalTransporter; -import mekanism.common.base.ITransporterTile; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter; @@ -38,9 +37,9 @@ public final class TransporterUtils { TileEntity tile = tileEntity.coord().offset(orientation).getTileEntity(tileEntity.world()); - if(tile instanceof ITransporterTile) + if(tile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, orientation.getOpposite())) { - ILogisticalTransporter otherTransporter = ((ITransporterTile)tile).getTransmitter(); + ILogisticalTransporter otherTransporter = tile.getCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, orientation.getOpposite()); if(otherTransporter.getColor() == null || tileEntity.getColor() == null || otherTransporter.getColor() == tileEntity.getColor()) { @@ -54,7 +53,7 @@ public final class TransporterUtils public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side) { - if(tile instanceof ITransmitterTile || !(tile instanceof IInventory)) + if(tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IInventory)) { return false; } @@ -151,7 +150,7 @@ public final class TransporterUtils { TileEntity inventory = transporter.coord().offset(orientation).getTileEntity(transporter.world()); - if(inventory instanceof IInventory && !(inventory instanceof ITransmitterTile)) + if(inventory instanceof IInventory && !(inventory.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, orientation.getOpposite()))) { inventories[orientation.ordinal()] = (IInventory)inventory; }