diff --git a/src/main/java/gregtech/api/unification/OreDictUnifier.java b/src/main/java/gregtech/api/unification/OreDictUnifier.java index 0a0bef5300a..176d7edf6a6 100644 --- a/src/main/java/gregtech/api/unification/OreDictUnifier.java +++ b/src/main/java/gregtech/api/unification/OreDictUnifier.java @@ -45,13 +45,13 @@ private OreDictUnifier() { public static Comparator getSimpleItemStackComparator() { if (stackComparator == null) { - if (ConfigHolder.useCustomModPriorities) { - List modPriorities = Arrays.asList(ConfigHolder.modPriorities); - stackComparator = Collections.reverseOrder(new CustomModPriorityComparator(modPriorities)); - } else { + List modPriorities = Arrays.asList(ConfigHolder.modPriorities); + if (modPriorities.isEmpty()) { //noinspection ConstantConditions Function modIdExtractor = stack -> stack.item.getRegistryName().getNamespace(); stackComparator = Comparator.comparing(modIdExtractor); + } else { + stackComparator = Collections.reverseOrder(new CustomModPriorityComparator(modPriorities)); } } return stackComparator; diff --git a/src/main/java/gregtech/common/ConfigHolder.java b/src/main/java/gregtech/common/ConfigHolder.java index 3739c4a4404..27f1a448c28 100644 --- a/src/main/java/gregtech/common/ConfigHolder.java +++ b/src/main/java/gregtech/common/ConfigHolder.java @@ -61,16 +61,14 @@ public class ConfigHolder { @Config.RequiresWorldRestart public static boolean insufficientEnergySupplyWipesRecipeProgress = false; - @Config.Comment("Whether to use modPriorities setting in config for prioritizing ore dictionary item registrations. " + - "By default, GTCE will sort ore dictionary registrations alphabetically comparing their owner ModIDs. Default: false") - @Config.RequiresMcRestart - public static boolean useCustomModPriorities = false; - @Config.Comment("Specifies priorities of mods in ore dictionary item registration. First ModID has highest priority, last - lowest. " + - "Unspecified ModIDs follow standard sorting, but always have lower priority than last specified ModID." + - "\nFor this to work \"useCustomModPriorities\" has to be set to true.") + "Unspecified ModIDs follow standard sorting, but always have lower priority than last specified ModID.") @Config.RequiresMcRestart - public static String[] modPriorities = new String[0]; + public static String[] modPriorities = { + "minecraft", + "gregtech", + "gtadditions" + }; @Config.Comment("Setting this to true makes GTCE ignore error and invalid recipes that would otherwise cause crash. Default: true") @Config.RequiresMcRestart