Merge pull request #17 from NSGolova/main

Fixed private methods with `in` arguments
beat-forge · Aug 31, 2023 · a4db378 · a4db378
2 parents e16a249 + 02b0375
commit a4db378
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 34 deletions.
diff --git a/GenericStripper/Modules/BeatSaber/BSAssemblyModule.cs b/GenericStripper/Modules/BeatSaber/BSAssemblyModule.cs
@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
 using Mono.Cecil;
-using Mono.Cecil.Rocks;
 
 namespace GenericStripper.Modules.BeatSaber;
 
@@ -10,8 +8,6 @@ public class BsAssemblyModule
     private readonly FileInfo _file;
     private readonly ModuleDefinition _module;
 
-    private TypeReference? _inasmref;
-
     public BsAssemblyModule(string gamePath, string fileName, params string[] resolverDirs)
     {
         _bslibLoader = new BsLibLoader(gamePath);
@@ -63,27 +59,7 @@ private void VirtualizeType(TypeDefinition type)
                      IsConstructor: false, IsSpecialName: false, IsGenericInstance: false, HasOverrides: false
                  }))
         {
-            foreach (var p in m.Parameters.Where(p => p.IsIn))
-            {
-                _inasmref ??= _module.ImportReference(typeof(InAttribute));
-                List<TypeReference> opt = new();
-                List<TypeReference> req = new();
-                while (_inasmref is IModifierType modType)
-                {
-                    if (_inasmref.IsOptionalModifier) opt.Add(modType.ModifierType);
-                    else req.Add(modType.ModifierType);
-                    _inasmref = modType.ElementType;
-                }
-
-                if (!req.Contains(_inasmref)) req.Add(_inasmref);
-                foreach (var typeReference in req) _inasmref = _inasmref.MakeRequiredModifierType(typeReference);
-
-                foreach (var typeReference in opt) _inasmref = _inasmref.MakeOptionalModifierType(typeReference);
-
-                p.ParameterType = _inasmref;
-            }
-
-            m.IsVirtual = true;
+            m.IsVirtual = !m.IsPrivate || m.Parameters.FirstOrDefault(p => p.IsIn) == null;
             m.IsPublic = true;
             m.IsPrivate = false;
             m.IsNewSlot = true;

diff --git a/GenericStripper/Modules/BeatSaber/BeatSaber.cs b/GenericStripper/Modules/BeatSaber/BeatSaber.cs
@@ -35,7 +35,7 @@ public void StripDll(string file, string outDir, params string[] resolveDirs)
         var outAssembly = Path.Combine(outDir, relativePath);
         if (!Directory.Exists(Path.GetDirectoryName(outAssembly)))
             Directory.CreateDirectory(Path.GetDirectoryName(outAssembly) ?? string.Empty);
-        
+
         bsAssemblyModule.Write(outAssembly);
     }
 
@@ -44,7 +44,7 @@ public async Task StripAllDlls(string outDir)
         await InstallBsipa();
 
         if (!Directory.Exists(outDir)) Directory.CreateDirectory(outDir);
-        
+
         var bsLibsDir = Path.Combine(GamePath, "Libs");
         var bsManagedDir = Path.Combine(GamePath, "Beat Saber_Data", "Managed");
 
@@ -70,7 +70,7 @@ public async Task StripAllDlls(string outDir)
                             AnsiConsole.MarkupLine($"[gray]Skipped {assemblyInf.Name}[/]");
                             continue;
                         }
-                        
+
                         StripDll(assembly, outDir, bsLibsDir, bsManagedDir);
                         task.Increment(1);
                         AnsiConsole.MarkupLine($"[teal]Stripped {assemblyInf.Name}[/]");

diff --git a/GenericStripper/Program.cs b/GenericStripper/Program.cs
@@ -17,13 +17,10 @@ public static int Main(string[] args)
             config.SetApplicationName("GenericStripper");
             config.AddCommand<StripCommand>("strip")
                 .WithDescription("Strips assemblies of their metadata and virtualizes them.")
-                .WithExample(new[]
-                {
-                    "strip", "-m", "beatsaber", "-p", "C:\\Program Files (x86)\\Steam\\steamapps\\common\\Beat Saber",
-                    "-o", "stripped"
-                });
+                .WithExample("strip", "-m", "beatsaber", "-p",
+                    "C:\\Program Files (x86)\\Steam\\steamapps\\common\\Beat Saber", "-o", "stripped");
         });
-        
+
         return app.Run(args);
     }