only merge jars if remapping occurred

FabricMC · Dec 13, 2024 · 1fae124 · 1fae124
1 parent da01aec
commit 1fae124
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 15 deletions.
diff --git a/...bricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java b/...bricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
@@ -85,7 +85,7 @@ public List<MinecraftJar> provide(ProvideContext context) throws Exception {
 			throw new IllegalStateException("No remapped jars provided");
 		}
 
-		if (!areOutputsValid(remappedJars) || context.refreshOutputs() || !hasBackupJars(minecraftJars)) {
+		if (shouldRemapInputs(context, remappedJars, minecraftJars)) {
 			try {
 				remapInputs(remappedJars, context.configContext());
 				createBackupJars(minecraftJars);
@@ -193,6 +193,23 @@ protected String getDependencyNotation(MinecraftJar.Type type) {
 		return "net.minecraft:%s:%s".formatted(getName(type), getVersion());
 	}
 
+	protected boolean shouldRemapInputs(ProvideContext context) {
+		final List<RemappedJars> remappedJars = getRemappedJars();
+		final List<MinecraftJar> minecraftJars = remappedJars.stream()
+				.map(RemappedJars::outputJar)
+				.toList();
+
+		if (remappedJars.isEmpty()) {
+			throw new IllegalStateException("No remapped jars provided");
+		}
+
+		return shouldRemapInputs(context, remappedJars, minecraftJars);
+	}
+
+	private boolean shouldRemapInputs(ProvideContext context, List<RemappedJars> remappedJars, List<MinecraftJar> minecraftJars) {
+		return !areOutputsValid(remappedJars) || context.refreshOutputs() || !hasBackupJars(minecraftJars);
+	}
+
 	private boolean areOutputsValid(List<RemappedJars> remappedJars) {
 		for (RemappedJars remappedJar : remappedJars) {
 			if (!getMavenHelper(remappedJar.type()).exists(null)) {

diff --git a/...fabricmc/loom/configuration/providers/minecraft/mapped/IntermediaryMinecraftProvider.java b/...fabricmc/loom/configuration/providers/minecraft/mapped/IntermediaryMinecraftProvider.java
@@ -80,18 +80,24 @@ public LegacyMergedImpl(Project project, LegacyMergedMinecraftProvider minecraft
 		public List<MinecraftJar> provide(ProvideContext context) throws Exception {
 			final List<MinecraftJar> minecraftJars = List.of(getMergedJar());
 
+			// this check must be done before the client and server impls are provided
+			// because the merging only needs to happen if the remapping step is run
+			final boolean mergeJars = client.shouldRemapInputs(context) || server.shouldRemapInputs(context);
+
 			// Map the client and server jars separately
 			server.provide(context);
 			client.provide(context);
 
-			// then merge them
-			MergedMinecraftProvider.mergeJars(
-						client.getEnvOnlyJar().toFile(),
-						server.getEnvOnlyJar().toFile(),
-						getMergedJar().toFile()
-			);
+			if (mergeJars) {
+				// then merge them
+				MergedMinecraftProvider.mergeJars(
+							client.getEnvOnlyJar().toFile(),
+							server.getEnvOnlyJar().toFile(),
+							getMergedJar().toFile()
+				);
+			}
 
-			if (!hasBackupJars(minecraftJars)) {
+			if (mergeJars || !hasBackupJars(minecraftJars)) {
 				createBackupJars(minecraftJars);
 			}
 

diff --git a/...va/net/fabricmc/loom/configuration/providers/minecraft/mapped/NamedMinecraftProvider.java b/...va/net/fabricmc/loom/configuration/providers/minecraft/mapped/NamedMinecraftProvider.java
@@ -87,18 +87,24 @@ public List<MinecraftJar> provide(ProvideContext context) throws Exception {
 			final ProvideContext childContext = context.withApplyDependencies(false);
 			final List<MinecraftJar> minecraftJars = List.of(getMergedJar());
 
+			// this check must be done before the client and server impls are provided
+			// because the merging only needs to happen if the remapping step is run
+			final boolean mergeJars = client.shouldRemapInputs(childContext) || server.shouldRemapInputs(childContext);
+
 			// Map the client and server jars separately
 			server.provide(childContext);
 			client.provide(childContext);
 
-			// then merge them
-			MergedMinecraftProvider.mergeJars(
-						client.getEnvOnlyJar().toFile(),
-						server.getEnvOnlyJar().toFile(),
-						getMergedJar().toFile()
-			);
+			if (mergeJars) {
+				// then merge them
+				MergedMinecraftProvider.mergeJars(
+							client.getEnvOnlyJar().toFile(),
+							server.getEnvOnlyJar().toFile(),
+							getMergedJar().toFile()
+				);
+			}
 
-			if (!hasBackupJars(minecraftJars)) {
+			if (mergeJars || !hasBackupJars(minecraftJars)) {
 				createBackupJars(minecraftJars);
 			}