From ac95874ca5722de6e4a4402e4a12a9b56432eec9 Mon Sep 17 00:00:00 2001
From: Cat Core <34719527+arthurbambou@users.noreply.github.com>
Date: Mon, 21 Aug 2023 15:12:14 +0200
Subject: [PATCH] Update MRAPI to 1.15.0 and ME to 0.2.0-beta.10

---
 build.gradle                                         | 12 +++++++-----
 gradle.properties                                    |  8 ++++----
 mod-compat/src/main/resources/fabric.mod.json        |  4 +---
 .../cpw/mods/fml/relauncher/RelaunchClassLoader.java |  2 +-
 src/main/resources/fabric.mod.json                   |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index f6fb4225..1fe94f5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,10 +50,9 @@ allprojects {
 		modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 		modApi("maven.modrinth:mod-remapping-api:${project.mod_remapping_api}")
-	//	modApi(group: "local", name: "mod-remapping-api", version: "1.8.0")
 
 		modApi("maven.modrinth:spasm:${project.spasm_version}")
-		modApi(annotationProcessor("com.github.LlamaLad7.MixinExtras:mixinextras-fabric:${project.mixin_extras_version}"))
+		implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}"))
 
 		implementation(group: "local", name: "argo", version: "2.25")
 		implementation(group: "local", name: "guava", version: "12.0.1")
@@ -69,9 +68,14 @@ allprojects {
 
 	processResources {
 		inputs.property "version", project.version
+		inputs.property "mc_version", project.minecraft_version
+		inputs.property "mrapi_version", project.mod_remapping_api
 
 		filesMatching("fabric.mod.json") {
-			expand "version": project.version
+			expand "version": project.version,
+					"mc_version": rootProject.minecraft_version,
+					"mrapi_version": project.mod_remapping_api
+//			expand "mc_version": rootProject.minecraft_version
 		}
 	}
 
@@ -107,8 +111,6 @@ loom {
 dependencies {
 	include(group: "local", name: "argo", version: "2.25")
 	include(group: "local", name: "guava", version: "12.0.1")
-
-	include("org.apache.commons:commons-lang3:3.12.0")
 }
 
 subprojects {
diff --git a/gradle.properties b/gradle.properties
index c81eafac..52f404d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,12 +9,12 @@ org.gradle.jvmargs=-Xmx2G
 	loader_version = 0.14.22
 
 # Legacy Fabric API
-	mod_remapping_api = 1.14.2
+	mod_remapping_api = 1.15.0
 	forge_version = 4.3.5.318
-	mixin_extras_version=0.2.0-beta.8
-	spasm_version=0.1.2
+	mixin_extras_version=0.2.0-beta.10
+	spasm_version=0.2
 
 # Mod Properties
-	mod_version = 2.6.0
+	mod_version = 2.6.1
 	maven_group = fr.catcore
 	archives_base_name = fabricated-forge
diff --git a/mod-compat/src/main/resources/fabric.mod.json b/mod-compat/src/main/resources/fabric.mod.json
index 0316c39c..63607f79 100644
--- a/mod-compat/src/main/resources/fabric.mod.json
+++ b/mod-compat/src/main/resources/fabric.mod.json
@@ -27,8 +27,6 @@
   "mixins": [
   ],
   "depends": {
-    "fabricloader": ">0.14.3",
-    "minecraft": "1.3.2",
-    "mod-remapping-api": ">=1.14.2"
+    "fabricloader": ">0.14.3"
   }
 }
diff --git a/src/main/java/cpw/mods/fml/relauncher/RelaunchClassLoader.java b/src/main/java/cpw/mods/fml/relauncher/RelaunchClassLoader.java
index 4087eda4..f310e1e5 100644
--- a/src/main/java/cpw/mods/fml/relauncher/RelaunchClassLoader.java
+++ b/src/main/java/cpw/mods/fml/relauncher/RelaunchClassLoader.java
@@ -71,7 +71,7 @@ public RelaunchClassLoader() {
     public void registerTransformer(String transformerClassName) {
         try {
             IClassTransformer classTransformer = (IClassTransformer) Class.forName(transformerClassName).newInstance();
-            ClassTransformer.registerTransformer(classTransformer);
+            ClassTransformer.registerPostTransformer(classTransformer);
             System.out.println("Registered ClassTransformer: " + transformerClassName);
             this.transformers.add(classTransformer);
         } catch (Exception var3) {
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index f136cf2b..41358d69 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -33,8 +33,8 @@
   ],
   "depends": {
     "fabricloader": ">0.14.3",
-    "minecraft": "1.3.2",
-    "mod-remapping-api": ">=1.14.2"
+    "minecraft": "${mc_version}",
+    "mod-remapping-api": ">=${mrapi_version}"
   },
   "custom": {
     "loom:injected_interfaces": {