fixed server crash

TerraformersMC · Sep 12, 2024 · 25276ce · 25276ce
1 parent 7e11fda
commit 25276ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Forge/src/main/java/com/terraformersmc/campanion/CampanionForge.java b/Forge/src/main/java/com/terraformersmc/campanion/CampanionForge.java
@@ -14,10 +14,12 @@
 import com.terraformersmc.campanion.stat.CampanionStats;
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ModelEvent;
 import net.minecraftforge.client.model.geometry.IGeometryLoader;
 import net.minecraftforge.client.model.geometry.IUnbakedGeometry;
 import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -55,8 +57,8 @@ public CampanionForge() {
 			CampanionStats.loadClass();
 		});
 
-		CampanionForgeClient.registerEvents(modEventBus);
-		modEventBus.addListener((FMLClientSetupEvent event) -> CampanionForgeClient.init());
+
+		DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> CampanionForgeClient::new);
 
 		modEventBus.addListener((ModelEvent.RegisterGeometryLoaders event) ->
 			event.register("bridge_planks", (IGeometryLoader<BridgePlanksUnbakedGeometry>) (jsonObject, deserializationContext) -> new BridgePlanksUnbakedGeometry())

diff --git a/Forge/src/main/java/com/terraformersmc/campanion/CampanionForgeClient.java b/Forge/src/main/java/com/terraformersmc/campanion/CampanionForgeClient.java
@@ -8,9 +8,17 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 public class CampanionForgeClient {
 
+	public CampanionForgeClient() {
+		IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+		CampanionForgeClient.registerEvents(modEventBus);
+		modEventBus.addListener((FMLClientSetupEvent event) -> CampanionForgeClient.init());
+	}
+
 	public static void registerEvents(IEventBus modEventBus) {
 		modEventBus.addListener((RegisterKeyMappingsEvent event) -> CampanionClient.registerKeybindings(event::register));
 		modEventBus.addListener((EntityRenderersEvent.RegisterRenderers event) -> CampanionClient.registerEntityRenderers(event::registerEntityRenderer));