From a910cb33edf2ac68ff809ff07a718576c7bfd348 Mon Sep 17 00:00:00 2001 From: AViewFromTheTop <87103914+AViewFromTheTop@users.noreply.github.com> Date: Thu, 16 Jan 2025 23:29:08 -0500 Subject: [PATCH] ugh --- src/main/java/net/frozenblock/lib/FrozenClient.java | 2 -- src/main/java/net/frozenblock/lib/FrozenMain.java | 12 +++--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/frozenblock/lib/FrozenClient.java b/src/main/java/net/frozenblock/lib/FrozenClient.java index ec91cf4d..55274a67 100644 --- a/src/main/java/net/frozenblock/lib/FrozenClient.java +++ b/src/main/java/net/frozenblock/lib/FrozenClient.java @@ -49,8 +49,6 @@ public final class FrozenClient implements ClientModInitializer { @Override public void onInitializeClient() { - FrozenMain.init(); - FrozenClientRegistry.initRegistry(); ModIntegrations.initializePreFreeze(); // Mod integrations must run after normal mod initialization diff --git a/src/main/java/net/frozenblock/lib/FrozenMain.java b/src/main/java/net/frozenblock/lib/FrozenMain.java index 0f3ee78c..d73e2ad9 100644 --- a/src/main/java/net/frozenblock/lib/FrozenMain.java +++ b/src/main/java/net/frozenblock/lib/FrozenMain.java @@ -70,15 +70,14 @@ import org.quiltmc.qsl.frozenblock.misc.datafixerupper.impl.ServerFreezer; public final class FrozenMain extends FrozenModInitializer { - public static boolean INITIALIZED = false; public FrozenMain() { super(FrozenSharedConstants.MOD_ID); } - public static void init() { - if (INITIALIZED) return; - INITIALIZED = true; + @Override + public void onInitialize(String modId, ModContainer container) { + if (!FabricLoader.getInstance().isModLoaded("trailiertales")) throw new AssertionError(); FrozenRegistry.initRegistry(); @@ -107,11 +106,6 @@ public static void init() { ServerCapeData.init(); FrozenMainEntrypoint.EVENT.invoker().init(); // includes dev init - } - - @Override - public void onInitialize(String modId, ModContainer container) { - init(); ArgumentTypeInfos.register( BuiltInRegistries.COMMAND_ARGUMENT_TYPE,