Better gas management

This commit is contained in:
aidancbrady committed 2017-04-04 19:45:51 -04:00
1 parent 8ae8652aff
commit 3d86b75da4
23 files changed
+149 -115

No files matched your search

+14 -4
View File
@@ -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()
@@ -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<ItemStack> getFuelStacks(Gas gasType)
{
if(gasType == GasRegistry.getGas("sulfuricAcid"))
if(gasType == MekanismFluids.SulfuricAcid)
{
List<ItemStack> fuels = new ArrayList<ItemStack>();
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<ItemStack> fuels = new ArrayList<ItemStack>();
fuels.addAll(OreDictionary.getOres("dustSalt"));
fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, GasRegistry.getGas("hydrogenChloride")));
fuels.add(MekanismUtils.getFullGasTank(GasTankTier.BASIC, MekanismFluids.HydrogenChloride));
return fuels;
}
@@ -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)
{
@@ -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)
{
+15 -15
View File
@@ -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));
@@ -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())
@@ -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"))
@@ -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));
}
/**
@@ -15,11 +15,6 @@ public abstract class AdvancedMachineRecipe<RECIPE extends AdvancedMachineRecipe
super(input, output);
}
public AdvancedMachineRecipe(ItemStack input, String gasName, ItemStack output)
{
this(new AdvancedMachineInput(input, GasRegistry.getGas(gasName)), new ItemStackOutput(output));
}
public AdvancedMachineRecipe(ItemStack input, Gas gas, ItemStack output)
{
this(new AdvancedMachineInput(input, gas), new ItemStackOutput(output));
@@ -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 CombinerRecipe extends AdvancedMachineRecipe<CombinerRecipe>
public CombinerRecipe(ItemStack input, ItemStack output)
{
super(input, "liquidStone", output);
super(input, MekanismFluids.LiquidStone, output);
}
@Override
@@ -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<InjectionRecipe>
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
@@ -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<OsmiumCompress
public OsmiumCompressorRecipe(ItemStack input, ItemStack output)
{
super(input, "liquidOsmium", output);
super(input, MekanismFluids.LiquidOsmium, output);
}
@Override
@@ -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 PurificationRecipe extends AdvancedMachineRecipe<PurificationRecipe
public PurificationRecipe(ItemStack input, ItemStack output)
{
super(input, "oxygen", output);
super(input, MekanismFluids.Oxygen, output);
}
@Override
@@ -18,6 +18,7 @@ import mekanism.api.gas.IGasItem;
import mekanism.api.gas.ITubeConnection;
import mekanism.api.util.ListUtils;
import mekanism.common.Mekanism;
import mekanism.common.MekanismFluids;
import mekanism.common.Upgrade;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISustainedData;
@@ -123,7 +124,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri
if(!inventory.get(0).isEmpty() && injectTank.getNeeded() > 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
@@ -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
@@ -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<Combin
{
if(itemstack.getItem() instanceof ItemBlock && Block.getBlockFromItem(itemstack.getItem()) == Blocks.COBBLESTONE)
{
return new GasStack(GasRegistry.getGas("liquidStone"), 200);
return new GasStack(MekanismFluids.LiquidStone, 200);
}
return null;
@@ -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.OsmiumCompressorRecipe;
@@ -34,7 +34,7 @@ public class TileEntityOsmiumCompressor extends TileEntityAdvancedElectricMachin
{
if(ore.isItemEqual(itemstack))
{
return new GasStack(GasRegistry.getGas("liquidOsmium"), 200);
return new GasStack(MekanismFluids.LiquidOsmium, 200);
}
}
@@ -42,7 +42,7 @@ public class TileEntityOsmiumCompressor extends TileEntityAdvancedElectricMachin
{
if(ore.isItemEqual(itemstack))
{
return new GasStack(GasRegistry.getGas("liquidOsmium"), 1800);
return new GasStack(MekanismFluids.LiquidOsmium, 1800);
}
}
@@ -11,7 +11,6 @@ import java.util.Set;
import mekanism.api.Coord4D;
import mekanism.api.IHeatTransfer;
import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTank;
import mekanism.api.reactor.IFusionReactor;
@@ -20,6 +19,7 @@ import mekanism.api.reactor.IReactorBlock;
import mekanism.api.util.UnitDisplayUtils.TemperatureUnit;
import mekanism.common.LaserManager;
import mekanism.common.Mekanism;
import mekanism.common.MekanismFluids;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.generators.common.item.ItemHohlraum;
import mekanism.generators.common.tile.reactor.TileEntityReactorController;
@@ -98,7 +98,7 @@ public class FusionReactor implements IFusionReactor
if(!hohlraum.isEmpty() && hohlraum.getItem() instanceof ItemHohlraum)
{
GasStack gasStack = ((ItemHohlraum)hohlraum.getItem()).getGas(hohlraum);
return gasStack != null && gasStack.getGas() == GasRegistry.getGas("fusionFuelDT") && gasStack.amount == ItemHohlraum.MAX_GAS;
return gasStack != null && gasStack.getGas() == MekanismFluids.FusionFuel && gasStack.amount == ItemHohlraum.MAX_GAS;
}
}
@@ -182,7 +182,7 @@ public class FusionReactor implements IFusionReactor
getDeuteriumTank().draw(amountToInject / 2, true);
getTritiumTank().draw(amountToInject / 2, true);
getFuelTank().receive(new GasStack(GasRegistry.getGas("fusionFuelDT"), amountToInject), true);
getFuelTank().receive(new GasStack(MekanismFluids.FusionFuel, amountToInject), true);
}
public int burnFuel()
@@ -12,6 +12,7 @@ import mekanism.api.infuse.InfuseRegistry;
import mekanism.common.FuelHandler;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismFluids;
import mekanism.common.MekanismItems;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.GasTankTier;
@@ -181,7 +182,7 @@ public class MekanismGenerators implements IModule
" R ", "RFR", " R ", Character.valueOf('R'), "dustRedstone", Character.valueOf('F'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1)
}));
FuelHandler.addGas(GasRegistry.getGas("ethene"), general.ETHENE_BURN_TIME, general.FROM_H2 + generators.bioGeneration * 2 * general.ETHENE_BURN_TIME); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus
FuelHandler.addGas(MekanismFluids.Ethene, general.ETHENE_BURN_TIME, general.FROM_H2 + generators.bioGeneration * 2 * general.ETHENE_BURN_TIME); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus
}
@Override
@@ -4,9 +4,9 @@ import java.util.List;
import mekanism.api.EnumColor;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.IGasItem;
import mekanism.common.MekanismFluids;
import mekanism.common.item.ItemMekanism;
import mekanism.common.util.ItemDataUtils;
import mekanism.common.util.LangUtils;
@@ -72,7 +72,7 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem
return 0;
}
if(stack.getGas() != GasRegistry.getGas("fusionFuelDT"))
if(stack.getGas() != MekanismFluids.FusionFuel)
{
return 0;
}
@@ -97,7 +97,7 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem
@Override
public boolean canReceiveGas(ItemStack itemstack, Gas type)
{
return type == GasRegistry.getGas("fusionFuelDT");
return type == MekanismFluids.FusionFuel;
}
@Override
@@ -161,7 +161,7 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem
list.add(empty);
ItemStack filled = new ItemStack(this);
setGas(filled, new GasStack(GasRegistry.getGas("fusionFuelDT"), ((IGasItem)filled.getItem()).getMaxGas(filled)));
setGas(filled, new GasStack(MekanismFluids.FusionFuel, ((IGasItem)filled.getItem()).getMaxGas(filled)));
list.add(filled);
}
}
@@ -12,6 +12,7 @@ import mekanism.api.gas.GasTank;
import mekanism.client.SparkleAnimation.INodeChecker;
import mekanism.client.sound.ISoundSource;
import mekanism.common.Mekanism;
import mekanism.common.MekanismFluids;
import mekanism.common.base.IActiveState;
import mekanism.common.base.IHasSound;
import mekanism.common.base.SoundWrapper;
@@ -277,9 +278,9 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen
getReactor().setCaseTemp(dataStream.readDouble());
getReactor().setInjectionRate(dataStream.readInt());
getReactor().setBurning(dataStream.readBoolean());
fuelTank.setGas(new GasStack(GasRegistry.getGas("fusionFuelDT"), dataStream.readInt()));
deuteriumTank.setGas(new GasStack(GasRegistry.getGas("deuterium"), dataStream.readInt()));
tritiumTank.setGas(new GasStack(GasRegistry.getGas("tritium"), dataStream.readInt()));
fuelTank.setGas(new GasStack(MekanismFluids.FusionFuel, dataStream.readInt()));
deuteriumTank.setGas(new GasStack(MekanismFluids.Deuterium, dataStream.readInt()));
tritiumTank.setGas(new GasStack(MekanismFluids.Tritium, dataStream.readInt()));
waterTank.setCapacity(dataStream.readInt());
waterTank.setFluid(new FluidStack(FluidRegistry.getFluid("water"), dataStream.readInt()));
steamTank.setCapacity(dataStream.readInt());
@@ -18,6 +18,7 @@ import mekanism.api.gas.ITubeConnection;
import mekanism.api.reactor.IReactorBlock;
import mekanism.api.util.CapabilityUtils;
import mekanism.common.Mekanism;
import mekanism.common.MekanismFluids;
import mekanism.common.base.FluidHandlerWrapper;
import mekanism.common.base.IFluidHandlerWrapper;
import mekanism.common.capabilities.Capabilities;
@@ -179,15 +180,15 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
{
if(getReactor() != null)
{
if(stack.getGas() == GasRegistry.getGas("deuterium"))
if(stack.getGas() == MekanismFluids.Deuterium)
{
return getReactor().getDeuteriumTank().receive(stack, doTransfer);
}
else if(stack.getGas() == GasRegistry.getGas("tritium"))
else if(stack.getGas() == MekanismFluids.Tritium)
{
return getReactor().getTritiumTank().receive(stack, doTransfer);
}
else if(stack.getGas() == GasRegistry.getGas("fusionFuelDT"))
else if(stack.getGas() == MekanismFluids.FusionFuel)
{
return getReactor().getFuelTank().receive(stack, doTransfer);
}
@@ -205,7 +206,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
@Override
public boolean canReceiveGas(EnumFacing side, Gas type)
{
return (type == GasRegistry.getGas("deuterium") || type == GasRegistry.getGas("tritium") || type == GasRegistry.getGas("fusionFuelDT"));
return (type == MekanismFluids.Deuterium || type == MekanismFluids.Tritium || type == MekanismFluids.FusionFuel);
}
@Override