From c9f8fd011e2e82d2fcda8f0d353c90e27e46bc38 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 27 May 2016 14:02:15 -0400 Subject: [PATCH] Polished capabilities, still need to decide if we're allowed to ship capability references in API --- .../java/mekanism/api/gas/GasNetwork.java | 6 +-- .../mekanism/api/gas/GasTransmission.java | 12 ++--- .../mekanism/api/reactor/IReactorBlock.java | 2 - .../mekanism/api/util/CapabilityUtils.java | 22 ++++++++++ .../java/mekanism/common/LaserManager.java | 20 +++++++-- .../common/base/EnergyAcceptorWrapper.java | 5 ++- .../common/capabilities/Capabilities.java | 44 ++++++++++++++----- ...tion.java => DefaultAlloyInteraction.java} | 6 +-- ...n.java => DefaultBlockableConnection.java} | 6 +-- ...putter.java => DefaultCableOutputter.java} | 6 +-- .../capabilities/DefaultConfigCardAccess.java | 13 ++++++ ...igurable.java => DefaultConfigurable.java} | 6 +-- .../capabilities/DefaultEvaporationSolar.java | 19 ++++++++ ...GasHandler.java => DefaultGasHandler.java} | 6 +-- ...rTile.java => DefaultGridTransmitter.java} | 6 +-- ...Transfer.java => DefaultHeatTransfer.java} | 6 +-- .../capabilities/DefaultLaserReceptor.java | 26 +++++++++++ ...java => DefaultLogisticalTransporter.java} | 6 +-- .../DefaultSpecialConfigData.java | 32 ++++++++++++++ ...eHelper.java => DefaultStorageHelper.java} | 2 +- ....java => DefaultStrictEnergyAcceptor.java} | 10 ++--- ...e.java => DefaultStrictEnergyStorage.java} | 10 ++--- ...leNetwork.java => DefaultTileNetwork.java} | 6 +-- ...ection.java => DefaultTubeConnection.java} | 6 +-- .../transporter/TransporterPathfinder.java | 14 +++--- .../content/transporter/TransporterStack.java | 8 ++-- .../java/mekanism/common/item/ItemAlloy.java | 6 +-- .../common/item/ItemConfigurationCard.java | 26 ++++++----- .../common/item/ItemConfigurator.java | 5 ++- .../common/item/ItemNetworkReader.java | 18 ++++---- .../multipart/MultipartTransmitter.java | 10 ++--- .../multipart/MultipartTransporter.java | 3 +- .../multipart/PartLogisticalTransporter.java | 4 +- .../common/multipart/PartPressurizedTube.java | 4 +- .../common/multipart/PartSidedPipe.java | 13 +++--- .../multipart/PartThermodynamicConductor.java | 10 ++--- .../common/multipart/PartUniversalCable.java | 5 ++- .../network/PacketConfigurationUpdate.java | 3 +- .../common/network/PacketDataRequest.java | 10 ++--- .../common/network/PacketTileEntity.java | 6 +-- .../network/PacketTransmitterUpdate.java | 22 +++++----- .../tile/TileEntityAdvancedBoundingBlock.java | 10 +++-- .../common/tile/TileEntityBasicMachine.java | 19 ++++++++ .../mekanism/common/tile/TileEntityBin.java | 5 ++- .../tile/TileEntityChemicalCrystallizer.java | 5 ++- .../common/tile/TileEntityDigitalMiner.java | 24 +++++++++- .../common/tile/TileEntityElectricBlock.java | 3 +- .../common/tile/TileEntityFactory.java | 4 +- .../TileEntityFormulaicAssemblicator.java | 43 +++++++++++------- .../common/tile/TileEntityFuelwoodHeater.java | 5 ++- .../common/tile/TileEntityInductionPort.java | 3 +- .../mekanism/common/tile/TileEntityLaser.java | 4 +- .../common/tile/TileEntityLaserAmplifier.java | 11 +++-- .../tile/TileEntityLaserTractorBeam.java | 25 ++++++++++- .../tile/TileEntityLogisticalSorter.java | 26 +++++++++-- .../tile/TileEntityMetallurgicInfuser.java | 19 ++++++++ .../tile/TileEntityOredictionificator.java | 20 +++++++++ .../tile/TileEntityQuantumEntangloporter.java | 5 ++- .../tile/TileEntityResistiveHeater.java | 5 ++- ...ileEntityThermalEvaporationController.java | 6 ++- .../tile/component/TileComponentEjector.java | 7 +-- .../java/mekanism/common/util/CableUtils.java | 23 +++++----- .../java/mekanism/common/util/HeatUtils.java | 3 +- .../mekanism/common/util/MekanismUtils.java | 16 ------- .../java/mekanism/common/util/PipeUtils.java | 3 +- .../common/util/TransporterUtils.java | 3 +- .../generators/common/FusionReactor.java | 4 +- .../TileEntityAdvancedSolarGenerator.java | 19 ++++++++ .../common/tile/TileEntityHeatGenerator.java | 5 ++- .../TileEntityReactorLaserFocusMatrix.java | 19 ++++++++ .../tile/reactor/TileEntityReactorPort.java | 6 +-- 71 files changed, 566 insertions(+), 234 deletions(-) create mode 100644 src/main/java/mekanism/api/util/CapabilityUtils.java rename src/main/java/mekanism/common/capabilities/{AlloyInteraction.java => DefaultAlloyInteraction.java} (71%) rename src/main/java/mekanism/common/capabilities/{BlockableConnection.java => DefaultBlockableConnection.java} (69%) rename src/main/java/mekanism/common/capabilities/{CableOutputter.java => DefaultCableOutputter.java} (70%) create mode 100644 src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java rename src/main/java/mekanism/common/capabilities/{Configurable.java => DefaultConfigurable.java} (78%) create mode 100644 src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java rename src/main/java/mekanism/common/capabilities/{GasHandler.java => DefaultGasHandler.java} (81%) rename src/main/java/mekanism/common/capabilities/{GridTransmitterTile.java => DefaultGridTransmitter.java} (91%) rename src/main/java/mekanism/common/capabilities/{HeatTransfer.java => DefaultHeatTransfer.java} (83%) create mode 100644 src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java rename src/main/java/mekanism/common/capabilities/{LogisticalTransporter.java => DefaultLogisticalTransporter.java} (95%) create mode 100644 src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java rename src/main/java/mekanism/common/capabilities/{StorageHelper.java => DefaultStorageHelper.java} (97%) rename src/main/java/mekanism/common/capabilities/{StrictEnergyAcceptor.java => DefaultStrictEnergyAcceptor.java} (73%) rename src/main/java/mekanism/common/capabilities/{StrictEnergyStorage.java => DefaultStrictEnergyStorage.java} (78%) rename src/main/java/mekanism/common/capabilities/{TileNetwork.java => DefaultTileNetwork.java} (74%) rename src/main/java/mekanism/common/capabilities/{TubeConnection.java => DefaultTubeConnection.java} (66%) diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 9ec5a6853..b2da2acaa 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -10,8 +10,8 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; -import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; @@ -307,12 +307,12 @@ public class GasNetwork extends DynamicNetwork for(EnumFacing side : sides) { - if(!MekanismUtils.hasCapability(tile, Capabilities.GAS_HANDLER_CAPABILITY, side)) + if(!CapabilityUtils.hasCapability(tile, Capabilities.GAS_HANDLER_CAPABILITY, side)) { continue; } - IGasHandler acceptor = MekanismUtils.getCapability(tile, Capabilities.GAS_HANDLER_CAPABILITY, side); + IGasHandler acceptor = CapabilityUtils.getCapability(tile, Capabilities.GAS_HANDLER_CAPABILITY, side); if(acceptor != null && acceptor.canReceiveGas(side, type)) { diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index 8569157cf..677edd682 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -6,8 +6,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; -import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -34,9 +34,9 @@ public final class GasTransmission { TileEntity acceptor = world.getTileEntity(pos.offset(orientation)); - if(MekanismUtils.hasCapability(acceptor, Capabilities.GAS_HANDLER_CAPABILITY, orientation.getOpposite())) + if(CapabilityUtils.hasCapability(acceptor, Capabilities.GAS_HANDLER_CAPABILITY, orientation.getOpposite())) { - acceptors[orientation.ordinal()] = MekanismUtils.getCapability(acceptor, Capabilities.GAS_HANDLER_CAPABILITY, orientation.getOpposite()); + acceptors[orientation.ordinal()] = CapabilityUtils.getCapability(acceptor, Capabilities.GAS_HANDLER_CAPABILITY, orientation.getOpposite()); } } @@ -60,14 +60,14 @@ public final class GasTransmission public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side) { - if(MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { return false; } - if(MekanismUtils.hasCapability(tile, Capabilities.TUBE_CONNECTION_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(tile, Capabilities.TUBE_CONNECTION_CAPABILITY, side.getOpposite())) { - ITubeConnection connection = MekanismUtils.getCapability(tile, Capabilities.TUBE_CONNECTION_CAPABILITY, side.getOpposite()); + ITubeConnection connection = CapabilityUtils.getCapability(tile, Capabilities.TUBE_CONNECTION_CAPABILITY, side.getOpposite()); if(connection.canTubeConnect(side.getOpposite())) { diff --git a/src/main/java/mekanism/api/reactor/IReactorBlock.java b/src/main/java/mekanism/api/reactor/IReactorBlock.java index b3b85188d..66919fdb1 100644 --- a/src/main/java/mekanism/api/reactor/IReactorBlock.java +++ b/src/main/java/mekanism/api/reactor/IReactorBlock.java @@ -1,6 +1,5 @@ package mekanism.api.reactor; - public interface IReactorBlock { public boolean isFrame(); @@ -8,5 +7,4 @@ public interface IReactorBlock public void setReactor(IFusionReactor reactor); public IFusionReactor getReactor(); - } diff --git a/src/main/java/mekanism/api/util/CapabilityUtils.java b/src/main/java/mekanism/api/util/CapabilityUtils.java new file mode 100644 index 000000000..06888cff8 --- /dev/null +++ b/src/main/java/mekanism/api/util/CapabilityUtils.java @@ -0,0 +1,22 @@ +package mekanism.api.util; + +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; + +public final class CapabilityUtils +{ + public static boolean hasCapability(ICapabilityProvider provider, Capability cap, EnumFacing side) + { + if(provider == null || cap == null) return false; + + return provider.hasCapability(cap, side); + } + + public static T getCapability(ICapabilityProvider provider, Capability cap, EnumFacing side) + { + if(provider == null || cap == null) return null; + + return provider.getCapability(cap, side); + } +} diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index 7028dd563..e54619403 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -6,6 +6,8 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; import mekanism.api.lasers.ILaserReceptor; +import mekanism.api.util.CapabilityUtils; +import mekanism.common.capabilities.Capabilities; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -39,11 +41,13 @@ public class LaserManager Coord4D toCoord = new Coord4D(mop.getBlockPos(), world); TileEntity tile = toCoord.getTileEntity(world); - if(tile instanceof ILaserReceptor) + if(isReceptor(tile, mop.sideHit)) { - if(!(((ILaserReceptor)tile).canLasersDig())) + ILaserReceptor receptor = getReceptor(tile, mop.sideHit); + + if(!(receptor.canLasersDig())) { - ((ILaserReceptor)tile).receiveLaserEnergy(energy, mop.sideHit); + receptor.receiveLaserEnergy(energy, mop.sideHit); } } } @@ -127,6 +131,16 @@ public class LaserManager return mop; } + public static boolean isReceptor(TileEntity tile, EnumFacing side) + { + return CapabilityUtils.hasCapability(tile, Capabilities.LASER_RECEPTOR_CAPABILITY, side); + } + + public static ILaserReceptor getReceptor(TileEntity tile, EnumFacing side) + { + return CapabilityUtils.getCapability(tile, Capabilities.LASER_RECEPTOR_CAPABILITY, side); + } + public static class LaserInfo { public RayTraceResult movingPos; diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 7be79b128..ff42e8376 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -4,6 +4,7 @@ import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; @@ -23,9 +24,9 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor EnergyAcceptorWrapper wrapper = null; - if(MekanismUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null)) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null)) { - wrapper = new MekanismAcceptor(MekanismUtils.getCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null)); + wrapper = new MekanismAcceptor(CapabilityUtils.getCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null)); } else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver) { diff --git a/src/main/java/mekanism/common/capabilities/Capabilities.java b/src/main/java/mekanism/common/capabilities/Capabilities.java index 6734143f5..f095cc746 100644 --- a/src/main/java/mekanism/common/capabilities/Capabilities.java +++ b/src/main/java/mekanism/common/capabilities/Capabilities.java @@ -1,13 +1,17 @@ package mekanism.common.capabilities; import mekanism.api.IAlloyInteraction; +import mekanism.api.IConfigCardAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.IConfigurable; +import mekanism.api.IEvaporationSolar; 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.gas.ITubeConnection; +import mekanism.api.lasers.ILaserReceptor; import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.base.ILogisticalTransporter; @@ -55,23 +59,39 @@ public class Capabilities @CapabilityInject(ITubeConnection.class) public static Capability TUBE_CONNECTION_CAPABILITY = null; + + @CapabilityInject(IConfigCardAccess.class) + public static Capability CONFIG_CARD_CAPABILITY = null; + + @CapabilityInject(ISpecialConfigData.class) + public static Capability SPECIAL_CONFIG_DATA_CAPABILITY = null; + + @CapabilityInject(IEvaporationSolar.class) + public static Capability EVAPORATION_SOLAR_CAPABILITY = null; + + @CapabilityInject(ILaserReceptor.class) + public static Capability LASER_RECEPTOR_CAPABILITY = null; public static void registerCapabilities() { - StrictEnergyStorage.register(); - StrictEnergyAcceptor.register(); - CableOutputter.register(); + DefaultStrictEnergyStorage.register(); + DefaultStrictEnergyAcceptor.register(); + DefaultCableOutputter.register(); - GridTransmitterTile.register(); - LogisticalTransporter.register(); - BlockableConnection.register(); + DefaultGridTransmitter.register(); + DefaultLogisticalTransporter.register(); + DefaultBlockableConnection.register(); - GasHandler.register(); - TubeConnection.register(); + DefaultGasHandler.register(); + DefaultTubeConnection.register(); - Configurable.register(); - TileNetwork.register(); - AlloyInteraction.register(); - HeatTransfer.register(); + DefaultConfigurable.register(); + DefaultTileNetwork.register(); + DefaultAlloyInteraction.register(); + DefaultHeatTransfer.register(); + DefaultConfigCardAccess.register(); + DefaultSpecialConfigData.register(); + DefaultEvaporationSolar.register(); + DefaultLaserReceptor.register(); } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/capabilities/AlloyInteraction.java b/src/main/java/mekanism/common/capabilities/DefaultAlloyInteraction.java similarity index 71% rename from src/main/java/mekanism/common/capabilities/AlloyInteraction.java rename to src/main/java/mekanism/common/capabilities/DefaultAlloyInteraction.java index 3edb71c25..d7c1c24bf 100644 --- a/src/main/java/mekanism/common/capabilities/AlloyInteraction.java +++ b/src/main/java/mekanism/common/capabilities/DefaultAlloyInteraction.java @@ -1,19 +1,19 @@ package mekanism.common.capabilities; import mekanism.api.IAlloyInteraction; -import mekanism.common.capabilities.StorageHelper.NullStorage; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; import net.minecraftforge.common.capabilities.CapabilityManager; -public class AlloyInteraction implements IAlloyInteraction +public class DefaultAlloyInteraction implements IAlloyInteraction { @Override public void onAlloyInteraction(EntityPlayer player, EnumHand hand, ItemStack stack, int tierOrdinal) {} public static void register() { - CapabilityManager.INSTANCE.register(IAlloyInteraction.class, new NullStorage<>(), AlloyInteraction.class); + CapabilityManager.INSTANCE.register(IAlloyInteraction.class, new NullStorage<>(), DefaultAlloyInteraction.class); } } diff --git a/src/main/java/mekanism/common/capabilities/BlockableConnection.java b/src/main/java/mekanism/common/capabilities/DefaultBlockableConnection.java similarity index 69% rename from src/main/java/mekanism/common/capabilities/BlockableConnection.java rename to src/main/java/mekanism/common/capabilities/DefaultBlockableConnection.java index c57f3faa6..e3b446541 100644 --- a/src/main/java/mekanism/common/capabilities/BlockableConnection.java +++ b/src/main/java/mekanism/common/capabilities/DefaultBlockableConnection.java @@ -1,11 +1,11 @@ package mekanism.common.capabilities; import mekanism.api.transmitters.IBlockableConnection; -import mekanism.common.capabilities.StorageHelper.NullStorage; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; -public class BlockableConnection implements IBlockableConnection +public class DefaultBlockableConnection implements IBlockableConnection { @Override public boolean canConnectMutual(EnumFacing side) @@ -21,6 +21,6 @@ public class BlockableConnection implements IBlockableConnection public static void register() { - CapabilityManager.INSTANCE.register(IBlockableConnection.class, new NullStorage<>(), BlockableConnection.class); + CapabilityManager.INSTANCE.register(IBlockableConnection.class, new NullStorage<>(), DefaultBlockableConnection.class); } } diff --git a/src/main/java/mekanism/common/capabilities/CableOutputter.java b/src/main/java/mekanism/common/capabilities/DefaultCableOutputter.java similarity index 70% rename from src/main/java/mekanism/common/capabilities/CableOutputter.java rename to src/main/java/mekanism/common/capabilities/DefaultCableOutputter.java index e295e1d74..6f12aa92b 100644 --- a/src/main/java/mekanism/common/capabilities/CableOutputter.java +++ b/src/main/java/mekanism/common/capabilities/DefaultCableOutputter.java @@ -1,14 +1,14 @@ package mekanism.common.capabilities; import mekanism.api.energy.ICableOutputter; -import mekanism.common.capabilities.StorageHelper.NullStorage; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; /** * Created by ben on 30/04/16. */ -public class CableOutputter implements ICableOutputter +public class DefaultCableOutputter implements ICableOutputter { @Override public boolean canOutputTo(EnumFacing side) @@ -18,6 +18,6 @@ public class CableOutputter implements ICableOutputter public static void register() { - CapabilityManager.INSTANCE.register(ICableOutputter.class, new NullStorage<>(), CableOutputter.class); + CapabilityManager.INSTANCE.register(ICableOutputter.class, new NullStorage<>(), DefaultCableOutputter.class); } } diff --git a/src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java b/src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java new file mode 100644 index 000000000..94d9f4716 --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/DefaultConfigCardAccess.java @@ -0,0 +1,13 @@ +package mekanism.common.capabilities; + +import mekanism.api.IConfigCardAccess; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; +import net.minecraftforge.common.capabilities.CapabilityManager; + +public class DefaultConfigCardAccess implements IConfigCardAccess +{ + public static void register() + { + CapabilityManager.INSTANCE.register(IConfigCardAccess.class, new NullStorage(), DefaultConfigCardAccess.class); + } +} diff --git a/src/main/java/mekanism/common/capabilities/Configurable.java b/src/main/java/mekanism/common/capabilities/DefaultConfigurable.java similarity index 78% rename from src/main/java/mekanism/common/capabilities/Configurable.java rename to src/main/java/mekanism/common/capabilities/DefaultConfigurable.java index f3b724758..8e066098d 100644 --- a/src/main/java/mekanism/common/capabilities/Configurable.java +++ b/src/main/java/mekanism/common/capabilities/DefaultConfigurable.java @@ -1,7 +1,7 @@ package mekanism.common.capabilities; import mekanism.api.IConfigurable; -import mekanism.common.capabilities.StorageHelper.NullStorage; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -10,7 +10,7 @@ import net.minecraftforge.common.capabilities.CapabilityManager; /** * Created by ben on 19/05/16. */ -public class Configurable implements IConfigurable +public class DefaultConfigurable implements IConfigurable { @Override public EnumActionResult onSneakRightClick(EntityPlayer player, EnumFacing side) @@ -26,6 +26,6 @@ public class Configurable implements IConfigurable public static void register() { - CapabilityManager.INSTANCE.register(IConfigurable.class, new NullStorage(), Configurable.class); + CapabilityManager.INSTANCE.register(IConfigurable.class, new NullStorage(), DefaultConfigurable.class); } } diff --git a/src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java b/src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java new file mode 100644 index 000000000..80561ad31 --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/DefaultEvaporationSolar.java @@ -0,0 +1,19 @@ +package mekanism.common.capabilities; + +import mekanism.api.IEvaporationSolar; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; +import net.minecraftforge.common.capabilities.CapabilityManager; + +public class DefaultEvaporationSolar implements IEvaporationSolar +{ + @Override + public boolean seesSun() + { + return false; + } + + public static void register() + { + CapabilityManager.INSTANCE.register(IEvaporationSolar.class, new NullStorage(), DefaultEvaporationSolar.class); + } +} diff --git a/src/main/java/mekanism/common/capabilities/GasHandler.java b/src/main/java/mekanism/common/capabilities/DefaultGasHandler.java similarity index 81% rename from src/main/java/mekanism/common/capabilities/GasHandler.java rename to src/main/java/mekanism/common/capabilities/DefaultGasHandler.java index feba2ea1e..8b1e08cd6 100644 --- a/src/main/java/mekanism/common/capabilities/GasHandler.java +++ b/src/main/java/mekanism/common/capabilities/DefaultGasHandler.java @@ -3,11 +3,11 @@ package mekanism.common.capabilities; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; -import mekanism.common.capabilities.StorageHelper.NullStorage; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; -public class GasHandler implements IGasHandler +public class DefaultGasHandler implements IGasHandler { @Override public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) @@ -35,6 +35,6 @@ public class GasHandler implements IGasHandler public static void register() { - CapabilityManager.INSTANCE.register(IGasHandler.class, new NullStorage<>(), GasHandler.class); + CapabilityManager.INSTANCE.register(IGasHandler.class, new NullStorage<>(), DefaultGasHandler.class); } } diff --git a/src/main/java/mekanism/common/capabilities/GridTransmitterTile.java b/src/main/java/mekanism/common/capabilities/DefaultGridTransmitter.java similarity index 91% rename from src/main/java/mekanism/common/capabilities/GridTransmitterTile.java rename to src/main/java/mekanism/common/capabilities/DefaultGridTransmitter.java index 0e5d1034b..05011626a 100644 --- a/src/main/java/mekanism/common/capabilities/GridTransmitterTile.java +++ b/src/main/java/mekanism/common/capabilities/DefaultGridTransmitter.java @@ -6,7 +6,7 @@ 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 mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.CapabilityManager; @@ -14,7 +14,7 @@ import net.minecraftforge.common.capabilities.CapabilityManager; /** * Created by ben on 03/05/16. */ -public class GridTransmitterTile> implements IGridTransmitter +public class DefaultGridTransmitter> implements IGridTransmitter { @Override public boolean hasTransmitterNetwork() @@ -165,6 +165,6 @@ public class GridTransmitterTile> implements I public static void register() { - CapabilityManager.INSTANCE.register(IGridTransmitter.class, new NullStorage<>(), GridTransmitterTile.class); + CapabilityManager.INSTANCE.register(IGridTransmitter.class, new NullStorage<>(), DefaultGridTransmitter.class); } } diff --git a/src/main/java/mekanism/common/capabilities/HeatTransfer.java b/src/main/java/mekanism/common/capabilities/DefaultHeatTransfer.java similarity index 83% rename from src/main/java/mekanism/common/capabilities/HeatTransfer.java rename to src/main/java/mekanism/common/capabilities/DefaultHeatTransfer.java index 83fe30df7..646c410bc 100644 --- a/src/main/java/mekanism/common/capabilities/HeatTransfer.java +++ b/src/main/java/mekanism/common/capabilities/DefaultHeatTransfer.java @@ -1,11 +1,11 @@ package mekanism.common.capabilities; import mekanism.api.IHeatTransfer; -import mekanism.common.capabilities.StorageHelper.NullStorage; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; -public class HeatTransfer implements IHeatTransfer +public class DefaultHeatTransfer implements IHeatTransfer { @Override public double getTemp() @@ -57,6 +57,6 @@ public class HeatTransfer implements IHeatTransfer public static void register() { - CapabilityManager.INSTANCE.register(IHeatTransfer.class, new NullStorage<>(), HeatTransfer.class); + CapabilityManager.INSTANCE.register(IHeatTransfer.class, new NullStorage<>(), DefaultHeatTransfer.class); } } diff --git a/src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java b/src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java new file mode 100644 index 000000000..a0fe1024f --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/DefaultLaserReceptor.java @@ -0,0 +1,26 @@ +package mekanism.common.capabilities; + +import mekanism.api.lasers.ILaserReceptor; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.CapabilityManager; + +public class DefaultLaserReceptor implements ILaserReceptor +{ + @Override + public void receiveLaserEnergy(double energy, EnumFacing side) + { + + } + + @Override + public boolean canLasersDig() + { + return false; + } + + public static void register() + { + CapabilityManager.INSTANCE.register(ILaserReceptor.class, new NullStorage(), DefaultLaserReceptor.class); + } +} diff --git a/src/main/java/mekanism/common/capabilities/LogisticalTransporter.java b/src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java similarity index 95% rename from src/main/java/mekanism/common/capabilities/LogisticalTransporter.java rename to src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java index 62c4fc29d..9fe201f4f 100644 --- a/src/main/java/mekanism/common/capabilities/LogisticalTransporter.java +++ b/src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java @@ -7,7 +7,7 @@ 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.capabilities.DefaultStorageHelper.NullStorage; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter; import net.minecraft.inventory.IInventory; @@ -20,7 +20,7 @@ import net.minecraftforge.common.capabilities.CapabilityManager; /** * Created by ben on 03/05/16. */ -public class LogisticalTransporter implements ILogisticalTransporter +public class DefaultLogisticalTransporter implements ILogisticalTransporter { @Override public ItemStack insert(Coord4D original, ItemStack itemStack, EnumColor color, boolean doEmit, int min) @@ -231,6 +231,6 @@ public class LogisticalTransporter implements ILogisticalTransporter public static void register() { - CapabilityManager.INSTANCE.register(ILogisticalTransporter.class, new NullStorage<>(), LogisticalTransporter.class); + CapabilityManager.INSTANCE.register(ILogisticalTransporter.class, new NullStorage<>(), DefaultLogisticalTransporter.class); } } diff --git a/src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java b/src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java new file mode 100644 index 000000000..870d21d0b --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/DefaultSpecialConfigData.java @@ -0,0 +1,32 @@ +package mekanism.common.capabilities; + +import mekanism.api.IConfigCardAccess.ISpecialConfigData; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.capabilities.CapabilityManager; + +public class DefaultSpecialConfigData extends DefaultConfigCardAccess implements ISpecialConfigData +{ + @Override + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) + { + return null; + } + + @Override + public void setConfigurationData(NBTTagCompound nbtTags) + { + + } + + @Override + public String getDataType() + { + return null; + } + + public static void register() + { + CapabilityManager.INSTANCE.register(ISpecialConfigData.class, new NullStorage(), DefaultSpecialConfigData.class); + } +} diff --git a/src/main/java/mekanism/common/capabilities/StorageHelper.java b/src/main/java/mekanism/common/capabilities/DefaultStorageHelper.java similarity index 97% rename from src/main/java/mekanism/common/capabilities/StorageHelper.java rename to src/main/java/mekanism/common/capabilities/DefaultStorageHelper.java index a355d0db5..3dd961263 100644 --- a/src/main/java/mekanism/common/capabilities/StorageHelper.java +++ b/src/main/java/mekanism/common/capabilities/DefaultStorageHelper.java @@ -10,7 +10,7 @@ import net.minecraftforge.common.util.INBTSerializable; /** * Created by ben on 03/05/16. */ -public class StorageHelper +public class DefaultStorageHelper { public static class DefaultStorage implements IStorage { diff --git a/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java b/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyAcceptor.java similarity index 73% rename from src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java rename to src/main/java/mekanism/common/capabilities/DefaultStrictEnergyAcceptor.java index 2c7253568..1b9d2bc06 100644 --- a/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java +++ b/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyAcceptor.java @@ -1,7 +1,7 @@ package mekanism.common.capabilities; import mekanism.api.energy.IStrictEnergyAcceptor; -import mekanism.common.capabilities.StorageHelper.DefaultStorage; +import mekanism.common.capabilities.DefaultStorageHelper.DefaultStorage; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; @@ -10,14 +10,14 @@ import net.minecraftforge.common.util.INBTSerializable; /** * Created by ben on 30/04/16. */ -public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrictEnergyAcceptor, INBTSerializable +public class DefaultStrictEnergyAcceptor extends DefaultStrictEnergyStorage implements IStrictEnergyAcceptor, INBTSerializable { - public StrictEnergyAcceptor() + public DefaultStrictEnergyAcceptor() { this(0); } - public StrictEnergyAcceptor(double capacity) + public DefaultStrictEnergyAcceptor(double capacity) { super(capacity); } @@ -50,6 +50,6 @@ public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrict public static void register() { - CapabilityManager.INSTANCE.register(IStrictEnergyAcceptor.class, new DefaultStorage<>(), StrictEnergyAcceptor.class); + CapabilityManager.INSTANCE.register(IStrictEnergyAcceptor.class, new DefaultStorage<>(), DefaultStrictEnergyAcceptor.class); } } diff --git a/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java b/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyStorage.java similarity index 78% rename from src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java rename to src/main/java/mekanism/common/capabilities/DefaultStrictEnergyStorage.java index 6c88ce76e..d1c9bb4a7 100644 --- a/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java +++ b/src/main/java/mekanism/common/capabilities/DefaultStrictEnergyStorage.java @@ -1,7 +1,7 @@ package mekanism.common.capabilities; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.common.capabilities.StorageHelper.DefaultStorage; +import mekanism.common.capabilities.DefaultStorageHelper.DefaultStorage; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.util.INBTSerializable; @@ -9,17 +9,17 @@ import net.minecraftforge.common.util.INBTSerializable; /** * Created by ben on 30/04/16. */ -public class StrictEnergyStorage implements IStrictEnergyStorage, INBTSerializable +public class DefaultStrictEnergyStorage implements IStrictEnergyStorage, INBTSerializable { private double energyStored = 0; private double maxEnergy; - public StrictEnergyStorage() + public DefaultStrictEnergyStorage() { this(0); } - public StrictEnergyStorage(double capacity) + public DefaultStrictEnergyStorage(double capacity) { maxEnergy = capacity; } @@ -60,6 +60,6 @@ public class StrictEnergyStorage implements IStrictEnergyStorage, INBTSerializab public static void register() { - CapabilityManager.INSTANCE.register(IStrictEnergyStorage.class, new DefaultStorage<>(), StrictEnergyStorage.class); + CapabilityManager.INSTANCE.register(IStrictEnergyStorage.class, new DefaultStorage<>(), DefaultStrictEnergyStorage.class); } } diff --git a/src/main/java/mekanism/common/capabilities/TileNetwork.java b/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java similarity index 74% rename from src/main/java/mekanism/common/capabilities/TileNetwork.java rename to src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java index 86a25968d..5cc824043 100644 --- a/src/main/java/mekanism/common/capabilities/TileNetwork.java +++ b/src/main/java/mekanism/common/capabilities/DefaultTileNetwork.java @@ -5,10 +5,10 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.common.base.ITileNetwork; -import mekanism.common.capabilities.StorageHelper.NullStorage; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraftforge.common.capabilities.CapabilityManager; -public class TileNetwork implements ITileNetwork +public class DefaultTileNetwork implements ITileNetwork { @Override public void handlePacketData(ByteBuf dataStream) throws Exception {} @@ -21,6 +21,6 @@ public class TileNetwork implements ITileNetwork public static void register() { - CapabilityManager.INSTANCE.register(ITileNetwork.class, new NullStorage<>(), TileNetwork.class); + CapabilityManager.INSTANCE.register(ITileNetwork.class, new NullStorage<>(), DefaultTileNetwork.class); } } diff --git a/src/main/java/mekanism/common/capabilities/TubeConnection.java b/src/main/java/mekanism/common/capabilities/DefaultTubeConnection.java similarity index 66% rename from src/main/java/mekanism/common/capabilities/TubeConnection.java rename to src/main/java/mekanism/common/capabilities/DefaultTubeConnection.java index 08d054b64..09318780c 100644 --- a/src/main/java/mekanism/common/capabilities/TubeConnection.java +++ b/src/main/java/mekanism/common/capabilities/DefaultTubeConnection.java @@ -1,11 +1,11 @@ package mekanism.common.capabilities; import mekanism.api.gas.ITubeConnection; -import mekanism.common.capabilities.StorageHelper.NullStorage; +import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; -public class TubeConnection implements ITubeConnection +public class DefaultTubeConnection implements ITubeConnection { @Override public boolean canTubeConnect(EnumFacing side) @@ -15,6 +15,6 @@ public class TubeConnection implements ITubeConnection public static void register() { - CapabilityManager.INSTANCE.register(ITubeConnection.class, new NullStorage<>(), TubeConnection.class); + CapabilityManager.INSTANCE.register(ITubeConnection.class, new NullStorage<>(), DefaultTubeConnection.class); } } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 51b18e6e3..3c9561a44 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -10,6 +10,7 @@ import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; +import mekanism.api.util.CapabilityUtils; import mekanism.common.InventoryNetwork; import mekanism.common.InventoryNetwork.AcceptorData; import mekanism.common.base.ILogisticalTransporter; @@ -19,7 +20,6 @@ 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.util.EnumFacing; @@ -73,7 +73,7 @@ public final class TransporterPathfinder return new Destination(ret, true, null, 0).setPathType(Path.NONE); } else { - Destination newPath = TransporterPathfinder.getNewBasePath(MekanismUtils.getCapability(start.getTileEntity(worldObj), Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null), transportStack, 0); + Destination newPath = TransporterPathfinder.getNewBasePath(CapabilityUtils.getCapability(start.getTileEntity(worldObj), Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null), transportStack, 0); if(newPath != null && TransporterManager.didEmit(transportStack.itemStack, newPath.rejected)) { @@ -189,9 +189,9 @@ public final class TransporterPathfinder { TileEntity tile = location.getTileEntity(world); - if(MekanismUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) + if(CapabilityUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) { - score += MekanismUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null).getCost(); + score += CapabilityUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null).getCost(); } } @@ -271,12 +271,12 @@ public final class TransporterPathfinder { TileEntity tile = path.get(i).getTileEntity(world); - if(!MekanismUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) + if(!CapabilityUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) { return false; } - ILogisticalTransporter transporter = MekanismUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null); + ILogisticalTransporter transporter = CapabilityUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null); if(transporter == null || (transporter.getColor() != null && transporter.getColor() != stack.color)) { @@ -474,7 +474,7 @@ public final class TransporterPathfinder if(transportStack.canInsertToTransporter(neighbor.getTileEntity(worldObj), direction)) { TileEntity tile = neighbor.getTileEntity(worldObj); - double tentativeG = gScore.get(currentNode) + MekanismUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, direction.getOpposite()).getCost(); + double tentativeG = gScore.get(currentNode) + CapabilityUtils.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 8a86622fe..bd56f1931 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -7,12 +7,12 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.util.CapabilityUtils; import mekanism.common.PacketHandler; 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; @@ -313,14 +313,14 @@ public class TransporterStack public boolean canInsertToTransporter(TileEntity tileEntity, EnumFacing from) { - if(!(MekanismUtils.hasCapability(tileEntity, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()))) + if(!(CapabilityUtils.hasCapability(tileEntity, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()))) { return false; } - ILogisticalTransporter transporter = MekanismUtils.getCapability(tileEntity, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()); + ILogisticalTransporter transporter = CapabilityUtils.getCapability(tileEntity, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, from.getOpposite()); - if(!MekanismUtils.getCapability(tileEntity, Capabilities.BLOCKABLE_CONNECTION_CAPABILITY, from.getOpposite()).canConnectMutual(from.getOpposite())) + if(!CapabilityUtils.getCapability(tileEntity, Capabilities.BLOCKABLE_CONNECTION_CAPABILITY, from.getOpposite()).canConnectMutual(from.getOpposite())) { return false; } diff --git a/src/main/java/mekanism/common/item/ItemAlloy.java b/src/main/java/mekanism/common/item/ItemAlloy.java index 86ae88872..bd4b91fc6 100644 --- a/src/main/java/mekanism/common/item/ItemAlloy.java +++ b/src/main/java/mekanism/common/item/ItemAlloy.java @@ -1,9 +1,9 @@ package mekanism.common.item; import mekanism.api.IAlloyInteraction; +import mekanism.api.util.CapabilityUtils; import mekanism.common.MekanismItems; import mekanism.common.capabilities.Capabilities; -import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -25,11 +25,11 @@ public class ItemAlloy extends ItemMekanism { TileEntity tile = world.getTileEntity(pos); - if(MekanismUtils.hasCapability(tile, Capabilities.ALLOY_INTERACTION_CAPABILITY, side)) + if(CapabilityUtils.hasCapability(tile, Capabilities.ALLOY_INTERACTION_CAPABILITY, side)) { if(!world.isRemote) { - IAlloyInteraction interaction = MekanismUtils.getCapability(tile, Capabilities.ALLOY_INTERACTION_CAPABILITY, side); + IAlloyInteraction interaction = CapabilityUtils.getCapability(tile, Capabilities.ALLOY_INTERACTION_CAPABILITY, side); int ordinal = stack.getItem() == MekanismItems.EnrichedAlloy? 1 : (stack.getItem() == MekanismItems.ReinforcedAlloy ? 2 : 3); interaction.onAlloyInteraction(player, hand, stack, ordinal); } diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index 125689171..01beffb13 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -3,11 +3,12 @@ package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.IConfigCardAccess; import mekanism.api.IConfigCardAccess.ISpecialConfigData; +import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.base.ISideConfiguration; +import mekanism.common.capabilities.Capabilities; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; @@ -46,20 +47,21 @@ public class ItemConfigurationCard extends ItemMekanism { TileEntity tileEntity = world.getTileEntity(pos); - if(tileEntity instanceof IConfigCardAccess) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.CONFIG_CARD_CAPABILITY, side)) { if(player.isSneaking()) { NBTTagCompound data = getBaseData(tileEntity); - if(tileEntity instanceof ISpecialConfigData) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY, side)) { - data = ((ISpecialConfigData)tileEntity).getConfigurationData(data); + ISpecialConfigData special = CapabilityUtils.getCapability(tileEntity, Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY, side); + data = special.getConfigurationData(data); } if(data != null) { - data.setString("dataType", getNameFromTile(tileEntity)); + data.setString("dataType", getNameFromTile(tileEntity, side)); setData(stack, data); player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurationCard.got").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(data.getString("dataType")) + EnumColor.GREY))); } @@ -68,13 +70,14 @@ public class ItemConfigurationCard extends ItemMekanism } else if(getData(stack) != null) { - if(getNameFromTile(tileEntity).equals(getDataType(stack))) + if(getNameFromTile(tileEntity, side).equals(getDataType(stack))) { setBaseData(getData(stack), tileEntity); - if(tileEntity instanceof ISpecialConfigData) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY, side)) { - ((ISpecialConfigData)tileEntity).setConfigurationData(getData(stack)); + ISpecialConfigData special = CapabilityUtils.getCapability(tileEntity, Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY, side); + special.setConfigurationData(getData(stack)); } player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + LangUtils.localize("tooltip.configurationCard.set").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); @@ -124,7 +127,7 @@ public class ItemConfigurationCard extends ItemMekanism } } - private String getNameFromTile(TileEntity tile) + private String getNameFromTile(TileEntity tile, EnumFacing side) { String ret = Integer.toString(tile.hashCode()); @@ -133,9 +136,10 @@ public class ItemConfigurationCard extends ItemMekanism ret = tile.getBlockType().getUnlocalizedName() + "." + ((TileEntityContainerBlock)tile).fullName + ".name"; } - if(tile instanceof ISpecialConfigData) + if(CapabilityUtils.hasCapability(tile, Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY, side)) { - ret = ((ISpecialConfigData)tile).getDataType(); + ISpecialConfigData special = CapabilityUtils.getCapability(tile, Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY, side); + ret = special.getDataType(); } return ret; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 5a99efb58..f8da02b68 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -11,6 +11,7 @@ import mekanism.api.IConfigurable; import mekanism.api.IMekWrench; import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; @@ -113,9 +114,9 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool return EnumActionResult.SUCCESS; } - else if(MekanismUtils.hasCapability(tile, Capabilities.CONFIGURABLE_CAPABILITY, side)) + else if(CapabilityUtils.hasCapability(tile, Capabilities.CONFIGURABLE_CAPABILITY, side)) { - IConfigurable config = MekanismUtils.getCapability(tile, Capabilities.CONFIGURABLE_CAPABILITY, side); + IConfigurable config = CapabilityUtils.getCapability(tile, Capabilities.CONFIGURABLE_CAPABILITY, side); if(SecurityUtils.canAccess(player, tile)) { diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 6ff41e4c7..4dc65f938 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -10,8 +10,8 @@ import mekanism.api.MekanismAPI; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; +import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; -import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -41,11 +41,11 @@ public class ItemNetworkReader extends ItemEnergized if(getEnergy(stack) >= ENERGY_PER_USE && tileEntity != null) { - if(MekanismUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE); - IGridTransmitter transmitter = MekanismUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); + IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkSize())); @@ -55,9 +55,9 @@ public class ItemNetworkReader extends ItemEnergized player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Throughput: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkFlow())); player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Capacity: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkCapacity())); - if(MekanismUtils.hasCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) { - IHeatTransfer transfer = MekanismUtils.getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); + IHeatTransfer transfer = CapabilityUtils.getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient")); } @@ -65,11 +65,11 @@ public class ItemNetworkReader extends ItemEnergized return EnumActionResult.SUCCESS; } - else if(MekanismUtils.hasCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) + else if(CapabilityUtils.hasCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) { if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE); - IHeatTransfer transfer = MekanismUtils.getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); + IHeatTransfer transfer = CapabilityUtils.getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient")); player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); @@ -87,9 +87,9 @@ public class ItemNetworkReader extends ItemEnergized TileEntity tile = coord.getTileEntity(world); - if(tile != null && MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite())) + if(tile != null && CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite())) { - IGridTransmitter transmitter = MekanismUtils.getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, iterSide.getOpposite()); + IGridTransmitter transmitter = CapabilityUtils.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 958e91134..14e1aa09e 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -7,9 +7,9 @@ import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; import mekanism.common.transmitters.Transmitter; -import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -53,9 +53,9 @@ public class MultipartTransmitter> extends Tran return null; } - if(MekanismUtils.hasCapability(potentialTransmitterTile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(potentialTransmitterTile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { - IGridTransmitter transmitter = MekanismUtils.getCapability(potentialTransmitterTile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); + IGridTransmitter transmitter = CapabilityUtils.getCapability(potentialTransmitterTile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType())) { @@ -101,9 +101,9 @@ public class MultipartTransmitter> extends Tran { TileEntity tile = from.getTileEntity(world()); - if(MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + if(CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { - IGridTransmitter transmitter = MekanismUtils.getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + IGridTransmitter transmitter = CapabilityUtils.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 2681bcd3d..9ce5f0bf0 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransporter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransporter.java @@ -6,6 +6,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; +import mekanism.api.util.CapabilityUtils; import mekanism.common.HashList; import mekanism.common.InventoryNetwork; import mekanism.common.Mekanism; @@ -93,7 +94,7 @@ public class MultipartTransporter extends MultipartTransmitter())), (EntityPlayerMP)player); } diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index 4ddade2d2..eb8ab6da0 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -5,11 +5,11 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.util.CapabilityUtils; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; @@ -33,9 +33,9 @@ public class PacketTileEntity implements IMessageHandler T getCapability(Capability capability, EnumFacing facing) { - if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY) - return (T) this; + if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY + || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY + || capability == Capabilities.CONFIG_CARD_CAPABILITY + || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY) + return (T)this; return super.getCapability(capability, facing); } - } diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java index bb5f1eb66..6adcecccd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java @@ -16,6 +16,7 @@ import mekanism.common.base.IElectricMachine; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; +import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.inputs.MachineInput; @@ -30,6 +31,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; public abstract class TileEntityBasicMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile @@ -309,4 +311,21 @@ public abstract class TileEntityBasicMachine, { return securityComponent; } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.CONFIG_CARD_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.CONFIG_CARD_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index ba362ae75..c6ad97e92 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IConfigurable; import mekanism.api.Range4D; +import mekanism.api.util.CapabilityUtils; import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; @@ -208,9 +209,9 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento { TileEntity tile = Coord4D.get(this).offset(EnumFacing.DOWN).getTileEntity(worldObj); - if(MekanismUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP)) + if(CapabilityUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP)) { - ILogisticalTransporter transporter = MekanismUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, EnumFacing.UP); + ILogisticalTransporter transporter = CapabilityUtils.getCapability(tile, 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/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 3a057fbe4..cab110150 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -390,13 +390,14 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock public boolean hasCapability(Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY - || super.hasCapability(capability, side); + || capability == Capabilities.CONFIG_CARD_CAPABILITY || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) + if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY + || capability == Capabilities.CONFIG_CARD_CAPABILITY) { return (T)this; } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 14e70dd20..a696dbedf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -16,6 +16,7 @@ import mekanism.api.Chunk3D; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; +import mekanism.api.util.CapabilityUtils; import mekanism.common.HashList; import mekanism.common.Mekanism; import mekanism.common.Upgrade; @@ -60,6 +61,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -303,9 +305,9 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I getTopEject(true, remains); } - else if(MekanismUtils.hasCapability(getEjectInv(), Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) + else if(CapabilityUtils.hasCapability(getEjectInv(), Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) { - ItemStack rejected = TransporterUtils.insert(getEjectTile(), MekanismUtils.getCapability(getEjectInv(), Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()), getTopEject(false, null), null, true, 0); + ItemStack rejected = TransporterUtils.insert(getEjectTile(), CapabilityUtils.getCapability(getEjectInv(), Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()), getTopEject(false, null), null, true, 0); if(TransporterManager.didEmit(getTopEject(false, null), rejected)) { @@ -1533,4 +1535,22 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { return securityComponent; } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY + || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index f846cd4b9..a608fb8ea 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.EnumSet; import mekanism.api.MekanismConfig.general; +import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; import mekanism.common.util.MekanismUtils; @@ -376,7 +377,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i public double injectEnergy(EnumFacing direction, double amount, double voltage) { TileEntity tile = getWorld().getTileEntity(getPos().offset(direction)); - if(tile == null || MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite())) + if(tile == null || CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite())) { return amount; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 69ea91566..b11d01b81 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -1129,13 +1129,15 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I public boolean hasCapability(Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY + || capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) + if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY + || capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY) { return (T)this; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 4252d6d16..c47479508 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -16,6 +16,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.assemblicator.RecipeFormula; import mekanism.common.item.ItemCraftingFormula; import mekanism.common.security.ISecurityTile; @@ -30,6 +31,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock implements ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile @@ -266,22 +268,16 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im container = null; } - if(container != null/*TODO && !stack.getItem().doesContainerItemLeaveCraftingGrid(stack)*/) + if(container != null) { - /*TODOif(!stack.getItem().doesContainerItemLeaveCraftingGrid(stack)) - { - inventory[i] = container.copy(); - } - else*/ { - boolean move = tryMoveToOutput(container.copy(), false); - - if(move) - { - tryMoveToOutput(container.copy(), true); - } - - inventory[i] = move ? null : container.copy(); - } + boolean move = tryMoveToOutput(container.copy(), false); + + if(move) + { + tryMoveToOutput(container.copy(), true); + } + + inventory[i] = move ? null : container.copy(); } } } @@ -742,4 +738,21 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im break; } } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.CONFIG_CARD_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.CONFIG_CARD_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index 94ec53bce..76a1bd0f3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.capabilities.Capabilities; @@ -273,9 +274,9 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement { TileEntity adj = Coord4D.get(this).offset(side).getTileEntity(worldObj); - if(MekanismUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) { - return MekanismUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); + return CapabilityUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); } return null; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index f14242d30..41134b172 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -15,6 +15,7 @@ import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IEnergyWrapper; @@ -398,7 +399,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement public double injectEnergy(EnumFacing direction, double amount, double voltage) { TileEntity tile = getWorld().getTileEntity(getPos().offset(direction)); - if(tile == null || MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite())) + if(tile == null || CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite())) { return amount; } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index d528d25ab..068671c59 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -63,7 +63,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); - if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) + if(!(hardness < 0 || (LaserManager.isReceptor(tileHit, mop.sideHit) && !(LaserManager.getReceptor(tileHit, mop.sideHit).canLasersDig())))) { diggingProgress += usage.laserUsage; @@ -95,7 +95,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); - if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) + if(!(hardness < 0 || (LaserManager.isReceptor(tileHit, info.movingPos.sideHit) && !(LaserManager.getReceptor(tileHit, info.movingPos.sideHit).canLasersDig())))) { diggingProgress += usage.laserUsage; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index d8ffddbb9..d34f27abb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -91,7 +91,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); - if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) + if(!(hardness < 0 || (LaserManager.isReceptor(tileHit, mop.sideHit) && !(LaserManager.getReceptor(tileHit, mop.sideHit).canLasersDig())))) { diggingProgress += lastFired; @@ -143,7 +143,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); - if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) + if(!(hardness < 0 || (LaserManager.isReceptor(tileHit, info.movingPos.sideHit) && !(LaserManager.getReceptor(tileHit, info.movingPos.sideHit).canLasersDig())))) { diggingProgress += firing; @@ -353,6 +353,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY + || capability == Capabilities.LASER_RECEPTOR_CAPABILITY || super.hasCapability(capability, facing); } @@ -360,9 +361,11 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement public T getCapability(Capability capability, EnumFacing facing) { if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY) - return (T) this; + return (T)this; if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) - return (T) this; + return (T)this; + if(capability == Capabilities.LASER_RECEPTOR_CAPABILITY) + return (T)this; return super.getCapability(capability, facing); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 906f0f526..7c3852ee0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -12,6 +12,7 @@ import mekanism.api.util.StackUtils; import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; +import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; @@ -22,6 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.RayTraceResult; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor, ISecurityTile @@ -78,7 +80,8 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme IBlockState blockHit = hitCoord.getBlockState(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); - if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) + + if(!(hardness < 0 || (LaserManager.isReceptor(tileHit, mop.sideHit) && !(LaserManager.getReceptor(tileHit, mop.sideHit).canLasersDig())))) { diggingProgress += lastFired; @@ -117,7 +120,8 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme IBlockState blockHit = hitCoord.getBlockState(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); - if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) + + if(!(hardness < 0 || (LaserManager.isReceptor(tileHit, info.movingPos.sideHit) && !(LaserManager.getReceptor(tileHit, info.movingPos.sideHit).canLasersDig())))) { diggingProgress += firing; @@ -228,4 +232,21 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme { return securityComponent; } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.LASER_RECEPTOR_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.LASER_RECEPTOR_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 43479ceb3..30869ad53 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -9,6 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.Range4D; +import mekanism.api.util.CapabilityUtils; import mekanism.common.HashList; import mekanism.common.Mekanism; import mekanism.common.MekanismSounds; @@ -40,6 +41,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -95,7 +97,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen TileEntity back = Coord4D.get(this).offset(facing.getOpposite()).getTileEntity(worldObj); TileEntity front = Coord4D.get(this).offset(facing).getTileEntity(worldObj); - if(back instanceof IInventory && (front != null && MekanismUtils.hasCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()) || front instanceof IInventory)) + if(back instanceof IInventory && (front != null && CapabilityUtils.hasCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()) || front instanceof IInventory)) { IInventory inventory = InventoryUtils.checkChestInv((IInventory)back); @@ -181,9 +183,9 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { ItemStack used = null; - if(MekanismUtils.hasCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) + if(CapabilityUtils.hasCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite())) { - ILogisticalTransporter transporter = MekanismUtils.getCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()); + ILogisticalTransporter transporter = CapabilityUtils.getCapability(front, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, facing.getOpposite()); if(!roundRobin) { @@ -721,4 +723,22 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } } } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY + || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index d78851bc4..0524137bb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -25,6 +25,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; @@ -42,6 +43,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile @@ -577,4 +579,21 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i break; } } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.CONFIG_CARD_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.CONFIG_CARD_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 86136176f..e17350413 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -16,6 +16,7 @@ import mekanism.common.PacketHandler; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; @@ -28,6 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.oredict.OreDictionary; @@ -424,6 +426,24 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple return securityComponent; } + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY + || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.CONFIG_CARD_CAPABILITY || capability == Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } + public static class OredictionificatorFilter { public String filter; diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 0d98513ef..aaa74f6d5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -13,6 +13,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.SideData.IOState; @@ -586,9 +587,9 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp if(hasFrequency() && configComponent.getOutput(TransmissionType.HEAT, side, facing).ioState == IOState.INPUT) { - if(MekanismUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) { - return MekanismUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); + return CapabilityUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 50583a7eb..7c080686a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -9,6 +9,7 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; import mekanism.common.block.states.BlockStateMachine.MachineType; @@ -265,9 +266,9 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl { TileEntity adj = Coord4D.get(this).offset(side).getTileEntity(worldObj); - if(MekanismUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) { - return MekanismUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); + return CapabilityUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); } return null; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 6835dd839..1e3aefb80 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -10,11 +10,13 @@ import mekanism.api.Coord4D; import mekanism.api.IEvaporationSolar; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.util.CapabilityUtils; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.IActiveState; import mekanism.common.base.ITankManager; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; @@ -532,9 +534,9 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva public boolean addSolarPanel(TileEntity tile, int i) { - if(tile instanceof IEvaporationSolar && !tile.isInvalid()) + if(!tile.isInvalid() && CapabilityUtils.hasCapability(tile, Capabilities.EVAPORATION_SOLAR_CAPABILITY, EnumFacing.DOWN)) { - solars[i] = (IEvaporationSolar)tile; + solars[i] = CapabilityUtils.getCapability(tile, Capabilities.EVAPORATION_SOLAR_CAPABILITY, EnumFacing.DOWN); return true; } else { diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index 3e9827931..35053de53 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -13,6 +13,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.GasTransmission; import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.CapabilityUtils; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; @@ -190,13 +191,13 @@ public class TileComponentEjector implements ITileComponent TileEntity tile = Coord4D.get(tileEntity).offset(side).getTileEntity(tileEntity.getWorld()); ItemStack prev = stack.copy(); - if(tile instanceof IInventory && !(MekanismUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()))) + if(tile instanceof IInventory && !(CapabilityUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()))) { stack = InventoryUtils.putStackInInventory((IInventory)tile, stack, side, false); } - else if(MekanismUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite())) + else if(CapabilityUtils.hasCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite())) { - ItemStack rejects = TransporterUtils.insert(tileEntity, MekanismUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, side.getOpposite()), stack, outputColor, true, 0); + ItemStack rejects = TransporterUtils.insert(tileEntity, CapabilityUtils.getCapability(tile, 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 9ae8fbdf7..11c993ba5 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -13,6 +13,7 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; import net.minecraft.tileentity.TileEntity; @@ -27,16 +28,16 @@ public final class CableUtils { public static boolean isEnergyAcceptor(TileEntity tileEntity) { - return tileEntity != null && (MekanismUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null) || + return tileEntity != null && (CapabilityUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, null) || (MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) || (MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver)); } public static boolean isCable(TileEntity tileEntity) { - if(tileEntity != null && MekanismUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + if(tileEntity != null && CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { - return TransmissionType.checkTransmissionType(MekanismUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null), TransmissionType.ENERGY); + return TransmissionType.checkTransmissionType(CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null), TransmissionType.ENERGY); } return false; @@ -115,7 +116,7 @@ public final class CableUtils public static boolean isOutputter(TileEntity tileEntity, EnumFacing side) { return tileEntity != null && ( - (MekanismUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()) && MekanismUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) || + (CapabilityUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()) && CapabilityUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) || (MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) || (MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())) ); @@ -123,14 +124,14 @@ public final class CableUtils public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, EnumFacing side) { - if(MekanismUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite())) { return false; } - if(MekanismUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite())) { - if(MekanismUtils.getCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite()).canReceiveEnergy(side.getOpposite())) + if(CapabilityUtils.getCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite()).canReceiveEnergy(side.getOpposite())) { return true; } @@ -142,9 +143,9 @@ public final class CableUtils return true; } } - else if(MekanismUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite())) + else if(CapabilityUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite())) { - if(MekanismUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) + if(CapabilityUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite())) { return true; } @@ -235,9 +236,9 @@ public final class CableUtils { double sent = 0; - if(MekanismUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite())) { - IStrictEnergyAcceptor acceptor = MekanismUtils.getCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite()); + IStrictEnergyAcceptor acceptor = CapabilityUtils.getCapability(tileEntity, Capabilities.ENERGY_ACCEPTOR_CAPABILITY, side.getOpposite()); if(acceptor.canReceiveEnergy(side.getOpposite())) { diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index 2a4df3fcc..968cc873c 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -1,6 +1,7 @@ package mekanism.common.util; import mekanism.api.IHeatTransfer; +import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.ICapabilityProvider; @@ -22,7 +23,7 @@ public class HeatUtils source.transferHeatTo(-heatToTransfer); sink.transferHeatTo(heatToTransfer); - if(!(sink instanceof ICapabilityProvider && MekanismUtils.hasCapability((ICapabilityProvider)sink, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))) + if(!(sink instanceof ICapabilityProvider && CapabilityUtils.hasCapability((ICapabilityProvider)sink, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))) { heatTransferred[0] += heatToTransfer; } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 8940d42a6..7c063ce83 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -82,8 +82,6 @@ import net.minecraft.util.text.TextComponentString; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -1502,20 +1500,6 @@ public final class MekanismUtils return false; } - public static boolean hasCapability(ICapabilityProvider provider, Capability cap, EnumFacing side) - { - if(provider == null || cap == null) return false; - - return provider.hasCapability(cap, side); - } - - public static T getCapability(ICapabilityProvider provider, Capability cap, EnumFacing side) - { - if(provider == null || cap == null) return null; - - return provider.getCapability(cap, side); - } - public static enum ResourceType { GUI("gui"), diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index b7e3db647..1460570c2 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -21,7 +22,7 @@ public final class PipeUtils public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side) { - if(MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IFluidHandler)) + if(CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IFluidHandler)) { return false; } diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index fca110a0c..caa891e0b 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -4,6 +4,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.util.CapabilityUtils; import mekanism.api.util.ListUtils; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.capabilities.Capabilities; @@ -24,7 +25,7 @@ public final class TransporterUtils public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side) { - if(MekanismUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IInventory)) + if(CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()) || !(tile instanceof IInventory)) { return false; } diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 323b34074..739400aaf 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -14,11 +14,11 @@ import mekanism.api.IHeatTransfer; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; -import mekanism.api.lasers.ILaserReceptor; import mekanism.api.reactor.IFusionReactor; import mekanism.api.reactor.INeutronCapture; import mekanism.api.reactor.IReactorBlock; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.common.LaserManager; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.generators.common.item.ItemHohlraum; @@ -434,7 +434,7 @@ public class FusionReactor implements IFusionReactor { TileEntity tile = centre.clone().translate(coords[0], coords[1], coords[2]).getTileEntity(controller.getWorld()); - if(tile instanceof ILaserReceptor && !(coords[1] == 0 && (coords[0] == 0 || coords[2] == 0))) + if(LaserManager.isReceptor(tile, null) && !(coords[1] == 0 && (coords[0] == 0 || coords[2] == 0))) { return false; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index fda84ad89..19263ebe8 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -6,8 +6,10 @@ import mekanism.api.Coord4D; import mekanism.api.IEvaporationSolar; import mekanism.api.MekanismConfig.generators; import mekanism.common.base.IBoundingBlock; +import mekanism.common.capabilities.Capabilities; import mekanism.common.util.MekanismUtils; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, IEvaporationSolar { @@ -60,4 +62,21 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i { return seesSun; } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.EVAPORATION_SOLAR_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.EVAPORATION_SOLAR_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 7277dfc19..a52165c7a 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismConfig.generators; +import mekanism.api.util.CapabilityUtils; import mekanism.common.base.ISustainedData; import mekanism.common.capabilities.Capabilities; import mekanism.common.util.ChargeUtils; @@ -462,9 +463,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu { TileEntity adj = Coord4D.get(this).offset(side).getTileEntity(worldObj); - if(MekanismUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) { - return MekanismUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); + return CapabilityUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); } } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java index 6789f7ac3..c6bddd6f7 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java @@ -1,7 +1,9 @@ package mekanism.generators.common.tile.reactor; import mekanism.api.lasers.ILaserReceptor; +import mekanism.common.capabilities.Capabilities; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; public class TileEntityReactorLaserFocusMatrix extends TileEntityReactorBlock implements ILaserReceptor { @@ -25,4 +27,21 @@ public class TileEntityReactorLaserFocusMatrix extends TileEntityReactorBlock im { return false; } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.LASER_RECEPTOR_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.LASER_RECEPTOR_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index af0c12c97..f9925e02f 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -10,11 +10,11 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; import mekanism.api.reactor.IReactorBlock; +import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; import mekanism.common.util.CableUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.InventoryUtils; -import mekanism.common.util.MekanismUtils; import mekanism.generators.common.item.ItemHohlraum; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -305,11 +305,11 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl { TileEntity adj = Coord4D.get(this).offset(side).getTileEntity(worldObj); - if(MekanismUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) + if(CapabilityUtils.hasCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) { if(!(adj instanceof IReactorBlock)) { - return MekanismUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); + return CapabilityUtils.getCapability(adj, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); } }