imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-30 05:05:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove workaround for #42

Browse Source 
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.
This commit is contained in:
Juuz
2022-05-09 14:28:48 +03:00
parent d540768e55
commit b97def4e56
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java
View File

@@ -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<String> 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);