From 9d70d06454e26da11df02c34c8d6ea201ee99d21 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Wed, 8 Nov 2017 11:35:53 +0800 Subject: [PATCH] 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