Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove mod priority toggle config #119

Merged
merged 1 commit into from
Aug 29, 2021
Merged

remove mod priority toggle config #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/gregtech/api/unification/OreDictUnifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ private OreDictUnifier() {

public static Comparator<ItemAndMetadata> getSimpleItemStackComparator() {
if (stackComparator == null) {
if (ConfigHolder.useCustomModPriorities) {
List<String> modPriorities = Arrays.asList(ConfigHolder.modPriorities);
stackComparator = Collections.reverseOrder(new CustomModPriorityComparator(modPriorities));
} else {
List<String> modPriorities = Arrays.asList(ConfigHolder.modPriorities);
if (modPriorities.isEmpty()) {
//noinspection ConstantConditions
Function<ItemAndMetadata, String> modIdExtractor = stack -> stack.item.getRegistryName().getNamespace();
stackComparator = Comparator.comparing(modIdExtractor);
} else {
stackComparator = Collections.reverseOrder(new CustomModPriorityComparator(modPriorities));
}
}
return stackComparator;
Expand Down
14 changes: 6 additions & 8 deletions src/main/java/gregtech/common/ConfigHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down