From 582e0a001cc61209c60f323edf545a35ec30c396 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 2 Dec 2021 17:25:23 +0800
Subject: [PATCH] Update Forge to enable Mixins

---
 forge/build.gradle                                    |  6 ++----
 .../mixin/forge/MixinChunkSerializer.java             |  2 +-
 forge/src/main/resources/META-INF/mods.toml           | 11 +++++++++--
 gradle.properties                                     |  2 +-
 testmod-forge/build.gradle                            |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/forge/build.gradle b/forge/build.gradle
index d3f4b7a3..c44fc997 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -5,8 +5,8 @@ plugins {
 
 loom {
     forge {
-//        mixinConfig "architectury.mixins.json"
-//        mixinConfig "architectury-common.mixins.json"
+        mixinConfig "architectury.mixins.json"
+        mixinConfig "architectury-common.mixins.json"
     }
 }
 
@@ -33,8 +33,6 @@ dependencies {
 
     common(project(path: ":common", configuration: "dev")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive false }
-    // compile with mixins for now
-    compileClasspath("dev.architectury:mixin-patched:0.8.4.+")
 }
 
 processResources {
diff --git a/forge/src/main/java/dev/architectury/mixin/forge/MixinChunkSerializer.java b/forge/src/main/java/dev/architectury/mixin/forge/MixinChunkSerializer.java
index 929fccf3..778200bb 100644
--- a/forge/src/main/java/dev/architectury/mixin/forge/MixinChunkSerializer.java
+++ b/forge/src/main/java/dev/architectury/mixin/forge/MixinChunkSerializer.java
@@ -44,7 +44,7 @@ public class MixinChunkSerializer {
     private static ThreadLocal<WeakReference<ServerLevel>> level = new ThreadLocal<>();
     
     @Inject(method = "read", at = @At("HEAD"))
-    private static void read(ServerLevel worldIn, StructureManager templateManagerIn, PoiManager poiManager, ChunkPos pos, CompoundTag compound, CallbackInfoReturnable<ProtoChunk> cir) {
+    private static void read(ServerLevel worldIn, PoiManager arg2, ChunkPos arg3, CompoundTag arg4, CallbackInfoReturnable<ProtoChunk> cir) {
         level.set(new WeakReference<>(worldIn));
     }
     
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 368f8ff3..4298e135 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[33,)"
+loaderVersion = "[38,)"
 issueTrackerURL = "https://github.com/shedaniel/architectury/issues"
 license = "GNU LGPLv3"
 
@@ -17,6 +17,13 @@ license = "LGPL-3"
 [[dependencies.architectury]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.17.1,)"
+versionRange = "[1.18,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.architectury]]
+modId = "forge"
+mandatory = true
+versionRange = "[38.0.6,)"
 ordering = "NONE"
 side = "BOTH"
diff --git a/gradle.properties b/gradle.properties
index 41d1fb44..76784a7d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,4 @@ fabric_loader_version=0.12.5
 fabric_api_version=0.43.1+1.18
 mod_menu_version=3.0.0
 
-forge_version=38.0.4
+forge_version=38.0.8
diff --git a/testmod-forge/build.gradle b/testmod-forge/build.gradle
index 7015042d..8b0fa5d0 100644
--- a/testmod-forge/build.gradle
+++ b/testmod-forge/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 loom {
     forge {
-        // mixinConfig "architectury.mixins.json"
+        mixinConfig "architectury.mixins.json"
 
         localMods {
             forge {