From 6784bab6d81cbabe49e6860a85d9c835d2f60a58 Mon Sep 17 00:00:00 2001
From: 3944Realms <f256198830@hotmail.com>
Date: Tue, 27 May 2025 14:43:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC2=E9=83=A8=E5=88=86,?=
 =?UTF-8?q?=E4=BD=BFforge=E5=8F=AF=E4=BB=A5=E9=A1=BA=E5=88=A9=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/resources/jsonem.mixins.json      |  3 ++-
 forge/build.gradle                                | 15 ++++++++-------
 .../leisuretimedock/jsonem/forge/JsonEmForge.java | 10 +++++-----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/common/src/main/resources/jsonem.mixins.json b/common/src/main/resources/jsonem.mixins.json
index ab68579..9d09741 100644
--- a/common/src/main/resources/jsonem.mixins.json
+++ b/common/src/main/resources/jsonem.mixins.json
@@ -15,5 +15,6 @@
   ],
   "injectors": {
     "defaultRequire": 1
-  }
+  },
+  "refmap": "jsonem.refmap.json"
 }
diff --git a/forge/build.gradle b/forge/build.gradle
index 1f9eac2..4581f1e 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -33,19 +33,20 @@ configurations {
 }
 
 dependencies {
-    compileOnly project(":common")
+
     forge "net.minecraftforge:forge:$rootProject.forge_version"
 
     modImplementation "dev.architectury:architectury-forge:$rootProject.architectury_api_version"
-
+    common(project(path: '::common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: '::common', configuration: 'transformProductionForge')
 }
 
 processResources {
-    inputs.property 'version', project.version
-
-    filesMatching('META-INF/mods.toml') {
-        expand version: project.version
-    }
+//    inputs.property 'version', project.version
+//
+//    filesMatching('META-INF/mods.toml') {
+//        expand version: project.version
+//    }
 }
 
 shadowJar {
diff --git a/forge/src/main/java/com/leisuretimedock/jsonem/forge/JsonEmForge.java b/forge/src/main/java/com/leisuretimedock/jsonem/forge/JsonEmForge.java
index 1acea9b..4e0b92c 100644
--- a/forge/src/main/java/com/leisuretimedock/jsonem/forge/JsonEmForge.java
+++ b/forge/src/main/java/com/leisuretimedock/jsonem/forge/JsonEmForge.java
@@ -4,17 +4,17 @@ import com.leisuretimedock.jsonem.JsonEm;
 import com.leisuretimedock.jsonem.forge.config.JsonEmConfig;
 import dev.architectury.platform.forge.EventBuses;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 
 @Mod(JsonEm.MOD_ID)
 public final class JsonEmForge {
-    public JsonEmForge(IEventBus eventBus) {
+    public JsonEmForge(FMLJavaModLoadingContext context) {
         // Submit our event bus to let Architectury API register our content on the right time.
-        EventBuses.registerModEventBus(JsonEm.MOD_ID, eventBus);
-        //noinspection removal
-        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, JsonEmConfig.spec, "jsonem.toml");
+        IEventBus modEventBus = context.getModEventBus();
+        EventBuses.registerModEventBus(JsonEm.MOD_ID, modEventBus);
+        context.registerConfig(ModConfig.Type.CLIENT, JsonEmConfig.spec, "jsonem.toml");
         // Run our common setup.
         JsonEm.init();
     }