Fix build

Gaming32 · Apr 17, 2023 · 5cf54eb · 5cf54eb
1 parent b35c63b
commit 5cf54eb
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,12 +15,12 @@ preprocess {
     val forge10809 = createNode("1.8.9-forge", 1_08_09, "srg")
 
     fabric11904.link(forge11904)
-    fabric11904.link(fabric11902)
-    fabric11902.link(forge11902)
+    forge11904.link(forge11902)
+    forge11902.link(fabric11902)
     fabric11902.link(fabric11802)
     fabric11802.link(forge11802)
-    fabric11802.link(fabric11605)
-    fabric11605.link(forge11605)
+    forge11802.link(forge11605)
+    forge11605.link(fabric11605)
     forge11605.link(forge11202)
     forge11202.link(forge10809)
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -11,7 +11,7 @@ pluginManagement {
     }
 
     plugins {
-        id("xyz.deftu.gradle.multiversion-root") version("1.9.0")
+        id("xyz.deftu.gradle.multiversion-root") version("1.10.4")
     }
 }
 

diff --git a/src/main/java/io/github/gaming32/worldhost/WorldHost.java b/src/main/java/io/github/gaming32/worldhost/WorldHost.java
@@ -1,34 +1,53 @@
 package io.github.gaming32.worldhost;
 
+//#if MC >= 11700
 import com.mojang.logging.LogUtils;
 import org.slf4j.Logger;
+//#else
+//$$ import org.apache.logging.log4j.LogManager;
+//$$ import org.apache.logging.log4j.Logger;
+//#endif
 
 //#if FABRIC
 import net.fabricmc.api.ClientModInitializer;
 //#endif
 
 //#if FORGE
+//$$ import net.minecraftforge.fml.common.Mod;
+//#if MC > 11202
 //$$ import net.minecraftforge.api.distmarker.Dist;
 //$$ import net.minecraftforge.eventbus.api.SubscribeEvent;
-//$$ import net.minecraftforge.fml.common.Mod;
 //$$ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+//#else
+//$$ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+//#endif
 //#endif
 
 //#if FORGE
+//#if MC > 11202
 //$$ @Mod(WorldHost.MOD_ID)
+//#else
+//$$ @Mod(modid = WorldHost.MOD_ID, useMetadata = true, clientSideOnly = true)
+//#endif
 //#endif
 public class WorldHost
     //#if FABRIC
     implements ClientModInitializer
     //#endif
 {
-    //#if FORGE
-    //$$ public static final String MOD_ID = "world_host";
-    //#else
-    public static final String MOD_ID = "world-host";
-    //#endif
+    public static final String MOD_ID =
+        //#if FORGE
+        //$$ "world_host";
+        //#else
+        "world-host";
+        //#endif
 
-    public static final Logger LOGGER = LogUtils.getLogger();
+    public static final Logger LOGGER =
+        //#if MC >= 11700
+        LogUtils.getLogger();
+        //#else
+        //$$ LogManager.getLogger();
+        //#endif
 
     //#if FABRIC
     @Override
@@ -42,12 +61,19 @@ private static void init() {
     }
 
     //#if FORGE
+    //#if MC > 11202
     //$$ @Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
     //$$ public static class ClientModEvents {
     //$$     @SubscribeEvent
     //$$     public static void onClientSetup(FMLClientSetupEvent event) {
     //$$         init();
     //$$     }
     //$$ }
+    //#else
+    //$$ @Mod.EventHandler
+    //$$ public void init(FMLInitializationEvent event) {
+    //$$     init();
+    //$$ }
+    //#endif
     //#endif
 }