From d9785100600e4173c99402b24a071438dd6c3384 Mon Sep 17 00:00:00 2001 From: LlamaLad7 Date: Sun, 2 Jun 2024 19:53:31 +0100 Subject: [PATCH 1/4] Build: Bump Mixin. --- gradle.properties | 2 +- .../launch/knot/MixinContainerHandleMod.java | 34 ------------------- src/main/resources/fabric-installer.json | 12 +++---- .../fabric-installer.launchwrapper.json | 12 +++---- 4 files changed, 13 insertions(+), 47 deletions(-) delete mode 100644 src/main/java/net/fabricmc/loader/impl/launch/knot/MixinContainerHandleMod.java diff --git a/gradle.properties b/gradle.properties index cbe6ee571..9005b0c15 100644 --- 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/launch/knot/MixinContainerHandleMod.java b/src/main/java/net/fabricmc/loader/impl/launch/knot/MixinContainerHandleMod.java deleted file mode 100644 index ff81da71b..000000000 --- a/src/main/java/net/fabricmc/loader/impl/launch/knot/MixinContainerHandleMod.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2016 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.loader.impl.launch.knot; - -import java.util.Collection; -import java.util.Collections; - -import org.spongepowered.asm.launch.platform.container.IContainerHandle; - -public class MixinContainerHandleMod implements IContainerHandle { - @Override - public String getAttribute(String name) { - return null; - } - - @Override - public Collection getNestedContainers() { - return Collections.emptyList(); - } -} diff --git a/src/main/resources/fabric-installer.json b/src/main/resources/fabric-installer.json index a2214b0b8..c4856b134 100644 --- 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 index 35bd9320e..29ffa40f3 100644 --- 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", From 9f8863d7fec419d7d3ea6699bb19278863e4c35e Mon Sep 17 00:00:00 2001 From: LlamaLad7 Date: Sun, 2 Jun 2024 19:54:00 +0100 Subject: [PATCH 2/4] Build: Bump Version. --- src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java b/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java index 0977d60c2..fcba53c7b 100644 --- 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 From ba2c3fa0839cb3428f1f959ec8234c7d85c72d32 Mon Sep 17 00:00:00 2001 From: LlamaLad7 Date: Sun, 2 Jun 2024 22:32:59 +0100 Subject: [PATCH 3/4] Mixin: Enable `COMPATIBILITY_0_14_0` for loader >= 0.16 --- .../net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java b/src/main/java/net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java index 2738b2318..8f5b3c55a 100644 --- 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); } From fff397218a02de8d270a6445b8b24e8bd9178b9e Mon Sep 17 00:00:00 2001 From: LlamaLad7 Date: Sun, 2 Jun 2024 22:37:17 +0100 Subject: [PATCH 4/4] Mixin: Fix only the most recent compatibility version being checked. --- .../net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java b/src/main/java/net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java index 8f5b3c55a..6069f797e 100644 --- a/src/main/java/net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java +++ b/src/main/java/net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java @@ -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; } } }