diff --git a/Reactor.Greenhouse/Generation/TypeContext.cs b/Reactor.Greenhouse/Generation/TypeContext.cs index 20aeff4..be750ad 100644 --- a/Reactor.Greenhouse/Generation/TypeContext.cs +++ b/Reactor.Greenhouse/Generation/TypeContext.cs @@ -58,9 +58,12 @@ namespace Reactor.Greenhouse.Generation foreach (var cleanMethod in CleanType.GetMethods()) { + if (obfuscatedType.GetMethods().Any(x => x.Name == cleanMethod.Name)) + continue; + var matching = new List(); - foreach (var obfuscatedMethod in obfuscatedType.GetMethods()) + foreach (var obfuscatedMethod in obfuscatedType.GetMethods().Where(x => x.Name.IsObfuscated())) { if (cleanMethod.ReturnType.FullName != obfuscatedMethod.ReturnType.FullName) continue; diff --git a/Reactor.Greenhouse/Mappings b/Reactor.Greenhouse/Mappings index a2ac437..1e6512a 160000 --- a/Reactor.Greenhouse/Mappings +++ b/Reactor.Greenhouse/Mappings @@ -1 +1 @@ -Subproject commit a2ac4373f2aaf2399eecaa1c0a29d6e74897333b +Subproject commit 1e6512a56e27bce73e33b093320052f7d3c511a3 diff --git a/Reactor.Greenhouse/Program.cs b/Reactor.Greenhouse/Program.cs index 4848b5c..b484c71 100644 --- a/Reactor.Greenhouse/Program.cs +++ b/Reactor.Greenhouse/Program.cs @@ -65,8 +65,6 @@ namespace Reactor.Greenhouse { await GenerateAsync(gameManager.Itch, cleanModule); } - - new OxygenFilter.OxygenFilter().Start(File.ReadAllText(Path.Combine("bin", "2020.12.9s.json")), new FileInfo(gameManager.Steam.Dll), new FileInfo("test.dll")); } private static async Task GenerateAsync(Game game, ModuleDefinition cleanModule)