Fix namespaces

ReCodeItCLI/Commands/DeObfuscate.cs

@@ -1,8 +1,8 @@
 using CliFx;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
-using ReCodeItLib.Remapper;
+using ReCodeItLib.ReMapper;
 
 namespace ReCodeItCLI.Commands;
 

ReCodeItCLI/Commands/Dumper.cs

@@ -1,7 +1,7 @@
 using CliFx;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
 using ReCodeItLib.Dumper;
 
 namespace ReCodeItCLI.Commands;

ReCodeItCLI/Commands/ReMap.cs

@@ -1,8 +1,8 @@
 using CliFx;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
-using ReCodeIt.ReMapper;
+using ReCodeItLib.Utils;
-using ReCodeIt.Utils;
+using ReCodeItLib.ReMapper;
 
 namespace ReCodeItCLI.Commands;
 

RecodeItGUI/GUI/Main.cs

@@ -1,6 +1,6 @@
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
-using ReCodeIt.ReMapper;
+using ReCodeItLib.ReMapper;
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
 using System.Diagnostics;
 
 namespace ReCodeIt.GUI;

RecodeItGUI/Program.cs

@@ -1,6 +1,5 @@
-using Microsoft.Win32;
 using ReCodeIt.GUI;
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
 
 namespace ReCodeIt;
 

RecodeItGUI/Utils/GUIHelpers.cs

@@ -1,5 +1,5 @@
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
 
 namespace ReCodeIt.GUI;
 

RecodeItLib/Dumper/DumperClass.cs

@@ -1,8 +1,7 @@
 using System.Collections;
-using System.Runtime.CompilerServices;
 using dnlib.DotNet;
 using dnlib.DotNet.Emit;
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
 using System.IO.Compression;
 
 namespace ReCodeItLib.Dumper;

RecodeItLib/Dumper/DumpyILHelper.cs

@@ -1,13 +1,5 @@
-using System;
+using dnlib.DotNet;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection.Metadata;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using dnlib.DotNet;
 using dnlib.DotNet.Emit;
-using DumpLib;
-using ReCodeIt.Utils;
 
 namespace ReCodeItLib.Dumper;
 

RecodeItLib/Enums/ELogLevel.cs

