aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
diff options
context:
space:
mode:
authorBlueWeabo <ilia.iliev2005@gmail.com>2023-05-03 20:33:28 +0300
committerGitHub <noreply@github.com>2023-05-03 19:33:28 +0200
commitda8c43bcd3a8ff78973eb8830bd1c99fbc56d4ac (patch)
treeb5f83f48474e02d063130852baca3608a50408bf /src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
parente92797ce23e59b5456196aee54887dc40412cb02 (diff)
downloadGT5-Unofficial-da8c43bcd3a8ff78973eb8830bd1c99fbc56d4ac.tar.gz
GT5-Unofficial-da8c43bcd3a8ff78973eb8830bd1c99fbc56d4ac.tar.bz2
GT5-Unofficial-da8c43bcd3a8ff78973eb8830bd1c99fbc56d4ac.zip
allow mute registers to be made outside of gt5u (#1947)
* allow mute registers to be made outside of gt5u * add back the check using forge api * fix the typo oops
Diffstat (limited to 'src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java')
-rw-r--r--src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
index 239a4867a5..45117773fe 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java
@@ -21,8 +21,9 @@ import net.minecraft.world.World;
import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap;
import appeng.core.CreativeTab;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.LoaderState;
import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.multitileentity.base.MultiTileEntity;
import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
@@ -70,8 +71,11 @@ public class MultiTileEntityRegistry {
* @param aNameInternal the internal Name of the Item
*/
public MultiTileEntityRegistry(String aNameInternal, MultiTileEntityBlockInternal aBlock) {
- if (!GregTech_API.sPreloadStarted || GregTech_API.sPreloadFinished) throw new IllegalStateException(
- "The MultiTileEntity Registry must be initialised during Preload Phase and not before");
+ if (!Loader.instance()
+ .isInState(LoaderState.PREINITIALIZATION)) {
+ throw new IllegalStateException(
+ "The MultiTileEntity Registry must be initialized during Preload Phase and not before");
+ }
mNameInternal = aNameInternal;
mBlock = aBlock;
GT_FML_LOGGER.info(aNameInternal + " " + Block.getIdFromBlock(aBlock) + "This is the answer");