Remove deprecated IGasHandler methods, properly implement AlloyInteraction and GasHandler capabilities

This commit is contained in:
aidancbrady committed 2016-05-23 12:44:05 -04:00
1 parent 4ddcb151a1
commit b618263e69
23 files changed
+83 -209

No files matched your search

@@ -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
@@ -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);
}
}
@@ -63,5 +63,7 @@ public class Capabilities
Configurable.register();
TileNetwork.register();
GasHandler.register();
AlloyInteraction.register();
}
}
@@ -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);
}
}
@@ -51,7 +51,5 @@ public class StrictEnergyAcceptor extends StrictEnergyStorage implements IStrict
public static void register()
{
CapabilityManager.INSTANCE.register(IStrictEnergyAcceptor.class, new DefaultStorage<>(), StrictEnergyAcceptor.class);
}
}
@@ -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<IInventory, InventoryNetwork>
{
@@ -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<IGasHandler, GasNetwork> implements IGasHandler
{
@@ -275,24 +277,12 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{
@@ -358,4 +348,21 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
super.writeUpdatePacket(packet);
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.GAS_HANDLER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.GAS_HANDLER_CAPABILITY)
{
return (T)getTransmitter();
}
return super.getCapability(capability, side);
}
}
@@ -209,13 +209,14 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> 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> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.GRID_TRANSMITTER_CAPABILITY)
if(capability == Capabilities.GRID_TRANSMITTER_CAPABILITY || capability == Capabilities.ALLOY_INTERACTION_CAPABILITY)
{
return (T)getTransmitter();
}
@@ -399,24 +399,12 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{
@@ -57,24 +57,12 @@ public class TileEntityAmbientAccumulator extends TileEntityContainerBlock imple
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
return collectedGas.draw(amount, doTransfer);
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{
@@ -370,24 +370,12 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canDrawGas(EnumFacing side, Gas type)
{
@@ -430,25 +430,13 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{
@@ -429,12 +429,6 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
@@ -446,12 +440,6 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canDrawGas(EnumFacing side, Gas type)
{
@@ -437,12 +437,6 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
@@ -454,12 +448,6 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canDrawGas(EnumFacing side, Gas type)
{
@@ -654,12 +654,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
@@ -675,12 +669,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{
@@ -1087,12 +1087,6 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{
@@ -1121,12 +1115,6 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canDrawGas(EnumFacing side, Gas type)
{
@@ -180,24 +180,12 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
return gasTank.receive(stack, doTransfer);
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canDrawGas(EnumFacing side, Gas type)
{
@@ -406,12 +406,6 @@ public class TileEntityPRC extends TileEntityBasicMachine<PressurizedInput, Pres
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
@@ -423,12 +417,6 @@ public class TileEntityPRC extends TileEntityBasicMachine<PressurizedInput, Pres
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{
@@ -466,24 +466,12 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
return !hasFrequency() ? 0 : frequency.storedGas.receive(stack, doTransfer);
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
return !hasFrequency() ? null : frequency.storedGas.draw(amount, doTransfer);
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{
@@ -422,24 +422,12 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp
return gasTank.receive(stack, doTransfer);
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
return gasTank.draw(amount, doTransfer);
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canDrawGas(EnumFacing side, Gas type)
{
@@ -300,12 +300,6 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
@@ -317,12 +311,6 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{
@@ -296,12 +296,6 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public void readFromNBT(NBTTagCompound nbtTags)
{
@@ -338,12 +332,6 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canDrawGas(EnumFacing side, Gas type)
{
@@ -129,12 +129,6 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
return 0;
}
@Override
public int receiveGas(EnumFacing side, GasStack stack)
{
return receiveGas(side, stack, true);
}
@Override
public GasStack drawGas(EnumFacing side, int amount, boolean doTransfer)
{
@@ -149,12 +143,6 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
return null;
}
@Override
public GasStack drawGas(EnumFacing side, int amount)
{
return drawGas(side, amount, true);
}
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{