From f4bbb5b35c8ded5b5ef09234fdf595289f749c03 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Fri, 22 Sep 2017 15:49:39 +0800 Subject: [PATCH] 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