Many small fixes:

- Fix "Found Illegal Access from Minecraft to Quilt Loader" warning for AppletMain on older versions of minecraft from an applet.
- Add QuiltPluginContext.pluginOption() to retrieve the original ModLoadOption which the plugin is from.
- Improve loaders error handling when plugins fail to load, and the error gui fails to open by including a link to the original crash report (or the crash report text if it failed to save). This is better than before, where the latest crash report would only have an error relating to the error gui.
- Fix EntrypointContainer.getDefinition() always returning the empty string.
- Add the method "requiresPackageAccessFix" to GameProvider, which is used instead of a blind cast to MappingConfigurationImpl in QuiltTransformer to call it.
- Improve QuiltTransformer logic to not skip reflective fixes if no other transform is selected.
- Add the system property "loader.transform.kotlin_metadata_remap.disable" to allow disabling the kotlin metadata remapper, as it's a bit buggy at the moment.

Author: AlexIIL

gradle.properties

@@ -5,7 +5,7 @@ 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.29.0-beta.6
+quilt_loader = 0.29.0-beta.7
 
 # Fabric & Quilt Libraries
 asm = 9.7.1

minecraft/src/main/java/org/quiltmc/loader/impl/game/minecraft/applet/AppletMain.java

@@ -2,6 +2,10 @@
 
 import java.io.File;
 
