Separate client initialization

Glitchfiend · Dec 30, 2023 · 124d646 · 124d646
1 parent dc19970
commit 124d646
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/common/src/main/java/toughasnails/core/ToughAsNails.java b/common/src/main/java/toughasnails/core/ToughAsNails.java
@@ -32,6 +32,11 @@ public static void init()
         ModApi.init();
     }
 
+    public static void initClient()
+    {
+        ModBlocks.registerRenderers();
+    }
+
     private static void addRegistrars()
     {
         var regHelper = RegistryHelper.create();

diff --git a/common/src/main/java/toughasnails/init/ModBlocks.java b/common/src/main/java/toughasnails/init/ModBlocks.java
@@ -27,14 +27,9 @@ public static void registerBlocks(BiConsumer<ResourceLocation, Block> func)
     {
         TANBlocks.RAIN_COLLECTOR = register(func, "rain_collector", new RainCollectorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).requiresCorrectToolForDrops().strength(2.0F).noOcclusion()));
         TANBlocks.WATER_PURIFIER = register(func, "water_purifier", new WaterPurifierBlock(BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(3.5F).noOcclusion()));
-
-        if (Environment.isClient())
-        {
-            registerRenderers();
-        }
     }
 
-    private static void registerRenderers()
+    public static void registerRenderers()
     {
         RenderType transparentRenderType = RenderType.cutoutMipped();
         RenderType cutoutRenderType = RenderType.cutout();

diff --git a/fabric/src/main/java/toughasnails/core/ToughAsNailsFabric.java b/fabric/src/main/java/toughasnails/core/ToughAsNailsFabric.java
@@ -6,6 +6,7 @@
 
 import glitchcore.fabric.GlitchCoreFabric;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 
 public class ToughAsNailsFabric implements ModInitializer
 {
@@ -20,5 +21,9 @@ public void onInitialize()
     {
         ToughAsNails.init();
         GlitchCoreFabric.prepareEvents();
+
+        ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
+            ToughAsNails.initClient();
+        });
     }
 }
diff --git a/forge/src/main/java/toughasnails/core/ToughAsNailsForge.java b/forge/src/main/java/toughasnails/core/ToughAsNailsForge.java
@@ -7,6 +7,7 @@
 import glitchcore.forge.GlitchCoreForge;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.logging.log4j.LogManager;
@@ -25,11 +26,20 @@ public ToughAsNailsForge()
     {
         IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
         bus.addListener(this::loadComplete);
+        bus.addListener(this::clientSetup);
 
         ToughAsNails.init();
         GlitchCoreForge.prepareModEventHandlers(bus);
     }
 
+    private void clientSetup(final FMLClientSetupEvent event)
+    {
+        event.enqueueWork(() ->
+        {
+            ToughAsNails.initClient();
+        });
+    }
+
     private void loadComplete(final FMLLoadCompleteEvent event)
     {
         event.enqueueWork(() ->

diff --git a/neoforge/src/main/java/toughasnails/core/ToughAsNailsNeoForge.java b/neoforge/src/main/java/toughasnails/core/ToughAsNailsNeoForge.java
@@ -7,6 +7,7 @@
 import glitchcore.neoforge.GlitchCoreNeoForge;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
 import toughasnails.api.TANAPI;
 import toughasnails.init.*;
@@ -17,8 +18,17 @@ public class ToughAsNailsNeoForge
     public ToughAsNailsNeoForge()
     {
         IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
+        bus.addListener(this::clientSetup);
 
         ToughAsNails.init();
         GlitchCoreNeoForge.prepareModEventHandlers(bus);
     }
+
+    private void clientSetup(final FMLClientSetupEvent event)
+    {
+        event.enqueueWork(() ->
+        {
+            ToughAsNails.initClient();
+        });
+    }
 }