Fix config load

dima-dencep · May 14, 2024 · cd6a889 · cd6a889
1 parent bc11977
commit cd6a889
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/...e/src/main/java/org/redlance/dima_dencep/mods/rrls/neoforge/ConfigExpectPlatformImpl.java b/...e/src/main/java/org/redlance/dima_dencep/mods/rrls/neoforge/ConfigExpectPlatformImpl.java
@@ -22,6 +22,8 @@
 import net.neoforged.neoforge.common.ModConfigSpec;
 import org.apache.commons.lang3.tuple.Pair;
 
+import java.util.Optional;
+
 @SuppressWarnings("unused")
 public class ConfigExpectPlatformImpl { // TODO categorize
     public static final Pair<ConfigExpectPlatformImpl, ModConfigSpec> CONFIG_SPEC_PAIR = new ModConfigSpec.Builder()
@@ -108,11 +110,23 @@ public ConfigExpectPlatformImpl(ModConfigSpec.Builder builder) {
     }
 
     static { // Early loading for config
-        ModContainer activeContainer = ModList.get().getModContainerById(Rrls.MOD_ID).orElseThrow();
+        Optional<? extends ModContainer> activeContainer = ModList.get().getModContainerById(Rrls.MOD_ID);
         ModConfigSpec configSpec = ConfigExpectPlatformImpl.CONFIG_SPEC_PAIR.getValue();
 
-        ModConfig modConfig = new ModConfig(ModConfig.Type.CLIENT, configSpec, activeContainer, "rrls.toml");
-        activeContainer.addConfig(modConfig);
+        final ModConfig modConfig = new ModConfig(ModConfig.Type.CLIENT, configSpec, activeContainer.orElse(null), "rrls.toml") {
+            @Override
+            public String getModId() {
+                if (this.container == null) {
+                    return Rrls.MOD_ID;
+                }
+
+                return super.getModId();
+            }
+        };
+        activeContainer.ifPresentOrElse(
+                container -> container.addConfig(modConfig),
+                () -> Rrls.LOGGER.error("Unable to find ModContainer, this can cause issues!")
+        );
 
         if (!configSpec.isLoaded()) {
             Rrls.LOGGER.warn("Config is not loaded?");

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.parallel=true
     minecraft_version = 1.20.6
     parchment_version = 2024.05.01
     loader_version = 0.15.11
-    forge_version = 20.6.48-beta
+    forge_version = 20.6.62-beta
 
 # Mod Properties
     mod_version = 4.0.5