reduce the api surface of QuarkConfigBuilder a little more

VazkiiMods · Oct 23, 2023 · 4a038de · 4a038de
1 parent 790b795
commit 4a038de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 26 deletions.
diff --git a/src/main/java/vazkii/quark/base/module/config/IConfigBuilder.java b/src/main/java/vazkii/quark/base/module/config/IConfigBuilder.java
@@ -14,10 +14,11 @@ public interface IConfigBuilder {
 	void pop();
 	void comment(String s);
 
-	ForgeConfigSpec.ConfigValue<List<?>> defineList(String name, List<?> default_, Supplier<List<?>> getter, Predicate<Object> predicate);
-	ForgeConfigSpec.ConfigValue<?> defineObj(String name, Object default_, Supplier<Object> getter, Predicate<Object> predicate);
+	<T> ForgeConfigSpec.ConfigValue<List<? extends T>> defineList(String name, List<? extends T> default_, Supplier<List<? extends T>> getter, Predicate<Object> predicate);
+	<T> ForgeConfigSpec.ConfigValue<T> defineObj(String name, T default_, Supplier<T> getter, Predicate<Object> predicate);
+
+	default ForgeConfigSpec.ConfigValue<Boolean> defineBool(String name, Supplier<Boolean> getter, boolean default_) {
+		return defineObj(name, default_, getter, x -> true);
+	}
 
-	ForgeConfigSpec.ConfigValue<Boolean> defineBool(String name, Supplier<Boolean> getter, boolean default_);
-	ForgeConfigSpec.ConfigValue<Integer> defineInt(String name, Supplier<Integer> getter, int default_);
-	ForgeConfigSpec.ConfigValue<Double> defineDouble(String name, Supplier<Double> getter, double default_);
 }
diff --git a/src/main/java/vazkii/quark/base/module/config/QuarkConfigBuilder.java b/src/main/java/vazkii/quark/base/module/config/QuarkConfigBuilder.java
@@ -48,20 +48,20 @@ public void comment(String s) {
 	}
 
 	@Override
-	public ConfigValue<List<?>> defineList(String name, List<?> default_, Supplier<List<?>> getter, Predicate<Object> predicate) {
+	public <T> ConfigValue<List<? extends T>> defineList(String name, List<? extends T> default_, Supplier<List<? extends T>> getter, Predicate<Object> predicate) {
 		beforeDefine();
-		ConfigValue<List<?>> value = parent.defineList(name, default_, predicate);
+		ConfigValue<List<? extends T>> value = parent.defineList(name, default_, predicate);
 		onDefine(value, default_, getter, predicate);
 		return value;
 	}
 
 	@Override
-	public ConfigValue<?> defineObj(String name, Object default_, Supplier<Object> getter, Predicate<Object> predicate) {
+	public <T> ConfigValue<T> defineObj(String name, T default_, Supplier<T> getter, Predicate<Object> predicate) {
 		if(default_ == null)
 			throw new RuntimeException("Can't define object " + name + " with null default @ " + layers.toString());
 
 		beforeDefine();
-		ConfigValue<Object> value = parent.define(name, default_, predicate);
+		ConfigValue<T> value = parent.define(name, default_, predicate);
 		onDefine(value, default_, getter, predicate);
 		return value;
 	}
@@ -74,24 +74,8 @@ public ConfigValue<Boolean> defineBool(String name, Supplier<Boolean> getter, bo
 		return value;
 	}
 
-	@Override
-	public ConfigValue<Integer> defineInt(String name, Supplier<Integer> getter, int default_) {
-		beforeDefine();
-		ConfigValue<Integer> value = parent.define(name, default_);
-		onDefine(value, default_, getter, o -> true);
-		return value;
-	}
-
-	@Override
-	public ConfigValue<Double> defineDouble(String name, Supplier<Double> getter, double default_) {
-		beforeDefine();
-		ConfigValue<Double> value = parent.define(name, default_);
-		onDefine(value, default_, getter, o -> true);
-		return value;
-	}
-
 	private void beforeDefine() {
-		if(currComment.length() > 0)
+		if(!currComment.isEmpty())
 			parent.comment(currComment);
 	}