Skip to content

Use JarFileSystem When Scanning Mods #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
calmilamsy merged 1 commit into from
Feb 25, 2025
Merged

Use JarFileSystem When Scanning Mods #165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions station-api-base/src/main/java/net/modificationstation/stationapi/api/util/Namespace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import net.fabricmc.loader.api.ModContainer;
import net.fabricmc.loader.api.Version;
import net.fabricmc.loader.api.metadata.ModMetadata;
import net.fabricmc.loader.impl.util.FileSystemUtil;
import net.modificationstation.stationapi.api.util.exception.MissingModException;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
Expand All @@ -25,7 +26,6 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down Expand Up @@ -77,7 +77,9 @@ public final class Namespace implements Comparable<@NotNull Namespace> {
// i'm so sorry
if (Files.isRegularFile(callerPath)) { // regular case
final URI callerRoot;
try (val fs = FileSystems.newFileSystem(callerPath)) {
try {
// do NOT close - the same FileSystem may be used by Fabric Loader!
val fs = FileSystemUtil.getJarFileSystem(callerPath, false).get();
callerRoot = fs.getPath("/").toUri();
} catch (IOException e) {
throw new RuntimeException(e);
Expand Down