From 6c732783c7fa047c034578919ab02125e650d2ae Mon Sep 17 00:00:00 2001
From: Martin Prokoph <motschen@midnightdust.eu>
Date: Sun, 23 Nov 2025 21:10:22 +0100
Subject: [PATCH] fix: crash when loading existing NeoForge configs

- Closes #120, #119
---
 CHANGELOG.md                                  |  2 ++
 gradle.properties                             |  2 +-
 .../core/config/MidnightLibConfig.java        | 19 +++++++------------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 510aa06..41fd035 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## MidnightLib v1.9.1
+- Fix crash when loading existing main config on NeoForge
 # MidnightLib v1.9.0
 - Setup a **multiversion** build environment 
   - MidnightLib will now always be up-to-date on all relevant versions of Minecraft  
diff --git a/gradle.properties b/gradle.properties
index e370a1d..cb56064 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.parallel=false
 #org.gradle.configureondemand=true
 
 # Mod properties
-mod.version=1.9.0
+mod.version=1.9.1
 mod.group=eu.midnightdust
 mod.id=midnightlib
 mod.name=MidnightLib
diff --git a/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java b/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java
index 8d4ac32..2fcd58c 100644
--- a/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java
+++ b/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java
@@ -4,20 +4,15 @@ import eu.midnightdust.lib.config.MidnightConfig;
 import eu.midnightdust.lib.util.PlatformFunctions;
 
 public class MidnightLibConfig extends MidnightConfig {
-    //? if fabric {
-    @Entry public static ConfigButton config_screen_list = PlatformFunctions.isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE;
+    public static final boolean HAS_MODMENU = PlatformFunctions.isModLoaded("modmenu") || "neoforge".equals(PlatformFunctions.getPlatformName());
 
-    public static boolean shouldShowButton() {
-        return config_screen_list.equals(ConfigButton.TRUE) || (config_screen_list.equals(ConfigButton.MODMENU) && !PlatformFunctions.isModLoaded("modmenu"));
-    }
-    //?} else {
-    /*@Entry public static ConfigButton config_screen_list = ConfigButton.FALSE;
+    @Entry public static ConfigButton config_screen_list = HAS_MODMENU ? ConfigButton.MODMENU : ConfigButton.TRUE;
 
-    public static boolean shouldShowButton() {
-        return config_screen_list.equals(ConfigButton.TRUE);
-    }
-    *///?}
     public enum ConfigButton {
-        TRUE, FALSE /*? if fabric {*/, MODMENU /*?}*/
+        TRUE, FALSE, MODMENU
+    }
+
+    public static boolean shouldShowButton() {
+        return config_screen_list.equals(ConfigButton.TRUE) || (config_screen_list.equals(ConfigButton.MODMENU) && !HAS_MODMENU);
     }
 }