Skip to content

Don't Use Fabric's Impl For Namespace.resolve #168

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
mineLdiver merged 3 commits into from
May 17, 2025
Merged

Don't Use Fabric's Impl For Namespace.resolve #168

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6044c71
Yeet
calmilamsy Mar 20, 2025
227aec5
Wait this is wrong
calmilamsy Mar 20, 2025
2f59a0d
Merge branch 'develop' into namespace-change
calmilamsy Mar 20, 2025
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
28 changes: 21 additions & 7 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,7 +13,6 @@
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 @@ -26,16 +25,18 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.*;
import java.util.Collections;
import java.util.Map;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Stream;
import java.util.zip.ZipError;

@Slf4j
public final class Namespace implements Comparable<@NotNull Namespace> {
private static final boolean CHECK_MISSING_MODS = false;
private static final Map<String, String> CREATE_FILESYSTEM_ARGS = Collections.singletonMap("create", "true");

@NotNull
private static final Cache<@NotNull String, @NotNull Namespace> CACHE = Caffeine.newBuilder().softValues().build();
Expand Down Expand Up @@ -77,11 +78,24 @@ public final class Namespace implements Comparable<@NotNull Namespace> {
// i'm so sorry
if (Files.isRegularFile(callerPath)) { // regular case
final URI callerRoot;
val uri = callerPath.toUri();
try {
// do NOT close - the same FileSystem may be used by Fabric Loader!
val fs = FileSystemUtil.getJarFileSystem(callerPath, false).get();
FileSystem fs;
boolean created = false;
val jarUri = new URI("jar:" + uri.getScheme(), uri.getHost(), uri.getPath(), uri.getFragment());
try {
fs = FileSystems.newFileSystem(jarUri, CREATE_FILESYSTEM_ARGS);
created = true;
} catch (FileSystemAlreadyExistsException ignore2) {
fs = FileSystems.getFileSystem(jarUri);
} catch (IOException | ZipError e) {
throw new IOException("Error accessing " + uri + ": " + e, e);
}
callerRoot = fs.getPath("/").toUri();
} catch (IOException e) {
if (created) {
fs.close();
}
} catch (IOException | URISyntaxException e) {
throw new RuntimeException(e);
}
candidates = mods
Expand Down