ProxyAssemblyGenerator: fix to work with new Unhollower version

Author: ghorsington

BepInEx.IL2CPP/ProxyAssemblyGenerator.cs

@@ -14,7 +14,6 @@
 using Il2CppDumper;
 using Mono.Cecil;
 using UnhollowerBaseLib;
-using AssemblyUnhollowerRunner = AssemblyUnhollower.Program;
 using Logger = BepInEx.Logging.Logger;
 
 namespace BepInEx.IL2CPP;
@@ -93,7 +92,7 @@ static void HashString(ICryptoTransform hash, string str)
             }
 
         // Hash some common dependencies as they can affect output
-        HashString(md5, typeof(AssemblyUnhollowerRunner).Assembly.GetName().Version.ToString());
+        HashString(md5, typeof(UnhollowedAssemblyGenerator).Assembly.GetName().Version.ToString());
         HashString(md5, typeof(Cpp2IlApi).Assembly.GetName().Version.ToString());
         HashString(md5, typeof(Il2CppDumper.Il2CppDumper).Assembly.GetName().Version.ToString());
 
@@ -145,9 +144,9 @@ public static void GenerateAssemblies()
         });
 
         var runner =
-            (AppDomainRunner)AppDomainHelper.CreateInstanceAndUnwrap(domain,
-                                                                     typeof(AppDomainRunner).Assembly.FullName,
-                                                                     typeof(AppDomainRunner).FullName);
+            (AppDomainRunner) AppDomainHelper.CreateInstanceAndUnwrap(domain,
+                                                                      typeof(AppDomainRunner).Assembly.FullName,
+                                                                      typeof(AppDomainRunner).FullName);
 
         runner.Setup(Paths.ExecutablePath, Preloader.IL2CPPUnhollowedPath, Paths.BepInExRootPath,
                      Paths.ManagedPath);
@@ -341,29 +340,9 @@ private void GenerateAssembliesInternal(AppDomainListener listener,
             if (File.Exists(renameMapLocation))
             {
                 listener.DoPreloaderLog("Parsing deobfuscation rename mappings", LogLevel.Info);
-
-                using var fileStream =
-                    new FileStream(renameMapLocation, FileMode.Open, FileAccess.Read, FileShare.Read);
-                using var gzipStream = new GZipStream(fileStream, CompressionMode.Decompress);
-
-                using var reader = new StreamReader(gzipStream, Encoding.UTF8, false);
-                while (!reader.EndOfStream)
-                {
-                    var line = reader.ReadLine();
-
-                    if (string.IsNullOrWhiteSpace(line) || line.StartsWith("#"))
-                        continue;
-
-                    var mapping = line.Split(';');
-
-                    if (mapping.Length != 2)
-                        continue;
-
-                    unhollowerOptions.RenameMap[mapping[0]] = mapping[1];
-                }
+                unhollowerOptions.ReadRenameMap(renameMapLocation);
             }
 
-
             listener.DoPreloaderLog("Executing Il2CppUnhollower generator", LogLevel.Info);
 
             LogSupport.InfoHandler += s => listener.DoUnhollowerLog(s.Trim(), LogLevel.Info);
@@ -373,7 +352,7 @@ private void GenerateAssembliesInternal(AppDomainListener listener,
 
             try
             {
-                AssemblyUnhollowerRunner.Main(unhollowerOptions);
+                UnhollowedAssemblyGenerator.GenerateUnhollowedAssemblies(unhollowerOptions);
             }
             catch (Exception e)
             {