Sync with Fabric Loader 0.16.2

gradle.properties

@@ -9,9 +9,9 @@ quilt_loader = 0.26.4-beta.1
 
 # Fabric & Quilt Libraries
 asm = 9.6
-sponge_mixin = 0.13.3+mixin.0.8.5
+sponge_mixin = 0.15.2+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.1

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

minecraft/src/main/java/org/quiltmc/loader/impl/game/minecraft/McVersionLookup.java

@@ -284,7 +284,9 @@ protected static String getRelease(String version) {
 			int year = Integer.parseInt(matcher.group(1));
 			int week = Integer.parseInt(matcher.group(2));
 
-			if (year >= 24 && week >= 18) {
+			if (year >= 24 && week >= 33) {
+				return "1.21.2";
+			} else if (year == 24 && week >= 18 && week <= 21) {
 				return "1.21";
 			} else if (year == 23 && week >= 51 || year == 24 && week <= 14) {
 				return "1.20.5";

src/fabric/api/java/net/fabricmc/loader/api/entrypoint/EntrypointContainer.java

@@ -36,4 +36,11 @@ public interface EntrypointContainer<T> {
 	 * Returns the mod that provided this entrypoint.
 	 */
 	ModContainer getProvider();
+
+	/**
+	 * Returns a string representation of the entrypoint's definition.
+	 */
+	default String getDefinition() {
+		return "";
+	}
 }

src/fabric/impl/java/net/fabricmc/loader/impl/entrypoint/EntrypointContainerImpl.java

@@ -38,4 +38,9 @@ public T getEntrypoint() {
 	public ModContainer getProvider() {
 		return new ModContainerImpl(quilt.getProvider());
 	}
+
+	@Override
+	public String getDefinition() {
+		return quilt.getDefinition();
+	}
 }

src/main/java/org/quiltmc/loader/api/entrypoint/EntrypointContainer.java

@@ -35,4 +35,11 @@ public interface EntrypointContainer<T> {
 	 * Returns the mod that provided this entrypoint.
 	 */
 	ModContainer getProvider();
+
+	/**
+	 * Returns a string representation of the entrypoint's definition.
+	 */
+	default String getDefinition() {
+		return "";
+	}
 }

src/main/java/org/quiltmc/loader/impl/entrypoint/EntrypointStorage.java

@@ -39,6 +39,8 @@ interface Entry {
 		boolean isOptional();
 
 		ModContainerExt getModContainer();
+
+		String getDefinition();
 	}
 
 	@SuppressWarnings("deprecation")
@@ -87,6 +89,11 @@ public boolean isOptional() {
 		public ModContainerExt getModContainer() {
 			return mod;
 		}
+
+		@Override
+		public String getDefinition() {
+			return value;
+		}
 	}
 
 	private static final class NewEntry implements Entry {
@@ -131,6 +138,11 @@ public boolean isOptional() {
 		public ModContainerExt getModContainer() {
 			return mod;
 		}
+
+		@Override
+		public String getDefinition() {
+			return value;
+		}
 	}
 
 	private final Map<String, List<Entry>> entryMap = new HashMap<>();

src/main/java/org/quiltmc/loader/impl/entrypoint/EntrypointUtils.java

@@ -63,8 +63,8 @@ private static <T> void invoke0(String name, Class<T> type, Consumer<EntrypointC
 			} catch (Throwable t) {
 				exception = ExceptionUtil.gatherExceptions(t,
 						exception,
-						exc -> new RuntimeException(String.format("Could not execute entrypoint stage '%s' due to errors, provided by '%s'!",
-								name, container.getProvider().metadata().id()),
+						exc -> new RuntimeException(String.format("Could not execute entrypoint stage '%s' due to errors, provided by '%s' at '%s'!",
+								name, container.getProvider().metadata().id(), container.getDefinition()),
 								exc));
 			}
 		}

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);
 		}
 
@@ -171,9 +171,11 @@ public static int getMixinCompat(boolean isFabric, ModMetadata metadata) {
 			List<VersionInterval> reqIntervals = Collections.singletonList(VersionInterval.INFINITE);
 
 			if (!isFabric) {
-				// quilt or builtin mod, we can assume it uses latest compat
-				Log.debug(LogCategory.MIXIN, "Assuming Quilt mod %s uses latest mixin compatibility", metadata.id());
-				return FabricUtil.COMPATIBILITY_LATEST;
+				// quilt or builtin mod, we can assume it uses latest (0.10.0 at the time) compat
+				// Except since <insert update that introduces mixin 0.14.0 compat>, we can't assume that anymore!
+				// TODO - Handle Quilt mods like Fabric mods but with our own version ranges
+				Log.debug(LogCategory.MIXIN, "Assuming Quilt mod %s uses 0.10.0 mixin compatibility", metadata.id());
+				return FabricUtil.COMPATIBILITY_0_10_0;
 			}
 
 			FabricLoaderModMetadata fabricMeta = ((InternalModMetadata) metadata).asFabricModMetadata();
@@ -200,11 +202,10 @@ public static int getMixinCompat(boolean isFabric, ModMetadata metadata) {
 					if (minLoaderVersion.compareTo(version.loaderVersion) >= 0) { // lower bound is >= current version
 						Log.debug(LogCategory.MIXIN, "Mod %s requires loader version %s, using mixin compatibility %s", metadata.id(), minLoaderVersion, version.mixinVersion);
 						return version.mixinVersion;
-					} else {
-						Log.debug(LogCategory.MIXIN, "Mod %s requires loader version %s, using 0.9.2 mixin compatability", metadata.id(), minLoaderVersion);
-						return FabricUtil.COMPATIBILITY_0_9_2;
 					}
 				}
+				Log.debug(LogCategory.MIXIN, "Mod %s requires loader version %s, using 0.9.2 mixin compatability", metadata.id(), minLoaderVersion);
+				return FabricUtil.COMPATIBILITY_0_9_2;
 			}
 
 			// Mod doesn't declare a dependency on a loader version; use oldest mixin compat version

src/main/java/org/quiltmc/loader/impl/launch/knot/MixinServiceKnot.java

@@ -85,9 +85,14 @@ 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;
 	}
 

src/main/resources/quilt.mod.json

@@ -22,7 +22,7 @@
     "provides": [
         {
           "id": "fabricloader",
-          "version": "0.15.11"
+          "version": "0.16.2"
         }
       ],
       "depends": [