fix: make JarNester deterministic

Sorts the list of jars to nest before adding them to fabric.mod.json to ensure the ordering is deterministic.
FabricMC · Oct 20, 2024 · 29c2166 · 29c2166
1 parent 6b18a7b
commit 29c2166
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/net/fabricmc/loom/build/nesting/JarNester.java b/src/main/java/net/fabricmc/loom/build/nesting/JarNester.java
@@ -51,8 +51,11 @@ public static void nestJars(Collection<File> jars, File modJar, Logger logger) {
 
 		Preconditions.checkArgument(FabricModJsonFactory.isModJar(modJar), "Cannot nest jars into none mod jar " + modJar.getName());
 
+		// Ensure deterministic ordering of entries in fabric.mod.json
+		Collection<File> sortedJars = jars.stream().sorted().toList();
+
 		try {
-			ZipUtils.add(modJar.toPath(), jars.stream().map(file -> {
+			ZipUtils.add(modJar.toPath(), sortedJars.stream().map(file -> {
 				try {
 					return new Pair<>("META-INF/jars/" + file.getName(), Files.readAllBytes(file.toPath()));
 				} catch (IOException e) {
@@ -67,7 +70,7 @@ public static void nestJars(Collection<File> jars, File modJar, Logger logger) {
 					nestedJars = new JsonArray();
 				}
 
-				for (File file : jars) {
+				for (File file : sortedJars) {
 					String nestedJarPath = "META-INF/jars/" + file.getName();
 					Preconditions.checkArgument(FabricModJsonFactory.isModJar(file), "Cannot nest none mod jar: " + file.getName());