Skip to content

Commit

Permalink
More fixes, including one for #460
Browse files Browse the repository at this point in the history
- Added a "path data" system to QuiltClassPath, which allows us to expose zips added there back as regular "zip:file://" urls
- Changed Multi-Release jar handling in QuiltZipFileSystem to use mounted files rather than regular QuiltZipFile 's, which allows multi-release jars to be exposed correctly using the above system.
- Removed misc game libraries from being added to the "minecraft" transform cache, as a previous fix resulted in a much larger cache in a devlopment environment.
- Updated quilt parsers to 0.3.1.
	- Switched most json usage over to this.
  • Loading branch information
AlexIIL committed Dec 11, 2024
1 parent 1021992 commit 6d7aa9c
Show file tree
Hide file tree
Showing 18 changed files with 446 additions and 132 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.28.0-beta.2
quilt_loader = 0.28.0-beta.3

# Fabric & Quilt Libraries
asm = 9.7.1
Expand All @@ -15,7 +15,7 @@ tiny_remapper = 0.10.4
access_widener = 2.1.0
mapping_io = 0.6.1
quilt_json5 = 1.0.4+final
quilt_parsers = 0.2.0
quilt_parsers = 0.3.1
quilt_loader_sat4j = 2.3.5.1
quilt_config = 1.3.1
quilt_chasm = 0.1.0-20230126.045734-27
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.quiltmc.json5.JsonReader;
import org.quiltmc.json5.JsonToken;
import org.quiltmc.parsers.json.JsonReader;
import org.quiltmc.parsers.json.JsonToken;
import org.quiltmc.loader.api.Version;
import org.quiltmc.loader.impl.QuiltLoaderImpl;
import org.quiltmc.loader.impl.util.ExceptionUtil;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public ModDependencyIdentifier id() {
});
}
List<Path> paths = new ArrayList<>(gameJars);
paths.addAll(miscGameLibraries);
// paths.addAll(miscGameLibraries);
return Collections.singletonList(new BuiltinMod(paths, metadata.build()));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;

import org.quiltmc.json5.JsonReader;
import org.quiltmc.parsers.json.JsonReader;
import org.quiltmc.loader.impl.game.minecraft.McVersion;
import org.quiltmc.loader.impl.game.minecraft.McVersionLookup;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public final class QuiltLoaderImpl {

public static final int ASM_VERSION = Opcodes.ASM9;

public static final String VERSION = "0.28.0-beta.2";
public static final String VERSION = "0.28.0-beta.3";
public static final String MOD_ID = "quilt_loader";
public static final String DEFAULT_MODS_DIR = "mods";
public static final String DEFAULT_CACHE_DIR = ".cache";
Expand Down
Loading

0 comments on commit 6d7aa9c

Please sign in to comment.