spt/assembly-tool
spt/assembly-tool
0
0
Fork 0
mirror of https://github.com/sp-tarkov/assembly-tool.git synced 2025-02-13 03:10:45 -05:00
Code

make renamer and publicizer instances instead of static

Browse Source
This commit is contained in:
Cj 2025-01-02 12:15:38 -05:00
parent c3bba19df7
commit 8884815de0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RecodeItLib/Remapper/Publicizer.cs
View File

@ -3,9 +3,9 @@ using ReCodeItLib.Utils;
namespace ReCodeItLib.ReMapper; 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(); 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)) while (!publicizeTasks.TrueForAll(t => t.Status == TaskStatus.RanToCompletion))
{ {
Logger.DrawProgressBar(publicizeTasks.Where(t => t.IsCompleted)!.Count() + 1, publicizeTasks.Count, 50); Logger.DrawProgressBar(publicizeTasks.Where(t => t.IsCompleted)!.Count() + 1, publicizeTasks.Count, 50);

6
RecodeItLib/Remapper/ReMapper.cs
View File

@ -108,13 +108,15 @@ public class ReMapper
{ {
Logger.LogSync("\nRenaming...", ConsoleColor.Green); Logger.LogSync("\nRenaming...", ConsoleColor.Green);
var renamer = new Renamer();
var renameTasks = new List<Task>(_remaps.Count); var renameTasks = new List<Task>(_remaps.Count);
foreach (var remap in _remaps) foreach (var remap in _remaps)
{ {
renameTasks.Add( renameTasks.Add(
Task.Factory.StartNew(() => 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 // Don't publicize and unseal until after the remapping, so we can use those as search parameters
Logger.LogSync("\nPublicizing classes...", ConsoleColor.Green); Logger.LogSync("\nPublicizing classes...", ConsoleColor.Green);
SPTPublicizer.PublicizeClasses(Module); new Publicizer().PublicizeClasses(Module);
} }
private bool Validate(List<RemapModel> remaps) private bool Validate(List<RemapModel> remaps)

4
RecodeItLib/Remapper/RenameHelper.cs → RecodeItLib/Remapper/Renamer.cs
View File

@ -4,7 +4,7 @@ using ReCodeItLib.Utils;
namespace ReCodeItLib.ReMapper; namespace ReCodeItLib.ReMapper;
internal static class RenameHelper internal class Renamer
{ {
private static List<string>? TokensToMatch => DataProvider.Settings?.Remapper?.TokensToMatch; private static List<string>? TokensToMatch => DataProvider.Settings?.Remapper?.TokensToMatch;
@ -14,7 +14,7 @@ internal static class RenameHelper
/// <param name="module"></param> /// <param name="module"></param>
/// <param name="remap"></param> /// <param name="remap"></param>
/// <param name="direct"></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) if (remap.TypePrimeCandidate is null)
{ {