From c61db44bf490052f6c098b6ad95589b0ef6c2d0e Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Thu, 9 Jan 2014 21:46:22 -0500 Subject: [PATCH] Going to use Sulfuric Acid/Sulfur in the Chemical Injection Chamber until we get Salt/Brine/etc down --- .../nei/ChemicalInjectionChamberRecipeHandler.java | 4 ++-- .../tile/TileEntityChemicalInjectionChamber.java | 10 +++++----- common/mekanism/common/tile/TileEntityFactory.java | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 767c6e852..25c1d6ef6 100644 --- a/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -47,8 +47,8 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe @Override public List getFuelStacks() { - List fuels = OreDictionary.getOres("dustSalt"); - fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("hydrogenChloride"))); + List fuels = OreDictionary.getOres("dustSulfur"); + fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("sulfuricAcid"))); return fuels; } diff --git a/common/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/common/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index fd6708ccb..f9a6f6ca0 100644 --- a/common/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/common/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -33,9 +33,9 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr @Override public int getFuelTicks(ItemStack itemstack) { - if(MekanismUtils.getOreDictName(itemstack).contains("dustSalt")) return 5; + if(MekanismUtils.getOreDictName(itemstack).contains("dustSulfur")) return 5; if(itemstack.itemID == Mekanism.GasTank.blockID && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && - ((IGasItem)itemstack.getItem()).getGas(itemstack).getGas() == GasRegistry.getGas("hydrogenChloride")) return 1; + ((IGasItem)itemstack.getItem()).getGas(itemstack).getGas() == GasRegistry.getGas("sulfuricAcid")) return 1; return 0; } @@ -43,7 +43,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr @Override public int receiveGas(ForgeDirection side, GasStack stack) { - if(stack.getGas() == GasRegistry.getGas("hydrogenChloride")) + if(stack.getGas() == GasRegistry.getGas("sulfuricAcid")) { int toUse = Math.min(MAX_SECONDARY_ENERGY-secondaryEnergyStored, stack.amount); secondaryEnergyStored += toUse; @@ -56,7 +56,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { - return type == GasRegistry.getGas("hydrogenChloride"); + return type == GasRegistry.getGas("sulfuricAcid"); } @Override @@ -64,7 +64,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr { if(inventory[1] != null && secondaryEnergyStored < MAX_SECONDARY_ENERGY && inventory[1].getItem() instanceof IGasItem) { - GasStack removed = GasTransmission.removeGas(inventory[1], GasRegistry.getGas("hydrogenChloride"), MAX_SECONDARY_ENERGY-secondaryEnergyStored); + GasStack removed = GasTransmission.removeGas(inventory[1], GasRegistry.getGas("sulfuricAcid"), MAX_SECONDARY_ENERGY-secondaryEnergyStored); setSecondaryEnergy(secondaryEnergyStored + (removed != null ? removed.amount : 0)); return; } diff --git a/common/mekanism/common/tile/TileEntityFactory.java b/common/mekanism/common/tile/TileEntityFactory.java index 90787b776..70500f51c 100644 --- a/common/mekanism/common/tile/TileEntityFactory.java +++ b/common/mekanism/common/tile/TileEntityFactory.java @@ -360,7 +360,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip { if(inventory[4].getItem() instanceof IGasItem) { - GasStack removed = GasTransmission.removeGas(inventory[4], GasRegistry.getGas("hydrogenChloride"), getMaxSecondaryEnergy()-secondaryEnergyStored); + GasStack removed = GasTransmission.removeGas(inventory[4], GasRegistry.getGas("sulfuricAcid"), getMaxSecondaryEnergy()-secondaryEnergyStored); setSecondaryEnergy(secondaryEnergyStored + (removed != null ? removed.amount : 0)); return; @@ -895,7 +895,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip public int receiveGas(ForgeDirection side, GasStack stack) { if(recipeType == RecipeType.PURIFYING.ordinal() && stack.getGas() == GasRegistry.getGas("oxygen") || - recipeType == RecipeType.INJECTING.ordinal() && stack.getGas() == GasRegistry.getGas("hydrogenChloride")) + recipeType == RecipeType.INJECTING.ordinal() && stack.getGas() == GasRegistry.getGas("sulfuricAcid")) { int toUse = Math.min(getMaxSecondaryEnergy()-secondaryEnergyStored, stack.amount); secondaryEnergyStored += toUse; @@ -909,7 +909,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip public boolean canReceiveGas(ForgeDirection side, Gas type) { return recipeType == RecipeType.PURIFYING.ordinal() && type == GasRegistry.getGas("oxygen") || - recipeType == RecipeType.INJECTING.ordinal() && type == GasRegistry.getGas("hydrogenChloride"); + recipeType == RecipeType.INJECTING.ordinal() && type == GasRegistry.getGas("sulfuricAcid"); } @Override