tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Going to use Sulfuric Acid/Sulfur in the Chemical Injection Chamber until we get Salt/Brine/etc down

Browse source
This commit is contained in:
Aidan Brady 2014-01-09 21:46:22 -05:00
parent 531bfe85ee
commit c61db44bf4
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java
View file

@ -47,8 +47,8 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe
@Override @Override
public List<ItemStack> getFuelStacks() public List<ItemStack> getFuelStacks()
{ {
List<ItemStack> fuels = OreDictionary.getOres("dustSalt"); List<ItemStack> fuels = OreDictionary.getOres("dustSulfur");
fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("hydrogenChloride"))); fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("sulfuricAcid")));
return fuels; return fuels;
} }

10
common/mekanism/common/tile/TileEntityChemicalInjectionChamber.java
View file

@ -33,9 +33,9 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr
@Override @Override
public int getFuelTicks(ItemStack itemstack) 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 && 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; return 0;
} }
@ -43,7 +43,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr
@Override @Override
public int receiveGas(ForgeDirection side, GasStack stack) 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); int toUse = Math.min(MAX_SECONDARY_ENERGY-secondaryEnergyStored, stack.amount);
secondaryEnergyStored += toUse; secondaryEnergyStored += toUse;
@ -56,7 +56,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr
@Override @Override
public boolean canReceiveGas(ForgeDirection side, Gas type) public boolean canReceiveGas(ForgeDirection side, Gas type)
{ {
return type == GasRegistry.getGas("hydrogenChloride"); return type == GasRegistry.getGas("sulfuricAcid");
} }
@Override @Override
@ -64,7 +64,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr
{ {
if(inventory[1] != null && secondaryEnergyStored < MAX_SECONDARY_ENERGY && inventory[1].getItem() instanceof IGasItem) 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)); setSecondaryEnergy(secondaryEnergyStored + (removed != null ? removed.amount : 0));
return; return;
} }

6
common/mekanism/common/tile/TileEntityFactory.java
View file

@ -360,7 +360,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip
{ {
if(inventory[4].getItem() instanceof IGasItem) 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)); setSecondaryEnergy(secondaryEnergyStored + (removed != null ? removed.amount : 0));
return; return;
@ -895,7 +895,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip
public int receiveGas(ForgeDirection side, GasStack stack) public int receiveGas(ForgeDirection side, GasStack stack)
{ {
if(recipeType == RecipeType.PURIFYING.ordinal() && stack.getGas() == GasRegistry.getGas("oxygen") || 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); int toUse = Math.min(getMaxSecondaryEnergy()-secondaryEnergyStored, stack.amount);
secondaryEnergyStored += toUse; secondaryEnergyStored += toUse;
@ -909,7 +909,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip
public boolean canReceiveGas(ForgeDirection side, Gas type) public boolean canReceiveGas(ForgeDirection side, Gas type)
{ {
return recipeType == RecipeType.PURIFYING.ordinal() && type == GasRegistry.getGas("oxygen") || 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 @Override