Update NightConfig and cleanup config code (#172)

Co-authored-by: Sebastian Hartte <[email protected]>

gradle.properties

@@ -10,7 +10,7 @@ bootstraplauncher_version=1.1.8
 asm_version=9.5
 mixin_version=0.14.0+mixin.0.8.6
 terminalconsoleappender_version=1.3.0
-nightconfig_version=3.6.4
+nightconfig_version=3.8.0
 jetbrains_annotations_version=24.0.1
 slf4j_api_version=1.8.0-beta4
 apache_maven_artifact_version=3.8.5

loader/src/main/java/net/neoforged/fml/ModContainer.java

@@ -95,7 +95,7 @@ public <T extends IExtensionPoint> void registerExtensionPoint(Class<T> point, S
         extensionPoints.put(point, extension);
     }
 
-    public void addConfig(final ModConfig modConfig) {
+    private void addConfig(final ModConfig modConfig) {
         configs.put(modConfig.getType(), modConfig);
 
         if (modConfig.getType() == ModConfig.Type.STARTUP) {
@@ -110,14 +110,14 @@ public void addConfig(final ModConfig modConfig) {
      * @param type       The type of config
      * @param configSpec A config spec
      */
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> configSpec) {
+    public void registerConfig(ModConfig.Type type, IConfigSpec configSpec) {
         if (configSpec.isEmpty()) {
             // This handles the case where a mod tries to register a config, without any options configured inside it.
             LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, modId);
             return;
         }
 
-        addConfig(new ModConfig(type, configSpec, this));
+        addConfig(ConfigTracker.INSTANCE.registerConfig(type, configSpec, this));
     }
 
     /**
@@ -127,14 +127,14 @@ public void registerConfig(ModConfig.Type type, IConfigSpec<?> configSpec) {
      * @param type       The type of config
      * @param configSpec A config spec
      */
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> configSpec, String fileName) {
+    public void registerConfig(ModConfig.Type type, IConfigSpec configSpec, String fileName) {
         if (configSpec.isEmpty()) {
             // This handles the case where a mod tries to register a config, without any options configured inside it.
             LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, modId, fileName);
             return;
         }
 
-        addConfig(new ModConfig(type, configSpec, this, fileName));
+        addConfig(ConfigTracker.INSTANCE.registerConfig(type, configSpec, this, fileName));
     }
 
     /**