From acde30dee3917f912a0bdd71be305bc2f2217492 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 4 Apr 2017 19:49:44 -0400 Subject: [PATCH] More gas changes --- .../PurificationChamberRecipeWrapper.java | 6 +++--- .../render/tileentity/RenderTeleporter.java | 4 ++-- src/main/java/mekanism/common/Mekanism.java | 18 +++++++++--------- .../ContainerElectrolyticSeparator.java | 6 +++--- .../mekanism/common/item/ItemFlamethrower.java | 8 ++++---- .../java/mekanism/common/item/ItemJetpack.java | 8 ++++---- .../mekanism/common/item/ItemScubaTank.java | 8 ++++---- .../tile/TileEntityElectrolyticSeparator.java | 5 +++-- .../tile/TileEntityPurificationChamber.java | 14 +++++++------- .../container/ContainerGasGenerator.java | 4 ++-- 10 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java index 0d29503cf..f1e6cc850 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java @@ -4,10 +4,10 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; import mekanism.api.util.ListUtils; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.common.MekanismFluids; import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.util.MekanismUtils; @@ -24,9 +24,9 @@ public class PurificationChamberRecipeWrapper extends AdvancedMachineRecipeWrapp @Override public List getFuelStacks(Gas gasType) { - if(gasType == GasRegistry.getGas("oxygen")) + if(gasType == MekanismFluids.Oxygen) { - return ListUtils.asList(new ItemStack(Items.FLINT), MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("oxygen"))); + return ListUtils.asList(new ItemStack(Items.FLINT), MekanismUtils.getFullGasTank(GasTankTier.BASIC, MekanismFluids.Oxygen)); } return new ArrayList(); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java index 9ddc7659b..ce04267c1 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java @@ -4,11 +4,11 @@ import java.util.HashMap; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.gas.GasRegistry; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismFluids; import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.GlStateManager; @@ -80,7 +80,7 @@ public class RenderTeleporter extends TileEntitySpecialRenderer 0 && inventory.get(1).getItem() instanceof IGasItem) { - GasStack removed = GasTransmission.removeGas(inventory.get(1), GasRegistry.getGas("oxygen"), gasTank.getNeeded()); + GasStack removed = GasTransmission.removeGas(inventory.get(1), MekanismFluids.Oxygen, gasTank.getNeeded()); gasTank.receive(removed, true); return; } @@ -79,7 +79,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac @Override public boolean isValidGas(Gas gas) { - return gas == GasRegistry.getGas("oxygen"); + return gas == MekanismFluids.Oxygen; } @Override diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java index 0b42744cc..b000c7597 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java @@ -1,7 +1,7 @@ package mekanism.generators.common.inventory.container; -import mekanism.api.gas.GasRegistry; import mekanism.api.gas.IGasItem; +import mekanism.common.MekanismFluids; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityGasGenerator; @@ -85,7 +85,7 @@ public class ContainerGasGenerator extends Container { if(slotID != 0 && slotID != 1) { - if(((IGasItem)slotStack.getItem()).getGas(slotStack) != null && ((IGasItem)slotStack.getItem()).getGas(slotStack).getGas() == GasRegistry.getGas("hydrogen")) + if(((IGasItem)slotStack.getItem()).getGas(slotStack) != null && ((IGasItem)slotStack.getItem()).getGas(slotStack).getGas() == MekanismFluids.Hydrogen) { if(!mergeItemStack(slotStack, 0, 1, false)) {