From 1fba04132b2ebe0d538acec3a756eb53e7c05a2f Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Thu, 24 Aug 2023 21:16:13 -0500
Subject: [PATCH] Revert "Fixed config system only working with dh"

This reverts commit f1b31a4cfe40bec682f4a71203a6c41428e744dd.
---
 .../com/seibel/distanthorizons/core/config/Config.java    | 8 ++++++++
 .../presets/AbstractPresetConfigEventHandler.java         | 2 +-
 .../core/config/file/ConfigFileHandling.java              | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
index 4b4696a56..761db1814 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
@@ -60,6 +60,14 @@ public class Config
 	
 	public static ConfigCategory client = new ConfigCategory.Builder().set(Client.class).build();
 	
+	/**
+	 * <strong>False</strong> if the config hasn't been loaded in from file yet. 
+	 * While in this state the config shouldn't be modified since it may cause file corruption. <br><br>
+	 * 
+	 * <strong>True</strong> if the config has been loaded and is ready to use.
+	 */
+	public static boolean loaded = false;
+	
 	
 	
 	public static class Client
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java
index 12131b0bd..1aae2f6d8 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/AbstractPresetConfigEventHandler.java
@@ -64,7 +64,7 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
 	public void onConfigValueSet()
 	{
 		// don't try modifying the config before it's been loaded from file
-		if (this.configList.get(0).configEntry.configBase == null) // If the config is not initialised, then this should not be ran (so it checks the first config item)
+		if (!Config.loaded)
 		{
 			return;
 		}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java b/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java
index 3861ccf50..7f16b5aae 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandling.java
@@ -1,6 +1,7 @@
 package com.seibel.distanthorizons.core.config.file;
 
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
+import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
@@ -260,6 +261,10 @@ public class ConfigFileHandling
 				SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Loading file and resetting config file failed at path [" + configPath + "]. Please check the file is ok and you have the permissions", ex);
 			}
 		}
+		
+		// if the config is modified before having been loaded it can cause file corruption
+		// and permissions errors
+		Config.loaded = true;
 	}