fix: Fix Set and ResourceLocation configs in Forge and NeoForge

TwelveIterationMods · Dec 28, 2023 · 0dc9230 · 0dc9230
1 parent d029eaa
commit 0dc9230
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/forge/src/main/java/net/blay09/mods/balm/forge/config/ForgeBalmConfig.java b/forge/src/main/java/net/blay09/mods/balm/forge/config/ForgeBalmConfig.java
@@ -8,6 +8,7 @@
 import net.blay09.mods.balm.api.event.ConfigReloadedEvent;
 import net.blay09.mods.balm.api.network.ConfigReflection;
 import net.minecraft.client.Minecraft;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModLoadingContext;
@@ -56,7 +57,9 @@ private void buildConfigSpec(String parentPath, ForgeConfigSpec.Builder builder,
 
             if (String.class.isAssignableFrom(type)) {
                 builder.define(path, (String) defaultValue);
-            } else if (Collection.class.isAssignableFrom(type)) {
+            } else if (ResourceLocation.class.isAssignableFrom(type)) {
+                builder.define(path, ((ResourceLocation) defaultValue).toString());
+            } else if (List.class.isAssignableFrom(type)) {
                 ExpectedType expectedType = field.getAnnotation(ExpectedType.class);
                 if (expectedType == null) {
                     logger.warn("Config field without expected type, will not validate list content ({} in {})", field.getName(), clazz.getName());
@@ -66,6 +69,16 @@ private void buildConfigSpec(String parentPath, ForgeConfigSpec.Builder builder,
                         () -> ((List<?>) defaultValue),
                         it -> expectedType == null || expectedType.value().isAssignableFrom(it.getClass()) || (expectedType.value().isEnum() && Arrays.stream(
                                 expectedType.value().getEnumConstants()).anyMatch(constant -> constant.toString().equals(it))));
+            } else if (Set.class.isAssignableFrom(type)) {
+                ExpectedType expectedType = field.getAnnotation(ExpectedType.class);
+                if (expectedType == null) {
+                    logger.warn("Config field without expected type, will not validate list content ({} in {})", field.getName(), clazz.getName());
+                }
+
+                builder.defineListAllowEmpty(Arrays.asList(path.split("\\.")),
+                        () -> (((Set<?>) defaultValue).stream().toList()),
+                        it -> expectedType == null || expectedType.value().isAssignableFrom(it.getClass()) || (expectedType.value().isEnum() && Arrays.stream(
+                                expectedType.value().getEnumConstants()).anyMatch(constant -> constant.toString().equals(it))));
             } else if (Enum.class.isAssignableFrom(type)) {
                 builder.defineEnum(path, (Enum) defaultValue);
             } else if (int.class.isAssignableFrom(type)) {

diff --git a/neoforge/src/main/java/net/blay09/mods/balm/neoforge/config/NeoForgeBalmConfig.java b/neoforge/src/main/java/net/blay09/mods/balm/neoforge/config/NeoForgeBalmConfig.java
@@ -7,6 +7,7 @@
 import net.blay09.mods.balm.api.config.ExpectedType;
 import net.blay09.mods.balm.api.event.ConfigReloadedEvent;
 import net.blay09.mods.balm.api.network.ConfigReflection;
+import net.minecraft.resources.ResourceLocation;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.config.IConfigSpec;
 import net.neoforged.fml.config.ModConfig;
@@ -53,7 +54,9 @@ private void buildConfigSpec(String parentPath, ModConfigSpec.Builder builder, C
 
             if (String.class.isAssignableFrom(type)) {
                 builder.define(path, (String) defaultValue);
-            } else if (Collection.class.isAssignableFrom(type)) {
+            } else if (ResourceLocation.class.isAssignableFrom(type)) {
+                builder.define(path, ((ResourceLocation) defaultValue).toString());
+            } else if (List.class.isAssignableFrom(type)) {
                 ExpectedType expectedType = field.getAnnotation(ExpectedType.class);
                 if (expectedType == null) {
                     logger.warn("Config field without expected type, will not validate list content ({} in {})", field.getName(), clazz.getName());
@@ -63,6 +66,16 @@ private void buildConfigSpec(String parentPath, ModConfigSpec.Builder builder, C
                         () -> ((List<?>) defaultValue),
                         it -> expectedType == null || expectedType.value().isAssignableFrom(it.getClass()) || (expectedType.value().isEnum() && Arrays.stream(
                                 expectedType.value().getEnumConstants()).anyMatch(constant -> constant.toString().equals(it))));
+            } else if (Set.class.isAssignableFrom(type)) {
+                ExpectedType expectedType = field.getAnnotation(ExpectedType.class);
+                if (expectedType == null) {
+                    logger.warn("Config field without expected type, will not validate list content ({} in {})", field.getName(), clazz.getName());
+                }
+
+                builder.defineListAllowEmpty(Arrays.asList(path.split("\\.")),
+                        () -> (((Set<?>) defaultValue).stream().toList()),
+                        it -> expectedType == null || expectedType.value().isAssignableFrom(it.getClass()) || (expectedType.value().isEnum() && Arrays.stream(
+                                expectedType.value().getEnumConstants()).anyMatch(constant -> constant.toString().equals(it))));
             } else if (Enum.class.isAssignableFrom(type)) {
                 builder.defineEnum(path, (Enum) defaultValue);
             } else if (int.class.isAssignableFrom(type)) {