keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

A couple of minor improvements and fixes to ForgeConfigSpec (#5394)

Browse source 
- Use the config file's path instead of the config object in error messages.
 - Print the dotted path of each config key instead of the array version (group.item instead of [group item]).
 - Fix comments causing a config file to be considered incorrect.
 - Pass each list element to the element validator, rather than the whole list.
This commit is contained in:
SquidDev 2019-01-25 21:43:06 +00:00 committed by LexManos
parent c8c54113d0
commit 659091c565
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/net/minecraftforge/common/ForgeConfigSpec.java
View file

@ -87,9 +87,10 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
((FileConfig) config).load(); ((FileConfig) config).load();
} }
if (!isCorrect(config)) { if (!isCorrect(config)) {
LogManager.getLogger().warn(CORE, "Configuration file {} is not correct. Correcting", config); String configName = config instanceof FileConfig ? ((FileConfig) config).getNioPath().toString() : config.toString();
LogManager.getLogger().warn(CORE, "Configuration file {} is not correct. Correcting", configName);
correct(config, (action, path, incorrectValue, correctedValue) -> correct(config, (action, path, incorrectValue, correctedValue) ->
LogManager.getLogger().warn(CORE, "Incorrect key {} was corrected from {} to {}", path, incorrectValue, correctedValue)); LogManager.getLogger().warn(CORE, "Incorrect key {} was corrected from {} to {}", DOT_JOINER.join( path ), incorrectValue, correctedValue));
if (config instanceof FileConfig) { if (config instanceof FileConfig) {
((FileConfig) config).save(); ((FileConfig) config).save();
} }
@ -97,7 +98,8 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
} }
public boolean isCorrect(CommentedConfig config) { public boolean isCorrect(CommentedConfig config) {
return correct(this.config, config, null, null, null, true) == 0; LinkedList<String> parentPath = new LinkedList<>();
return correct(this.config, config, parentPath, Collections.unmodifiableList( parentPath ), null, true) == 0;
} }
public int correct(CommentedConfig config) { public int correct(CommentedConfig config) {
@ -123,8 +125,7 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
final Object configValue = configMap.get(key); final Object configValue = configMap.get(key);
final CorrectionAction action = configValue == null ? ADD : REPLACE; final CorrectionAction action = configValue == null ? ADD : REPLACE;
if (!dryRun) parentPath.addLast(key);
parentPath.addLast(key);
if (specValue instanceof Config) if (specValue instanceof Config)
{ {
@ -181,8 +182,8 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
config.setComment(key, valueSpec.getComment()); config.setComment(key, valueSpec.getComment());
} }
} }
if (!dryRun)
parentPath.removeLast(); parentPath.removeLast();
} }
// Second step: removes the unspecified values // Second step: removes the unspecified values
@ -286,20 +287,14 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
} }
public <T> ConfigValue<List<? extends T>> defineList(List<String> path, Supplier<List<? extends T>> defaultSupplier, Predicate<Object> elementValidator) { public <T> ConfigValue<List<? extends T>> defineList(List<String> path, Supplier<List<? extends T>> defaultSupplier, Predicate<Object> elementValidator) {
context.setClazz(List.class); context.setClazz(List.class);
return define(path, new ValueSpec(defaultSupplier, elementValidator, context) { return define(path, new ValueSpec(defaultSupplier, x -> x instanceof List && ((List<?>) x).stream().allMatch( elementValidator ), context) {
@Override @Override
public Object correct(Object value) { public Object correct(Object value) {
if (value == null || !(value instanceof List) || ((List<?>)value).isEmpty()) { if (value == null || !(value instanceof List) || ((List<?>)value).isEmpty()) {
return getDefault(); return getDefault();
} }
List<?> list = Lists.newArrayList((List<?>) value); List<?> list = Lists.newArrayList((List<?>) value);
Iterator<?> iter = list.iterator(); list.removeIf(elementValidator.negate());
while (iter.hasNext()) {
Object o = iter.next();
if (!elementValidator.test(o)) {
iter.remove();
}
}
if (list.isEmpty()) { if (list.isEmpty()) {
return getDefault(); return getDefault();
} }
@ -639,6 +634,7 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
} }
private static final Joiner LINE_JOINER = Joiner.on("\n"); private static final Joiner LINE_JOINER = Joiner.on("\n");
private static final Joiner DOT_JOINER = Joiner.on(".");
private static final Splitter DOT_SPLITTER = Splitter.on("."); private static final Splitter DOT_SPLITTER = Splitter.on(".");
private static List<String> split(String path) private static List<String> split(String path)
{ {