From 3d86b75da4b4e540b1448fbc1c4cef881fdd7f80 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 4 Apr 2017 19:45:51 -0400 Subject: [PATCH] Better gas management --- src/main/java/mekanism/api/gas/Gas.java | 18 ++++-- ...ChemicalInjectionChamberRecipeWrapper.java | 13 +++-- ...micalDissolutionChamberRecipeCategory.java | 4 +- ...emicalDissolutionChamberRecipeWrapper.java | 8 +-- src/main/java/mekanism/common/Mekanism.java | 30 +++++----- .../java/mekanism/common/MekanismFluids.java | 58 +++++++++++++------ .../common/integration/OreDictManager.java | 11 ++-- .../mekanism/common/recipe/RecipeHandler.java | 4 +- .../machines/AdvancedMachineRecipe.java | 5 -- .../recipe/machines/CombinerRecipe.java | 3 +- .../recipe/machines/InjectionRecipe.java | 5 +- .../machines/OsmiumCompressorRecipe.java | 3 +- .../recipe/machines/PurificationRecipe.java | 3 +- .../TileEntityChemicalDissolutionChamber.java | 5 +- .../TileEntityChemicalInjectionChamber.java | 9 +-- .../common/tile/TileEntityCombiner.java | 4 +- .../tile/TileEntityOsmiumCompressor.java | 6 +- .../generators/common/FusionReactor.java | 6 +- .../generators/common/MekanismGenerators.java | 3 +- .../generators/common/item/ItemHohlraum.java | 8 +-- .../reactor/TileEntityReactorController.java | 7 ++- .../tile/reactor/TileEntityReactorPort.java | 9 +-- .../resources/assets/mekanism/lang/en_us.lang | 42 +++++++------- 23 files changed, 149 insertions(+), 115 deletions(-) diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index 9ade2f0ee..eaf57b358 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -223,22 +223,32 @@ public class Gas * Registers a new fluid out of this Gas or gets one from the FluidRegistry. * @return this Gas object */ - public Gas registerFluid() + public Gas registerFluid(String name) { if(fluid == null) { - if(FluidRegistry.getFluid(getName()) == null) + if(FluidRegistry.getFluid(name) == null) { - fluid = new Fluid(getName(), getIcon(), getIcon()).setGaseous(true); + fluid = new Fluid(name, getIcon(), getIcon()); FluidRegistry.registerFluid(fluid); } else { - fluid = FluidRegistry.getFluid(getName()); + fluid = FluidRegistry.getFluid(name); } } return this; } + + /** + * Registers a new fluid out of this Gas or gets one from the FluidRegistry. + * Uses default gas name. + * @return this Gas object + */ + public Gas registerFluid() + { + return registerFluid(getName()); + } @Override public String toString() diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java index 747a64cb6..e6265211a 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java @@ -8,6 +8,7 @@ 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,23 +25,23 @@ public class ChemicalInjectionChamberRecipeWrapper extends AdvancedMachineRecipe @Override public List getFuelStacks(Gas gasType) { - if(gasType == GasRegistry.getGas("sulfuricAcid")) + if(gasType == MekanismFluids.SulfuricAcid) { List fuels = new ArrayList(); fuels.addAll(OreDictionary.getOres("dustSulfur")); - fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("sulfuricAcid"))); + fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, MekanismFluids.SulfuricAcid)); return fuels; } - else if(gasType == GasRegistry.getGas("water")) + else if(gasType == MekanismFluids.Water) { - return ListUtils.asList(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("water"))); + return ListUtils.asList(MekanismUtils.getFullGasTank(GasTankTier.BASIC, MekanismFluids.Water)); } - else if(gasType == GasRegistry.getGas("hydrogenChloride")) + else if(gasType == MekanismFluids.HydrogenChloride) { List fuels = new ArrayList(); fuels.addAll(OreDictionary.getOres("dustSalt")); - fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("hydrogenChloride"))); + fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, MekanismFluids.HydrogenChloride)); return fuels; } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java index 7d9670aa4..dd89dd078 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeCategory.java @@ -1,8 +1,8 @@ package mekanism.client.jei.machine.chemical; -import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.MekanismFluids; import mekanism.common.recipe.machines.DissolutionRecipe; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; @@ -48,7 +48,7 @@ public class ChemicalDissolutionChamberRecipeCategory extends BaseRecipeCategory float f = (float)timer.getValue() / 20F; drawTexturedRect(64-xOffset, 40-yOffset, 176, 63, (int)(48*f), 8); - displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, new GasStack(GasRegistry.getGas("sulfuricAcid"), 1)); + displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, null, new GasStack(MekanismFluids.SulfuricAcid, 1)); if(gas != null) { diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java index 26cf66c18..27933376e 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java @@ -1,14 +1,12 @@ package mekanism.client.jei.machine.chemical; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import javax.annotation.Nonnull; import javax.annotation.Nullable; -import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; +import mekanism.common.MekanismFluids; import mekanism.common.recipe.machines.DissolutionRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; @@ -30,7 +28,7 @@ public class ChemicalDissolutionChamberRecipeWrapper extends BlankRecipeWrapper @Override public void getIngredients(IIngredients ingredients) { - ingredients.setInput(GasStack.class, new GasStack(GasRegistry.getGas("sulfuricAcid"), 1000)); + ingredients.setInput(GasStack.class, new GasStack(MekanismFluids.SulfuricAcid, 1000)); ingredients.setInput(ItemStack.class, recipe.recipeInput.ingredient); ingredients.setOutput(GasStack.class, recipe.recipeOutput.output); } @@ -43,7 +41,7 @@ public class ChemicalDissolutionChamberRecipeWrapper extends BlankRecipeWrapper if(mouseX >= 6-3 && mouseX <= 22-3 && mouseY >= 5-3 && mouseY <= 63-3) { - currenttip.add(GasRegistry.getGas("sulfuricAcid").getLocalizedName()); + currenttip.add(MekanismFluids.SulfuricAcid.getLocalizedName()); } else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-3 && mouseY <= 72-3) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 3fc9d74ce..8455a3982 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -906,10 +906,10 @@ public class Mekanism RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT)); //Chemical Injection Chamber Recipes - RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.DIRT), "water", new ItemStack(Blocks.CLAY)); - RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.HARDENED_CLAY), "water", new ItemStack(Blocks.CLAY)); - RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.BRICK), "water", new ItemStack(Items.CLAY_BALL)); - RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.GUNPOWDER), "hydrogenChloride", new ItemStack(MekanismItems.OtherDust, 1, 3)); + RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.DIRT), MekanismFluids.Water, new ItemStack(Blocks.CLAY)); + RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.HARDENED_CLAY), MekanismFluids.Water, new ItemStack(Blocks.CLAY)); + RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.BRICK), MekanismFluids.Water, new ItemStack(Items.CLAY_BALL)); + RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.GUNPOWDER), MekanismFluids.HydrogenChloride, new ItemStack(MekanismItems.OtherDust, 1, 3)); //Precision Sawmill Recipes RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.LADDER, 3), new ItemStack(Items.STICK, 7)); @@ -956,23 +956,23 @@ public class Mekanism RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("OBSIDIAN"), 10, new ItemStack(MekanismItems.ReinforcedAlloy), new ItemStack(MekanismItems.AtomicAlloy)); //Chemical Infuser Recipes - RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("oxygen"), 1), new GasStack(GasRegistry.getGas("sulfurDioxideGas"), 2), new GasStack(GasRegistry.getGas("sulfurTrioxideGas"), 2)); - RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("sulfurTrioxideGas"), 1), new GasStack(GasRegistry.getGas("water"), 1), new GasStack(GasRegistry.getGas("sulfuricAcid"), 1)); - RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("hydrogen"), 1), new GasStack(GasRegistry.getGas("chlorine"), 1), new GasStack(GasRegistry.getGas("hydrogenChloride"), 1)); - RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("deuterium"), 1), new GasStack(GasRegistry.getGas("tritium"), 1), new GasStack(GasRegistry.getGas("fusionFuelDT"), 2)); + RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("oxygen"), 1), new GasStack(MekanismFluids.SulfurDioxide, 2), new GasStack(MekanismFluids.SulfurTrioxide, 2)); + RecipeHandler.addChemicalInfuserRecipe(new GasStack(MekanismFluids.SulfurTrioxide, 1), new GasStack(MekanismFluids.Water, 1), new GasStack(MekanismFluids.SulfuricAcid, 1)); + RecipeHandler.addChemicalInfuserRecipe(new GasStack(GasRegistry.getGas("hydrogen"), 1), new GasStack(MekanismFluids.Chlorine, 1), new GasStack(MekanismFluids.HydrogenChloride, 1)); + RecipeHandler.addChemicalInfuserRecipe(new GasStack(MekanismFluids.Deuterium, 1), new GasStack(MekanismFluids.Tritium, 1), new GasStack(MekanismFluids.FusionFuel, 2)); //Electrolytic Separator Recipes RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("water", 2), 2 * general.FROM_H2, new GasStack(GasRegistry.getGas("hydrogen"), 2), new GasStack(GasRegistry.getGas("oxygen"), 1)); - RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("brine", 10), 2 * general.FROM_H2, new GasStack(GasRegistry.getGas("sodium"), 1), new GasStack(GasRegistry.getGas("chlorine"), 1)); - RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("heavywater", 2), usage.heavyWaterElectrolysisUsage, new GasStack(GasRegistry.getGas("deuterium"), 2), new GasStack(GasRegistry.getGas("oxygen"), 1)); + RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("brine", 10), 2 * general.FROM_H2, new GasStack(MekanismFluids.Sodium, 1), new GasStack(MekanismFluids.Chlorine, 1)); + RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("heavywater", 2), usage.heavyWaterElectrolysisUsage, new GasStack(MekanismFluids.Deuterium, 2), new GasStack(GasRegistry.getGas("oxygen"), 1)); //Thermal Evaporation Plant Recipes RecipeHandler.addThermalEvaporationRecipe(FluidRegistry.getFluidStack("water", 10), FluidRegistry.getFluidStack("brine", 1)); RecipeHandler.addThermalEvaporationRecipe(FluidRegistry.getFluidStack("brine", 10), FluidRegistry.getFluidStack("lithium", 1)); //Chemical Crystallizer Recipes - RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(GasRegistry.getGas("lithium"), 100), new ItemStack(MekanismItems.OtherDust, 1, 4)); - RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(GasRegistry.getGas("brine"), 15), new ItemStack(MekanismItems.Salt)); + RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(MekanismFluids.Lithium, 100), new ItemStack(MekanismItems.OtherDust, 1, 4)); + RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(MekanismFluids.Brine, 15), new ItemStack(MekanismItems.Salt)); //T4 Processing Recipes for(Gas gas : GasRegistry.getRegisteredGasses()) @@ -989,7 +989,7 @@ public class Mekanism //Pressurized Reaction Chamber Recipes RecipeHandler.addPRCRecipe( new ItemStack(MekanismItems.BioFuel, 2), new FluidStack(FluidRegistry.WATER, 10), new GasStack(GasRegistry.getGas("hydrogen"), 100), - new ItemStack(MekanismItems.Substrate), new GasStack(GasRegistry.getGas("ethene"), 100), + new ItemStack(MekanismItems.Substrate), new GasStack(MekanismFluids.Ethene, 100), 0, 100 ); @@ -1000,14 +1000,14 @@ public class Mekanism 60 ); RecipeHandler.addPRCRecipe( - new ItemStack(MekanismItems.Substrate), new FluidStack(FluidRegistry.WATER, 200), new GasStack(GasRegistry.getGas("ethene"), 100), + new ItemStack(MekanismItems.Substrate), new FluidStack(FluidRegistry.WATER, 200), new GasStack(MekanismFluids.Ethene, 100), new ItemStack(MekanismItems.Substrate, 8), new GasStack(GasRegistry.getGas("oxygen"), 10), 200, 400 ); //Solar Neutron Activator Recipes - RecipeHandler.addSolarNeutronRecipe(new GasStack(GasRegistry.getGas("lithium"), 1), new GasStack(GasRegistry.getGas("tritium"), 1)); + RecipeHandler.addSolarNeutronRecipe(new GasStack(MekanismFluids.Lithium, 1), new GasStack(MekanismFluids.Tritium, 1)); //Infuse objects InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.BioFuel), new InfuseObject(InfuseRegistry.get("BIO"), 5)); diff --git a/src/main/java/mekanism/common/MekanismFluids.java b/src/main/java/mekanism/common/MekanismFluids.java index 9e6993f55..aa23d69c9 100644 --- a/src/main/java/mekanism/common/MekanismFluids.java +++ b/src/main/java/mekanism/common/MekanismFluids.java @@ -9,29 +9,49 @@ import net.minecraftforge.fluids.FluidRegistry; public class MekanismFluids { + public static final Gas Hydrogen = new Gas("hydrogen", "mekanism:blocks/liquid/LiquidHydrogen"); + public static final Gas Oxygen = new Gas("oxygen", "mekanism:blocks/liquid/LiquidOxygen"); + public static final Gas Water = new Gas("water", "mekanism:blocks/liquid/LiquidSteam"); + public static final Gas Chlorine = new Gas("chlorine", "mekanism:blocks/liquid/LiquidChlorine"); + public static final Gas SulfurDioxide = new Gas("sulfurdioxide", "mekanism:blocks/liquid/LiquidSulfurDioxide"); + public static final Gas SulfurTrioxide = new Gas("sulfurtrioxide", "mekanism:blocks/liquid/LiquidSulfurTrioxide"); + public static final Gas SulfuricAcid = new Gas("sulfuricacid", "mekanism:blocks/liquid/LiquidSulfuricAcid"); + public static final Gas HydrogenChloride = new Gas("hydrogenchloride", "mekanism:blocks/liquid/LiquidHydrogenChloride"); + + + //Internal gases + public static final Gas LiquidOsmium = new Gas("liquidosmium", "mekanism:blocks/liquid/LiquidOsmium"); + public static final Gas LiquidStone = new Gas("liquidstone", "mekanism:blocks/liquid/LiquidStone"); + public static final Gas Ethene = new Gas("ethene", "mekanism:blocks/liquid/LiquidEthene"); + public static final Gas Sodium = new Gas("sodium", "mekanism:blocks/liquid/LiquidSodium"); + public static final Gas Brine = new Gas("brine", "mekanism:blocks/liquid/LiquidBrine"); + public static final Gas Deuterium = new Gas("deuterium", "mekanism:blocks/liquid/LiquidDeuterium"); + public static final Gas Tritium = new Gas("tritium", "mekanism:blocks/liquid/LiquidTritium"); + public static final Gas FusionFuel = new Gas("fusionfuel", "mekanism:blocks/liquid/LiquidDT"); + public static final Gas Lithium = new Gas("lithium", "mekanism:blocks/liquid/LiquidLithium"); + public static void register() { - GasRegistry.register(new Gas("hydrogen", "mekanism:blocks/liquid/LiquidHydrogen")).registerFluid(); - GasRegistry.register(new Gas("oxygen", "mekanism:blocks/liquid/LiquidOxygen")).registerFluid(); - GasRegistry.register(new Gas("water", "mekanism:blocks/liquid/LiquidSteam")).registerFluid(); - GasRegistry.register(new Gas("chlorine", "mekanism:blocks/liquid/LiquidChlorine")).registerFluid(); - GasRegistry.register(new Gas("sulfurDioxideGas", "mekanism:blocks/liquid/LiquidSulfurDioxide")).registerFluid(); - GasRegistry.register(new Gas("sulfurTrioxideGas", "mekanism:blocks/liquid/LiquidSulfurTrioxide")).registerFluid(); - GasRegistry.register(new Gas("sulfuricAcid", "mekanism:blocks/liquid/LiquidSulfuricAcid")).registerFluid(); - GasRegistry.register(new Gas("hydrogenChloride", "mekanism:blocks/liquid/LiquidHydrogenChloride")).registerFluid(); - GasRegistry.register(new Gas("liquidOsmium", "mekanism:blocks/liquid/LiquidOsmium").setVisible(false)); - GasRegistry.register(new Gas("liquidStone", "mekanism:blocks/liquid/LiquidStone").setVisible(false)); - GasRegistry.register(new Gas("ethene", "mekanism:blocks/liquid/LiquidEthene").registerFluid()); - GasRegistry.register(new Gas("sodium", "mekanism:blocks/liquid/LiquidSodium").registerFluid()); - GasRegistry.register(new Gas("brine", "mekanism:blocks/liquid/LiquidBrine").registerFluid()); - GasRegistry.register(new Gas("deuterium", "mekanism:blocks/liquid/LiquidDeuterium")).registerFluid(); - GasRegistry.register(new Gas("tritium", "mekanism:blocks/liquid/LiquidTritium")).registerFluid(); - GasRegistry.register(new Gas("fusionFuelDT", "mekanism:blocks/liquid/LiquidDT")).registerFluid(); - GasRegistry.register(new Gas("lithium", "mekanism:blocks/liquid/LiquidLithium")).registerFluid(); + GasRegistry.register(Hydrogen).registerFluid("liquidhydrogen"); + GasRegistry.register(Oxygen).registerFluid("liquidoxygen"); + GasRegistry.register(Water).registerFluid(); + GasRegistry.register(Chlorine).registerFluid("liquidchlorine"); + GasRegistry.register(SulfurDioxide).registerFluid("liquidsulfurdioxide"); + GasRegistry.register(SulfurTrioxide).registerFluid("liquidsulfurtrioxide"); + GasRegistry.register(SulfuricAcid).registerFluid(); + GasRegistry.register(HydrogenChloride).registerFluid("liquidhydrogenchloride"); + GasRegistry.register(Ethene).registerFluid("liquidethene"); + GasRegistry.register(Sodium).registerFluid("liquidsodium"); + GasRegistry.register(Brine).registerFluid(); + GasRegistry.register(Deuterium).registerFluid("liquiddeuterium"); + GasRegistry.register(Tritium).registerFluid("liquidtritium"); + GasRegistry.register(FusionFuel).registerFluid("liquidfusionfuel"); + GasRegistry.register(Lithium).registerFluid("liquidlithium"); - FluidRegistry.getFluid("brine").setGaseous(false); + GasRegistry.register(LiquidOsmium).setVisible(false); + GasRegistry.register(LiquidStone).setVisible(false); - FluidRegistry.registerFluid(new Fluid("heavyWater", new ResourceLocation("mekanism:blocks/liquid/LiquidHeavyWater"), new ResourceLocation("mekanism:blocks/liquid/LiquidHeavyWater"))); + FluidRegistry.registerFluid(new Fluid("heavywater", new ResourceLocation("mekanism:blocks/liquid/LiquidHeavyWater"), new ResourceLocation("mekanism:blocks/liquid/LiquidHeavyWater"))); FluidRegistry.registerFluid(new Fluid("steam", new ResourceLocation("mekanism:blocks/liquid/LiquidSteam"), new ResourceLocation("mekanism:blocks/liquid/LiquidSteam")).setGaseous(true)); for(Resource resource : Resource.values()) diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 31b802e02..cbf575d8b 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -13,6 +13,7 @@ import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; +import mekanism.common.MekanismFluids; import mekanism.common.MekanismItems; import mekanism.common.Resource; import mekanism.common.recipe.RecipeHandler; @@ -68,12 +69,12 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("dustSulfur")) { - RecipeHandler.addChemicalOxidizerRecipe(StackUtils.size(ore, 1), new GasStack(GasRegistry.getGas("sulfurDioxideGas"), 100)); + RecipeHandler.addChemicalOxidizerRecipe(StackUtils.size(ore, 1), new GasStack(MekanismFluids.SulfurDioxide, 100)); } for(ItemStack ore : OreDictionary.getOres("dustSalt")) { - RecipeHandler.addChemicalOxidizerRecipe(StackUtils.size(ore, 1), new GasStack(GasRegistry.getGas("brine"), 15)); + RecipeHandler.addChemicalOxidizerRecipe(StackUtils.size(ore, 1), new GasStack(MekanismFluids.Brine, 15)); } for(ItemStack ore : OreDictionary.getOres("dustRefinedObsidian")) @@ -99,7 +100,7 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("crystal" + resource.getName())) { - RecipeHandler.addChemicalInjectionChamberRecipe(StackUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 1, resource.ordinal())); + RecipeHandler.addChemicalInjectionChamberRecipe(StackUtils.size(ore, 1), MekanismFluids.HydrogenChloride, new ItemStack(MekanismItems.Shard, 1, resource.ordinal())); } for(ItemStack ore : OreDictionary.getOres("dustDirty" + resource.getName())) @@ -111,7 +112,7 @@ public final class OreDictManager { RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, resource.ordinal())); RecipeHandler.addPurificationChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, resource.ordinal())); - RecipeHandler.addChemicalInjectionChamberRecipe(StackUtils.size(ore, 1), "hydrogenChloride", new ItemStack(MekanismItems.Shard, 4, resource.ordinal())); + RecipeHandler.addChemicalInjectionChamberRecipe(StackUtils.size(ore, 1), MekanismFluids.HydrogenChloride, new ItemStack(MekanismItems.Shard, 4, resource.ordinal())); RecipeHandler.addChemicalDissolutionChamberRecipe(StackUtils.size(ore, 1), new GasStack(GasRegistry.getGas(resource.getName().toLowerCase()), 1000)); } @@ -291,7 +292,7 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("dustLithium")) { - RecipeHandler.addChemicalOxidizerRecipe(StackUtils.size(ore, 1), new GasStack(GasRegistry.getGas("lithium"), 100)); + RecipeHandler.addChemicalOxidizerRecipe(StackUtils.size(ore, 1), new GasStack(MekanismFluids.Lithium, 100)); } for(ItemStack ore : OreDictionary.getOres("dustObsidian")) diff --git a/src/main/java/mekanism/common/recipe/RecipeHandler.java b/src/main/java/mekanism/common/recipe/RecipeHandler.java index cb4457724..436a1612d 100644 --- a/src/main/java/mekanism/common/recipe/RecipeHandler.java +++ b/src/main/java/mekanism/common/recipe/RecipeHandler.java @@ -160,9 +160,9 @@ public final class RecipeHandler * @param input - input ItemStack * @param output - output ItemStack */ - public static void addChemicalInjectionChamberRecipe(ItemStack input, String gasName, ItemStack output) + public static void addChemicalInjectionChamberRecipe(ItemStack input, Gas gas, ItemStack output) { - addRecipe(Recipe.CHEMICAL_INJECTION_CHAMBER, new InjectionRecipe(input, gasName, output)); + addRecipe(Recipe.CHEMICAL_INJECTION_CHAMBER, new InjectionRecipe(input, gas, output)); } /** diff --git a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java index ecb872e1c..736521298 100644 --- a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java @@ -15,11 +15,6 @@ public abstract class AdvancedMachineRecipe public CombinerRecipe(ItemStack input, ItemStack output) { - super(input, "liquidStone", output); + super(input, MekanismFluids.LiquidStone, output); } @Override diff --git a/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java b/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java index 80c5c22b6..3101cac4b 100644 --- a/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java @@ -1,5 +1,6 @@ package mekanism.common.recipe.machines; +import mekanism.api.gas.Gas; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; import net.minecraft.item.ItemStack; @@ -11,9 +12,9 @@ public class InjectionRecipe extends AdvancedMachineRecipe super(input, output); } - public InjectionRecipe(ItemStack input, String gasName, ItemStack output) + public InjectionRecipe(ItemStack input, Gas gas, ItemStack output) { - super(input, gasName, output); + super(input, gas, output); } @Override diff --git a/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java b/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java index 1c8a4b6d7..2bf3c9e29 100644 --- a/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java @@ -1,5 +1,6 @@ package mekanism.common.recipe.machines; +import mekanism.common.MekanismFluids; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; import net.minecraft.item.ItemStack; @@ -13,7 +14,7 @@ public class OsmiumCompressorRecipe extends AdvancedMachineRecipe 0) { - injectTank.receive(GasTransmission.removeGas(inventory.get(0), GasRegistry.getGas("sulfuricAcid"), injectTank.getNeeded()), true); + injectTank.receive(GasTransmission.removeGas(inventory.get(0), MekanismFluids.SulfuricAcid, injectTank.getNeeded()), true); } if(!inventory.get(2).isEmpty() && outputTank.getGas() != null) @@ -436,7 +437,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri @Override public boolean canReceiveGas(EnumFacing side, Gas type) { - return side == MekanismUtils.getLeft(facing) && type == GasRegistry.getGas("sulfuricAcid"); + return side == MekanismUtils.getLeft(facing) && type == MekanismFluids.SulfuricAcid; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index b95a8b948..74ab73d61 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -11,6 +11,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasItem; import mekanism.api.transmitters.TransmissionType; import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismFluids; import mekanism.common.SideData; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.recipe.RecipeHandler.Recipe; @@ -43,10 +44,10 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr @Override public GasStack getItemGas(ItemStack itemstack) { - if(MekanismUtils.getOreDictName(itemstack).contains("dustSulfur")) return new GasStack(GasRegistry.getGas("sulfuricAcid"), 2); - if(MekanismUtils.getOreDictName(itemstack).contains("dustSalt")) return new GasStack(GasRegistry.getGas("hydrogenChloride"), 2); + if(MekanismUtils.getOreDictName(itemstack).contains("dustSulfur")) return new GasStack(MekanismFluids.SulfuricAcid, 2); + if(MekanismUtils.getOreDictName(itemstack).contains("dustSalt")) return new GasStack(MekanismFluids.HydrogenChloride, 2); if(Block.getBlockFromItem(itemstack.getItem()) == MekanismBlocks.GasTank && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && - isValidGas(((IGasItem)itemstack.getItem()).getGas(itemstack).getGas())) return new GasStack(GasRegistry.getGas("sulfuricAcid"), 1); + isValidGas(((IGasItem)itemstack.getItem()).getGas(itemstack).getGas())) return new GasStack(MekanismFluids.SulfuricAcid, 1); return null; } @@ -101,7 +102,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr @Override public boolean isValidGas(Gas gas) { - return gas == GasRegistry.getGas("sulfuricAcid") || gas == GasRegistry.getGas("water") || gas == GasRegistry.getGas("hydrogenChloride"); + return gas == MekanismFluids.SulfuricAcid || gas == MekanismFluids.Water || gas == MekanismFluids.HydrogenChloride; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityCombiner.java b/src/main/java/mekanism/common/tile/TileEntityCombiner.java index e9f1da65d..1ee61eb17 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCombiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityCombiner.java @@ -4,8 +4,8 @@ import java.util.Map; import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; +import mekanism.common.MekanismFluids; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CombinerRecipe; @@ -32,7 +32,7 @@ public class TileEntityCombiner extends TileEntityAdvancedElectricMachine