amy/almostunified
1
0
Fork 0
mirror of https://github.com/AlmostReliable/almostunified.git synced 2024-11-14 03:05:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename sanitizing to implicit count handling

Browse source
This commit is contained in:
rlnt 2024-08-22 22:31:16 +02:00
parent 448d2a9dfe
commit ff9973a95e
No known key found for this signature in database
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Common/src/main/java/com/almostreliable/unified/utils/JsonCompare.java
View file

@ -103,7 +103,7 @@ public final class JsonCompare {
if (secondElem == null) return false;
// sanitize elements for implicit counts of 1
if (compareSettings.shouldSanitize && needsSanitizing(firstElem, secondElem)) {
if (compareSettings.handleImplicitCounts && needsSanitizing(firstElem, secondElem)) {
firstElem = sanitize(firstElem);
secondElem = sanitize(secondElem);
}
@ -262,13 +262,14 @@ public final class JsonCompare {
}
public static class CompareSettings {
public static final String IGNORED_FIELDS = "ignored_fields";
public static final String RULES = "rules";
public static final String SHOULD_SANITIZE = "should_sanitize";
public static final String HANDLE_IMPLICIT_COUNTS = "handle_implicit_counts";
private final LinkedHashMap<String, Rule> rules = new LinkedHashMap<>();
private final Set<String> ignoredFields = new HashSet<>();
private boolean shouldSanitize;
private boolean handleImplicitCounts;
public void ignoreField(String property) {
ignoredFields.add(property);
@ -282,10 +283,6 @@ public final class JsonCompare {
}
}
public void setShouldSanitize(boolean shouldSanitize) {
this.shouldSanitize = shouldSanitize;
}
public Set<String> getIgnoredFields() {
return Collections.unmodifiableSet(ignoredFields);
}
@ -303,7 +300,7 @@ public final class JsonCompare {
});
result.add(RULES, rulesJson);
result.addProperty(SHOULD_SANITIZE, shouldSanitize);
result.addProperty(HANDLE_IMPLICIT_COUNTS, handleImplicitCounts);
return result;
}
@ -322,7 +319,7 @@ public final class JsonCompare {
addRule(e.getKey(), r);
});
shouldSanitize = json.getAsJsonPrimitive(SHOULD_SANITIZE).getAsBoolean();
handleImplicitCounts = json.getAsJsonPrimitive(HANDLE_IMPLICIT_COUNTS).getAsBoolean();
}
public Map<String, Rule> getRules() {

4
testmod_configs/duplicates.json
View file

@ -15,7 +15,7 @@
"energy": "HigherRule",
"experience": "HigherRule"
},
"should_sanitize": false
"handle_implicit_counts": false
},
"override_duplicate_rules": {
"minecraft:crafting_shaped": {
@ -28,7 +28,7 @@
"group"
],
"rules": {},
"should_sanitize": false
"handle_implicit_counts": false
}
},
"compare_all": false