From 9b8e5c710947836a3122835679a7a4bfdaa56b3d Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 2 Nov 2025 18:39:39 -0800 Subject: [PATCH] Add workaround for Mixin bug. Closes #10710 --- .../moddiscovery/AbstractModProvider.java | 12 ++++--- .../JarInJarDependencyLocator.java | 36 +++++++++++++++---- .../fml/loading/moddiscovery/ModFile.java | 24 ++++++++++--- 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java index 53e9af9c47..b846393430 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java @@ -54,12 +54,16 @@ public abstract class AbstractModProvider implements IModProvider { @Nullable protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) { + var debug = path.toString(); + if (debug.equals("/")) + debug = path.toUri().toString(); + var mjm = new ModJarMetadata(); SecureJar sj = null; try { sj = SecureJar.from(jar -> loadMetaFromJar(jar, mjm), path); } catch (Throwable t) { - return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + path + "\" - " + t.getMessage())); + return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + debug + "\" - " + t.getMessage())); } IModFile mod; @@ -68,7 +72,7 @@ public abstract class AbstractModProvider implements IModProvider { type = defaultType; if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) { - LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path); + LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, debug); mod = new ModFile(sj, this, ModFileParser::modsTomlParser); // ModJarMetadata is only used when loading mods.toml mods as ModJarMetadata mjm.setModFile(mod); @@ -77,12 +81,12 @@ public abstract class AbstractModProvider implements IModProvider { return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName()))); } } else if (type != null) { - LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path); + LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, debug); mod = new ModFile(sj, this, this::manifestParser, type); } else if (ignoreUnknown) { return null; } else - return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path)); + return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + debug)); return new IModLocator.ModFileOrException(mod, null); } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java index 8dc21e0e52..2c7b6ff29c 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java @@ -172,7 +172,7 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID // Now lets build the actual mod files for (var entry : selected) { try { - var root = entry.path; + var root = entry.getFinalPath(); var mod = createMod(root, false, entry.type.name()); if (mod.ex() != null) @@ -276,6 +276,10 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID this.coord = coord; } + Path getFinalPath() { + return path; + } + void cleanup(boolean selected) { } @@ -385,10 +389,25 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID this.zipPath = zipPath; } + /* + * Due to a bug in Mixin, anything that is not on the DefaultFileSystem MUST be a directory. + * Or else it can't resolve resources correctly. So for anything we put on the roimfs we need + * to return the nested zip file system. + * + * This will be an annoying to backport, but we can cross that bridge when we come to it. + * + * See: https://github.com/SpongePowered/Mixin/blob/4053421aa10aaac6127d969028a29c94fe3054f6/src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java#L102 + */ + @Override + public Path getFinalPath() { + return zipPath; + } + @Override void cleanup(boolean selected) { if (selected) return; + LOGGER.info(MARKER, "Closeing unselected FileSystem {}", this); try { zipPath.getFileSystem().close(); @@ -417,11 +436,14 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID private final HashMap> children = new HashMap<>(); private Selector(Iterable mods) { - for (var mod : mods) { - var entry = new ModEntry(mod); - this.force(entry); - entries.put(new Key(entry, ""), entry); - } + for (var mod : mods) + this.force(new ModEntry(mod)); + } + + @Override + public void force(Entry entry) { + super.force(entry); + entries.put(new Key(entry, ""), entry); } @Override @@ -490,7 +512,7 @@ public class JarInJarDependencyLocator extends AbstractModProvider implements ID Path roimfsPath = null; Path zipPath = null; try { - // Lets copy the uncomressed file to memory, and then create a ReadOnlyInMemorryFileSystem for it, this allows us to reference it by URI. + // Lets copy the uncompressed file to memory, and then create a ReadOnlyInMemorryFileSystem for it, this allows us to reference it by URI. // Which is needed because a lot of things require navigation via URI. // And ZipFileSystem only caches the FileSystem instance when accessed via URI. byte[] data = Files.readAllBytes(targetPath); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java index 6869e1d121..3c033d878b 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java @@ -21,13 +21,13 @@ import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.slf4j.Logger; +import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -98,7 +98,7 @@ public class ModFile implements IModFile { public boolean identifyMods() { if (this.modFileInfo == null) return this.getType() != Type.MOD; - LOGGER.debug(LogMarkers.LOADING,"Loading mod file {} with languages {}", this.getFilePath(), this.modFileInfo.requiredLanguageLoaders()); + LOGGER.debug(LogMarkers.LOADING,"Loading mod file {} with languages {}", this.getFileName(), this.modFileInfo.requiredLanguageLoaders()); this.coreMods = ModFileParser.getCoreMods(this); if (!this.coreMods.isEmpty()) LOGGER.warn("Mod file {} contains javascript coremods! JS CoreMods are deprecated and will be removed in a future release. Consider using Mixin or ModLauncher transformers.", this.getFileName()); @@ -179,12 +179,28 @@ public class ModFile implements IModFile { @Override public String toString() { - return "Mod File: " + Objects.toString(this.jar.getPrimaryPath()); + var path = getFilePath(); + return "Mod File: " + path == null ? "null" : path.toUri().toString(); } @Override public String getFileName() { - return getFilePath().getFileName().toString(); + // This is only used for debugging, so lets try and make it a useful debug + var path = getFilePath(); + var filename = path.getFileName(); + + // ZipFileSystem toString will return the outer file path + var ret = filename == null ? path.getFileSystem().toString() : filename.toString(); + + // If it's a directory on the default file system, return the full path + if (Files.isDirectory(path) && path.getFileSystem() == FileSystems.getDefault()) + ret = path.toAbsolutePath().toString(); + + // If we are in a FileSystem 'root' like UnionFS, return the full uri + if (ret.isEmpty() || ret.equals("/")) + ret = path.toUri().toString(); + + return ret; } @Override