diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index a5827c67a..daf667ca7 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -79,6 +79,7 @@ import mekanism.common.tileentity.TileEntityBin; import mekanism.common.tileentity.TileEntityChargepad; import mekanism.common.tileentity.TileEntityChemicalFormulator; import mekanism.common.tileentity.TileEntityChemicalInfuser; +import mekanism.common.tileentity.TileEntityChemicalInjectionChamber; import mekanism.common.tileentity.TileEntityCombiner; import mekanism.common.tileentity.TileEntityCrusher; import mekanism.common.tileentity.TileEntityDigitalMiner; @@ -268,6 +269,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityDigitalMiner.class, "DigitalMiner", new RenderDigitalMiner()); ClientRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator", new RenderRotaryCondensentrator()); ClientRegistry.registerTileEntity(TileEntityTeleporter.class, "MekanismTeleporter", new RenderTeleporter()); + ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine()); } @Override diff --git a/common/mekanism/common/tileentity/TileEntityChemicalInjectionChamber.java b/common/mekanism/common/tileentity/TileEntityChemicalInjectionChamber.java index a198a0cf0..cbb92caed 100644 --- a/common/mekanism/common/tileentity/TileEntityChemicalInjectionChamber.java +++ b/common/mekanism/common/tileentity/TileEntityChemicalInjectionChamber.java @@ -34,7 +34,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr public int getFuelTicks(ItemStack itemstack) { if(itemstack.isItemEqual(new ItemStack(Item.gunpowder))) return 20; - if(itemstack.isItemEqual(new ItemStack(Mekanism.GasTank)) && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && + if(itemstack.itemID == Mekanism.GasTank.blockID && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && ((IGasItem)itemstack.getItem()).getGas(itemstack).getGas() == GasRegistry.getGas("sulfuricAcid")) return 1; return 0; @@ -62,10 +62,11 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr @Override public void handleSecondaryFuel() { - if(inventory[1] != null && secondaryEnergyStored < MAX_SECONDARY_ENERGY) + if(inventory[1] != null && secondaryEnergyStored < MAX_SECONDARY_ENERGY && inventory[1].getItem() instanceof IGasItem) { GasStack removed = GasTransmission.removeGas(inventory[1], GasRegistry.getGas("sulfuricAcid"), MAX_SECONDARY_ENERGY-secondaryEnergyStored); setSecondaryEnergy(secondaryEnergyStored + (removed != null ? removed.amount : 0)); + return; } super.handleSecondaryFuel(); diff --git a/common/mekanism/common/tileentity/TileEntityPurificationChamber.java b/common/mekanism/common/tileentity/TileEntityPurificationChamber.java index ec8eade21..6a1f58b4d 100644 --- a/common/mekanism/common/tileentity/TileEntityPurificationChamber.java +++ b/common/mekanism/common/tileentity/TileEntityPurificationChamber.java @@ -34,7 +34,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac public int getFuelTicks(ItemStack itemstack) { if(itemstack.isItemEqual(new ItemStack(Item.flint))) return 300; - if(itemstack.isItemEqual(new ItemStack(Mekanism.GasTank)) && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && + if(itemstack.itemID == Mekanism.GasTank.blockID && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && ((IGasItem)itemstack.getItem()).getGas(itemstack).getGas() == GasRegistry.getGas("oxygen")) return 1; return 0; @@ -62,10 +62,11 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac @Override public void handleSecondaryFuel() { - if(inventory[1] != null && secondaryEnergyStored < MAX_SECONDARY_ENERGY) + if(inventory[1] != null && secondaryEnergyStored < MAX_SECONDARY_ENERGY && inventory[1].getItem() instanceof IGasItem) { GasStack removed = GasTransmission.removeGas(inventory[1], GasRegistry.getGas("oxygen"), MAX_SECONDARY_ENERGY-secondaryEnergyStored); setSecondaryEnergy(secondaryEnergyStored + (removed != null ? removed.amount : 0)); + return; } super.handleSecondaryFuel();