diff --git a/src/main/java/mekanism/api/gas/IGasHandler.java b/src/main/java/mekanism/api/gas/IGasHandler.java index be7e03434..8f9842956 100644 --- a/src/main/java/mekanism/api/gas/IGasHandler.java +++ b/src/main/java/mekanism/api/gas/IGasHandler.java @@ -16,9 +16,6 @@ public interface IGasHandler */ public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer); - @Deprecated - public int receiveGas(EnumFacing side, GasStack stack); - /** * Draws a certain amount of gas from this block. * @param amount - amount to draw @@ -26,9 +23,6 @@ public interface IGasHandler */ public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer); - @Deprecated - public GasStack drawGas(EnumFacing side, int amount); - /** * Whether or not this block can accept gas from a certain side. * @param side - side to check diff --git a/src/main/java/mekanism/common/capabilities/AlloyInteraction.java b/src/main/java/mekanism/common/capabilities/AlloyInteraction.java new file mode 100644 index 000000000..2aa30fb16 --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/AlloyInteraction.java @@ -0,0 +1,17 @@ +package mekanism.common.capabilities; + +import mekanism.api.IAlloyInteraction; +import mekanism.common.capabilities.StorageHelper.NullStorage; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.common.capabilities.CapabilityManager; + +public class AlloyInteraction implements IAlloyInteraction +{ + @Override + public void onAlloyInteraction(EntityPlayer player, int tierOrdinal) {} + + public static void register() + { + CapabilityManager.INSTANCE.register(IAlloyInteraction.class, new NullStorage<>(), AlloyInteraction.class); + } +} diff --git a/src/main/java/mekanism/common/capabilities/Capabilities.java b/src/main/java/mekanism/common/capabilities/Capabilities.java index 0f927b2a0..35bc81bd8 100644 --- a/src/main/java/mekanism/common/capabilities/Capabilities.java +++ b/src/main/java/mekanism/common/capabilities/Capabilities.java @@ -63,5 +63,7 @@ public class Capabilities Configurable.register(); TileNetwork.register(); + GasHandler.register(); + AlloyInteraction.register(); } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/capabilities/GasHandler.java b/src/main/java/mekanism/common/capabilities/GasHandler.java new file mode 100644 index 000000000..feba2ea1e --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/GasHandler.java @@ -0,0 +1,40 @@ +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 net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.CapabilityManager; + +public class GasHandler implements IGasHandler +{ + @Override + public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) + { + return 0; + } + + @Override + public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer) + { + return null; + } + + @Override + public boolean canReceiveGas(EnumFacing side, Gas type) + { + return false; + } + + @Override + public boolean canDrawGas(EnumFacing side, Gas type) + { + return false; + } + + public static void register() + { + CapabilityManager.INSTANCE.register(IGasHandler.class, new NullStorage<>(), GasHandler.class); + } +} diff --git a/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java b/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java index 2b15462bd..2c7253568 100644 --- a/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java +++ b/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java @@ -51,7 +51,5 @@ public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrict public static void register() { CapabilityManager.INSTANCE.register(IStrictEnergyAcceptor.class, new DefaultStorage<>(), StrictEnergyAcceptor.class); - } - } diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 2616efd7e..f717b32e7 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -40,11 +40,6 @@ import net.minecraft.util.EnumFacing; //import net.minecraft.util.IIcon; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; -/* -import codechicken.lib.data.MCDataInput; -import codechicken.lib.data.MCDataOutput; -import codechicken.lib.vec.Vector3; -*/ public class PartLogisticalTransporter extends PartTransmitter { diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index 79e6436c4..1087b1cc5 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -12,6 +12,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TubeTier; +import mekanism.common.capabilities.Capabilities; //import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -25,6 +26,7 @@ import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Vector3; */ +import net.minecraftforge.common.capabilities.Capability; public class PartPressurizedTube extends PartTransmitter implements IGasHandler { @@ -275,24 +277,12 @@ public class PartPressurizedTube extends PartTransmitter capability, EnumFacing side) + { + return capability == Capabilities.GAS_HANDLER_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.GAS_HANDLER_CAPABILITY) + { + return (T)getTransmitter(); + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index a47425285..53848d9d3 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -209,13 +209,14 @@ public abstract class PartTransmitter> extends @Override public boolean hasCapability(Capability capability, EnumFacing side) { - return capability == Capabilities.GRID_TRANSMITTER_CAPABILITY || super.hasCapability(capability, side); + return capability == Capabilities.GRID_TRANSMITTER_CAPABILITY || capability == Capabilities.ALLOY_INTERACTION_CAPABILITY + || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.GRID_TRANSMITTER_CAPABILITY) + if(capability == Capabilities.GRID_TRANSMITTER_CAPABILITY || capability == Capabilities.ALLOY_INTERACTION_CAPABILITY) { return (T)getTransmitter(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index ce7dea9e0..07a2180d1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -399,24 +399,12 @@ public abstract class TileEntityAdvancedElectricMachine