From e7994691ee11bc98590cc7fc85471f71ae65314a Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Tue, 31 Dec 2024 13:46:44 -0500 Subject: [PATCH] Fix namespaces --- ReCodeItCLI/Commands/DeObfuscate.cs | 4 +- ReCodeItCLI/Commands/Dumper.cs | 2 +- ReCodeItCLI/Commands/ReMap.cs | 4 +- RecodeItGUI/GUI/Main.cs | 6 +-- RecodeItGUI/Program.cs | 3 +- RecodeItGUI/Utils/GUIHelpers.cs | 4 +- RecodeItLib/Dumper/DumperClass.cs | 3 +- RecodeItLib/Dumper/DumpyILHelper.cs | 10 +---- RecodeItLib/Enums/ELogLevel.cs | 2 +- RecodeItLib/Enums/EMatchResult.cs | 2 +- RecodeItLib/Enums/ENoMatchReason.cs | 2 +- RecodeItLib/Models/AppSettingsModel.cs | 4 +- RecodeItLib/Models/ItemTemplateModel.cs | 2 +- RecodeItLib/Models/RemapModel.cs | 4 +- RecodeItLib/Remapper/DeObfuscator.cs | 5 +-- RecodeItLib/Remapper/Publicizer.cs | 5 +-- RecodeItLib/Remapper/ReCodeItRemapper.cs | 43 ++++++++----------- RecodeItLib/Remapper/RenameHelper.cs | 6 +-- .../Remapper/Search/CtorTypeFilters.cs | 4 +- .../Remapper/Search/EventTypeFilters.cs | 4 +- .../Remapper/Search/FieldTypeFilters.cs | 5 +-- .../Remapper/Search/GenericTypeFilters.cs | 5 +-- .../Remapper/Search/MethodTypeFilters.cs | 5 +-- .../Remapper/Search/NestedTypeFilters.cs | 4 +- .../Remapper/Search/PropertyTypeFilters.cs | 5 +-- RecodeItLib/Remapper/Statistics.cs | 8 ++-- RecodeItLib/Utils/DataProvider.cs | 4 +- RecodeItLib/Utils/HashUtil.cs | 2 +- RecodeItLib/Utils/Logger.cs | 4 +- RecodeItLib/Utils/SysTypeExtentions.cs | 2 +- 30 files changed, 70 insertions(+), 93 deletions(-) diff --git a/ReCodeItCLI/Commands/DeObfuscate.cs b/ReCodeItCLI/Commands/DeObfuscate.cs index af9e441..db5b0e7 100644 --- a/ReCodeItCLI/Commands/DeObfuscate.cs +++ b/ReCodeItCLI/Commands/DeObfuscate.cs @@ -1,8 +1,8 @@ using CliFx; using CliFx.Attributes; using CliFx.Infrastructure; -using ReCodeIt.Utils; -using ReCodeItLib.Remapper; +using ReCodeItLib.Utils; +using ReCodeItLib.ReMapper; namespace ReCodeItCLI.Commands; diff --git a/ReCodeItCLI/Commands/Dumper.cs b/ReCodeItCLI/Commands/Dumper.cs index de308ab..0bcd25f 100644 --- a/ReCodeItCLI/Commands/Dumper.cs +++ b/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; diff --git a/ReCodeItCLI/Commands/ReMap.cs b/ReCodeItCLI/Commands/ReMap.cs index d17db94..c507ea4 100644 --- a/ReCodeItCLI/Commands/ReMap.cs +++ b/ReCodeItCLI/Commands/ReMap.cs @@ -1,8 +1,8 @@ using CliFx; using CliFx.Attributes; using CliFx.Infrastructure; -using ReCodeIt.ReMapper; -using ReCodeIt.Utils; +using ReCodeItLib.Utils; +using ReCodeItLib.ReMapper; namespace ReCodeItCLI.Commands; diff --git a/RecodeItGUI/GUI/Main.cs b/RecodeItGUI/GUI/Main.cs index 7d2bdf7..773e794 100644 --- a/RecodeItGUI/GUI/Main.cs +++ b/RecodeItGUI/GUI/Main.cs @@ -1,6 +1,6 @@ -using ReCodeIt.Models; -using ReCodeIt.ReMapper; -using ReCodeIt.Utils; +using ReCodeItLib.Models; +using ReCodeItLib.ReMapper; +using ReCodeItLib.Utils; using System.Diagnostics; namespace ReCodeIt.GUI; diff --git a/RecodeItGUI/Program.cs b/RecodeItGUI/Program.cs index fc4af83..b095485 100644 --- a/RecodeItGUI/Program.cs +++ b/RecodeItGUI/Program.cs @@ -1,6 +1,5 @@ -using Microsoft.Win32; using ReCodeIt.GUI; -using ReCodeIt.Utils; +using ReCodeItLib.Utils; namespace ReCodeIt; diff --git a/RecodeItGUI/Utils/GUIHelpers.cs b/RecodeItGUI/Utils/GUIHelpers.cs index 97dd563..244ace0 100644 --- a/RecodeItGUI/Utils/GUIHelpers.cs +++ b/RecodeItGUI/Utils/GUIHelpers.cs @@ -1,5 +1,5 @@ -using ReCodeIt.Models; -using ReCodeIt.Utils; +using ReCodeItLib.Models; +using ReCodeItLib.Utils; namespace ReCodeIt.GUI; diff --git a/RecodeItLib/Dumper/DumperClass.cs b/RecodeItLib/Dumper/DumperClass.cs index 9e4654f..36e5194 100644 --- a/RecodeItLib/Dumper/DumperClass.cs +++ b/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; diff --git a/RecodeItLib/Dumper/DumpyILHelper.cs b/RecodeItLib/Dumper/DumpyILHelper.cs index 0ed41a1..911f839 100644 --- a/RecodeItLib/Dumper/DumpyILHelper.cs +++ b/RecodeItLib/Dumper/DumpyILHelper.cs @@ -1,13 +1,5 @@ -using System; -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; using dnlib.DotNet.Emit; -using DumpLib; -using ReCodeIt.Utils; namespace ReCodeItLib.Dumper; diff --git a/RecodeItLib/Enums/ELogLevel.cs b/RecodeItLib/Enums/ELogLevel.cs index aef2fa8..ed329a9 100644 --- a/RecodeItLib/Enums/ELogLevel.cs +++ b/RecodeItLib/Enums/ELogLevel.cs @@ -1,4 +1,4 @@ -namespace ReCodeIt.Enums; +namespace ReCodeItLib.Enums; internal enum ELogLevel { diff --git a/RecodeItLib/Enums/EMatchResult.cs b/RecodeItLib/Enums/EMatchResult.cs index 7063301..dacc239 100644 --- a/RecodeItLib/Enums/EMatchResult.cs +++ b/RecodeItLib/Enums/EMatchResult.cs @@ -1,4 +1,4 @@ -namespace ReCodeIt.Enums; +namespace ReCodeItLib.Enums; internal enum EMatchResult { diff --git a/RecodeItLib/Enums/ENoMatchReason.cs b/RecodeItLib/Enums/ENoMatchReason.cs index 1ae51f4..2911219 100644 --- a/RecodeItLib/Enums/ENoMatchReason.cs +++ b/RecodeItLib/Enums/ENoMatchReason.cs @@ -1,4 +1,4 @@ -namespace ReCodeIt.Enums; +namespace ReCodeItLib.Enums; public enum ENoMatchReason { diff --git a/RecodeItLib/Models/AppSettingsModel.cs b/RecodeItLib/Models/AppSettingsModel.cs index 6232b75..d855c9a 100644 --- a/RecodeItLib/Models/AppSettingsModel.cs +++ b/RecodeItLib/Models/AppSettingsModel.cs @@ -1,6 +1,6 @@ -using ReCodeIt.Utils; +using ReCodeItLib.Utils; -namespace ReCodeIt.Models; +namespace ReCodeItLib.Models; /// /// All settings container diff --git a/RecodeItLib/Models/ItemTemplateModel.cs b/RecodeItLib/Models/ItemTemplateModel.cs index e8cd4c0..c6995f3 100644 --- a/RecodeItLib/Models/ItemTemplateModel.cs +++ b/RecodeItLib/Models/ItemTemplateModel.cs @@ -1,4 +1,4 @@ -namespace ReCodeIt.Models; +namespace ReCodeItLib.Models; public class ItemTemplateModel { diff --git a/RecodeItLib/Models/RemapModel.cs b/RecodeItLib/Models/RemapModel.cs index 8b93771..7343272 100644 --- a/RecodeItLib/Models/RemapModel.cs +++ b/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; /// /// Object to store linq statements in inside of json to search and remap classes diff --git a/RecodeItLib/Remapper/DeObfuscator.cs b/RecodeItLib/Remapper/DeObfuscator.cs index a7a81bc..d42d27c 100644 --- a/RecodeItLib/Remapper/DeObfuscator.cs +++ b/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 { diff --git a/RecodeItLib/Remapper/Publicizer.cs b/RecodeItLib/Remapper/Publicizer.cs index 0ccfec2..96d3257 100644 --- a/RecodeItLib/Remapper/Publicizer.cs +++ b/RecodeItLib/Remapper/Publicizer.cs @@ -1,8 +1,7 @@ using dnlib.DotNet; -using System.Runtime.CompilerServices; -using ReCodeIt.Utils; +using ReCodeItLib.Utils; -namespace ReCodeIt.ReMapper; +namespace ReCodeItLib.ReMapper; internal static class SPTPublicizer { diff --git a/RecodeItLib/Remapper/ReCodeItRemapper.cs b/RecodeItLib/Remapper/ReCodeItRemapper.cs index 2116e19..2618426 100644 --- a/RecodeItLib/Remapper/ReCodeItRemapper.cs +++ b/RecodeItLib/Remapper/ReCodeItRemapper.cs @@ -1,21 +1,16 @@ using dnlib.DotNet; using dnlib.DotNet.Emit; -using ReCodeIt.Enums; -using ReCodeIt.Models; -using ReCodeIt.ReMapper.Search; -using ReCodeIt.Utils; -using ReCodeItLib.Remapper.Search; +using ReCodeItLib.Enums; +using ReCodeItLib.Models; +using ReCodeItLib.ReMapper.Search; +using ReCodeItLib.Utils; 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; } + + var remap = new RemapModel + { + OriginalTypeName = type.Value.Name, + NewTypeName = $"{template._name}{extName}", + UseForceRename = true + }; - // Logger.Log($"Found no association for key: {type.Key} Type: {type.Value}", ConsoleColor.Yellow); + _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; } diff --git a/RecodeItLib/Remapper/RenameHelper.cs b/RecodeItLib/Remapper/RenameHelper.cs index a32e924..59fab88 100644 --- a/RecodeItLib/Remapper/RenameHelper.cs +++ b/RecodeItLib/Remapper/RenameHelper.cs @@ -1,8 +1,8 @@ using dnlib.DotNet; -using ReCodeIt.Models; -using ReCodeIt.Utils; +using ReCodeItLib.Models; +using ReCodeItLib.Utils; -namespace ReCodeIt.ReMapper; +namespace ReCodeItLib.ReMapper; internal static class RenameHelper { diff --git a/RecodeItLib/Remapper/Search/CtorTypeFilters.cs b/RecodeItLib/Remapper/Search/CtorTypeFilters.cs index c527d21..92a8152 100644 --- a/RecodeItLib/Remapper/Search/CtorTypeFilters.cs +++ b/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 { diff --git a/RecodeItLib/Remapper/Search/EventTypeFilters.cs b/RecodeItLib/Remapper/Search/EventTypeFilters.cs index 1a6c814..f2eeeff 100644 --- a/RecodeItLib/Remapper/Search/EventTypeFilters.cs +++ b/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 { diff --git a/RecodeItLib/Remapper/Search/FieldTypeFilters.cs b/RecodeItLib/Remapper/Search/FieldTypeFilters.cs index 5ce4073..fb9f033 100644 --- a/RecodeItLib/Remapper/Search/FieldTypeFilters.cs +++ b/RecodeItLib/Remapper/Search/FieldTypeFilters.cs @@ -1,8 +1,7 @@ using dnlib.DotNet; -using ReCodeIt.Models; -using ReCodeIt.Utils; +using ReCodeItLib.Models; -namespace ReCodeItLib.Remapper.Search; +namespace ReCodeItLib.ReMapper.Search; internal static class FieldTypeFilters { diff --git a/RecodeItLib/Remapper/Search/GenericTypeFilters.cs b/RecodeItLib/Remapper/Search/GenericTypeFilters.cs index 2dab59e..f15c922 100644 --- a/RecodeItLib/Remapper/Search/GenericTypeFilters.cs +++ b/RecodeItLib/Remapper/Search/GenericTypeFilters.cs @@ -1,8 +1,7 @@ using dnlib.DotNet; -using ReCodeIt.Models; -using ReCodeIt.Utils; +using ReCodeItLib.Models; -namespace ReCodeItLib.Remapper.Search; +namespace ReCodeItLib.ReMapper.Search; internal static class GenericTypeFilters { diff --git a/RecodeItLib/Remapper/Search/MethodTypeFilters.cs b/RecodeItLib/Remapper/Search/MethodTypeFilters.cs index cb4720f..bcb93a7 100644 --- a/RecodeItLib/Remapper/Search/MethodTypeFilters.cs +++ b/RecodeItLib/Remapper/Search/MethodTypeFilters.cs @@ -1,8 +1,7 @@ using dnlib.DotNet; -using ReCodeIt.Models; -using ReCodeIt.Utils; +using ReCodeItLib.Models; -namespace ReCodeItLib.Remapper.Search; +namespace ReCodeItLib.ReMapper.Search; internal static class MethodTypeFilters { diff --git a/RecodeItLib/Remapper/Search/NestedTypeFilters.cs b/RecodeItLib/Remapper/Search/NestedTypeFilters.cs index 18c14d8..cb186bc 100644 --- a/RecodeItLib/Remapper/Search/NestedTypeFilters.cs +++ b/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 { diff --git a/RecodeItLib/Remapper/Search/PropertyTypeFilters.cs b/RecodeItLib/Remapper/Search/PropertyTypeFilters.cs index c26efed..7d1f90d 100644 --- a/RecodeItLib/Remapper/Search/PropertyTypeFilters.cs +++ b/RecodeItLib/Remapper/Search/PropertyTypeFilters.cs @@ -1,8 +1,7 @@ using dnlib.DotNet; -using ReCodeIt.Models; -using ReCodeIt.Utils; +using ReCodeItLib.Models; -namespace ReCodeItLib.Remapper.Search; +namespace ReCodeItLib.ReMapper.Search; internal static class PropertyTypeFilters { diff --git a/RecodeItLib/Remapper/Statistics.cs b/RecodeItLib/Remapper/Statistics.cs index 8050d3b..f337675 100644 --- a/RecodeItLib/Remapper/Statistics.cs +++ b/RecodeItLib/Remapper/Statistics.cs @@ -1,9 +1,9 @@ using System.Diagnostics; -using ReCodeIt.Enums; -using ReCodeIt.Models; -using ReCodeIt.Utils; +using ReCodeItLib.Enums; +using ReCodeItLib.Models; +using ReCodeItLib.Utils; -namespace ReCodeItLib.Remapper; +namespace ReCodeItLib.ReMapper; public class Statistics( List remapModels, diff --git a/RecodeItLib/Utils/DataProvider.cs b/RecodeItLib/Utils/DataProvider.cs index 159333d..f5a74c5 100644 --- a/RecodeItLib/Utils/DataProvider.cs +++ b/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 { diff --git a/RecodeItLib/Utils/HashUtil.cs b/RecodeItLib/Utils/HashUtil.cs index df3402d..35d460f 100644 --- a/RecodeItLib/Utils/HashUtil.cs +++ b/RecodeItLib/Utils/HashUtil.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography; -namespace ReCodeIt.Utils; +namespace ReCodeItLib.Utils; internal static class HashUtil { diff --git a/RecodeItLib/Utils/Logger.cs b/RecodeItLib/Utils/Logger.cs index 6aaf426..a929003 100644 --- a/RecodeItLib/Utils/Logger.cs +++ b/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); diff --git a/RecodeItLib/Utils/SysTypeExtentions.cs b/RecodeItLib/Utils/SysTypeExtentions.cs index 9557e61..720ecff 100644 --- a/RecodeItLib/Utils/SysTypeExtentions.cs +++ b/RecodeItLib/Utils/SysTypeExtentions.cs @@ -1,7 +1,7 @@ using dnlib.DotNet; using System.Text; -namespace ReCodeIt.Utils; +namespace ReCodeItLib.Utils; public static class SysTypeExtentions {