From dd7882598eede903753ee41cdaaf02dbf4f5ff7f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 15 Nov 2021 13:41:59 +0000 Subject: Add getBaseMappedJar to make it easier to get the pre-transformed game jar. --- .../configuration/providers/minecraft/MinecraftMappedProvider.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/java') diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java index f78f9484..264b855c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java @@ -210,6 +210,10 @@ public class MinecraftMappedProvider extends DependencyProvider { return minecraftMappedJar; } + public final File getBaseMappedJar() { + return minecraftMappedJar; + } + public File getUnpickedJar() { return new File(getExtension().getMappingsProvider().mappingsWorkingDir().toFile(), "minecraft-unpicked.jar"); } -- cgit From 9c2b1e8d6ddd3ac97a67343100fc7a9c35b7c625 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 17 Nov 2021 15:30:23 +0000 Subject: Fix access widener file hashcode calculation breaking caching. When using transitive access wideners the mc jar would always be re-processed. --- .../loom/configuration/accesswidener/AccessWidenerFile.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/main/java') diff --git a/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java b/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java index a8648611..893a1611 100644 --- a/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java +++ b/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java @@ -28,6 +28,8 @@ import java.io.IOException; import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; import java.nio.file.Path; +import java.util.Arrays; +import java.util.Objects; import com.google.gson.Gson; import com.google.gson.JsonObject; @@ -78,4 +80,11 @@ public record AccessWidenerFile( content ); } + + @Override + public int hashCode() { + int result = Objects.hash(name, modId); + result = 31 * result + Arrays.hashCode(content); + return result; + } } -- cgit