From 8884815de093a6ddea70c5d812223fd6f2a48006 Mon Sep 17 00:00:00 2001
From: Cj <161484149+CJ-SPT@users.noreply.github.com>
Date: Thu, 2 Jan 2025 12:15:38 -0500
Subject: [PATCH] make renamer and publicizer instances instead of static

---
 RecodeItLib/Remapper/Publicizer.cs                   | 5 +++--
 RecodeItLib/Remapper/ReMapper.cs                     | 6 ++++--
 RecodeItLib/Remapper/{RenameHelper.cs => Renamer.cs} | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)
 rename RecodeItLib/Remapper/{RenameHelper.cs => Renamer.cs} (98%)

diff --git a/RecodeItLib/Remapper/Publicizer.cs b/RecodeItLib/Remapper/Publicizer.cs
index 40f6bea..5f8f0ac 100644
--- a/RecodeItLib/Remapper/Publicizer.cs
+++ b/RecodeItLib/Remapper/Publicizer.cs
@@ -3,9 +3,9 @@ using ReCodeItLib.Utils;
 
 namespace ReCodeItLib.ReMapper;
 
-internal static class SPTPublicizer
+internal class Publicizer
 {
-    public static void PublicizeClasses(ModuleDefMD definition, bool isLauncher = false)
+    public void PublicizeClasses(ModuleDefMD definition, bool isLauncher = false)
     {
         var types = definition.GetTypes();
         
@@ -22,6 +22,7 @@ internal static class SPTPublicizer
             );
         }
         
+        // TODO: This is broken. No idea why.
         while (!publicizeTasks.TrueForAll(t => t.Status == TaskStatus.RanToCompletion))
         {
             Logger.DrawProgressBar(publicizeTasks.Where(t => t.IsCompleted)!.Count() + 1, publicizeTasks.Count, 50);
diff --git a/RecodeItLib/Remapper/ReMapper.cs b/RecodeItLib/Remapper/ReMapper.cs
index 3411b56..5c50bfb 100644
--- a/RecodeItLib/Remapper/ReMapper.cs
+++ b/RecodeItLib/Remapper/ReMapper.cs
@@ -107,6 +107,8 @@ public class ReMapper
     private void RenameMatches(IEnumerable<TypeDef> types)
     {
         Logger.LogSync("\nRenaming...", ConsoleColor.Green);
+
+        var renamer = new Renamer();
         
         var renameTasks = new List<Task>(_remaps.Count);
         foreach (var remap in _remaps)
@@ -114,7 +116,7 @@ public class ReMapper
             renameTasks.Add(
                 Task.Factory.StartNew(() =>
                 {
-                    RenameHelper.RenameAll(types, remap);
+                    renamer.RenameAll(types, remap);
                 })
             );
         }
@@ -132,7 +134,7 @@ public class ReMapper
         // Don't publicize and unseal until after the remapping, so we can use those as search parameters
         Logger.LogSync("\nPublicizing classes...", ConsoleColor.Green);
 
-        SPTPublicizer.PublicizeClasses(Module);
+        new Publicizer().PublicizeClasses(Module);
     }
     
     private bool Validate(List<RemapModel> remaps)
diff --git a/RecodeItLib/Remapper/RenameHelper.cs b/RecodeItLib/Remapper/Renamer.cs
similarity index 98%
rename from RecodeItLib/Remapper/RenameHelper.cs
rename to RecodeItLib/Remapper/Renamer.cs
index c2e9948..0ff499f 100644
--- a/RecodeItLib/Remapper/RenameHelper.cs
+++ b/RecodeItLib/Remapper/Renamer.cs
@@ -4,7 +4,7 @@ using ReCodeItLib.Utils;
 
 namespace ReCodeItLib.ReMapper;
 
-internal static class RenameHelper
+internal class Renamer
 {
     private static List<string>? TokensToMatch => DataProvider.Settings?.Remapper?.TokensToMatch;
 
@@ -14,7 +14,7 @@ internal static class RenameHelper
     /// <param name="module"></param>
     /// <param name="remap"></param>
     /// <param name="direct"></param>
-    public static void RenameAll(IEnumerable<TypeDef> types, RemapModel remap)
+    public void RenameAll(IEnumerable<TypeDef> types, RemapModel remap)
     {
         if (remap.TypePrimeCandidate is null)
         {