feat: Update for Forge 1.21.4

TwelveIterationMods · Jan 13, 2025 · 3e4e86c · 3e4e86c
1 parent b9d0a0a
commit 3e4e86c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -7,8 +7,6 @@ plugins {
 }
 
 mixin {
-    add(sourceSets.main, "${mod_id}.refmap.json")
-
     config("${mod_id}.mixins.json")
     config("${mod_id}.forge.mixins.json")
 }
@@ -119,4 +117,10 @@ modrinth {
     dependencies {
         required.project "balm"
     }
+}
+
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
 }
diff --git a/forge/src/main/java/net/blay09/mods/netherportalfix/ForgeNetherPortalFix.java b/forge/src/main/java/net/blay09/mods/netherportalfix/ForgeNetherPortalFix.java
@@ -1,18 +1,19 @@
 package net.blay09.mods.netherportalfix;
 
 import net.blay09.mods.balm.api.Balm;
-import net.blay09.mods.balm.api.EmptyLoadContext;
+import net.blay09.mods.balm.forge.ForgeLoadContext;
 import net.minecraftforge.fml.IExtensionPoint;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 @Mod(NetherPortalFix.MOD_ID)
 public class ForgeNetherPortalFix {
 
-    public ForgeNetherPortalFix() {
-        Balm.initialize(NetherPortalFix.MOD_ID, EmptyLoadContext.INSTANCE, NetherPortalFix::initialize);
+    public ForgeNetherPortalFix(FMLJavaModLoadingContext context) {
+        final var loadContext = new ForgeLoadContext(context.getModEventBus());
+        Balm.initialize(NetherPortalFix.MOD_ID, loadContext, NetherPortalFix::initialize);
 
-        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (a, b) -> true));
+        context.registerDisplayTest(IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION);
     }
 
 }
diff --git a/forge/src/main/resources/netherportalfix.forge.mixins.json b/forge/src/main/resources/netherportalfix.forge.mixins.json
@@ -3,7 +3,6 @@
   "minVersion": "0.8",
   "package": "net.blay09.mods.netherportalfix.forge.mixin",
   "compatibilityLevel": "JAVA_17",
-  "refmap": "${mod_id}.refmap.json",
   "mixins": [
   ],
   "client": [