From 185ea3c4d89279883cd4cc9fa2312cdd29831eaa Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 1 May 2016 23:10:47 +0100 Subject: [PATCH] Experiments with Capabilities. --- build.gradle | 2 +- build.properties | 2 +- src/main/java/mekanism/api/Capabilities.java | 23 +++++++ src/main/java/mekanism/common/Mekanism.java | 63 +++++++++++++++++++ .../common/base/EnergyAcceptorWrapper.java | 6 +- .../common/capabilities/CableOutputter.java | 17 +++++ .../capabilities/StrictEnergyAcceptor.java | 30 +++++++++ .../capabilities/StrictEnergyStorage.java | 35 +++++++++++ .../multipart/PartLogisticalTransporter.java | 2 +- .../common/multipart/PartMechanicalPipe.java | 2 +- .../common/multipart/PartPressurizedTube.java | 2 +- .../common/multipart/PartSidedPipe.java | 18 +++--- .../multipart/PartThermodynamicConductor.java | 2 +- .../common/multipart/PartUniversalCable.java | 46 +++++++++----- .../common/tile/TileEntityElectricBlock.java | 19 ++++++ .../tile/TileEntityInductionCasing.java | 16 +++++ .../common/tile/TileEntityInductionCell.java | 17 +++++ .../common/tile/TileEntityInductionPort.java | 19 +++++- .../common/tile/TileEntityLaserAmplifier.java | 16 +++++ .../java/mekanism/common/util/CableUtils.java | 13 ++-- 20 files changed, 311 insertions(+), 39 deletions(-) create mode 100644 src/main/java/mekanism/api/Capabilities.java create mode 100644 src/main/java/mekanism/common/capabilities/CableOutputter.java create mode 100644 src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java create mode 100644 src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java diff --git a/build.gradle b/build.gradle index 13fa7adbb..7d113bd14 100644 --- a/build.gradle +++ b/build.gradle @@ -67,7 +67,7 @@ minecraft { } dependencies { - deobfCompile "MCMultiPart:MCMultiPart:${config.mcmp_version}:universal" + deobfCompile "MCMultiPart:MCMultiPart-experimental:${config.mcmp_version}:universal" } processResources diff --git a/build.properties b/build.properties index 84d0d4708..4e7abc984 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft_version=1.8.9 mappings_version=stable_22 forge_version=11.15.1.1722 -mcmp_version=1.0.8 +mcmp_version=1.0.9_47 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 CCC_version=1.0.6.39 diff --git a/src/main/java/mekanism/api/Capabilities.java b/src/main/java/mekanism/api/Capabilities.java new file mode 100644 index 000000000..0db919690 --- /dev/null +++ b/src/main/java/mekanism/api/Capabilities.java @@ -0,0 +1,23 @@ +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/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index c82423942..ffd4e6046 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -16,6 +16,9 @@ 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; @@ -44,6 +47,9 @@ import mekanism.common.base.IFactory.RecipeType; 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.StrictEnergyAcceptor; +import mekanism.common.capabilities.StrictEnergyStorage; import mekanism.common.chunkloading.ChunkManager; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.entangloporter.InventoryFrequency; @@ -95,14 +101,19 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.Capability.IStorage; +import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.world.ChunkEvent; @@ -1295,6 +1306,8 @@ public class Mekanism InfuseRegistry.registerInfuseType(new InfuseType("FUNGI", "mekanism:infuse/Fungi").setUnlocalizedName("fungi")); InfuseRegistry.registerInfuseType(new InfuseType("BIO", "mekanism:infuse/Bio").setUnlocalizedName("bio")); InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", "mekanism:infuse/Obsidian").setUnlocalizedName("obsidian")); + + registerCapabilities(); } @EventHandler @@ -1407,6 +1420,56 @@ 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 fa24542e9..450991409 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -1,6 +1,8 @@ package mekanism.common.base; import ic2.api.energy.tile.IEnergySink; + +import mekanism.api.Capabilities; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; @@ -22,9 +24,9 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor EnergyAcceptorWrapper wrapper = null; - if(tileEntity instanceof IStrictEnergyAcceptor) + if(tileEntity.hasCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null)) { - wrapper = new MekanismAcceptor((IStrictEnergyAcceptor)tileEntity); + wrapper = new MekanismAcceptor(tileEntity.getCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null)); } else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver) { diff --git a/src/main/java/mekanism/common/capabilities/CableOutputter.java b/src/main/java/mekanism/common/capabilities/CableOutputter.java new file mode 100644 index 000000000..7f34ebe0f --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/CableOutputter.java @@ -0,0 +1,17 @@ +package mekanism.common.capabilities; + +import mekanism.api.energy.ICableOutputter; + +import net.minecraft.util.EnumFacing; + +/** + * Created by ben on 30/04/16. + */ +public class CableOutputter implements ICableOutputter +{ + @Override + public boolean canOutputTo(EnumFacing side) + { + return true; + } +} diff --git a/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java b/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java new file mode 100644 index 000000000..3f50b6b4e --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java @@ -0,0 +1,30 @@ +package mekanism.common.capabilities; + +import mekanism.api.energy.IStrictEnergyAcceptor; + +import net.minecraft.util.EnumFacing; + +/** + * Created by ben on 30/04/16. + */ +public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrictEnergyAcceptor +{ + public StrictEnergyAcceptor(double capacity) + { + super(capacity); + } + + @Override + public double transferEnergyToAcceptor(EnumFacing side, double amount) + { + double used = Math.min(amount, Math.max(0, getMaxEnergy() - getEnergy())); + setEnergy(getEnergy() + used); + return used; + } + + @Override + public boolean canReceiveEnergy(EnumFacing side) + { + return true; + } +} diff --git a/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java b/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java new file mode 100644 index 000000000..04e8a4063 --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java @@ -0,0 +1,35 @@ +package mekanism.common.capabilities; + +import mekanism.api.energy.IStrictEnergyStorage; + +/** + * Created by ben on 30/04/16. + */ +public class StrictEnergyStorage implements IStrictEnergyStorage +{ + double energyStored = 0; + double maxEnergy; + + public StrictEnergyStorage(double capacity) + { + maxEnergy = capacity; + } + + @Override + public double getEnergy() + { + return energyStored; + } + + @Override + public void setEnergy(double energy) + { + energyStored = energy; + } + + @Override + public double getMaxEnergy() + { + return maxEnergy; + } +} diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 6140ce46d..eed6944ff 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -482,7 +482,7 @@ public class PartLogisticalTransporter extends PartTransmitter getSlotMask() { @@ -452,7 +452,7 @@ public abstract class PartSidedPipe extends Multipart implements ISlottedPart, I return EnumSet.of(PartSlot.CENTER); //TODO implement properly } -/* + @Override public TextureAtlasSprite getBreakingIcon(Object subPart, EnumFacing side) { @@ -535,7 +535,7 @@ public abstract class PartSidedPipe extends Multipart implements ISlottedPart, I } testingSide = side; - boolean unblocked = getContainer().canReplacePart(this, this); + boolean unblocked = true;//getContainer().canReplacePart(this, this); testingSide = null; return unblocked; @@ -700,16 +700,14 @@ public abstract class PartSidedPipe extends Multipart implements ISlottedPart, I refreshConnections(); } -/*TODO onLoad()? @Override - public void onChunkLoad() + public void onLoaded() { - super.onChunkLoad(); + super.onLoaded(); - refreshConnections(); - notifyTileChange(); + //refreshConnections(); TODO causes StackOverflow. Why? + //notifyTileChange(); } -*/ @Override public void onNeighborTileChange(EnumFacing side) diff --git a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java index 703889bbb..75b314df3 100644 --- a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java +++ b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java @@ -192,7 +192,7 @@ public class PartThermodynamicConductor extends PartTransmitter 0) - { - toDraw -= takeEnergy(received, true); - } - - ((IStrictEnergyStorage)outputter).setEnergy(((IStrictEnergyStorage)outputter).getEnergy() - toDraw); + if(received > 0) + { + toDraw -= takeEnergy(received, true); } - } + + storage.setEnergy(storage.getEnergy() - toDraw); + } else if(MekanismUtils.useRF() && outputter instanceof IEnergyProvider) { double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(canDraw*general.TO_TE), true) * general.FROM_TE; @@ -228,7 +229,7 @@ public class PartUniversalCable extends PartTransmitter 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/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 34dd6b773..8fffd8a27 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -10,8 +10,10 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; +import mekanism.api.Capabilities; import mekanism.api.Coord4D; 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; @@ -19,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.Optional.Method; public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements IEnergyWrapper @@ -397,4 +400,20 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i return toUse; } + + @Override + public boolean hasCapability(net.minecraftforge.common.capabilities.Capability capability, net.minecraft.util.EnumFacing facing) + { + return capability == Capabilities.ENERGY_STORAGE_CAPABILITY + || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY + || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(Capability capability, net.minecraft.util.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/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index 5360ccd9b..3d4163a68 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import mekanism.api.Capabilities; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; @@ -19,6 +20,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.capabilities.Capability; public class TileEntityInductionCasing extends TileEntityMultiblock implements IStrictEnergyStorage, IComputerIntegration { @@ -212,4 +214,18 @@ public class TileEntityInductionCasing extends TileEntityMultiblock capability, net.minecraft.util.EnumFacing facing) + { + return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(Capability capability, net.minecraft.util.EnumFacing facing) + { + if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY) + return (T) this; + return super.getCapability(capability, facing); + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java index d391543b7..7a515ef9c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java @@ -4,11 +4,13 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import mekanism.api.Capabilities; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Tier.InductionCellTier; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.capabilities.Capability; public class TileEntityInductionCell extends TileEntityBasicBlock implements IStrictEnergyStorage { @@ -83,4 +85,19 @@ public class TileEntityInductionCell extends TileEntityBasicBlock implements ISt { return tier.maxEnergy; } + + @Override + public boolean hasCapability(net.minecraftforge.common.capabilities.Capability capability, net.minecraft.util.EnumFacing facing) + { + return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(Capability capability, net.minecraft.util.EnumFacing facing) + { + if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY) + 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 1fad871e0..a2cb223eb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -10,6 +10,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; +import mekanism.api.Capabilities; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; @@ -29,6 +30,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.MinecraftForge; import net.minecraft.util.EnumFacing; +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; @@ -429,7 +431,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement String modeText = " " + (mode ? EnumColor.DARK_RED : EnumColor.DARK_GREEN) + LangUtils.transOutputInput(mode) + "."; player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.inductionPortMode") + modeText)); - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); markDirty(); } @@ -465,4 +467,19 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement { return false; } + + @Override + public boolean hasCapability(net.minecraftforge.common.capabilities.Capability capability, net.minecraft.util.EnumFacing facing) + { + return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(Capability capability, net.minecraft.util.EnumFacing facing) + { + if (capability == Capabilities.ENERGY_STORAGE_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 b2fdbe793..b00473bc9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import mekanism.api.Capabilities; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.ICableOutputter; @@ -24,6 +25,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, ICableOutputter, IStrictEnergyStorage, IComputerIntegration, ISecurityTile { @@ -342,4 +344,18 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { return securityComponent; } + + @Override + public boolean hasCapability(net.minecraftforge.common.capabilities.Capability capability, net.minecraft.util.EnumFacing facing) + { + return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(Capability capability, net.minecraft.util.EnumFacing facing) + { + if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY) + return (T) this; + return super.getCapability(capability, facing); + } } diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index cd32ba46b..2d8c7c3ed 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import mekanism.api.Capabilities; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.ICableOutputter; @@ -29,7 +30,7 @@ public final class CableUtils { public static boolean isEnergyAcceptor(TileEntity tileEntity) { - return (tileEntity instanceof IStrictEnergyAcceptor || + return tileEntity != null && (tileEntity.hasCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null) || (MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) || (MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver)); } @@ -73,7 +74,7 @@ public final class CableUtils */ public static boolean isValidAcceptorOnSide(TileEntity cableEntity, TileEntity tile, EnumFacing side) { - if(isCable(tile)) + if(tile == null || isCable(tile)) { return false; } @@ -127,9 +128,9 @@ public final class CableUtils return false; } - if(tileEntity instanceof IStrictEnergyAcceptor) + if(tileEntity.hasCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite())) { - if(((IStrictEnergyAcceptor)tileEntity).canReceiveEnergy(side.getOpposite())) + if(tileEntity.getCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite()).canReceiveEnergy(side.getOpposite())) { return true; } @@ -234,9 +235,9 @@ public final class CableUtils { double sent = 0; - if(tileEntity instanceof IStrictEnergyAcceptor) + if(tileEntity.hasCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite())) { - IStrictEnergyAcceptor acceptor = (IStrictEnergyAcceptor)tileEntity; + IStrictEnergyAcceptor acceptor = tileEntity.getCapability(Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite()); if(acceptor.canReceiveEnergy(side.getOpposite())) {