+import org.quiltmc.loader.impl.util.QuiltLoaderInternal;
+import org.quiltmc.loader.impl.util.QuiltLoaderInternalType;
+
+@QuiltLoaderInternal(QuiltLoaderInternalType.LEGACY_NO_WARN)
 public final class AppletMain {
 	private AppletMain() { }
 

src/main/java/org/quiltmc/loader/api/plugin/QuiltPluginContext.java

@@ -54,6 +54,9 @@ public interface QuiltPluginContext {
 	 *         {@link Class#getResource(String)}. */
 	Path pluginPath();
 
+	/** @return The original {@link ModLoadOption} that this plugin is loaded from. */
+	ModLoadOption pluginOption();
+
 	// ##############
 	// # Operations #
 	// ##############

src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java

@@ -131,7 +131,7 @@ public final class QuiltLoaderImpl {
 
 	public static final int ASM_VERSION = Opcodes.ASM9;
 
-	public static final String VERSION = "0.29.0-beta.6";
+	public static final String VERSION = "0.29.0-beta.7";
 	public static final String MOD_ID = "quilt_loader";
 	public static final String DEFAULT_MODS_DIR = "mods";
 	public static final String DEFAULT_CACHE_DIR = ".cache";
@@ -728,7 +728,15 @@ private ModSolveResult runPlugins() {
 			System.exit(1);
 			throw new Error("System.exit(1) Failed!");
 		} catch (Exception e) {
-			throw new Error(e);
+			if (crashReportFile == null) {
+				StringBuilder text = new StringBuilder();
+				text.append("Failed to open the error gui, and also failed to write the original crash report!\n\n");
+				text.append(fullCrashText);
+				throw new Error(text.toString(), e);
+			} else {
+				throw new Error("Failed to open the error gui - please see the original crash report "
+					+ crashReportFile, e);
+			}
 		}
 	}
 

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

@@ -28,21 +28,40 @@
 public class EntrypointContainerImpl<T> implements EntrypointContainer<T> {
 	private final ModContainer container;
 	private final Supplier<T> entrypointSupplier;
+	private final String definition;
 	private T instance;
 
 	/**
-	 * Create EntrypointContainer with lazy init.
+	 * @deprecated As this version omits the {@link #getDefinition()} field.
 	 */
+	@Deprecated
 	public EntrypointContainerImpl(ModContainer container, Supplier<T> entrypointSupplier) {
+		this(container, "", entrypointSupplier);
+	}
+
+	/**
+	 * Create EntrypointContainer with lazy init.
+	 */
+	public EntrypointContainerImpl(ModContainer container, String definition, Supplier<T> entrypointSupplier) {
 		this.container = container;
+		this.definition = definition;
 		this.entrypointSupplier = entrypointSupplier;
 	}
 
 	/**
-	 * Create EntrypointContainer without lazy init.
+	 * @deprecated As this version omits the {@link #getDefinition()} field.
 	 */
+	@Deprecated
 	public EntrypointContainerImpl(ModContainer container, T instance) {
+		this(container, "", instance);
+	}
+
+	/**
+	 * Create EntrypointContainer without lazy init.
+	 */
+	public EntrypointContainerImpl(ModContainer container, String definition, T instance) {
 		this.container = container;
+		this.definition = definition;
 		this.entrypointSupplier = null;
 		this.instance = instance;
 	}
@@ -61,4 +80,9 @@ public synchronized T getEntrypoint() {
 	public ModContainer getProvider() {
 		return container;
 	}
+
+	@Override
+	public String getDefinition() {
+		return definition;
+	}
 }

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

@@ -222,7 +222,7 @@ public <T> List<EntrypointContainer<T>> getEntrypointContainers(String key, Clas
 					T instance = entry.getOrCreate(type);
 					if (instance == null) continue;
 
-					container = new EntrypointContainerImpl<>(entry.getModContainer(), instance);
+					container = new EntrypointContainerImpl<>(entry.getModContainer(), entry.getDefinition(), instance);
 				} catch (Throwable t) {
 					QuiltEntrypointException e2 = new QuiltEntrypointException(key, entry.getModContainer().metadata().id(), t);
 					if (exc == null) {
@@ -234,7 +234,7 @@ public <T> List<EntrypointContainer<T>> getEntrypointContainers(String key, Clas
 					continue;
 				}
 			} else {
-				container = new EntrypointContainerImpl<>(entry.getModContainer(), () -> {
+				container = new EntrypointContainerImpl<>(entry.getModContainer(), entry.getDefinition(), () -> {
 				try {
 					return entry.getOrCreate(type);
 				} catch (Exception | LinkageError ex) {

src/main/java/org/quiltmc/loader/impl/game/GameProvider.java

@@ -28,7 +28,7 @@
 import org.quiltmc.loader.impl.util.QuiltLoaderInternalType;
 import org.quiltmc.loader.impl.entrypoint.GameTransformer;
 import org.quiltmc.loader.impl.metadata.qmj.InternalModMetadata;
-
+import org.quiltmc.loader.impl.transformer.PackageAccessFixer;
 import org.quiltmc.loader.impl.launch.common.QuiltLauncher;
 
 import org.quiltmc.loader.impl.util.Arguments;
@@ -48,6 +48,19 @@ public interface GameProvider {
 	 * The mapping configuration for the game. Unobfuscated games should use {@link EmptyMappingConfiguration}.
 	 */
 	MappingConfiguration getMappingConfiguration();
+
+	/** @return True if the game itself (identified by {@link #getGameId()}) should be fully access-widend by
+	 *         {@link PackageAccessFixer}. This is normally only useful if your mappings moves classes between packages,
+	 *         and doesn't widen private members. */
+	default boolean requiresPackageAccessFix() {
+		// Compatibility code - we need this to always run
+		MappingConfiguration mappingConfig = getMappingConfiguration();
+		if (mappingConfig instanceof MappingConfigurationImpl) {
+			return ((MappingConfigurationImpl) mappingConfig).requiresPackageAccessHack();
+		}
+		return false;
+	}
+
 	boolean requiresUrlClassLoader();
 
 	boolean isEnabled();

src/main/java/org/quiltmc/loader/impl/game/MappingConfiguration.java

@@ -24,6 +24,7 @@
 import org.quiltmc.loader.impl.util.QuiltLoaderInternalType;
 
 import java.util.List;
+
 @ApiStatus.Experimental
 @QuiltLoaderInternal(QuiltLoaderInternalType.LEGACY_EXPOSED) // only accessible to people implementing GameProviders
 public interface MappingConfiguration {

src/main/java/org/quiltmc/loader/impl/plugin/BuiltinPluginContext.java

@@ -19,6 +19,7 @@
 import java.nio.file.Path;
 
 import org.quiltmc.loader.api.plugin.QuiltLoaderPlugin;
+import org.quiltmc.loader.api.plugin.solver.ModLoadOption;
 import org.quiltmc.loader.impl.util.QuiltLoaderInternal;
 import org.quiltmc.loader.impl.util.QuiltLoaderInternalType;
 
@@ -37,6 +38,11 @@ public Path pluginPath() {
 		throw new UnsupportedOperationException("Builtin plugins don't support pluginPath()");
 	}
 
+	@Override
+	public ModLoadOption pluginOption() {
+		throw new UnsupportedOperationException("Builtin plugins don't support pluginOption()");
+	}
+
 	@Override
 	public QuiltLoaderPlugin plugin() {
 		return plugin;

src/main/java/org/quiltmc/loader/impl/plugin/QuiltPluginContextImpl.java

@@ -68,6 +68,11 @@ public Path pluginPath() {
 		return pluginPath;
 	}
 
+	@Override
+	public ModLoadOption pluginOption() {
+		return optionFrom;
+	}
+
 	Map<String, LoaderValue> unload() {
 		Map<String, LoaderValue> data = new HashMap<>();
 

src/main/java/org/quiltmc/loader/impl/transformer/KotlinMetadataRemapper.java

@@ -86,6 +86,7 @@ private String remapCandidate(String candidate) {
 			}
 		} catch (IllegalArgumentException e) {
 			// ASM's remapper currently throws this if the candidate is an invalid method desc / desc / class
+			// TODO: Reimplement this in a way that won't generate exceptions!
 			Log.warn(LogCategory.CACHE, "Encountered an invalid / unknown Kotlin metdata annotation value '" + candidate + "' in " + currentName, e);
 		} catch (Throwable t) {
 			String msg = "While processing a kotlin metadata annotation value '" + candidate + "' in " + currentName;

src/main/java/org/quiltmc/loader/impl/transformer/QuiltTransformer.java

@@ -25,6 +25,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.quiltmc.loader.api.plugin.solver.ModLoadOption;
 import org.quiltmc.loader.impl.QuiltLoaderImpl;
+import org.quiltmc.loader.impl.game.GameProvider;
 import org.quiltmc.loader.impl.game.MappingConfigurationImpl;
 import org.quiltmc.loader.impl.launch.common.QuiltLauncherBase;
 import org.quiltmc.loader.impl.util.QuiltLoaderInternal;
@@ -39,13 +40,14 @@
 @QuiltLoaderInternal(QuiltLoaderInternalType.NEW_INTERNAL)
 final class QuiltTransformer {
 	public static byte @Nullable [] transform(boolean isDevelopment, EnvType envType, TransformCache cache, AccessWidener accessWidener, String name, ModLoadOption mod, byte[] bytes) {
-		boolean isGameClass = mod.id().equals(QuiltLoaderImpl.INSTANCE.getGameProvider().getGameId());
-		boolean transformAccess = isGameClass && ((MappingConfigurationImpl) QuiltLauncherBase.getLauncher().getMappingConfiguration()).requiresPackageAccessHack();
+		GameProvider gameProvider = QuiltLoaderImpl.INSTANCE.getGameProvider();
+		boolean isGameClass = mod.id().equals(gameProvider.getGameId());
+		boolean transformAccess = isGameClass && gameProvider.requiresPackageAccessFix();
 		boolean strip = !isGameClass || isDevelopment;
 		boolean applyAccessWidener = isGameClass && accessWidener.getTargets().contains(name);
-		boolean reflectiveFixes = !isGameClass;
+		boolean reflectiveFixes = !isGameClass && !Boolean.getBoolean(SystemProperties.DISABLE_REFLECTIVE_FIXES);
 
-		if (!transformAccess && !strip && !applyAccessWidener) {
+		if (!transformAccess && !strip && !applyAccessWidener && !reflectiveFixes) {
 			return bytes;
 		}
 
@@ -113,7 +115,7 @@ final class QuiltTransformer {
 			visitorCount++;
 		}
 
-		if (reflectiveFixes && !Boolean.getBoolean(SystemProperties.DISABLE_REFLECTIVE_FIXES)) {
+		if (reflectiveFixes) {
 			visitor = new ReflectiveFixer(QuiltLoaderImpl.ASM_VERSION, visitor);
 			visitorCount++;
 		}

src/main/java/org/quiltmc/loader/impl/transformer/RuntimeModRemapper.java

@@ -119,12 +119,16 @@ public void remap(TransformCache cache) {
 		}
 		Set<InputTag> remapMixins = new HashSet<>();
 
-		TinyRemapper remapper = TinyRemapper.newRemapper()
+		TinyRemapper.Builder remapBuilder = TinyRemapper.newRemapper()
 				.withMappings(TinyUtils.createMappingProvider(mappingConfiguration.getMappings(), "intermediary", mappingConfiguration.getTargetNamespace()))
 				.renameInvalidLocals(false)
-				.extension(new MixinExtension(remapMixins::contains))
-				.extraPreApplyVisitor(KotlinMetadataRemapper::new)
-				.build();
+				.extension(new MixinExtension(remapMixins::contains));
+
+		if (!Boolean.getBoolean(SystemProperties.DISABLE_KOTLIN_METADATA_REMAP)) {
+			remapBuilder.extraPreApplyVisitor(KotlinMetadataRemapper::new);
+		}
+
+		TinyRemapper remapper = remapBuilder.build();
 
 		try {
 			remap0(cache, launcher, remapMixins, remapper);

src/main/java/org/quiltmc/loader/impl/util/SystemProperties.java

@@ -23,6 +23,7 @@
 import org.quiltmc.loader.impl.filesystem.QuiltBasePath;
 import org.quiltmc.loader.impl.filesystem.QuiltClassPath;
 import org.quiltmc.loader.impl.filesystem.QuiltMapFileSystem;
+import org.quiltmc.loader.impl.transformer.KotlinMetadataRemapper;
 
 @QuiltLoaderInternal(QuiltLoaderInternalType.LEGACY_EXPOSED)
 public final class SystemProperties {
@@ -117,6 +118,9 @@ private SystemProperties() {}
 	/** Prevents loader from transforming classes with ReflectiveFixer */
 	public static final String DISABLE_REFLECTIVE_FIXES = "loader.transform.reflective_fixes.disable";
 
+	/** Disables {@link KotlinMetadataRemapper}. */
+	public static final String DISABLE_KOTLIN_METADATA_REMAP = "loader.transform.kotlin_metadata_remap.disable";
+
 	// ##############
 	// # Validation #
 	// ##############