From 26a28c13dbd430731b51e9550ed67ed51b24e803 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Fri, 22 Sep 2017 11:42:20 +0800 Subject: [PATCH 1/7] add (String, ResourceLocation) constructor to Gas --- src/main/java/mekanism/api/gas/Gas.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index b76bdce17..af9253b82 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -41,6 +41,11 @@ public class Gas iconLocation = new ResourceLocation(icon); } + public Gas(String s, ResourceLocation icon){ + unlocalizedName = name = s; + iconLocation = icon; + } + /** * Creates a new Gas object that corresponds to the given Fluid */ From 64b2e421f7db5b422d468fcc43aba0cd7eef7ee1 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Fri, 22 Sep 2017 15:37:04 +0800 Subject: [PATCH 2/7] add recipe adding methods to the API, and a handler to get the internal class. --- src/main/java/mekanism/api/MekanismAPI.java | 21 +++ .../mekanism/api/MekanismRecipeHelper.java | 136 ++++++++++++++++++ .../mekanism/common/recipe/APIHandler.java | 100 +++++++++++++ 3 files changed, 257 insertions(+) create mode 100644 src/main/java/mekanism/api/MekanismRecipeHelper.java create mode 100644 src/main/java/mekanism/common/recipe/APIHandler.java diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index 42a97e883..cfa01fae7 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -7,11 +7,14 @@ import mekanism.api.util.BlockInfo; import net.minecraft.block.Block; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.oredict.OreDictionary; +import org.apache.logging.log4j.LogManager; public class MekanismAPI { //Add a BlockInfo value here if you don't want a certain block to be picked up by cardboard boxes private static Set cardboardBoxIgnore = new HashSet<>(); + + private static MekanismRecipeHelper helper = null; /** Mekanism debug mode */ public static boolean debug = false; @@ -45,4 +48,22 @@ public class MekanismAPI } public static class BoxBlacklistEvent extends Event {} + + /** + * Get the instance of the recipe helper to directly add recipes. + * + * Do NOT copy/repackage this method into your package, nor use the class directly as it may change. + * + * @return {@link MekanismRecipeHelper} The handler. + */ + public static MekanismRecipeHelper recipeHelper(){ + if (helper == null){ + try { + helper = (MekanismRecipeHelper)Class.forName("mekanism.common.recipe.APIHandler").newInstance(); + } catch (ClassNotFoundException|InstantiationException|IllegalAccessException e) { + LogManager.getLogger("MekanismAPI").error("Could not find API Handler", e); + } + } + return helper; + } } diff --git a/src/main/java/mekanism/api/MekanismRecipeHelper.java b/src/main/java/mekanism/api/MekanismRecipeHelper.java new file mode 100644 index 000000000..bebe34617 --- /dev/null +++ b/src/main/java/mekanism/api/MekanismRecipeHelper.java @@ -0,0 +1,136 @@ +package mekanism.api; + +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasStack; +import mekanism.api.infuse.InfuseType; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public interface MekanismRecipeHelper { + /** + * Add an Enrichment Chamber recipe. + * @param input - input ItemStack + * @param output - output ItemStack + */ + void addEnrichmentChamberRecipe(ItemStack input, ItemStack output); + + /** + * Add an Osmium Compressor recipe. + * @param input - input ItemStack + * @param output - output ItemStack + */ + void addOsmiumCompressorRecipe(ItemStack input, ItemStack output); + + /** + * Add a Combiner recipe. + * @param input - input ItemStack + * @param output - output ItemStack + */ + void addCombinerRecipe(ItemStack input, ItemStack output); + + /** + * Add a Crusher recipe. + * @param input - input ItemStack + * @param output - output ItemStack + */ + void addCrusherRecipe(ItemStack input, ItemStack output); + + /** + * Add a Purification Chamber recipe. + * @param input - input ItemStack + * @param output - output ItemStack + */ + void addPurificationChamberRecipe(ItemStack input, ItemStack output); + + /** + * Add a Metallurgic Infuser recipe. + * @param infuse - which Infuse to use + * @param amount - how much of the Infuse to use + * @param input - input ItemStack + * @param output - output ItemStack + */ + void addMetallurgicInfuserRecipe(InfuseType infuse, int amount, ItemStack input, ItemStack output); + + /** + * Add a Chemical Infuser recipe. + * @param leftInput - left GasStack to input + * @param rightInput - right GasStack to input + * @param output - output GasStack + */ + void addChemicalInfuserRecipe(GasStack leftInput, GasStack rightInput, GasStack output); + + /** + * Add a Chemical Oxidizer recipe. + * @param input - input ItemStack + * @param output - output GasStack + */ + void addChemicalOxidizerRecipe(ItemStack input, GasStack output); + + /** + * Add a Chemical Injection Chamber recipe. + * @param input - input ItemStack + * @param output - output ItemStack + */ + void addChemicalInjectionChamberRecipe(ItemStack input, Gas gas, ItemStack output); + + /** + * Add an Electrolytic Separator recipe. + * @param fluid - FluidStack to electrolyze + * @param leftOutput - left gas to produce when the fluid is electrolyzed + * @param rightOutput - right gas to produce when the fluid is electrolyzed + */ + void addElectrolyticSeparatorRecipe(FluidStack fluid, double energy, GasStack leftOutput, GasStack rightOutput); + + /** + * Add a Precision Sawmill recipe. + * @param input - input ItemStack + * @param primaryOutput - guaranteed output + * @param secondaryOutput - possible extra output + * @param chance - probability of obtaining extra output + */ + void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, double chance); + + /** + * Add a Precision Sawmill recipe with no chance output + * @param input - input ItemStack + * @param primaryOutput - guaranteed output + */ + void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput); + + /** + * Add a Chemical Dissolution Chamber recipe. + * @param input - input ItemStack + * @param output - output GasStack + */ + void addChemicalDissolutionChamberRecipe(ItemStack input, GasStack output); + + /** + * Add a Chemical Washer recipe. + * @param input - input GasStack + * @param output - output GasStack + */ + void addChemicalWasherRecipe(GasStack input, GasStack output); + + /** + * Add a Chemical Crystallizer recipe. + * @param input - input GasStack + * @param output - output ItemStack + */ + void addChemicalCrystallizerRecipe(GasStack input, ItemStack output); + + /** + * Add a Pressurized Reaction Chamber recipe. + * @param inputSolid - input ItemStack + * @param inputFluid - input FluidStack + * @param inputGas - input GasStack + * @param outputSolid - output ItemStack + * @param outputGas - output GasStack + * @param extraEnergy - extra energy needed by the recipe + * @param ticks - amount of ticks it takes for this recipe to complete + */ + void addPRCRecipe(ItemStack inputSolid, FluidStack inputFluid, GasStack inputGas, ItemStack outputSolid, GasStack outputGas, double extraEnergy, int ticks); + + void addThermalEvaporationRecipe(FluidStack inputFluid, FluidStack outputFluid); + + void addSolarNeutronRecipe(GasStack inputGas, GasStack outputGas); +} diff --git a/src/main/java/mekanism/common/recipe/APIHandler.java b/src/main/java/mekanism/common/recipe/APIHandler.java new file mode 100644 index 000000000..3fea5215c --- /dev/null +++ b/src/main/java/mekanism/common/recipe/APIHandler.java @@ -0,0 +1,100 @@ +package mekanism.common.recipe; + +import mekanism.api.MekanismRecipeHelper; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasStack; +import mekanism.api.infuse.InfuseType; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class APIHandler implements MekanismRecipeHelper { + @Override + public void addEnrichmentChamberRecipe(ItemStack input, ItemStack output) { + RecipeHandler.addEnrichmentChamberRecipe(input, output); + } + + @Override + public void addOsmiumCompressorRecipe(ItemStack input, ItemStack output) { + RecipeHandler.addOsmiumCompressorRecipe(input, output); + } + + @Override + public void addCombinerRecipe(ItemStack input, ItemStack output) { + RecipeHandler.addCombinerRecipe(input, output); + } + + @Override + public void addCrusherRecipe(ItemStack input, ItemStack output) { + RecipeHandler.addCrusherRecipe(input, output); + } + + @Override + public void addPurificationChamberRecipe(ItemStack input, ItemStack output) { + RecipeHandler.addPurificationChamberRecipe(input, output); + } + + @Override + public void addMetallurgicInfuserRecipe(InfuseType infuse, int amount, ItemStack input, ItemStack output) { + RecipeHandler.addMetallurgicInfuserRecipe(infuse, amount, input, output); + } + + @Override + public void addChemicalInfuserRecipe(GasStack leftInput, GasStack rightInput, GasStack output) { + RecipeHandler.addChemicalInfuserRecipe(leftInput, rightInput, output); + } + + @Override + public void addChemicalOxidizerRecipe(ItemStack input, GasStack output) { + RecipeHandler.addChemicalOxidizerRecipe(input, output); + } + + @Override + public void addChemicalInjectionChamberRecipe(ItemStack input, Gas gas, ItemStack output) { + RecipeHandler.addChemicalInjectionChamberRecipe(input, gas, output); + } + + @Override + public void addElectrolyticSeparatorRecipe(FluidStack fluid, double energy, GasStack leftOutput, GasStack rightOutput) { + RecipeHandler.addElectrolyticSeparatorRecipe(fluid, energy, leftOutput, rightOutput); + } + + @Override + public void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, double chance) { + RecipeHandler.addPrecisionSawmillRecipe(input, primaryOutput, secondaryOutput, chance); + } + + @Override + public void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput) { + RecipeHandler.addPrecisionSawmillRecipe(input, primaryOutput); + } + + @Override + public void addChemicalDissolutionChamberRecipe(ItemStack input, GasStack output) { + RecipeHandler.addChemicalDissolutionChamberRecipe(input, output); + } + + @Override + public void addChemicalWasherRecipe(GasStack input, GasStack output) { + RecipeHandler.addChemicalWasherRecipe(input, output); + } + + @Override + public void addChemicalCrystallizerRecipe(GasStack input, ItemStack output) { + RecipeHandler.addChemicalCrystallizerRecipe(input, output); + } + + @Override + public void addPRCRecipe(ItemStack inputSolid, FluidStack inputFluid, GasStack inputGas, ItemStack outputSolid, GasStack outputGas, double extraEnergy, int ticks) { + RecipeHandler.addPRCRecipe(inputSolid, inputFluid, inputGas, outputSolid, outputGas, extraEnergy, ticks); + } + + @Override + public void addThermalEvaporationRecipe(FluidStack inputFluid, FluidStack outputFluid) { + RecipeHandler.addThermalEvaporationRecipe(inputFluid, outputFluid); + } + + @Override + public void addSolarNeutronRecipe(GasStack inputGas, GasStack outputGas) { + RecipeHandler.addSolarNeutronRecipe(inputGas, outputGas); + } +} From f4bbb5b35c8ded5b5ef09234fdf595289f749c03 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Fri, 22 Sep 2017 15:49:39 +0800 Subject: [PATCH 3/7] Ensure gasses are registered in preinit or init (prevent textures not being set) --- src/main/java/mekanism/api/gas/GasRegistry.java | 14 +++++++++++++- src/main/java/mekanism/common/Mekanism.java | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/api/gas/GasRegistry.java b/src/main/java/mekanism/api/gas/GasRegistry.java index 071c9ccad..740902250 100644 --- a/src/main/java/mekanism/api/gas/GasRegistry.java +++ b/src/main/java/mekanism/api/gas/GasRegistry.java @@ -9,13 +9,18 @@ public class GasRegistry { private static ArrayList registeredGasses = new ArrayList<>(); + private static boolean initFinished = false; + /** - * Register a new gas into GasRegistry. + * Register a new gas into GasRegistry. Call this BEFORE post-init. * @param gas - Gas to register * @return the gas that has been registered, pulled right out of GasRegistry */ public static Gas register(Gas gas) { + if (initFinished){ + throw new IllegalStateException("Gasses must be registered before postInit."); + } if(gas == null) { return null; @@ -110,4 +115,11 @@ public class GasRegistry return registeredGasses.indexOf(gas); } + + /** + * Internal use only, don't call this. + */ + public static void postInit(){ + initFinished = true; + } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 2349497fb..1fe4b17cb 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -834,6 +834,8 @@ public class Mekanism MinecraftForge.EVENT_BUS.post(new BoxBlacklistEvent()); logger.info("Hooking complete."); + + GasRegistry.postInit(); } @SubscribeEvent From 08a13cff4f73e927671dc15891d30f8fa9216642 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Wed, 8 Nov 2017 11:28:56 +0800 Subject: [PATCH 4/7] check init phase in recipe handler --- .../mekanism/common/recipe/APIHandler.java | 169 ++++++++++-------- 1 file changed, 97 insertions(+), 72 deletions(-) diff --git a/src/main/java/mekanism/common/recipe/APIHandler.java b/src/main/java/mekanism/common/recipe/APIHandler.java index 3fea5215c..cce0c1342 100644 --- a/src/main/java/mekanism/common/recipe/APIHandler.java +++ b/src/main/java/mekanism/common/recipe/APIHandler.java @@ -1,100 +1,125 @@ package mekanism.common.recipe; +import com.google.common.base.Preconditions; import mekanism.api.MekanismRecipeHelper; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfuseType; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.LoaderState; public class APIHandler implements MekanismRecipeHelper { - @Override - public void addEnrichmentChamberRecipe(ItemStack input, ItemStack output) { - RecipeHandler.addEnrichmentChamberRecipe(input, output); - } + private static void checkPhase(){ + Preconditions.checkState(Loader.instance().getLoaderState().ordinal() > LoaderState.INITIALIZATION.ordinal(), "Recipes should be registered during Init."); + } + + @Override + public void addEnrichmentChamberRecipe(ItemStack input, ItemStack output) { + checkPhase(); + RecipeHandler.addEnrichmentChamberRecipe(input, output); + } - @Override - public void addOsmiumCompressorRecipe(ItemStack input, ItemStack output) { - RecipeHandler.addOsmiumCompressorRecipe(input, output); - } + @Override + public void addOsmiumCompressorRecipe(ItemStack input, ItemStack output) { + checkPhase(); + RecipeHandler.addOsmiumCompressorRecipe(input, output); + } - @Override - public void addCombinerRecipe(ItemStack input, ItemStack output) { - RecipeHandler.addCombinerRecipe(input, output); - } + @Override + public void addCombinerRecipe(ItemStack input, ItemStack output) { + checkPhase(); + RecipeHandler.addCombinerRecipe(input, output); + } - @Override - public void addCrusherRecipe(ItemStack input, ItemStack output) { - RecipeHandler.addCrusherRecipe(input, output); - } + @Override + public void addCrusherRecipe(ItemStack input, ItemStack output) { + checkPhase(); + RecipeHandler.addCrusherRecipe(input, output); + } - @Override - public void addPurificationChamberRecipe(ItemStack input, ItemStack output) { - RecipeHandler.addPurificationChamberRecipe(input, output); - } + @Override + public void addPurificationChamberRecipe(ItemStack input, ItemStack output) { + checkPhase(); + RecipeHandler.addPurificationChamberRecipe(input, output); + } - @Override - public void addMetallurgicInfuserRecipe(InfuseType infuse, int amount, ItemStack input, ItemStack output) { - RecipeHandler.addMetallurgicInfuserRecipe(infuse, amount, input, output); - } + @Override + public void addMetallurgicInfuserRecipe(InfuseType infuse, int amount, ItemStack input, ItemStack output) { + checkPhase(); + RecipeHandler.addMetallurgicInfuserRecipe(infuse, amount, input, output); + } - @Override - public void addChemicalInfuserRecipe(GasStack leftInput, GasStack rightInput, GasStack output) { - RecipeHandler.addChemicalInfuserRecipe(leftInput, rightInput, output); - } + @Override + public void addChemicalInfuserRecipe(GasStack leftInput, GasStack rightInput, GasStack output) { + checkPhase(); + RecipeHandler.addChemicalInfuserRecipe(leftInput, rightInput, output); + } - @Override - public void addChemicalOxidizerRecipe(ItemStack input, GasStack output) { - RecipeHandler.addChemicalOxidizerRecipe(input, output); - } + @Override + public void addChemicalOxidizerRecipe(ItemStack input, GasStack output) { + checkPhase(); + RecipeHandler.addChemicalOxidizerRecipe(input, output); + } - @Override - public void addChemicalInjectionChamberRecipe(ItemStack input, Gas gas, ItemStack output) { - RecipeHandler.addChemicalInjectionChamberRecipe(input, gas, output); - } + @Override + public void addChemicalInjectionChamberRecipe(ItemStack input, Gas gas, ItemStack output) { + checkPhase(); + RecipeHandler.addChemicalInjectionChamberRecipe(input, gas, output); + } - @Override - public void addElectrolyticSeparatorRecipe(FluidStack fluid, double energy, GasStack leftOutput, GasStack rightOutput) { - RecipeHandler.addElectrolyticSeparatorRecipe(fluid, energy, leftOutput, rightOutput); - } + @Override + public void addElectrolyticSeparatorRecipe(FluidStack fluid, double energy, GasStack leftOutput, GasStack rightOutput) { + checkPhase(); + RecipeHandler.addElectrolyticSeparatorRecipe(fluid, energy, leftOutput, rightOutput); + } - @Override - public void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, double chance) { - RecipeHandler.addPrecisionSawmillRecipe(input, primaryOutput, secondaryOutput, chance); - } + @Override + public void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, double chance) { + checkPhase(); + RecipeHandler.addPrecisionSawmillRecipe(input, primaryOutput, secondaryOutput, chance); + } - @Override - public void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput) { - RecipeHandler.addPrecisionSawmillRecipe(input, primaryOutput); - } + @Override + public void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput) { + checkPhase(); + RecipeHandler.addPrecisionSawmillRecipe(input, primaryOutput); + } - @Override - public void addChemicalDissolutionChamberRecipe(ItemStack input, GasStack output) { - RecipeHandler.addChemicalDissolutionChamberRecipe(input, output); - } + @Override + public void addChemicalDissolutionChamberRecipe(ItemStack input, GasStack output) { + checkPhase(); + RecipeHandler.addChemicalDissolutionChamberRecipe(input, output); + } - @Override - public void addChemicalWasherRecipe(GasStack input, GasStack output) { - RecipeHandler.addChemicalWasherRecipe(input, output); - } + @Override + public void addChemicalWasherRecipe(GasStack input, GasStack output) { + checkPhase(); + RecipeHandler.addChemicalWasherRecipe(input, output); + } - @Override - public void addChemicalCrystallizerRecipe(GasStack input, ItemStack output) { - RecipeHandler.addChemicalCrystallizerRecipe(input, output); - } + @Override + public void addChemicalCrystallizerRecipe(GasStack input, ItemStack output) { + checkPhase(); + RecipeHandler.addChemicalCrystallizerRecipe(input, output); + } - @Override - public void addPRCRecipe(ItemStack inputSolid, FluidStack inputFluid, GasStack inputGas, ItemStack outputSolid, GasStack outputGas, double extraEnergy, int ticks) { - RecipeHandler.addPRCRecipe(inputSolid, inputFluid, inputGas, outputSolid, outputGas, extraEnergy, ticks); - } + @Override + public void addPRCRecipe(ItemStack inputSolid, FluidStack inputFluid, GasStack inputGas, ItemStack outputSolid, GasStack outputGas, double extraEnergy, int ticks) { + checkPhase(); + RecipeHandler.addPRCRecipe(inputSolid, inputFluid, inputGas, outputSolid, outputGas, extraEnergy, ticks); + } - @Override - public void addThermalEvaporationRecipe(FluidStack inputFluid, FluidStack outputFluid) { - RecipeHandler.addThermalEvaporationRecipe(inputFluid, outputFluid); - } + @Override + public void addThermalEvaporationRecipe(FluidStack inputFluid, FluidStack outputFluid) { + checkPhase(); + RecipeHandler.addThermalEvaporationRecipe(inputFluid, outputFluid); + } - @Override - public void addSolarNeutronRecipe(GasStack inputGas, GasStack outputGas) { - RecipeHandler.addSolarNeutronRecipe(inputGas, outputGas); - } + @Override + public void addSolarNeutronRecipe(GasStack inputGas, GasStack outputGas) { + checkPhase(); + RecipeHandler.addSolarNeutronRecipe(inputGas, outputGas); + } } From 9d70d06454e26da11df02c34c8d6ea201ee99d21 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Wed, 8 Nov 2017 11:35:53 +0800 Subject: [PATCH 5/7] check loader state instead of relying on boolean --- src/main/java/mekanism/api/gas/GasRegistry.java | 16 ++++++---------- src/main/java/mekanism/common/Mekanism.java | 2 -- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/mekanism/api/gas/GasRegistry.java b/src/main/java/mekanism/api/gas/GasRegistry.java index 740902250..f39c3e08c 100644 --- a/src/main/java/mekanism/api/gas/GasRegistry.java +++ b/src/main/java/mekanism/api/gas/GasRegistry.java @@ -3,14 +3,15 @@ package mekanism.api.gas; import java.util.ArrayList; import java.util.List; +import com.google.common.base.Preconditions; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.LoaderState; public class GasRegistry { private static ArrayList registeredGasses = new ArrayList<>(); - private static boolean initFinished = false; - /** * Register a new gas into GasRegistry. Call this BEFORE post-init. * @param gas - Gas to register @@ -18,9 +19,7 @@ public class GasRegistry */ public static Gas register(Gas gas) { - if (initFinished){ - throw new IllegalStateException("Gasses must be registered before postInit."); - } + checkPhase(); if(gas == null) { return null; @@ -116,10 +115,7 @@ public class GasRegistry return registeredGasses.indexOf(gas); } - /** - * Internal use only, don't call this. - */ - public static void postInit(){ - initFinished = true; + private static void checkPhase(){ + Preconditions.checkState(Loader.instance().getLoaderState().ordinal() > LoaderState.INITIALIZATION.ordinal(), "Gasses must be registered before postInit."); } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 1fe4b17cb..2349497fb 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -834,8 +834,6 @@ public class Mekanism MinecraftForge.EVENT_BUS.post(new BoxBlacklistEvent()); logger.info("Hooking complete."); - - GasRegistry.postInit(); } @SubscribeEvent From 2d9a02b29e30299184405837751d4b1ca210bd4c Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Wed, 8 Nov 2017 11:48:40 +0800 Subject: [PATCH 6/7] null safety for silly mods that somehow register gasses after the texture stitch --- src/main/java/mekanism/api/gas/Gas.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index af9253b82..e3f902b48 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -2,6 +2,7 @@ package mekanism.api.gas; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.FluidType; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.nbt.NBTTagCompound; @@ -141,6 +142,10 @@ public class Gas { return MekanismRenderer.getFluidTexture(fluid, FluidType.STILL); } + + if (sprite == null){ + sprite = Minecraft.getMinecraft().getTextureMapBlocks().getMissingSprite(); + } return sprite; } From fdbeef9cb2c0b3829a369f6845039eb1ee4d7b00 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Wed, 8 Nov 2017 15:30:53 +0800 Subject: [PATCH 7/7] change late sprite getting to try the registered icon name --- src/main/java/mekanism/api/gas/Gas.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index e3f902b48..8920eb570 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -144,7 +144,7 @@ public class Gas } if (sprite == null){ - sprite = Minecraft.getMinecraft().getTextureMapBlocks().getMissingSprite(); + sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(getIcon().toString()); } return sprite;