Fixing minor bugs

- renaming a.cs to DrawBackToMainMenuSystem.cs
- PlayerDefinition and WorldDefinition are simplified and easier to work with
- fixing Start Server option in main menu
- fixing SinglePlayerReload

Author: Cotlim

Common/Configs/ConfigElements/PlayerPicker/PlayerDefinition.cs

@@ -1,4 +1,5 @@
 using ModReloader.Core.Features;
+using Terraria.IO;
 using Terraria.ModLoader.Config;
 
 
@@ -11,6 +12,8 @@ public class PlayerDefinition : EntityDefinition
     /// </summary>
     public override int Type => Utilities.FindPlayerId(Name);
 
+    public PlayerFileData File => IsUnloaded ? null : Main.PlayerList[Type];
+
     public override bool IsUnloaded
     => Type <= -1 || Name == null;
 
@@ -20,7 +23,7 @@ public PlayerDefinition() : base()
 
     }
 
-    public PlayerDefinition(int type) : base(Utilities.FindPlayer(type).Path)
+    public PlayerDefinition(int type) : base(Utilities.FindPlayer(type)?.Path ?? "None")
     {
 
     }

Common/Configs/ConfigElements/PlayerPicker/PlayerDefinitionElement.cs

@@ -94,10 +94,10 @@ protected override List<DefinitionOptionElement<PlayerDefinition>> GetPassedOpti
         foreach (var o in Options)
         {
             // If player is journey and user is searching for journey, add it
-            bool isJourney = Utilities.FindPlayer(o.Type).Player.difficulty == GameModeID.Creative;
+            bool isJourney = o.Definition.File?.Player?.difficulty == GameModeID.Creative;
 
             // Filter name
-            if (!Utilities.FindPlayer(o.Type).Name.Contains(filter, StringComparison.OrdinalIgnoreCase))
+            if (!o.Definition.File?.Name.Contains(filter, StringComparison.OrdinalIgnoreCase) ?? true)
                 continue;
 
             passed.Add(o);

Common/Configs/ConfigElements/PlayerPicker/PlayerDefinitionOptionElement.cs

@@ -38,7 +38,7 @@ public override void SetItem(PlayerDefinition definition)
             return;
         }
 
-        PlayerFileData file = Utilities.FindPlayer(definition.Type);
+        PlayerFileData file = definition.File;
 
         Player player = file.Player;
         player.dead = false;

Common/Configs/ConfigElements/WorldPicker/WorldDefinition.cs

@@ -1,5 +1,6 @@
 using ModReloader.Core.Features;
 using System.IO;
+using Terraria.IO;
 using Terraria.ModLoader.Config;
 
 
@@ -12,15 +13,17 @@ public class WorldDefinition : EntityDefinition
     /// </summary>
     public override int Type => Utilities.FindWorldId(Name);
 
+    public WorldFileData File => IsUnloaded ? null : Main.WorldList[Type];
+
     public override bool IsUnloaded
-        => Type <= -1 || Name == null;
+        => Type <= -1;
 
     public WorldDefinition() : base()
     {
 
     }
 
-    public WorldDefinition(int type) : base(Utilities.FindWorld(type).Path)
+    public WorldDefinition(int type) : base(Utilities.FindWorld(type)?.Path ?? "None")
     {
 
     }

Common/Configs/ConfigElements/WorldPicker/WorldDefinitionOptionElement.cs

@@ -31,7 +31,7 @@ public override void SetItem(WorldDefinition definition)
             return;
         }
 
-        var file = Utilities.FindWorld(definition.Type);
+        var file = definition.File;
 
         // Get icon asset
         _iconAsset = GetIconAsset(file);

Core/Features/MainMenuFeatures/a.cs …MenuFeatures/DrawBackToMainMenuSystem.csCore/Features/MainMenuFeatures/a.cs renamed to Core/Features/MainMenuFeatures/DrawBackToMainMenuSystem.cs Core/Features/MainMenuFeatures/a.cs renamed to Core/Features/MainMenuFeatures/DrawBackToMainMenuSystem.cs

@@ -175,7 +175,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(ClientDataMemoryStorage.WorldPath)) ?? throw new Exception("World not found: " + ClientDataMemoryStorage.WorldPath);
+            var world = Conf.C.World.File ?? throw new Exception("World not found: " + Conf.C.World.Name);
             if (string.IsNullOrEmpty(world.Path))
             {
                 Log.Error($"World {world.Name} has an invalid or null path.");

Core/Features/MainMenuFeatures/MainMenuActions.cs

@@ -199,15 +199,8 @@ private void AddSingleplayerSection(TooltipPanel tooltipPanel)
         Main.LoadPlayers();
         Main.LoadWorlds();
 
-        int playerIdx = Conf.C.Player.Type;
-        int worldIdx = Conf.C.World.Type;
-
-        string pName = (playerIdx >= 0 && playerIdx < Main.PlayerList.Count)
-            ? Main.PlayerList[playerIdx].Name
-            : "";
-        string wName = (worldIdx >= 0 && worldIdx < Main.WorldList.Count)
-            ? Main.WorldList[worldIdx].Name
-            : "";
+        string pName = Conf.C.Player.File?.Name ?? "Undefined";
+        string wName = Conf.C.World.File?.Name ?? "Undefined";
 
         if (string.IsNullOrEmpty(pName) || string.IsNullOrEmpty(wName))
             return Loc.Get("MainMenu.JoinSingleplayerTooltipNoData");

Core/Features/MainMenuFeatures/MainMenuState.cs

@@ -76,9 +76,10 @@ public static void EnterSingleplayerWorld()
             else
             {
                 Log.Error("Failed to select player and world for singleplayer.");
-                if (TryMoveToRejectionMenuIfNeeded())
-                    return;
+                if (!TryMoveToRejectionMenuIfNeeded())
+                    Main.menuMode = 0;
             }
+            
         }
 
         /// <summary>

Core/Features/Reload/AutoloadPlayerInWorldSystem.cs

@@ -46,18 +46,12 @@ public static async Task SinglePlayerReload()
 
         if (Main.netMode == NetmodeID.SinglePlayer)
         {
-            // Prepare client. Use singleplayer by default for now.
             PrepareClient(
-                clientMode: ClientMode.SinglePlayer,
-                playerID: Conf.C.Player.Name,
-                worldID: Conf.C.World.Name
+                clientMode: ClientMode.SinglePlayer
             );
 
-
-            // Exit the game.
             await ExitWorld();
 
-            // Mod was found, we can Reload
             BuildOrReloadMods();
             return;
         }
@@ -384,7 +378,7 @@ private static void PrepareClient(ClientMode clientMode, string playerID, string
         ClientDataMemoryStorage.ClientMode = clientMode;
         ClientDataMemoryStorage.PlayerPath = playerID;
         ClientDataMemoryStorage.WorldPath = worldID;
-        Log.Info("set player and worldid to " + ClientDataMemoryStorage.PlayerPath + " and " + ClientDataMemoryStorage.WorldPath);
+        Log.Info("set player and world to " + ClientDataMemoryStorage.PlayerPath + " and " + ClientDataMemoryStorage.WorldPath);
     }
 
     /// <summary>