Make overloads consistent for defineListAllowEmpty in ForgeConfigSpec.Builder (#9604)

This commit is contained in:
Thomas Kain authored and GitHub committed 2023-07-03 17:28:37 -07:00
1 parent 72e2ae1d6f
commit c0fe1688d8
2 files changed
+10 -2

No files matched your search

@@ -35,7 +35,7 @@ public class Config
// a list of strings that are treated as resource locations for items
private static final ForgeConfigSpec.ConfigValue<List<? extends String>> ITEM_STRINGS = BUILDER
.comment("A list of items to log on common setup.")
.defineListAllowEmpty(Collections.singletonList("items"), () -> List.of("minecraft:iron_ingot"), Config::validateItemName);
.defineListAllowEmpty("items", List.of("minecraft:iron_ingot"), Config::validateItemName);
static final ForgeConfigSpec SPEC = BUILDER.build();
@@ -380,7 +380,15 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<UnmodifiableConfi
}
}, defaultSupplier);
}
public <T> ConfigValue<List<? extends T>> defineListAllowEmpty(String path, List<? extends T> defaultValue, Predicate<Object> elementValidator) {
return defineListAllowEmpty(split(path), defaultValue, elementValidator);
}
public <T> ConfigValue<List<? extends T>> defineListAllowEmpty(String path, Supplier<List<? extends T>> defaultSupplier, Predicate<Object> elementValidator) {
return defineListAllowEmpty(split(path), defaultSupplier, elementValidator);
}
public <T> ConfigValue<List<? extends T>> defineListAllowEmpty(List<String> path, List<? extends T> defaultValue, Predicate<Object> elementValidator) {
return defineListAllowEmpty(path, () -> defaultValue, elementValidator);
}
public <T> ConfigValue<List<? extends T>> defineListAllowEmpty(List<String> path, Supplier<List<? extends T>> defaultSupplier, Predicate<Object> elementValidator) {
context.setClazz(List.class);
return define(path, new ValueSpec(defaultSupplier, x -> x instanceof List && ((List<?>) x).stream().allMatch( elementValidator ), context, path) {