Update to Mixin 0.8.6 (#932)

* Build: Bump Mixin. * Build: Bump Version. * Mixin: Enable `COMPATIBILITY_0_14_0` for loader >= 0.16 * Mixin: Fix only the most recent compatibility version being checked.
FabricMC · Jun 8, 2024 · 12775fd · 12775fd
1 parent 1a83326
commit 12775fd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 51 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,5 +6,5 @@ description = The mod loading component of Fabric
 url = https://github.com/FabricMC/fabric-loader
 
 asm_version = 9.6
-mixin_version = 0.13.3+mixin.0.8.5
+mixin_version = 0.14.0+mixin.0.8.6
 mixin_extras_version = 0.3.5
diff --git a/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java b/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java
@@ -74,7 +74,7 @@ public final class FabricLoaderImpl extends net.fabricmc.loader.FabricLoader {
 
 	public static final int ASM_VERSION = Opcodes.ASM9;
 
-	public static final String VERSION = "0.15.11";
+	public static final String VERSION = "0.16.0";
 	public static final String MOD_ID = "fabricloader";
 
 	public static final String CACHE_DIR_NAME = ".fabric"; // relative to game dir

diff --git a/src/main/java/net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java b/src/main/java/net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java
@@ -120,7 +120,7 @@ private static final class MixinConfigDecorator {
 			// maximum loader version and bundled fabric mixin version, DESCENDING ORDER, LATEST FIRST
 			// loader versions with new mixin versions need to be added here
 
-			// addVersion("0.13", FabricUtil.COMPATIBILITY_0_11_0); // example for next entry (latest first!)
+			addVersion("0.16.0", FabricUtil.COMPATIBILITY_0_14_0);
 			addVersion("0.12.0-", FabricUtil.COMPATIBILITY_0_10_0);
 		}
 
@@ -159,8 +159,6 @@ private static int getMixinCompat(ModContainerImpl mod) {
 				for (LoaderMixinVersionEntry version : versions) {
 					if (minLoaderVersion.compareTo(version.loaderVersion) >= 0) { // lower bound is >= current version
 						return version.mixinVersion;
-					} else {
-						break;
 					}
 				}
 			}

diff --git a/src/main/java/net/fabricmc/loader/impl/launch/knot/MixinContainerHandleMod.java b/src/main/java/net/fabricmc/loader/impl/launch/knot/MixinContainerHandleMod.java
diff --git a/src/main/resources/fabric-installer.json b/src/main/resources/fabric-installer.json
@@ -52,13 +52,13 @@
                 "size": 91131
             },
             {
-                "name": "net.fabricmc:sponge-mixin:0.13.3+mixin.0.8.5",
+                "name": "net.fabricmc:sponge-mixin:0.14.0+mixin.0.8.6",
                 "url": "https://maven.fabricmc.net/",
-                "md5": "9dcf01250f72212bf97f0fef55ba5acd",
-                "sha1": "9527e6b0d2449408958fd1302594dc65ec5ade9c",
-                "sha256": "6cb35f932d7455afb5b5ec21c081590b109a723e7a9cef7efe070522da7e4607",
-                "sha512": "cf1bc794351eca6cceee7dfb5f356664dd57ff51b80484b4a339b26805a3e95935027df3661e3b8ee7182567726f3e79531abe6a6ab86eb046f57cd71eebd5fe",
-                "size": 1458875
+                "md5": "8280fb756f93c34d5d6fb392779541f7",
+                "sha1": "c265173c84346e9e5d42a2384b2b02bd39a4a899",
+                "sha256": "3f22c86d1a89e0c2b1cdd4388d495b50c744add9a7f2e96a8937f0dfd8d0f0b1",
+                "sha512": "a8bcbb9436c0a70eb7d5eb3e3b90ed7bddc1b568553f450cab32eb75244002ff17a6285d60a56294180f7023780ddc1b3afe4255ef0b8d518159ab8ab5be07b0",
+                "size": 1484799
             }
         ],
         "server": [

diff --git a/src/main/resources/fabric-installer.launchwrapper.json b/src/main/resources/fabric-installer.launchwrapper.json
@@ -52,13 +52,13 @@
                 "size": 91131
             },
             {
-                "name": "net.fabricmc:sponge-mixin:0.13.3+mixin.0.8.5",
+                "name": "net.fabricmc:sponge-mixin:0.14.0+mixin.0.8.6",
                 "url": "https://maven.fabricmc.net/",
-                "md5": "9dcf01250f72212bf97f0fef55ba5acd",
-                "sha1": "9527e6b0d2449408958fd1302594dc65ec5ade9c",
-                "sha256": "6cb35f932d7455afb5b5ec21c081590b109a723e7a9cef7efe070522da7e4607",
-                "sha512": "cf1bc794351eca6cceee7dfb5f356664dd57ff51b80484b4a339b26805a3e95935027df3661e3b8ee7182567726f3e79531abe6a6ab86eb046f57cd71eebd5fe",
-                "size": 1458875
+                "md5": "8280fb756f93c34d5d6fb392779541f7",
+                "sha1": "c265173c84346e9e5d42a2384b2b02bd39a4a899",
+                "sha256": "3f22c86d1a89e0c2b1cdd4388d495b50c744add9a7f2e96a8937f0dfd8d0f0b1",
+                "sha512": "a8bcbb9436c0a70eb7d5eb3e3b90ed7bddc1b568553f450cab32eb75244002ff17a6285d60a56294180f7023780ddc1b3afe4255ef0b8d518159ab8ab5be07b0",
+                "size": 1484799
             },
             {
                 "name": "net.minecraft:launchwrapper:1.12",