From 357b811ea0ebf1327b5e7dd1d3524bb14ac4823e Mon Sep 17 00:00:00 2001 From: glitch Date: Sat, 13 Jul 2024 17:31:54 -0500 Subject: [PATCH] Floader 0.16.0 --- gradle.properties | 8 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../quiltmc/loader/impl/QuiltLoaderImpl.java | 2 +- .../launch/common/QuiltMixinBootstrap.java | 2 +- .../launch/knot/MixinContainerHandleMod.java | 38 ------------------- .../impl/launch/knot/MixinServiceKnot.java | 6 +++ src/main/resources/quilt.mod.json | 2 +- 7 files changed, 14 insertions(+), 46 deletions(-) delete mode 100644 src/main/java/org/quiltmc/loader/impl/launch/knot/MixinContainerHandleMod.java diff --git a/gradle.properties b/gradle.properties index e0e8841b1..0580636b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,13 +5,13 @@ group = org.quiltmc description = The mod loading component of Quilt url = https://github.com/quiltmc/quilt-loader # Don't forget to change this in QuiltLoaderImpl as well -quilt_loader = 0.26.1 +quilt_loader = 0.26.2 # Fabric & Quilt Libraries asm = 9.6 -sponge_mixin = 0.13.3+mixin.0.8.5 +sponge_mixin = 0.15.0+mixin.0.8.7 tiny_mappings_parser = 0.3.0+build.17 -tiny_remapper = 0.10.1 +tiny_remapper = 0.10.4 access_widener = 2.1.0 quilt_json5 = 1.0.4+final quilt_parsers = 0.2.0 @@ -27,4 +27,4 @@ junit_bom = 5.9.3 proguard_gradle = 7.4.2 github_api = 1.315 flexver = 1.1.0 -mixin_extras = 0.3.5 +mixin_extras = 0.4.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b825..19cfad969 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java b/src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java index 54f94f574..fb491cd65 100644 --- a/src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java +++ b/src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java @@ -132,7 +132,7 @@ public final class QuiltLoaderImpl { public static final int ASM_VERSION = Opcodes.ASM9; - public static final String VERSION = "0.26.1"; + public static final String VERSION = "0.26.2"; public static final String MOD_ID = "quilt_loader"; public static final String DEFAULT_MODS_DIR = "mods"; public static final String DEFAULT_CACHE_DIR = ".cache"; diff --git a/src/main/java/org/quiltmc/loader/impl/launch/common/QuiltMixinBootstrap.java b/src/main/java/org/quiltmc/loader/impl/launch/common/QuiltMixinBootstrap.java index b378ae7ab..b89ca5942 100644 --- a/src/main/java/org/quiltmc/loader/impl/launch/common/QuiltMixinBootstrap.java +++ b/src/main/java/org/quiltmc/loader/impl/launch/common/QuiltMixinBootstrap.java @@ -145,7 +145,7 @@ public 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); } diff --git a/src/main/java/org/quiltmc/loader/impl/launch/knot/MixinContainerHandleMod.java b/src/main/java/org/quiltmc/loader/impl/launch/knot/MixinContainerHandleMod.java deleted file mode 100644 index 99ad0d18a..000000000 --- a/src/main/java/org/quiltmc/loader/impl/launch/knot/MixinContainerHandleMod.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2016 FabricMC - * Copyright 2022-2023 QuiltMC - * - * 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 org.quiltmc.loader.impl.launch.knot; - -import java.util.Collection; -import java.util.Collections; - -import org.quiltmc.loader.impl.util.QuiltLoaderInternal; -import org.quiltmc.loader.impl.util.QuiltLoaderInternalType; -import org.spongepowered.asm.launch.platform.container.IContainerHandle; - -@QuiltLoaderInternal(QuiltLoaderInternalType.LEGACY_EXPOSED) -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/java/org/quiltmc/loader/impl/launch/knot/MixinServiceKnot.java b/src/main/java/org/quiltmc/loader/impl/launch/knot/MixinServiceKnot.java index 88cea02e1..ac5c71c5b 100644 --- a/src/main/java/org/quiltmc/loader/impl/launch/knot/MixinServiceKnot.java +++ b/src/main/java/org/quiltmc/loader/impl/launch/knot/MixinServiceKnot.java @@ -85,9 +85,15 @@ public ClassNode getClassNode(String name) throws ClassNotFoundException, IOExce @Override public ClassNode getClassNode(String name, boolean runTransformers) throws ClassNotFoundException, IOException { + return getClassNode(name, runTransformers, 0); + } + + @Override + public ClassNode getClassNode(String name, boolean runTransformers, int readerFlags) throws ClassNotFoundException, IOException { ClassReader reader = new ClassReader(getClassBytes(name, runTransformers)); ClassNode node = new ClassNode(); reader.accept(node, 0); + reader.accept(node, readerFlags); return node; } diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json index f3f3b9e3b..710c1dd57 100644 --- a/src/main/resources/quilt.mod.json +++ b/src/main/resources/quilt.mod.json @@ -22,7 +22,7 @@ "provides": [ { "id": "fabricloader", - "version": "0.15.11" + "version": "0.16.0" } ], "depends": [