From 1200a6daaf1d0a120cd34a9692b3c9acdab39a95 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Tue, 12 Jul 2022 12:27:04 +0200
Subject: [PATCH] [Fix] WorldsTogether data was not properly initialized

---
 src/main/java/org/betterx/bclib/BCLib.java                  | 1 +
 src/main/java/org/betterx/bclib/client/BCLibClient.java     | 2 ++
 .../java/org/betterx/worlds/together/WorldsTogether.java    | 6 ++----
 .../worlds/together/client/WorldsTogetherClient.java        | 6 ++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/betterx/bclib/BCLib.java b/src/main/java/org/betterx/bclib/BCLib.java
index fb4e3bed..ce54b584 100644
--- a/src/main/java/org/betterx/bclib/BCLib.java
+++ b/src/main/java/org/betterx/bclib/BCLib.java
@@ -45,6 +45,7 @@ public class BCLib implements ModInitializer {
 
     @Override
     public void onInitialize() {
+        WorldsTogether.onInitialize();
         LevelGenEvents.register();
         BlockPredicates.ensureStaticInitialization();
         BCLBiomeRegistry.ensureStaticallyLoaded();
diff --git a/src/main/java/org/betterx/bclib/client/BCLibClient.java b/src/main/java/org/betterx/bclib/client/BCLibClient.java
index 6a6d632b..26f4bae0 100644
--- a/src/main/java/org/betterx/bclib/client/BCLibClient.java
+++ b/src/main/java/org/betterx/bclib/client/BCLibClient.java
@@ -8,6 +8,7 @@ import org.betterx.bclib.config.Configs;
 import org.betterx.bclib.registry.BaseBlockEntityRenders;
 import org.betterx.bclib.registry.PresetsRegistryClient;
 import org.betterx.worlds.together.WorldsTogether;
+import org.betterx.worlds.together.client.WorldsTogetherClient;
 
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.client.resources.model.UnbakedModel;
@@ -23,6 +24,7 @@ public class BCLibClient implements ClientModInitializer, ModelResourceProvider,
 
     @Override
     public void onInitializeClient() {
+        WorldsTogetherClient.onInitializeClient();
         ModIntegrationAPI.registerAll();
         BaseBlockEntityRenders.register();
         DataExchangeAPI.prepareClientside();
diff --git a/src/main/java/org/betterx/worlds/together/WorldsTogether.java b/src/main/java/org/betterx/worlds/together/WorldsTogether.java
index 24ae4bef..cd237e35 100644
--- a/src/main/java/org/betterx/worlds/together/WorldsTogether.java
+++ b/src/main/java/org/betterx/worlds/together/WorldsTogether.java
@@ -8,10 +8,9 @@ import org.betterx.worlds.together.worldPreset.WorldPresets;
 
 import net.minecraft.resources.ResourceLocation;
 
-import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 
-public class WorldsTogether implements ModInitializer {
+public class WorldsTogether {
     public static boolean SURPRESS_EXPERIMENTAL_DIALOG = false;
     public static boolean FORCE_SERVER_TO_BETTERX_PRESET = false;
     public static final String MOD_ID = "worlds_together";
@@ -24,14 +23,13 @@ public class WorldsTogether implements ModInitializer {
         return FabricLoader.getInstance().isDevelopmentEnvironment();
     }
 
-    public void onInitialize() {
+    public static void onInitialize() {
         TagManager.ensureStaticallyLoaded();
         SurfaceRuleRegistry.ensureStaticallyLoaded();
 
 
         WorldConfig.registerModCache(WorldsTogether.MOD_ID);
         WorldPresets.ensureStaticallyLoaded();
-
     }
 
     public static ResourceLocation makeID(String s) {
diff --git a/src/main/java/org/betterx/worlds/together/client/WorldsTogetherClient.java b/src/main/java/org/betterx/worlds/together/client/WorldsTogetherClient.java
index 2a646f80..1aa64f4e 100644
--- a/src/main/java/org/betterx/worlds/together/client/WorldsTogetherClient.java
+++ b/src/main/java/org/betterx/worlds/together/client/WorldsTogetherClient.java
@@ -2,10 +2,8 @@ package org.betterx.worlds.together.client;
 
 import org.betterx.worlds.together.worldPreset.client.WorldPresetsClient;
 
-import net.fabricmc.api.ClientModInitializer;
-
-public class WorldsTogetherClient implements ClientModInitializer {
-    public void onInitializeClient() {
+public class WorldsTogetherClient {
+    public static void onInitializeClient() {
         WorldPresetsClient.setupClientside();
     }
 }