Removed JSON

Author: Cotlim

Core/Features/MainMenuFeatures/MainMenuActions.cs

@@ -176,7 +176,7 @@ public static void StartServer()
                     throw new Exception("No worlds found.");
 
                 // Getting Player and World from ClientDataHandler
-                var world = Main.WorldList.FirstOrDefault(p => p.Path.Equals(ClientDataJsonHelper.WorldPath)) ?? throw new Exception("World not found: " + ClientDataJsonHelper.WorldPath);
+                var world = Main.WorldList.FirstOrDefault(p => p.Path.Equals(ClientDataMemoryStorage.WorldPath)) ?? throw new Exception("World not found: " + ClientDataMemoryStorage.WorldPath);
                 if (string.IsNullOrEmpty(world.Path))
                 {
                     Log.Error($"World {world.Name} has an invalid or null path.");

Core/Features/MainMenuFeatures/MainMenuState.cs

@@ -152,9 +152,9 @@ private void AddSingleplayerSection(TooltipPanel tooltipPanel)
         var joinSingleplayer = new ActionMainMenuElement(
     () =>
     {
-        ClientDataJsonHelper.ClientMode = ClientMode.SinglePlayer;
-        ClientDataJsonHelper.PlayerPath = null;
-        ClientDataJsonHelper.WorldPath = null;
+        ClientDataMemoryStorage.ClientMode = ClientMode.SinglePlayer;
+        ClientDataMemoryStorage.PlayerPath = null;
+        ClientDataMemoryStorage.WorldPath = null;
         AutoloadPlayerInWorldSystem.EnterSingleplayerWorld();
     },
     Loc.Get("MainMenu.JoinSingleplayerText"),

Core/Features/Reload/AutoloadPlayerInWorldSystem.cs

@@ -22,7 +22,7 @@ public class AutoloadPlayerInWorldSystem : ModSystem
         public override void Unload()
         {
             if (Main.netMode != NetmodeID.Server)
-                ClientDataJsonHelper.WriteData();
+                ClientDataMemoryStorage.WriteData();
 
             // Reset some hooks
             typeof(ModLoader).GetField("OnSuccessfulLoad", BindingFlags.NonPublic | BindingFlags.Static)?.SetValue(null, null);
@@ -36,12 +36,12 @@ public override void OnModLoad()
                 return;
             }
 
-            if (ClientDataJsonHelper.ClientMode == ClientMode.SinglePlayer)
+            if (ClientDataMemoryStorage.ClientMode == ClientMode.SinglePlayer)
             {
                 // Modify the delegate to call EnterSingleplayerWorld() when OnSuccessfulLoad is called
                 ModLoader.OnSuccessfulLoad += EnterSingleplayerWorld;
             }
-            else if (ClientDataJsonHelper.ClientMode == ClientMode.MPMajor || ClientDataJsonHelper.ClientMode == ClientMode.MPMinor)
+            else if (ClientDataMemoryStorage.ClientMode == ClientMode.MPMajor || ClientDataMemoryStorage.ClientMode == ClientMode.MPMinor)
             {
                 ModLoader.OnSuccessfulLoad += EnterMultiplayerWorld;
             }
@@ -153,9 +153,9 @@ private static bool SelectPlayerAndWorld(bool onlyPlayer = false)
             }
             var player = Main.PlayerList[playerId];
 
-            if (ClientDataJsonHelper.PlayerPath != null && ClientDataJsonHelper.ClientMode != ClientMode.FreshClient)
+            if (ClientDataMemoryStorage.PlayerPath != null && ClientDataMemoryStorage.ClientMode != ClientMode.FreshClient)
             {
-                player = Main.PlayerList.FirstOrDefault(p => p.Path.Equals(ClientDataJsonHelper.PlayerPath), null);
+                player = Main.PlayerList.FirstOrDefault(p => p.Path.Equals(ClientDataMemoryStorage.PlayerPath), null);
             }
 
             if (player == null)
@@ -185,9 +185,9 @@ private static bool SelectPlayerAndWorld(bool onlyPlayer = false)
             }
             var world = Main.WorldList[worldId];
 
-            if (ClientDataJsonHelper.WorldPath != null && ClientDataJsonHelper.ClientMode != ClientMode.FreshClient)
+            if (ClientDataMemoryStorage.WorldPath != null && ClientDataMemoryStorage.ClientMode != ClientMode.FreshClient)
             {
-                world = Main.WorldList.FirstOrDefault(p => p.Path.Equals(ClientDataJsonHelper.WorldPath), null);
+                world = Main.WorldList.FirstOrDefault(p => p.Path.Equals(ClientDataMemoryStorage.WorldPath), null);
             }
 
             if (world == null)

Core/Features/Reload/ClientDataJson.cs

@@ -0,0 +1,79 @@
+using System;
+
+namespace ModReloader.Core.Features.Reload
+{
+    /// <summary>
+    /// Stores client data in AppDomain memory to persist across mod reloads.
+    /// Uses separate keys for each value to avoid Assembly reload issues.
+    /// </summary>
+    public static class ClientDataMemoryStorage
+    {
+        private const string ClientModeKey = "ModReloader_ClientMode";
+        private const string PlayerPathKey = "ModReloader_PlayerPath";
+        private const string WorldPathKey = "ModReloader_WorldPath";
+
+        public static ClientMode ClientMode
+        {
+            get
+            {
+                var value = AppDomain.CurrentDomain.GetData(ClientModeKey);
+                if (value is int intValue)
+                    return (ClientMode)intValue;
+                return ClientMode.FreshClient;
+            }
+            set => AppDomain.CurrentDomain.SetData(ClientModeKey, (int)value);
+        }
+
+        public static string PlayerPath
+        {
+            get => AppDomain.CurrentDomain.GetData(PlayerPathKey) as string;
+            set => AppDomain.CurrentDomain.SetData(PlayerPathKey, value);
+        }
+
+        public static string WorldPath
+        {
+            get => AppDomain.CurrentDomain.GetData(WorldPathKey) as string;
+            set => AppDomain.CurrentDomain.SetData(WorldPathKey, value);
+        }
+
+        /// <summary>
+        /// Writes the current client data to memory.
+        /// </summary>
+        public static void WriteData()
+        {
+            if (Main.dedServ)
+                return;
+
+            Log.Info($"Wrote ClientData to memory: C {ClientMode}, P {PlayerPath}, W {WorldPath}");
+        }
+
+        /// <summary>
+        /// Reads the client data from memory.
+        /// </summary>
+        public static void ReadData()
+        {
+            if (Main.dedServ)
+                return;
+
+            Log.Info($"Read ClientData from memory: C {ClientMode}, P {PlayerPath}, W {WorldPath}");
+        }
+
+        /// <summary>
+        /// Clears all stored client data from memory.
+        /// </summary>
+        public static void ClearData()
+        {
+            AppDomain.CurrentDomain.SetData(ClientModeKey, null);
+            AppDomain.CurrentDomain.SetData(PlayerPathKey, null);
+            AppDomain.CurrentDomain.SetData(WorldPathKey, null);
+        }
+    }
+
+    public enum ClientMode
+    {
+        FreshClient,
+        SinglePlayer,
+        MPMajor,
+        MPMinor,
+    }
+}