@@ -1,4 +1,4 @@
-namespace ReCodeIt.Enums;
+namespace ReCodeItLib.Enums;
 
 internal enum ELogLevel
 {

RecodeItLib/Enums/EMatchResult.cs

@@ -1,4 +1,4 @@
-namespace ReCodeIt.Enums;
+namespace ReCodeItLib.Enums;
 
 internal enum EMatchResult
 {

RecodeItLib/Enums/ENoMatchReason.cs

@@ -1,4 +1,4 @@
-namespace ReCodeIt.Enums;
+namespace ReCodeItLib.Enums;
 
 public enum ENoMatchReason
 {

RecodeItLib/Models/AppSettingsModel.cs

@@ -1,6 +1,6 @@
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
 
-namespace ReCodeIt.Models;
+namespace ReCodeItLib.Models;
 
 /// <summary>
 /// All settings container

RecodeItLib/Models/ItemTemplateModel.cs

@@ -1,4 +1,4 @@
-namespace ReCodeIt.Models;
+namespace ReCodeItLib.Models;
 
 public class ItemTemplateModel
 {

RecodeItLib/Models/RemapModel.cs

@@ -1,8 +1,8 @@
 using dnlib.DotNet;
 using Newtonsoft.Json;
-using ReCodeIt.Enums;
+using ReCodeItLib.Enums;
 
-namespace ReCodeIt.Models;
+namespace ReCodeItLib.Models;
 
 /// <summary>
 /// Object to store linq statements in inside of json to search and remap classes

RecodeItLib/Remapper/DeObfuscator.cs

@@ -1,10 +1,9 @@
 using dnlib.DotNet;
 using dnlib.DotNet.Emit;
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
 using System.Diagnostics;
-using ReCodeIt.ReMapper;
 
-namespace ReCodeItLib.Remapper;
+namespace ReCodeItLib.ReMapper;
 
 public static class Deobfuscator
 {

RecodeItLib/Remapper/Publicizer.cs

@@ -1,8 +1,7 @@
 using dnlib.DotNet;
-using System.Runtime.CompilerServices;
+using ReCodeItLib.Utils;
-using ReCodeIt.Utils;
 
-namespace ReCodeIt.ReMapper;
+namespace ReCodeItLib.ReMapper;
 
 internal static class SPTPublicizer
 {

RecodeItLib/Remapper/ReCodeItRemapper.cs

@@ -1,21 +1,16 @@
 using dnlib.DotNet;
 using dnlib.DotNet.Emit;
-using ReCodeIt.Enums;
+using ReCodeItLib.Enums;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
-using ReCodeIt.ReMapper.Search;
+using ReCodeItLib.ReMapper.Search;
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
-using ReCodeItLib.Remapper.Search;
 using System.Diagnostics;
 using System.Reflection;
-using ReCodeItLib.Remapper;
 
-namespace ReCodeIt.ReMapper;
+namespace ReCodeItLib.ReMapper;
 
 public class ReCodeItRemapper
 {
-    public ReCodeItRemapper()
-    { }
-
     private ModuleDefMD? Module { get; set; }
 
     public static bool IsRunning { get; private set; } = false;
@@ -515,22 +510,20 @@ public class ReCodeItRemapper
     {
         foreach (var type in table)
         {
-            if (DataProvider.ItemTemplates!.TryGetValue(type.Key, out var template))
+            if (!DataProvider.ItemTemplates!.TryGetValue(type.Key, out var template) ||
+                !type.Value.Name.StartsWith("GClass"))
             {
-                if (!type.Value.Name.StartsWith("GClass")) continue;
-                
-                var remap = new RemapModel
-                {
-                    OriginalTypeName = type.Value.Name,
-                    NewTypeName = $"{template._name}{extName}",
-                    UseForceRename = true
-                };
-                
-                _remaps.Add(remap);
                 continue;
             }
             
-            // Logger.Log($"Found no association for key: {type.Key} Type: {type.Value}", ConsoleColor.Yellow);
+            var remap = new RemapModel
+            {
+                OriginalTypeName = type.Value.Name,
+                NewTypeName = $"{template._name}{extName}",
+                UseForceRename = true
+            };
+                
+            _remaps.Add(remap);
         }
     }
     
@@ -596,11 +589,11 @@ public class ReCodeItRemapper
         }
         catch (Exception e)
         {
-            Logger.Log(e);
+            Logger.LogSync(e);
             throw;
         }
 
-        Logger.Log("\nCreating Hollow...", ConsoleColor.Yellow);
+        Logger.LogSync("\nCreating Hollow...", ConsoleColor.Green);
         Hollow();
 
         var hollowedDir = Path.GetDirectoryName(OutPath);
@@ -612,7 +605,7 @@ public class ReCodeItRemapper
         }
         catch (Exception e)
         {
-            Logger.Log(e);
+            Logger.LogSync(e);
             throw;
         }
         

RecodeItLib/Remapper/RenameHelper.cs

@@ -1,8 +1,8 @@
 using dnlib.DotNet;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
 
-namespace ReCodeIt.ReMapper;
+namespace ReCodeItLib.ReMapper;
 
 internal static class RenameHelper
 {

RecodeItLib/Remapper/Search/CtorTypeFilters.cs

@@ -1,7 +1,7 @@
 using dnlib.DotNet;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
 
-namespace ReCodeIt.ReMapper.Search;
+namespace ReCodeItLib.ReMapper.Search;
 
 internal static class CtorTypeFilters
 {

RecodeItLib/Remapper/Search/EventTypeFilters.cs

@@ -1,7 +1,7 @@
 using dnlib.DotNet;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
 
-namespace ReCodeItLib.Remapper.Search;
+namespace ReCodeItLib.ReMapper.Search;
 
 internal static class EventTypeFilters
 {

RecodeItLib/Remapper/Search/FieldTypeFilters.cs

@@ -1,8 +1,7 @@
 using dnlib.DotNet;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
-using ReCodeIt.Utils;
 
-namespace ReCodeItLib.Remapper.Search;
+namespace ReCodeItLib.ReMapper.Search;
 
 internal static class FieldTypeFilters
 {

RecodeItLib/Remapper/Search/GenericTypeFilters.cs

@@ -1,8 +1,7 @@
 using dnlib.DotNet;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
-using ReCodeIt.Utils;
 
-namespace ReCodeItLib.Remapper.Search;
+namespace ReCodeItLib.ReMapper.Search;
 
 internal static class GenericTypeFilters
 {

RecodeItLib/Remapper/Search/MethodTypeFilters.cs

@@ -1,8 +1,7 @@
 using dnlib.DotNet;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
-using ReCodeIt.Utils;
 
-namespace ReCodeItLib.Remapper.Search;
+namespace ReCodeItLib.ReMapper.Search;
 
 internal static class MethodTypeFilters
 {

RecodeItLib/Remapper/Search/NestedTypeFilters.cs

@@ -1,7 +1,7 @@
 using dnlib.DotNet;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
 
-namespace ReCodeIt.ReMapper.Search;
+namespace ReCodeItLib.ReMapper.Search;
 
 internal static class NestedTypeFilters
 {

RecodeItLib/Remapper/Search/PropertyTypeFilters.cs

@@ -1,8 +1,7 @@
 using dnlib.DotNet;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
-using ReCodeIt.Utils;
 
-namespace ReCodeItLib.Remapper.Search;
+namespace ReCodeItLib.ReMapper.Search;
 
 internal static class PropertyTypeFilters
 {

RecodeItLib/Remapper/Statistics.cs

@@ -1,9 +1,9 @@
 using System.Diagnostics;
-using ReCodeIt.Enums;
+using ReCodeItLib.Enums;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
-using ReCodeIt.Utils;
+using ReCodeItLib.Utils;
 
-namespace ReCodeItLib.Remapper;
+namespace ReCodeItLib.ReMapper;
 
 public class Statistics(
 	List<RemapModel> remapModels, 

RecodeItLib/Utils/DataProvider.cs

@@ -1,9 +1,9 @@
 using dnlib.DotNet;
 using Newtonsoft.Json;
-using ReCodeIt.Models;
+using ReCodeItLib.Models;
 using ReCodeItLib.Dumper;
 
-namespace ReCodeIt.Utils;
+namespace ReCodeItLib.Utils;
 
 public static class DataProvider
 {

RecodeItLib/Utils/HashUtil.cs

@@ -1,6 +1,6 @@
 using System.Security.Cryptography;
 
-namespace ReCodeIt.Utils;
+namespace ReCodeItLib.Utils;
 
 internal static class HashUtil
 {

RecodeItLib/Utils/Logger.cs

@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 
-namespace ReCodeIt.Utils;
+namespace ReCodeItLib.Utils;
 
 public static class Logger
 {
@@ -112,7 +112,7 @@ public static class Logger
         _messages.Enqueue(new LogMessage {Message = message, Color = color, Silent = silent, ThreadId = Thread.CurrentThread.ManagedThreadId});
     }
 
-    public static void LogSync(string message, ConsoleColor color = ConsoleColor.White)
+    public static void LogSync(object message, ConsoleColor color = ConsoleColor.White)
     {
         Console.ForegroundColor = color;
         Console.WriteLine(message);

RecodeItLib/Utils/SysTypeExtentions.cs

@@ -1,7 +1,7 @@
 using dnlib.DotNet;
 using System.Text;
 
-namespace ReCodeIt.Utils;
+namespace ReCodeItLib.Utils;
 
 public static class SysTypeExtentions
 {