From 45c67d057afaff54065ea354226bacda09ee7567 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Mon, 17 Feb 2025 21:16:22 -0600
Subject: [PATCH] Fix IDhApiConfigValue.clearValue() failing for some
 deprecated functions

---
 .../api/objects/config/DhApiConfigValue.java      | 15 ++++++++++++++-
 .../core/config/types/ConfigEntry.java            |  7 +++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/com/seibel/distanthorizons/api/objects/config/DhApiConfigValue.java b/api/src/main/java/com/seibel/distanthorizons/api/objects/config/DhApiConfigValue.java
index bbd74d9e1..af0f7c915 100644
--- a/api/src/main/java/com/seibel/distanthorizons/api/objects/config/DhApiConfigValue.java
+++ b/api/src/main/java/com/seibel/distanthorizons/api/objects/config/DhApiConfigValue.java
@@ -87,7 +87,20 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 		}
 	}
 	
-	public boolean clearValue() { return this.setValue(null); }
+	public boolean clearValue()
+	{
+		if (this.configEntry.getAllowApiOverride())
+		{
+			// no converter should be used here since null objects may need to be handled differently
+			// TODO the API should just have a bool to keep track of whether the API value is in use instead of using NULL
+			this.configEntry.setApiValue(null);
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
 	
 	public boolean getCanBeOverrodeByApi() { return this.configEntry.getAllowApiOverride(); }
 	
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java
index b249cc9ad..12c5344ca 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java
@@ -26,6 +26,7 @@ import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
 import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
 import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryPerformance;
 import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -54,6 +55,8 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
 	 * and any get() method calls will return the apiValue if it is set.
 	 */
 	public final boolean allowApiOverride;
+	/** Will be null if un-set */
+	@Nullable
 	private T apiValue;
 	
 	
@@ -132,9 +135,9 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
 	@Override
 	public T get()
 	{
-		if (allowApiOverride && apiValue != null)
+		if (this.allowApiOverride && this.apiValue != null)
 		{
-			return apiValue;
+			return this.apiValue;
 		}
 		
 		return super.get();