From ec5b4a4ef2caead8f52d4b0ebf6a3ceff1e5b9b6 Mon Sep 17 00:00:00 2001
From: forkiesassds <icanttellyou@memeware.net>
Date: Wed, 26 Mar 2025 18:36:19 +0200
Subject: [PATCH] Move client specific init code to be called from client
 initializer

---
 .../bluestaggo/modernerbeta/ModernerBeta.java | 24 +++++++++----------
 .../fabric/ModernerBetaFabricClient.java      | 11 +++++++++
 fabric/src/main/resources/fabric.mod.json     |  3 +++
 .../neoforge/ModernerBetaNeoForgeClient.java  |  6 +++--
 4 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/ModernerBetaFabricClient.java

diff --git a/common/src/main/java/mod/bluestaggo/modernerbeta/ModernerBeta.java b/common/src/main/java/mod/bluestaggo/modernerbeta/ModernerBeta.java
index b1959aac..c4b2aabf 100644
--- a/common/src/main/java/mod/bluestaggo/modernerbeta/ModernerBeta.java
+++ b/common/src/main/java/mod/bluestaggo/modernerbeta/ModernerBeta.java
@@ -17,7 +17,6 @@ import mod.bluestaggo.modernerbeta.world.chunk.ModernBetaChunkGenerator;
 import mod.bluestaggo.modernerbeta.world.feature.ModernBetaFeatures;
 import mod.bluestaggo.modernerbeta.world.feature.ModernBetaFoliagePlacers;
 import mod.bluestaggo.modernerbeta.world.feature.placement.ModernBetaPlacementTypes;
-import net.fabricmc.api.EnvType;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
@@ -28,7 +27,6 @@ public class ModernerBeta {
     public static final String MOD_ID = "moderner_beta";
     public static final String MOD_NAME = "Moderner Beta";
 
-    public static final boolean CLIENT_ENV = Platform.getEnv() == EnvType.CLIENT;
     public static final boolean DEV_ENV = Platform.isDevelopmentEnvironment();
 
     public static final ModernBetaConfig CONFIG = AutoConfig.register(ModernBetaConfig.class, GsonConfigSerializer::new).getConfig();
@@ -56,9 +54,17 @@ public class ModernerBeta {
         ModernBetaBuiltInProviders.registerSettingsPresets();
         ModernBetaBuiltInProviders.registerSettingsPresetCategories();
 
-        if (CLIENT_ENV) {
-            // Override default biome grass/foliage colors
-            BlockColors.register();
+        if (DEV_ENV) {
+            DebugProviderSettingsCommand.register();
+        }
+
+        // Initializes chunk and biome providers at server start-up.
+        LifecycleEvent.SERVER_BEFORE_START.register(ModernBetaWorldInitializer::init);
+    }
+
+    public static void clientInit() {
+        // Override default biome grass/foliage colors
+        BlockColors.register();
 
             // Load colormaps
             ReloadListenerRegistry.register(ResourceType.CLIENT_RESOURCES, new ModernBetaColormapResource(
@@ -72,14 +78,6 @@ public class ModernerBeta {
             ));
         }
 
-        if (DEV_ENV) {
-            DebugProviderSettingsCommand.register();
-        }
-
-        // Initializes chunk and biome providers at server start-up.
-        LifecycleEvent.SERVER_BEFORE_START.register(ModernBetaWorldInitializer::init);
-    }
-
     public static Identifier createId(String name) {
         return Identifier.of(MOD_ID, name);
     }
diff --git a/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/ModernerBetaFabricClient.java b/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/ModernerBetaFabricClient.java
new file mode 100644
index 00000000..6c8c6f06
--- /dev/null
+++ b/fabric/src/main/java/mod/bluestaggo/modernerbeta/fabric/ModernerBetaFabricClient.java
@@ -0,0 +1,11 @@
+package mod.bluestaggo.modernerbeta.fabric;
+
+import mod.bluestaggo.modernerbeta.ModernerBeta;
+import net.fabricmc.api.ClientModInitializer;
+
+public class ModernerBetaFabricClient implements ClientModInitializer {
+    @Override
+    public void onInitializeClient() {
+        ModernerBeta.clientInit();
+    }
+}
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 6c84df54..222a53e8 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -32,6 +32,9 @@
     "main": [
       "mod.bluestaggo.modernerbeta.fabric.ModernerBetaFabric"
     ],
+    "client": [
+      "mod.bluestaggo.modernerbeta.fabric.ModernerBetaFabricClient"
+    ],
     "modmenu": [
       "mod.bluestaggo.modernerbeta.fabric.config.ModernBetaModMenu"
     ],
diff --git a/neoforge/src/main/java/mod/bluestaggo/modernerbeta/neoforge/ModernerBetaNeoForgeClient.java b/neoforge/src/main/java/mod/bluestaggo/modernerbeta/neoforge/ModernerBetaNeoForgeClient.java
index c5c39069..76504408 100644
--- a/neoforge/src/main/java/mod/bluestaggo/modernerbeta/neoforge/ModernerBetaNeoForgeClient.java
+++ b/neoforge/src/main/java/mod/bluestaggo/modernerbeta/neoforge/ModernerBetaNeoForgeClient.java
@@ -7,13 +7,15 @@ import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.fml.event.lifecycle.FMLConstructModEvent;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 
 @EventBusSubscriber(modid = ModernerBeta.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 public class ModernerBetaNeoForgeClient {
     @SubscribeEvent
-    public static void clientInit(FMLConstructModEvent event) {
+    public static void clientInit(FMLClientSetupEvent event) {
+        ModernerBeta.clientInit();
+
         ModLoadingContext.get().registerExtensionPoint(
                 IConfigScreenFactory.class, () -> (mc, screen) -> AutoConfig.getConfigScreen(ModernBetaConfig.class, screen).get());
     }
-- 
knotmirror 0.0.1