From b97def4e5626e6cb64c73af1e309e588b165ad12 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Mon, 9 May 2022 14:28:48 +0300 Subject: [PATCH] Remove workaround for #42 This is not relevant anymore as it has been fixed in Forge. The code is reverted to how it's in upstream Loom. See MinecraftForge/MinecraftForge#8063. --- .../java/net/fabricmc/loom/build/ModCompileRemapper.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java index cf71658a..38250e25 100644 --- a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java +++ b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; -import com.google.common.base.Suppliers; import com.google.common.io.Files; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; @@ -89,10 +88,8 @@ public class ModCompileRemapper { for (ResolvedArtifact artifact : sourceConfig.getResolvedConfiguration().getResolvedArtifacts()) { String group = replaceIfNullOrEmpty(artifact.getModuleVersion().getId().getGroup(), () -> MISSING_GROUP); - // Awful fix for https://github.com/architectury/architectury-loom/issues/42 for now - Supplier checksum = Suppliers.memoize(() -> Checksum.truncatedSha256(artifact.getFile())); - String name = extension.isForgeAndOfficial() ? "B" + checksum.get() : artifact.getModuleVersion().getId().getName(); - String version = extension.isForgeAndOfficial() ? "B" + checksum.get() : replaceIfNullOrEmpty(artifact.getModuleVersion().getId().getVersion(), () -> Checksum.truncatedSha256(artifact.getFile())); + String name = artifact.getModuleVersion().getId().getName(); + String version = replaceIfNullOrEmpty(artifact.getModuleVersion().getId().getVersion(), () -> Checksum.truncatedSha256(artifact.getFile())); if (!ModUtils.shouldRemapMod(project.getLogger(), artifact.getFile(), artifact.getId(), extension.getPlatform().get(), sourceConfig.getName())) { addToRegularCompile(project, regularConfig, artifact);