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

Ensure that modImplementation is processed first, so any installer.json on that configuration takes priority. (#1015)

Browse Source
This commit is contained in:
modmuss
2024-01-02 22:35:22 +00:00
committed by GitHub
parent 6452509ec5
commit 20ea426a7a
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/fabricmc/loom/configuration/mods/ModConfigurationRemapper.java
View File

@@ -30,6 +30,7 @@ import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -83,7 +84,16 @@ public class ModConfigurationRemapper {
// Client remapped dep collectors for split source sets. Same keys and values.
final Map<Configuration, Configuration> clientConfigsToRemap = new HashMap<>();
for (RemapConfigurationSettings entry : extension.getRemapConfigurations()) {
/*
* Hack fix/improvement for https://github.com/FabricMC/fabric-loom/issues/1012
* Ensure that modImplementation is processed first, so any installer.json on that configuration takes priority.
*/
final List<RemapConfigurationSettings> remapConfigurationSettings = extension.getRemapConfigurations()
.stream()
.sorted(Comparator.comparing(setting -> !setting.getName().equals("modImplementation")))
.toList();
for (RemapConfigurationSettings entry : remapConfigurationSettings) {
// key: true if runtime, false if compile
final Map<Boolean, Boolean> envToEnabled = ImmutableMap.of(
false, entry.getOnCompileClasspath().get(),