Skip to content

Commit

Permalink
Fix unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
modmuss50 committed Dec 22, 2023
1 parent 6452509 commit ca6cbe0
Showing 1 changed file with 11 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
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;
Expand Down Expand Up @@ -83,7 +84,16 @@ public static void supplyModConfigurations(Project project, SharedServiceManager
// 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(),
Expand Down

0 comments on commit ca6cbe0

Please sign in to comment.