From 02a6c417ab32d3d574d5e1061edacc091061e9f8 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 19:17:56 -0500 Subject: [PATCH 01/13] Initial work and basic functionality --- ReCodeItCLI/Commands/AutoMatcher.cs | 48 +++++ ReCodeItCLI/ReCodeItCLI.csproj | 1 + RecodeItLib/Remapper/AssemblyUtils.cs | 34 ++++ RecodeItLib/Remapper/AutoMatcher.cs | 271 ++++++++++++++++++++++++++ RecodeItLib/Remapper/ReMapper.cs | 59 ++---- RecodeItLib/Remapper/Statistics.cs | 16 +- 6 files changed, 389 insertions(+), 40 deletions(-) create mode 100644 ReCodeItCLI/Commands/AutoMatcher.cs create mode 100644 RecodeItLib/Remapper/AssemblyUtils.cs create mode 100644 RecodeItLib/Remapper/AutoMatcher.cs diff --git a/ReCodeItCLI/Commands/AutoMatcher.cs b/ReCodeItCLI/Commands/AutoMatcher.cs new file mode 100644 index 0000000..3759ec5 --- /dev/null +++ b/ReCodeItCLI/Commands/AutoMatcher.cs @@ -0,0 +1,48 @@ +using CliFx; +using CliFx.Attributes; +using CliFx.Infrastructure; +using ReCodeItLib.Models; +using ReCodeItLib.ReMapper; +using ReCodeItLib.Utils; + +namespace ReCodeItCLI.Commands; + +[Command("AutoMatch", Description = "Automatically tries to generate a mapping object with the provided arguments.")] +public class AutoMatchCommand : ICommand +{ + [CommandParameter(0, IsRequired = true, Description = "The absolute path to your obfuscated assembly or exe file, folder must contain all references to be resolved.")] + public required string AssemblyPath { get; init; } + + [CommandParameter(1, IsRequired = true, Description = "Full old type name including namespace")] + public required string OldTypeName { get; init; } + + [CommandParameter(2, IsRequired = true, Description = "The name you want the type to be renamed to")] + public required string NewTypeName { get; init; } + + [CommandParameter(3, IsRequired = false, Description = "Path to your mapping file so it can be updated if a match is found")] + public string MappingsPath { get; init; } + + public ValueTask ExecuteAsync(IConsole console) + { + DataProvider.IsCli = true; + DataProvider.LoadAppSettings(); + + Logger.LogSync("Finding match..."); + + var remaps = new List(); + + if (!string.IsNullOrEmpty(MappingsPath)) + { + remaps.AddRange(DataProvider.LoadMappingFile(MappingsPath)); + } + + new AutoMatcher(remaps) + .AutoMatch(AssemblyPath, OldTypeName, NewTypeName); + + // Wait for log termination + Logger.Terminate(); + while(Logger.IsRunning()) {} + + return default; + } +} \ No newline at end of file diff --git a/ReCodeItCLI/ReCodeItCLI.csproj b/ReCodeItCLI/ReCodeItCLI.csproj index d3dadb7..3877a3e 100644 --- a/ReCodeItCLI/ReCodeItCLI.csproj +++ b/ReCodeItCLI/ReCodeItCLI.csproj @@ -6,6 +6,7 @@ net8.0 enable enable + Always diff --git a/RecodeItLib/Remapper/AssemblyUtils.cs b/RecodeItLib/Remapper/AssemblyUtils.cs new file mode 100644 index 0000000..2a325f5 --- /dev/null +++ b/RecodeItLib/Remapper/AssemblyUtils.cs @@ -0,0 +1,34 @@ +using dnlib.DotNet; +using ReCodeItLib.Utils; + +namespace ReCodeItLib.ReMapper; + +internal static class AssemblyUtils +{ + public static string TryDeObfuscate(ModuleDefMD module, string assemblyPath, out ModuleDefMD cleanedModule) + { + if (!module!.GetTypes().Any(t => t.Name.Contains("GClass"))) + { + Logger.LogSync("Assembly is obfuscated, running de-obfuscation...\n", ConsoleColor.Yellow); + + module.Dispose(); + module = null; + + Deobfuscator.Deobfuscate(assemblyPath); + + var cleanedName = Path.GetFileNameWithoutExtension(assemblyPath); + cleanedName = $"{cleanedName}-cleaned.dll"; + + var newPath = Path.GetDirectoryName(assemblyPath); + newPath = Path.Combine(newPath!, cleanedName); + + Logger.LogSync($"Cleaning assembly: {newPath}", ConsoleColor.Green); + + cleanedModule = DataProvider.LoadModule(newPath); + return newPath; + } + + cleanedModule = module; + return assemblyPath; + } +} \ No newline at end of file diff --git a/RecodeItLib/Remapper/AutoMatcher.cs b/RecodeItLib/Remapper/AutoMatcher.cs new file mode 100644 index 0000000..07fcc33 --- /dev/null +++ b/RecodeItLib/Remapper/AutoMatcher.cs @@ -0,0 +1,271 @@ +using dnlib.DotNet; +using ReCodeItLib.Models; +using ReCodeItLib.Utils; + +namespace ReCodeItLib.ReMapper; + +public class AutoMatcher(List mappings) +{ + private ModuleDefMD? Module { get; set; } + + private List? CandidateTypes { get; set; } + + private static List _tokens = DataProvider.Settings!.Remapper!.TokensToMatch; + + public void AutoMatch(string assemblyPath, string oldTypeName, string newTypeName) + { + assemblyPath = AssemblyUtils.TryDeObfuscate( + DataProvider.LoadModule(assemblyPath), + assemblyPath, + out var module); + + Module = module; + CandidateTypes = Module.GetTypes() + .Where(t => _tokens.Any(token => t.Name.StartsWith(token))) + // .Where(t => t.Name != oldTypeName) + .ToList(); + + var targetTypeDef = FindTargetType(oldTypeName); + + Logger.LogSync($"Found target type: {targetTypeDef!.FullName}", ConsoleColor.Green); + + var remapModel = new RemapModel(); + remapModel.NewTypeName = newTypeName; + + StartFilter(targetTypeDef, remapModel, assemblyPath); + } + + private TypeDef? FindTargetType(string oldTypeName) + { + return Module!.GetTypes().FirstOrDefault(t => t.FullName == oldTypeName); + } + + private void StartFilter(TypeDef target, RemapModel remapModel, string assemblyPath) + { + Logger.LogSync($"Starting Candidates: {CandidateTypes!.Count}", ConsoleColor.Yellow); + + // Purpose of this pass is to eliminate any types that have no matching parameters + foreach (var candidate in CandidateTypes!.ToList()) + { + if (!PassesGeneralChecks(target, candidate, remapModel.SearchParams.GenericParams)) + { + CandidateTypes!.Remove(candidate); + continue; + } + + if (!ContainsTargetMethods(target, candidate, remapModel.SearchParams.Methods)) + { + CandidateTypes!.Remove(candidate); + continue; + } + + if (!ContainsTargetFields(target, candidate, remapModel.SearchParams.Fields)) + { + CandidateTypes!.Remove(candidate); + continue; + } + + if (!ContainsTargetProperties(target, candidate, remapModel.SearchParams.Properties)) + { + CandidateTypes!.Remove(candidate); + } + } + + if (CandidateTypes!.Count == 1) + { + Logger.LogSync("Narrowed candidates down to one. Testing generated model...", ConsoleColor.Green); + + var tmpList = new List() + { + remapModel + }; + + new ReMapper().InitializeRemap(tmpList, assemblyPath, validate: true); + } + } + + private bool PassesGeneralChecks(TypeDef target, TypeDef candidate, GenericParams parms) + { + if (target.IsPublic != candidate.IsPublic) return false; + if (target.IsAbstract != candidate.IsAbstract) return false; + if (target.IsInterface != candidate.IsInterface) return false; + if (target.IsEnum != candidate.IsEnum) return false; + if (target.IsValueType != candidate.IsValueType) return false; + if (target.HasGenericParameters != candidate.HasGenericParameters) return false; + if (target.IsNested != candidate.IsNested) return false; + if (target.IsSealed != candidate.IsSealed) return false; + if (target.HasCustomAttributes != candidate.HasCustomAttributes) return false; + + parms.IsPublic = target.IsPublic; + parms.IsAbstract = target.IsAbstract; + parms.IsInterface = target.IsInterface; + parms.IsEnum = target.IsEnum; + parms.IsStruct = target.IsValueType && !target.IsEnum; + parms.HasGenericParameters = target.HasGenericParameters; + parms.IsNested = target.IsNested; + parms.IsSealed = target.IsSealed; + parms.HasAttribute = target.HasCustomAttributes; + + return true; + } + + private bool ContainsTargetMethods(TypeDef target, TypeDef candidate, MethodParams methods) + { + // Target has no methods and type has no methods + if (!target.Methods.Any() && !candidate.Methods.Any()) + { + methods.MethodCount = 0; + return true; + } + + // Target has no methods but type has methods + if (!target.Methods.Any() && candidate.Methods.Any()) return false; + + // Target has methods but type has no methods + if (target.Methods.Any() && !candidate.Methods.Any()) return false; + + // Target has a different number of methods + if (target.Methods.Count != candidate.Methods.Count) return false; + + var commonMethods = target.Methods + .Where(m => !m.IsConstructor && !m.IsGetter && !m.IsSetter) + .Select(s => s.Name) + .Intersect(candidate.Methods + .Where(m => !m.IsConstructor && !m.IsGetter && !m.IsSetter) + .Select(s => s.Name)); + + // Methods in target that are not in candidate + var includeMethods = target.Methods + .Where(m => !m.IsConstructor && !m.IsGetter && !m.IsSetter) + .Select(s => s.Name.ToString()) + .Except(candidate.Methods + .Where(m => !m.IsConstructor && !m.IsGetter && !m.IsSetter) + .Select(s => s.Name.ToString())); + + // Methods in candidate that are not in target + var excludeMethods = candidate.Methods + .Where(m => !m.IsConstructor && !m.IsGetter && !m.IsSetter) + .Select(s => s.Name.ToString()) + .Except(target.Methods + .Where(m => !m.IsConstructor && !m.IsGetter && !m.IsSetter) + .Select(s => s.Name.ToString())); + + methods.IncludeMethods.Clear(); + methods.IncludeMethods.AddRange(includeMethods); + + methods.ExcludeMethods.AddRange(excludeMethods); + + return commonMethods.Any(); + } + + private bool ContainsTargetFields(TypeDef target, TypeDef candidate, FieldParams fields) + { + // Target has no fields and type has no fields + if (!target.Fields.Any() && !candidate.Fields.Any()) + { + fields.FieldCount = 0; + return true; + } + + // Target has no fields but type has fields + if (!target.Fields.Any() && candidate.Fields.Any()) return false; + + // Target has fields but type has no fields + if (target.Fields.Any() && !candidate.Fields.Any()) return false; + + // Target has a different number of fields + if (target.Fields.Count != candidate.Fields.Count) return false; + + var commonFields = target.Fields + .Select(s => s.Name) + .Intersect(candidate.Fields.Select(s => s.Name)); + + // Methods in target that are not in candidate + var includeFields = target.Fields + .Select(s => s.Name.ToString()) + .Except(candidate.Fields.Select(s => s.Name.ToString())); + + // Methods in candidate that are not in target + var excludeFields = candidate.Fields + .Select(s => s.Name.ToString()) + .Except(target.Fields.Select(s => s.Name.ToString())); + + fields.IncludeFields.Clear(); + fields.IncludeFields.AddRange(includeFields); + + fields.ExcludeFields.AddRange(excludeFields); + + return commonFields.Any(); + } + + private bool ContainsTargetProperties(TypeDef target, TypeDef candidate, PropertyParams props) + { + // Both target and candidate don't have properties + if (!target.Properties.Any() && !candidate.Properties.Any()) + { + props.PropertyCount = 0; + return true; + } + + // Target has no props but type has props + if (!target.Properties.Any() && candidate.Properties.Any()) return false; + + // Target has props but type has no props + if (target.Properties.Any() && !candidate.Properties.Any()) return false; + + // Target has a different number of props + if (target.Properties.Count != candidate.Properties.Count) return false; + + var commonProps = target.Properties + .Select(s => s.Name) + .Intersect(candidate.Properties.Select(s => s.Name)); + + // Props in target that are not in candidate + var includeProps = target.Properties + .Select(s => s.Name.ToString()) + .Except(candidate.Properties.Select(s => s.Name.ToString())); + + // Props in candidate that are not in target + var excludeProps = candidate.Properties + .Select(s => s.Name.ToString()) + .Except(target.Properties.Select(s => s.Name.ToString())); + + props.IncludeProperties.Clear(); + props.IncludeProperties.AddRange(includeProps); + + props.ExcludeProperties.AddRange(excludeProps); + + return commonProps.Any(); + } + + private void CompareMethods(MappingDiff diff) + { + var diffsByTarget = diff.Target.Methods + .Select(m => m.Name) + .Except(diff.Candidate.Methods.Select(m => m.Name)) + .ToList(); + + if (diffsByTarget.Any()) + { + Logger.LogSync($"Methods in target not present in candidate:\n {string.Join(", ", diffsByTarget)}", ConsoleColor.Yellow); + } + + var diffsByCandidate = diff.Candidate.Methods + .Select(m => m.Name) + .Except(diff.Target.Methods.Select(m => m.Name)) + .ToList(); + + if (diffsByCandidate.Any()) + { + Logger.LogSync($"Methods in candidate not present in target:\n {string.Join(", ", diffsByCandidate)}", ConsoleColor.Yellow); + } + } + + private class MappingDiff + { + public required TypeDef Target; + public required TypeDef Candidate; + + public RemapModel RemapModel = new(); + } +} \ No newline at end of file diff --git a/RecodeItLib/Remapper/ReMapper.cs b/RecodeItLib/Remapper/ReMapper.cs index 589c1bb..4ccf524 100644 --- a/RecodeItLib/Remapper/ReMapper.cs +++ b/RecodeItLib/Remapper/ReMapper.cs @@ -34,14 +34,19 @@ public class ReMapper public void InitializeRemap( List remapModels, string assemblyPath, - string outPath, + string outPath = "", bool validate = false) { _remaps = []; _remaps = remapModels; _alreadyGivenNames = []; - Module = DataProvider.LoadModule(assemblyPath); + assemblyPath = AssemblyUtils.TryDeObfuscate( + DataProvider.LoadModule(assemblyPath), + assemblyPath, + out var module); + + Module = module; OutPath = outPath; @@ -51,9 +56,13 @@ public class ReMapper Stopwatch.Start(); var types = Module.GetTypes(); + + if (!validate) + { + GenerateDynamicRemaps(assemblyPath, types); + } - TryDeObfuscate(types, assemblyPath); - FindBestMatches(types); + FindBestMatches(types, validate); ChooseBestMatches(); // Don't go any further during a validation @@ -71,37 +80,8 @@ public class ReMapper // We are done, write the assembly WriteAssembly(); } - - private void TryDeObfuscate(IEnumerable types, string assemblyPath) - { - if (!Module!.GetTypes().Any(t => t.Name.Contains("GClass"))) - { - Logger.LogSync("Assembly is obfuscated, running de-obfuscation...\n", ConsoleColor.Yellow); - - Module.Dispose(); - Module = null; - - Deobfuscator.Deobfuscate(assemblyPath); - - var cleanedName = Path.GetFileNameWithoutExtension(assemblyPath); - cleanedName = $"{cleanedName}-cleaned.dll"; - - var newPath = Path.GetDirectoryName(assemblyPath); - newPath = Path.Combine(newPath!, cleanedName); - - Console.WriteLine($"Cleaning assembly: {newPath}"); - - Module = DataProvider.LoadModule(newPath); - types = Module.GetTypes(); - - GenerateDynamicRemaps(newPath, types); - return; - } - - GenerateDynamicRemaps(assemblyPath, types); - } - - private void FindBestMatches(IEnumerable types) + + private void FindBestMatches(IEnumerable types, bool validate) { Logger.LogSync("Finding Best Matches...", ConsoleColor.Green); @@ -115,10 +95,13 @@ public class ReMapper }) ); } - - while (!tasks.TrueForAll(t => t.Status == TaskStatus.RanToCompletion)) + + if (!validate) { - Logger.DrawProgressBar(tasks.Where(t => t.IsCompleted)!.Count(), tasks.Count, 50); + while (!tasks.TrueForAll(t => t.Status == TaskStatus.RanToCompletion)) + { + Logger.DrawProgressBar(tasks.Where(t => t.IsCompleted)!.Count(), tasks.Count, 50); + } } Task.WaitAll(tasks.ToArray()); diff --git a/RecodeItLib/Remapper/Statistics.cs b/RecodeItLib/Remapper/Statistics.cs index f337675..c6b49aa 100644 --- a/RecodeItLib/Remapper/Statistics.cs +++ b/RecodeItLib/Remapper/Statistics.cs @@ -1,4 +1,5 @@ using System.Diagnostics; +using Newtonsoft.Json; using ReCodeItLib.Enums; using ReCodeItLib.Models; using ReCodeItLib.Utils; @@ -14,7 +15,7 @@ public class Statistics( public void DisplayStatistics(bool validate = false) { DisplayAlternativeMatches(); - DisplayFailuresAndChanges(); + DisplayFailuresAndChanges(validate); if (!validate) { @@ -45,7 +46,7 @@ public class Statistics( } } - private void DisplayFailuresAndChanges() + private void DisplayFailuresAndChanges(bool validate) { var failures = 0; var changes = 0; @@ -75,6 +76,17 @@ public class Statistics( continue; } + if (validate) + { + var str = JsonConvert.SerializeObject(remap, Formatting.Indented); + + Logger.Log("Generated Model: ", ConsoleColor.Blue); + Logger.Log(str, ConsoleColor.Blue); + + Logger.Log("Passed validation", ConsoleColor.Green); + return; + } + changes++; } From 17df885ea8d1411616fe4087e85f8a879345fa50 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 20:07:20 -0500 Subject: [PATCH 02/13] More filter work, add prompts --- ReCodeItCLI/Commands/AutoMatcher.cs | 3 +- RecodeItLib/Remapper/AutoMatcher.cs | 70 ++++++++++++++++++----------- 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/ReCodeItCLI/Commands/AutoMatcher.cs b/ReCodeItCLI/Commands/AutoMatcher.cs index 3759ec5..df21588 100644 --- a/ReCodeItCLI/Commands/AutoMatcher.cs +++ b/ReCodeItCLI/Commands/AutoMatcher.cs @@ -33,10 +33,11 @@ public class AutoMatchCommand : ICommand if (!string.IsNullOrEmpty(MappingsPath)) { + Logger.LogSync("Loaded mapping file", ConsoleColor.Green); remaps.AddRange(DataProvider.LoadMappingFile(MappingsPath)); } - new AutoMatcher(remaps) + new AutoMatcher(remaps, MappingsPath) .AutoMatch(AssemblyPath, OldTypeName, NewTypeName); // Wait for log termination diff --git a/RecodeItLib/Remapper/AutoMatcher.cs b/RecodeItLib/Remapper/AutoMatcher.cs index 07fcc33..ee1b7fd 100644 --- a/RecodeItLib/Remapper/AutoMatcher.cs +++ b/RecodeItLib/Remapper/AutoMatcher.cs @@ -4,7 +4,7 @@ using ReCodeItLib.Utils; namespace ReCodeItLib.ReMapper; -public class AutoMatcher(List mappings) +public class AutoMatcher(List mappings, string mappingPath) { private ModuleDefMD? Module { get; set; } @@ -81,6 +81,8 @@ public class AutoMatcher(List mappings) }; new ReMapper().InitializeRemap(tmpList, assemblyPath, validate: true); + + ProcessEndQuestions(remapModel, assemblyPath); } } @@ -155,6 +157,14 @@ public class AutoMatcher(List mappings) methods.ExcludeMethods.AddRange(excludeMethods); + methods.MethodCount = target.Methods + .Count(m => !m.IsConstructor && !m.IsGetter && !m.IsSetter && !m.IsSpecialName); + + if (target.Methods.Any(m => m.IsConstructor && m.Parameters.Count > 0)) + { + methods.ConstructorParameterCount = target.Methods.First(m => m.IsConstructor && m.Parameters.Count > 0).Parameters.Count - 1; + } + return commonMethods.Any(); } @@ -195,6 +205,8 @@ public class AutoMatcher(List mappings) fields.ExcludeFields.AddRange(excludeFields); + fields.FieldCount = target.Fields.Count; + return commonFields.Any(); } @@ -235,37 +247,43 @@ public class AutoMatcher(List mappings) props.ExcludeProperties.AddRange(excludeProps); + props.PropertyCount = target.Properties.Count; + return commonProps.Any(); } - - private void CompareMethods(MappingDiff diff) - { - var diffsByTarget = diff.Target.Methods - .Select(m => m.Name) - .Except(diff.Candidate.Methods.Select(m => m.Name)) - .ToList(); - if (diffsByTarget.Any()) + private void ProcessEndQuestions(RemapModel remapModel, string assemblyPath) + { + Thread.Sleep(1000); + + Logger.LogSync("Add remap to existing list?.. (y/n)", ConsoleColor.Yellow); + var resp = Console.ReadLine(); + + if (resp == "y" || resp == "yes" || resp == "Y") { - Logger.LogSync($"Methods in target not present in candidate:\n {string.Join(", ", diffsByTarget)}", ConsoleColor.Yellow); + if (mappings.Count == 0) + { + Logger.LogSync("No remaps loaded. Please restart with a provided mapping path.", ConsoleColor.Red); + return; + } + + if (mappings.Any(m => m.NewTypeName == remapModel.NewTypeName)) + { + Logger.LogSync($"Ambiguous new type names found for {remapModel.NewTypeName}. Please pick a different name.", ConsoleColor.Red); + return; + } + + mappings.Add(remapModel); + DataProvider.UpdateMapping(mappingPath, mappings); } - var diffsByCandidate = diff.Candidate.Methods - .Select(m => m.Name) - .Except(diff.Target.Methods.Select(m => m.Name)) - .ToList(); - - if (diffsByCandidate.Any()) - { - Logger.LogSync($"Methods in candidate not present in target:\n {string.Join(", ", diffsByCandidate)}", ConsoleColor.Yellow); - } - } - - private class MappingDiff - { - public required TypeDef Target; - public required TypeDef Candidate; + Logger.LogSync("Would you like to run the remap process?... (y/n)", ConsoleColor.Yellow); + var resp2 = Console.ReadLine(); - public RemapModel RemapModel = new(); + if (resp2 == "y" || resp2 == "yes" || resp2 == "Y") + { + var outPath = Path.GetDirectoryName(assemblyPath); + new ReMapper().InitializeRemap(mappings, assemblyPath, outPath); + } } } \ No newline at end of file From 9f2165f32518d1fc53e92c5832faaeaf8e04f92b Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 20:10:41 -0500 Subject: [PATCH 03/13] Fix remapper error --- ReCodeItCLI/Commands/AutoMatcher.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ReCodeItCLI/Commands/AutoMatcher.cs b/ReCodeItCLI/Commands/AutoMatcher.cs index df21588..fc4ec33 100644 --- a/ReCodeItCLI/Commands/AutoMatcher.cs +++ b/ReCodeItCLI/Commands/AutoMatcher.cs @@ -27,6 +27,12 @@ public class AutoMatchCommand : ICommand DataProvider.IsCli = true; DataProvider.LoadAppSettings(); + var remapperSettings = DataProvider.Settings!.Remapper!.MappingSettings; + + remapperSettings!.RenameFields = true; + remapperSettings.RenameProperties = true; + remapperSettings.Publicize = true; + Logger.LogSync("Finding match..."); var remaps = new List(); From 2cf25373fe061e500c8de37aac5f13bfd1e82101 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 20:37:49 -0500 Subject: [PATCH 04/13] Make lists into hashsets --- Assets/mappings.jsonc | 166 ++++++++++++++++++++++++++++ ReCodeItCLI/Commands/AutoMatcher.cs | 6 - RecodeItGUI/GUI/Main.cs | 20 ++-- RecodeItGUI/Utils/GUIHelpers.cs | 2 +- RecodeItLib/Models/RemapModel.cs | 20 ++-- RecodeItLib/Remapper/AutoMatcher.cs | 45 ++++++-- 6 files changed, 220 insertions(+), 39 deletions(-) diff --git a/Assets/mappings.jsonc b/Assets/mappings.jsonc index 8064ca1..21fffa3 100644 --- a/Assets/mappings.jsonc +++ b/Assets/mappings.jsonc @@ -16422,5 +16422,171 @@ "ExcludeEvents": [] } } + }, + { + "NewTypeName": "PlantState", + "OriginalTypeName": "GClass1895", + "UseForceRename": false, + "SearchParams": { + "GenericParams": { + "IsPublic": true, + "IsAbstract": false, + "IsInterface": false, + "IsStruct": false, + "IsEnum": false, + "IsNested": false, + "IsSealed": true, + "HasAttribute": false, + "HasGenericParameters": false + }, + "Methods": { + "ConstructorParameterCount": 1, + "MethodCount": 9, + "IncludeMethods": [ + "Enter", + "Exit", + "ManualAnimatorMoveUpdate", + "ChangePose", + "SetTilt", + "Pickup", + "Examine", + "Plant", + "Cancel" + ], + "ExcludeMethods": [ + "Dispose", + "smethod_0", + "method_0", + "smethod_1", + "method_1", + "method_2", + "Pause", + "Resume", + "method_3", + "Begin", + "End", + "GetIcon", + "RenderModel", + "PoseModelByPivot", + "PoseModelByBounds", + "GetBounds", + "Create", + "ChatShared.IChatMember.Add", + "ChatShared.IChatMember.Remove", + "ChatShared.IChatMember.Receive", + "ChatShared.IChatMember.ReceiveReplay", + "ChatShared.IChatMember.SetBanned", + "ChatShared.IChatMember.SetUnbanned", + "ChatShared.IChatMember.Drop", + "OnUpdate", + "GetEffect", + "OnLateUpdate", + "method_4", + "method_5", + "OnDispose", + "StartFade", + "StopFade", + "Clear", + "ContainsIndex", + "GetNumPixels", + "ToIndexArray", + "ToSamplesArray", + "UnionWith", + "GetCellData", + "GetPixelData", + "DisposeAt", + "GetSample", + "Remap", + "ProcessAnimator", + "GInterface109.OnParameterValueChanged", + "Serialize", + "Deserialize", + "UpdateTimers", + "HandleExits", + "Transit", + "InteractWithTransit", + "Sizes", + "Timers", + "method_16", + "method_17", + "Start", + "Stop", + "method_6", + "add_OnQuit", + "remove_OnQuit", + "ShowDialogScreen", + "ExecuteDialogOption", + "ExecuteQuestAction", + "ExecuteServiceAction", + "SaveDialogState", + "add_SearchStopped", + "remove_SearchStopped", + "add_SearchComplete", + "remove_SearchComplete", + "Search", + "TryPauseFrameRelatedMetrics", + "TryResumeFrameRelatedMetrics", + "Update", + "SetAsCurrent", + "add_OnBuffsUpdated", + "remove_OnBuffsUpdated", + "Add", + "Replace", + "Remove", + "InvokeInternalBuffChange", + "EFT.IExplosiveItem.CreateFragment", + "Contains", + "CanExecute", + "RaiseEvents", + "RollBack", + "Execute", + "ExecuteWithNewCount", + "GInterface143.SetItemInfo", + "GetHashSum", + "GetInfo", + "ExecuteInternal", + "ToDescriptor", + "ToString", + "ToBaseInventoryCommand", + "method_7", + "method_8", + "method_9", + "method_10", + "ExecuteInteractionInternal", + "IsActive", + "IsInteractive", + "method_11", + "GetCommands", + "SetChanges", + "Reset", + "Rollback", + "Save", + "AddTask", + "CreateThread", + "RunInMainTread", + "CheckForFinishedTasks", + "Kill" + ] + }, + "Fields": { + "FieldCount": 2, + "IncludeFields": [], + "ExcludeFields": [] + }, + "Properties": { + "PropertyCount": 0, + "IncludeProperties": [], + "ExcludeProperties": [] + }, + "NestedTypes": { + "NestedTypeCount": -1, + "IncludeNestedTypes": [], + "ExcludeNestedTypes": [] + }, + "Events": { + "IncludeEvents": [], + "ExcludeEvents": [] + } + } } ] \ No newline at end of file diff --git a/ReCodeItCLI/Commands/AutoMatcher.cs b/ReCodeItCLI/Commands/AutoMatcher.cs index fc4ec33..b2edea2 100644 --- a/ReCodeItCLI/Commands/AutoMatcher.cs +++ b/ReCodeItCLI/Commands/AutoMatcher.cs @@ -26,12 +26,6 @@ public class AutoMatchCommand : ICommand { DataProvider.IsCli = true; DataProvider.LoadAppSettings(); - - var remapperSettings = DataProvider.Settings!.Remapper!.MappingSettings; - - remapperSettings!.RenameFields = true; - remapperSettings.RenameProperties = true; - remapperSettings.Publicize = true; Logger.LogSync("Finding match..."); diff --git a/RecodeItGUI/GUI/Main.cs b/RecodeItGUI/GUI/Main.cs index d466f05..af5e5a9 100644 --- a/RecodeItGUI/GUI/Main.cs +++ b/RecodeItGUI/GUI/Main.cs @@ -247,31 +247,31 @@ public partial class ReCodeItForm : Form { ConstructorParameterCount = (int)ConstructorCountEnabled.GetCount(ConstuctorCountUpDown), MethodCount = (int)MethodCountEnabled.GetCount(MethodCountUpDown), - IncludeMethods = GUIHelpers.GetAllEntriesFromListBox(MethodIncludeBox), - ExcludeMethods = GUIHelpers.GetAllEntriesFromListBox(MethodExcludeBox), + IncludeMethods = GUIHelpers.GetAllEntriesFromListBox(MethodIncludeBox).ToHashSet(), + ExcludeMethods = GUIHelpers.GetAllEntriesFromListBox(MethodExcludeBox).ToHashSet(), }, Fields = { FieldCount = (int)FieldCountEnabled.GetCount(FieldCountUpDown), - IncludeFields = GUIHelpers.GetAllEntriesFromListBox(FieldIncludeBox), - ExcludeFields = GUIHelpers.GetAllEntriesFromListBox(FieldExcludeBox), + IncludeFields = GUIHelpers.GetAllEntriesFromListBox(FieldIncludeBox).ToHashSet(), + ExcludeFields = GUIHelpers.GetAllEntriesFromListBox(FieldExcludeBox).ToHashSet(), }, Properties = { PropertyCount = (int)PropertyCountEnabled.GetCount(PropertyCountUpDown), - IncludeProperties = GUIHelpers.GetAllEntriesFromListBox(PropertiesIncludeBox), - ExcludeProperties = GUIHelpers.GetAllEntriesFromListBox(PropertiesExcludeBox), + IncludeProperties = GUIHelpers.GetAllEntriesFromListBox(PropertiesIncludeBox).ToHashSet(), + ExcludeProperties = GUIHelpers.GetAllEntriesFromListBox(PropertiesExcludeBox).ToHashSet(), }, NestedTypes = { NestedTypeCount = (int)NestedTypeCountEnabled.GetCount(NestedTypeCountUpDown), - IncludeNestedTypes = GUIHelpers.GetAllEntriesFromListBox(NestedTypesIncludeBox), - ExcludeNestedTypes = GUIHelpers.GetAllEntriesFromListBox(NestedTypesExcludeBox), + IncludeNestedTypes = GUIHelpers.GetAllEntriesFromListBox(NestedTypesIncludeBox).ToHashSet(), + ExcludeNestedTypes = GUIHelpers.GetAllEntriesFromListBox(NestedTypesExcludeBox).ToHashSet(), }, Events = { - IncludeEvents = GUIHelpers.GetAllEntriesFromListBox(EventsIncludeBox), - ExcludeEvents = GUIHelpers.GetAllEntriesFromListBox(EventsExcludeBox) + IncludeEvents = GUIHelpers.GetAllEntriesFromListBox(EventsIncludeBox).ToHashSet(), + ExcludeEvents = GUIHelpers.GetAllEntriesFromListBox(EventsExcludeBox).ToHashSet() } } }; diff --git a/RecodeItGUI/Utils/GUIHelpers.cs b/RecodeItGUI/Utils/GUIHelpers.cs index 2d02e10..cc12d50 100644 --- a/RecodeItGUI/Utils/GUIHelpers.cs +++ b/RecodeItGUI/Utils/GUIHelpers.cs @@ -286,7 +286,7 @@ internal static class GUIHelpers /// /// /// A new tree node, or null if the provided list is empty - private static TreeNode GenerateNodeFromList(List items, string name) + private static TreeNode GenerateNodeFromList(HashSet items, string name) { var node = new TreeNode(name); diff --git a/RecodeItLib/Models/RemapModel.cs b/RecodeItLib/Models/RemapModel.cs index 65c8cb5..87b5d0b 100644 --- a/RecodeItLib/Models/RemapModel.cs +++ b/RecodeItLib/Models/RemapModel.cs @@ -85,33 +85,33 @@ public class MethodParams { public int ConstructorParameterCount { get; set; } = -1; public int MethodCount { get; set; } = -1; - public List IncludeMethods { get; set; } = []; - public List ExcludeMethods { get; set; } = []; + public HashSet IncludeMethods { get; set; } = []; + public HashSet ExcludeMethods { get; set; } = []; } public class FieldParams { public int FieldCount { get; set; } = -1; - public List IncludeFields { get; set; } = []; - public List ExcludeFields { get; set; } = []; + public HashSet IncludeFields { get; set; } = []; + public HashSet ExcludeFields { get; set; } = []; } public class PropertyParams { public int PropertyCount { get; set; } = -1; - public List IncludeProperties { get; set; } = []; - public List ExcludeProperties { get; set; } = []; + public HashSet IncludeProperties { get; set; } = []; + public HashSet ExcludeProperties { get; set; } = []; } public class NestedTypeParams { public int NestedTypeCount { get; set; } = -1; - public List IncludeNestedTypes { get; set; } = []; - public List ExcludeNestedTypes { get; set; } = []; + public HashSet IncludeNestedTypes { get; set; } = []; + public HashSet ExcludeNestedTypes { get; set; } = []; } public class EventParams { - public List IncludeEvents { get; set; } = []; - public List ExcludeEvents { get; set; } = []; + public HashSet IncludeEvents { get; set; } = []; + public HashSet ExcludeEvents { get; set; } = []; } \ No newline at end of file diff --git a/RecodeItLib/Remapper/AutoMatcher.cs b/RecodeItLib/Remapper/AutoMatcher.cs index ee1b7fd..a4d64cc 100644 --- a/RecodeItLib/Remapper/AutoMatcher.cs +++ b/RecodeItLib/Remapper/AutoMatcher.cs @@ -26,6 +26,12 @@ public class AutoMatcher(List mappings, string mappingPath) .ToList(); var targetTypeDef = FindTargetType(oldTypeName); + + if (targetTypeDef is null) + { + Logger.LogSync($"Could not target type: {oldTypeName}", ConsoleColor.Red); + return; + } Logger.LogSync($"Found target type: {targetTypeDef!.FullName}", ConsoleColor.Green); @@ -152,10 +158,15 @@ public class AutoMatcher(List mappings, string mappingPath) .Where(m => !m.IsConstructor && !m.IsGetter && !m.IsSetter) .Select(s => s.Name.ToString())); - methods.IncludeMethods.Clear(); - methods.IncludeMethods.AddRange(includeMethods); - - methods.ExcludeMethods.AddRange(excludeMethods); + foreach (var include in includeMethods) + { + methods.IncludeMethods.Add(include); + } + + foreach (var exclude in excludeMethods) + { + methods.ExcludeMethods.Add(exclude); + } methods.MethodCount = target.Methods .Count(m => !m.IsConstructor && !m.IsGetter && !m.IsSetter && !m.IsSpecialName); @@ -200,10 +211,15 @@ public class AutoMatcher(List mappings, string mappingPath) .Select(s => s.Name.ToString()) .Except(target.Fields.Select(s => s.Name.ToString())); - fields.IncludeFields.Clear(); - fields.IncludeFields.AddRange(includeFields); - - fields.ExcludeFields.AddRange(excludeFields); + foreach (var include in includeFields) + { + fields.IncludeFields.Add(include); + } + + foreach (var exclude in excludeFields) + { + fields.ExcludeFields.Add(exclude); + } fields.FieldCount = target.Fields.Count; @@ -242,10 +258,15 @@ public class AutoMatcher(List mappings, string mappingPath) .Select(s => s.Name.ToString()) .Except(target.Properties.Select(s => s.Name.ToString())); - props.IncludeProperties.Clear(); - props.IncludeProperties.AddRange(includeProps); - - props.ExcludeProperties.AddRange(excludeProps); + foreach (var include in includeProps) + { + props.IncludeProperties.Add(include); + } + + foreach (var exclude in excludeProps) + { + props.ExcludeProperties.Add(exclude); + } props.PropertyCount = target.Properties.Count; From 3dbdfae5491d2f83cd0eeed61a76bdb9e0757c5a Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 20:38:57 -0500 Subject: [PATCH 05/13] Remove test remap --- Assets/mappings.jsonc | 166 ------------------------------------------ 1 file changed, 166 deletions(-) diff --git a/Assets/mappings.jsonc b/Assets/mappings.jsonc index 21fffa3..8064ca1 100644 --- a/Assets/mappings.jsonc +++ b/Assets/mappings.jsonc @@ -16422,171 +16422,5 @@ "ExcludeEvents": [] } } - }, - { - "NewTypeName": "PlantState", - "OriginalTypeName": "GClass1895", - "UseForceRename": false, - "SearchParams": { - "GenericParams": { - "IsPublic": true, - "IsAbstract": false, - "IsInterface": false, - "IsStruct": false, - "IsEnum": false, - "IsNested": false, - "IsSealed": true, - "HasAttribute": false, - "HasGenericParameters": false - }, - "Methods": { - "ConstructorParameterCount": 1, - "MethodCount": 9, - "IncludeMethods": [ - "Enter", - "Exit", - "ManualAnimatorMoveUpdate", - "ChangePose", - "SetTilt", - "Pickup", - "Examine", - "Plant", - "Cancel" - ], - "ExcludeMethods": [ - "Dispose", - "smethod_0", - "method_0", - "smethod_1", - "method_1", - "method_2", - "Pause", - "Resume", - "method_3", - "Begin", - "End", - "GetIcon", - "RenderModel", - "PoseModelByPivot", - "PoseModelByBounds", - "GetBounds", - "Create", - "ChatShared.IChatMember.Add", - "ChatShared.IChatMember.Remove", - "ChatShared.IChatMember.Receive", - "ChatShared.IChatMember.ReceiveReplay", - "ChatShared.IChatMember.SetBanned", - "ChatShared.IChatMember.SetUnbanned", - "ChatShared.IChatMember.Drop", - "OnUpdate", - "GetEffect", - "OnLateUpdate", - "method_4", - "method_5", - "OnDispose", - "StartFade", - "StopFade", - "Clear", - "ContainsIndex", - "GetNumPixels", - "ToIndexArray", - "ToSamplesArray", - "UnionWith", - "GetCellData", - "GetPixelData", - "DisposeAt", - "GetSample", - "Remap", - "ProcessAnimator", - "GInterface109.OnParameterValueChanged", - "Serialize", - "Deserialize", - "UpdateTimers", - "HandleExits", - "Transit", - "InteractWithTransit", - "Sizes", - "Timers", - "method_16", - "method_17", - "Start", - "Stop", - "method_6", - "add_OnQuit", - "remove_OnQuit", - "ShowDialogScreen", - "ExecuteDialogOption", - "ExecuteQuestAction", - "ExecuteServiceAction", - "SaveDialogState", - "add_SearchStopped", - "remove_SearchStopped", - "add_SearchComplete", - "remove_SearchComplete", - "Search", - "TryPauseFrameRelatedMetrics", - "TryResumeFrameRelatedMetrics", - "Update", - "SetAsCurrent", - "add_OnBuffsUpdated", - "remove_OnBuffsUpdated", - "Add", - "Replace", - "Remove", - "InvokeInternalBuffChange", - "EFT.IExplosiveItem.CreateFragment", - "Contains", - "CanExecute", - "RaiseEvents", - "RollBack", - "Execute", - "ExecuteWithNewCount", - "GInterface143.SetItemInfo", - "GetHashSum", - "GetInfo", - "ExecuteInternal", - "ToDescriptor", - "ToString", - "ToBaseInventoryCommand", - "method_7", - "method_8", - "method_9", - "method_10", - "ExecuteInteractionInternal", - "IsActive", - "IsInteractive", - "method_11", - "GetCommands", - "SetChanges", - "Reset", - "Rollback", - "Save", - "AddTask", - "CreateThread", - "RunInMainTread", - "CheckForFinishedTasks", - "Kill" - ] - }, - "Fields": { - "FieldCount": 2, - "IncludeFields": [], - "ExcludeFields": [] - }, - "Properties": { - "PropertyCount": 0, - "IncludeProperties": [], - "ExcludeProperties": [] - }, - "NestedTypes": { - "NestedTypeCount": -1, - "IncludeNestedTypes": [], - "ExcludeNestedTypes": [] - }, - "Events": { - "IncludeEvents": [], - "ExcludeEvents": [] - } - } } ] \ No newline at end of file From 4c82026a84e474a9db799035552bc1e358901044 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 21:10:31 -0500 Subject: [PATCH 06/13] Nested type support --- RecodeItLib/Models/RemapModel.cs | 2 + RecodeItLib/Remapper/AutoMatcher.cs | 67 ++++++++++++++++++++++++++--- 2 files changed, 62 insertions(+), 7 deletions(-) diff --git a/RecodeItLib/Models/RemapModel.cs b/RecodeItLib/Models/RemapModel.cs index 87b5d0b..028b922 100644 --- a/RecodeItLib/Models/RemapModel.cs +++ b/RecodeItLib/Models/RemapModel.cs @@ -35,6 +35,8 @@ public class RemapModel public bool UseForceRename { get; set; } + public bool? AutoGenerated { get; set; } = null; + public SearchParams SearchParams { get; set; } = new(); } diff --git a/RecodeItLib/Remapper/AutoMatcher.cs b/RecodeItLib/Remapper/AutoMatcher.cs index a4d64cc..cc5a0e5 100644 --- a/RecodeItLib/Remapper/AutoMatcher.cs +++ b/RecodeItLib/Remapper/AutoMatcher.cs @@ -72,6 +72,12 @@ public class AutoMatcher(List mappings, string mappingPath) } if (!ContainsTargetProperties(target, candidate, remapModel.SearchParams.Properties)) + { + CandidateTypes!.Remove(candidate); + continue; + } + + if (!ContainsTargetNestedTypes(target, candidate, remapModel.SearchParams.NestedTypes)) { CandidateTypes!.Remove(candidate); } @@ -89,7 +95,10 @@ public class AutoMatcher(List mappings, string mappingPath) new ReMapper().InitializeRemap(tmpList, assemblyPath, validate: true); ProcessEndQuestions(remapModel, assemblyPath); + return; } + + Logger.LogSync("Could not find a match... :(", ConsoleColor.Red); } private bool PassesGeneralChecks(TypeDef target, TypeDef candidate, GenericParams parms) @@ -113,6 +122,12 @@ public class AutoMatcher(List mappings, string mappingPath) parms.IsNested = target.IsNested; parms.IsSealed = target.IsSealed; parms.HasAttribute = target.HasCustomAttributes; + parms.IsDerived = target.BaseType != null && target.BaseType.Name != "Object"; + + if ((bool)parms.IsDerived) + { + parms.MatchBaseClass = target.BaseType?.Name.String; + } return true; } @@ -188,9 +203,6 @@ public class AutoMatcher(List mappings, string mappingPath) return true; } - // Target has no fields but type has fields - if (!target.Fields.Any() && candidate.Fields.Any()) return false; - // Target has fields but type has no fields if (target.Fields.Any() && !candidate.Fields.Any()) return false; @@ -235,9 +247,6 @@ public class AutoMatcher(List mappings, string mappingPath) return true; } - // Target has no props but type has props - if (!target.Properties.Any() && candidate.Properties.Any()) return false; - // Target has props but type has no props if (target.Properties.Any() && !candidate.Properties.Any()) return false; @@ -273,6 +282,48 @@ public class AutoMatcher(List mappings, string mappingPath) return commonProps.Any(); } + private bool ContainsTargetNestedTypes(TypeDef target, TypeDef candidate, NestedTypeParams nt) + { + // Target has no nt's but type has nt's + if (!target.NestedTypes.Any() && candidate.NestedTypes.Any()) + { + nt.NestedTypeCount = 0; + return false; + } + + // Target has nt's but type has no nt's + if (target.NestedTypes.Any() && !candidate.NestedTypes.Any()) return false; + + // Target has a different number of nt's + if (target.NestedTypes.Count != candidate.NestedTypes.Count) return false; + + var commonNts = target.NestedTypes + .Select(s => s.Name) + .Intersect(candidate.NestedTypes.Select(s => s.Name)); + + var includeNts = target.NestedTypes + .Select(s => s.Name.ToString()) + .Except(candidate.NestedTypes.Select(s => s.Name.ToString())); + + var excludeNts = candidate.NestedTypes + .Select(s => s.Name.ToString()) + .Except(target.NestedTypes.Select(s => s.Name.ToString())); + + foreach (var include in includeNts) + { + nt.IncludeNestedTypes.Add(include); + } + + foreach (var exclude in excludeNts) + { + nt.ExcludeNestedTypes.Add(exclude); + } + + nt.NestedTypeCount = target.NestedTypes.Count; + + return commonNts.Any() || !target.IsNested; + } + private void ProcessEndQuestions(RemapModel remapModel, string assemblyPath) { Thread.Sleep(1000); @@ -293,7 +344,9 @@ public class AutoMatcher(List mappings, string mappingPath) Logger.LogSync($"Ambiguous new type names found for {remapModel.NewTypeName}. Please pick a different name.", ConsoleColor.Red); return; } - + + remapModel.AutoGenerated = true; + mappings.Add(remapModel); DataProvider.UpdateMapping(mappingPath, mappings); } From b58fee548fcc8eb764e04c639ac265d4a27cc36e Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 21:51:50 -0500 Subject: [PATCH 07/13] Add events, remove unused property, move other properties --- Assets/mappings.jsonc | 22 ++++---- RecodeItGUI/GUI/Main.cs | 19 +++---- RecodeItGUI/Utils/GUIHelpers.cs | 2 +- RecodeItLib/Models/RemapModel.cs | 20 +++---- RecodeItLib/Remapper/AutoMatcher.cs | 55 ++++++++++++++++++- .../Remapper/Filters/GenericTypeFilters.cs | 13 ++--- RecodeItLib/Remapper/ReMapper.cs | 2 +- RecodeItLib/Remapper/RenameHelper.cs | 2 +- 8 files changed, 87 insertions(+), 48 deletions(-) diff --git a/Assets/mappings.jsonc b/Assets/mappings.jsonc index 8064ca1..d05b0a9 100644 --- a/Assets/mappings.jsonc +++ b/Assets/mappings.jsonc @@ -10282,7 +10282,7 @@ "GenericParams": { "IsPublic": true, "IsNested": true, - "NTParentName": "SkillManager", + "NestedTypeParentName": "SkillManager", "IsDerived": false }, "Methods": { @@ -10322,7 +10322,7 @@ "GenericParams": { "IsPublic": true, "IsNested": true, - "NTParentName": "SkillManager" + "NestedTypeParentName": "SkillManager" }, "Methods": { "ConstructorParameterCount": -1, @@ -10362,7 +10362,7 @@ "IsPublic": true, "IsAbstract": true, "IsNested": true, - "NTParentName": "SkillManager" + "NestedTypeParentName": "SkillManager" }, "Methods": { "ConstructorParameterCount": -1, @@ -10450,7 +10450,7 @@ "GenericParams": { "IsPublic": true, "IsNested": true, - "NTParentName": "TraderDialogScreen", + "NestedTypeParentName": "TraderDialogScreen", "IsSealed": true }, "Methods": { @@ -10496,7 +10496,7 @@ "IsPublic": true, "IsAbstract": false, "IsNested": true, - "NTParentName": "MatchmakerOfflineRaidScreen" + "NestedTypeParentName": "MatchmakerOfflineRaidScreen" }, "Methods": { "ConstructorParameterCount": -1, @@ -10621,7 +10621,7 @@ "GenericParams": { "IsPublic": true, "IsNested": true, - "NTParentName": "Profile" + "NestedTypeParentName": "Profile" }, "Methods": { "ConstructorParameterCount": -1, @@ -11019,7 +11019,7 @@ "GenericParams": { "IsPublic": true, "IsNested": true, - "NTParentName": "MatchmakerTimeHasCome", + "NestedTypeParentName": "MatchmakerTimeHasCome", "IsSealed": false }, "Methods": { @@ -11201,7 +11201,7 @@ "IsPublic": true, "IsInterface": true, "IsNested": true, - "NTParentName": "BetterAudio" + "NestedTypeParentName": "BetterAudio" }, "Methods": { "ConstructorParameterCount": -1, @@ -11243,7 +11243,7 @@ "IsPublic": true, "IsInterface": true, "IsNested": true, - "NTParentName": "ClientPlayer" + "NestedTypeParentName": "ClientPlayer" }, "Methods": { "ConstructorParameterCount": -1, @@ -13990,7 +13990,7 @@ "IsPublic": true, "IsAbstract": true, "IsNested": true, - "NTParentName": "Player" + "NestedTypeParentName": "Player" }, "Methods": { "ConstructorParameterCount": -1, @@ -15690,7 +15690,7 @@ "IsPublic": true, "IsStruct": true, "IsNested": true, - "NTParentName": "WorldInteractiveObject" + "NestedTypeParentName": "WorldInteractiveObject" }, "Methods": { "ConstructorParameterCount": -1, diff --git a/RecodeItGUI/GUI/Main.cs b/RecodeItGUI/GUI/Main.cs index af5e5a9..ab583eb 100644 --- a/RecodeItGUI/GUI/Main.cs +++ b/RecodeItGUI/GUI/Main.cs @@ -227,20 +227,12 @@ public partial class ReCodeItForm : Form ? bool.Parse(HasGenericParamsComboBox.GetSelectedItem().AsSpan()) : null, - IsNested = IsNestedUpDown.GetEnabled(), + IsDerived = IsDerivedUpDown.GetEnabled(), - NTParentName = NestedTypeParentName.Text == string.Empty - ? null - : NestedTypeParentName.Text, - MatchBaseClass = BaseClassIncludeTextFIeld.Text == string.Empty ? null : BaseClassIncludeTextFIeld.Text, - - IgnoreBaseClass = BaseClassExcludeTextField.Text == string.Empty - ? null - : BaseClassExcludeTextField.Text, }, Methods = @@ -264,6 +256,10 @@ public partial class ReCodeItForm : Form }, NestedTypes = { + IsNested = IsNestedUpDown.GetEnabled(), + NestedTypeParentName = NestedTypeParentName.Text == string.Empty + ? null + : NestedTypeParentName.Text, NestedTypeCount = (int)NestedTypeCountEnabled.GetCount(NestedTypeCountUpDown), IncludeNestedTypes = GUIHelpers.GetAllEntriesFromListBox(NestedTypesIncludeBox).ToHashSet(), ExcludeNestedTypes = GUIHelpers.GetAllEntriesFromListBox(NestedTypesExcludeBox).ToHashSet(), @@ -829,8 +825,7 @@ public partial class ReCodeItForm : Form RemapperUseForceRename.Checked = remap.UseForceRename; BaseClassIncludeTextFIeld.Text = remap.SearchParams.GenericParams.MatchBaseClass; - BaseClassExcludeTextField.Text = remap.SearchParams.GenericParams.IgnoreBaseClass; - NestedTypeParentName.Text = remap.SearchParams.GenericParams.NTParentName; + NestedTypeParentName.Text = remap.SearchParams.NestedTypes.NestedTypeParentName; ConstructorCountEnabled.Checked = remap.SearchParams.Methods.ConstructorParameterCount >= 0; @@ -882,7 +877,7 @@ public partial class ReCodeItForm : Form ? remap.SearchParams.GenericParams.HasGenericParameters.ToString() : "Disabled"; - IsNestedUpDown.BuildStringList("IsNested", false, remap.SearchParams.GenericParams.IsNested); + IsNestedUpDown.BuildStringList("IsNested", false, remap.SearchParams.NestedTypes.IsNested); IsDerivedUpDown.BuildStringList("IsDerived", false, remap.SearchParams.GenericParams.IsDerived); foreach (var method in remap.SearchParams.Methods.IncludeMethods) diff --git a/RecodeItGUI/Utils/GUIHelpers.cs b/RecodeItGUI/Utils/GUIHelpers.cs index cc12d50..f436ad4 100644 --- a/RecodeItGUI/Utils/GUIHelpers.cs +++ b/RecodeItGUI/Utils/GUIHelpers.cs @@ -106,7 +106,7 @@ internal static class GUIHelpers var isInterface = model.SearchParams.GenericParams.IsInterface == null ? null : model.SearchParams.GenericParams.IsInterface; var isStruct = model.SearchParams.GenericParams.IsStruct == null ? null : model.SearchParams.GenericParams.IsStruct; var isEnum = model.SearchParams.GenericParams.IsEnum == null ? null : model.SearchParams.GenericParams.IsEnum; - var isNested = model.SearchParams.GenericParams.IsNested == null ? null : model.SearchParams.GenericParams.IsNested; + var isNested = model.SearchParams.NestedTypes.IsNested == null ? null : model.SearchParams.NestedTypes.IsNested; var isSealed = model.SearchParams.GenericParams.IsSealed == null ? null : model.SearchParams.GenericParams.IsSealed; var HasAttribute = model.SearchParams.GenericParams.HasAttribute == null ? null : model.SearchParams.GenericParams.HasAttribute; var IsDerived = model.SearchParams.GenericParams.IsDerived == null ? null : model.SearchParams.GenericParams.IsDerived; diff --git a/RecodeItLib/Models/RemapModel.cs b/RecodeItLib/Models/RemapModel.cs index 028b922..3df2372 100644 --- a/RecodeItLib/Models/RemapModel.cs +++ b/RecodeItLib/Models/RemapModel.cs @@ -61,26 +61,15 @@ public class GenericParams public bool? IsInterface { get; set; } = null; public bool? IsStruct { get; set; } = null; public bool? IsEnum { get; set; } = null; - public bool? IsNested { get; set; } = null; - - /// - /// Name of the nested types parent - /// - public string? NTParentName { get; set; } = null; public bool? IsSealed { get; set; } = null; public bool? HasAttribute { get; set; } = null; + public bool? HasGenericParameters { get; set; } = null; public bool? IsDerived { get; set; } = null; /// /// Name of the derived classes declaring type /// public string? MatchBaseClass { get; set; } = null; - - /// - /// Name of the derived classes declaring type we want to ignore - /// - public string? IgnoreBaseClass { get; set; } = null; - public bool? HasGenericParameters { get; set; } = null; } public class MethodParams @@ -107,6 +96,12 @@ public class PropertyParams public class NestedTypeParams { + public bool? IsNested { get; set; } = null; + + /// + /// Name of the nested types parent + /// + public string? NestedTypeParentName { get; set; } = null; public int NestedTypeCount { get; set; } = -1; public HashSet IncludeNestedTypes { get; set; } = []; public HashSet ExcludeNestedTypes { get; set; } = []; @@ -114,6 +109,7 @@ public class NestedTypeParams public class EventParams { + public int EventCount { get; set; } = -1; public HashSet IncludeEvents { get; set; } = []; public HashSet ExcludeEvents { get; set; } = []; } \ No newline at end of file diff --git a/RecodeItLib/Remapper/AutoMatcher.cs b/RecodeItLib/Remapper/AutoMatcher.cs index cc5a0e5..03150ec 100644 --- a/RecodeItLib/Remapper/AutoMatcher.cs +++ b/RecodeItLib/Remapper/AutoMatcher.cs @@ -78,6 +78,12 @@ public class AutoMatcher(List mappings, string mappingPath) } if (!ContainsTargetNestedTypes(target, candidate, remapModel.SearchParams.NestedTypes)) + { + CandidateTypes!.Remove(candidate); + continue; + } + + if (!ContainsTargetEvents(target, candidate, remapModel.SearchParams.Events)) { CandidateTypes!.Remove(candidate); } @@ -119,7 +125,6 @@ public class AutoMatcher(List mappings, string mappingPath) parms.IsEnum = target.IsEnum; parms.IsStruct = target.IsValueType && !target.IsEnum; parms.HasGenericParameters = target.HasGenericParameters; - parms.IsNested = target.IsNested; parms.IsSealed = target.IsSealed; parms.HasAttribute = target.HasCustomAttributes; parms.IsDerived = target.BaseType != null && target.BaseType.Name != "Object"; @@ -320,10 +325,58 @@ public class AutoMatcher(List mappings, string mappingPath) } nt.NestedTypeCount = target.NestedTypes.Count; + nt.IsNested = target.IsNested; + + if (target.DeclaringType is not null) + { + nt.NestedTypeParentName = target.DeclaringType.Name.String; + } return commonNts.Any() || !target.IsNested; } + private bool ContainsTargetEvents(TypeDef target, TypeDef candidate, EventParams events) + { + // Target has no events but type has events + if (!target.Events.Any() && candidate.Events.Any()) + { + events.EventCount = 0; + return false; + } + + // Target has events but type has no events + if (target.Events.Any() && !candidate.Events.Any()) return false; + + // Target has a different number of events + if (target.Events.Count != candidate.Events.Count) return false; + + var commonEvents = target.Events + .Select(s => s.Name) + .Intersect(candidate.Events.Select(s => s.Name)); + + var includeEvents = target.Events + .Select(s => s.Name.ToString()) + .Except(candidate.Events.Select(s => s.Name.ToString())); + + var excludeEvents = candidate.Events + .Select(s => s.Name.ToString()) + .Except(target.Events.Select(s => s.Name.ToString())); + + foreach (var include in includeEvents) + { + events.IncludeEvents.Add(include); + } + + foreach (var exclude in excludeEvents) + { + events.ExcludeEvents.Add(exclude); + } + + events.EventCount = target.NestedTypes.Count; + + return commonEvents.Any() || target.Events.Count == 0; + } + private void ProcessEndQuestions(RemapModel remapModel, string assemblyPath) { Thread.Sleep(1000); diff --git a/RecodeItLib/Remapper/Filters/GenericTypeFilters.cs b/RecodeItLib/Remapper/Filters/GenericTypeFilters.cs index c24bf37..42cd74f 100644 --- a/RecodeItLib/Remapper/Filters/GenericTypeFilters.cs +++ b/RecodeItLib/Remapper/Filters/GenericTypeFilters.cs @@ -17,7 +17,7 @@ internal static class GenericTypeFilters // REQUIRED PROPERTY if (parms.GenericParams.IsPublic) { - if (parms.GenericParams.IsNested is true) + if (parms.NestedTypes.IsNested is true) { types = types.Where(t => t.IsNestedPublic); @@ -30,7 +30,7 @@ internal static class GenericTypeFilters } else { - if (parms.GenericParams.IsNested is true) + if (parms.NestedTypes.IsNested is true) { types = types.Where(t => t.IsNestedPrivate || t.IsNestedFamily @@ -50,9 +50,9 @@ internal static class GenericTypeFilters private static IEnumerable FilterNestedByName(IEnumerable types, SearchParams parms) { - if (parms.GenericParams.NTParentName is not null) + if (parms.NestedTypes.NestedTypeParentName is not null) { - types = types.Where(t => t.DeclaringType.Name.String == parms.GenericParams.NTParentName); + types = types.Where(t => t.DeclaringType.Name.String == parms.NestedTypes.NestedTypeParentName); } return types; @@ -200,11 +200,6 @@ internal static class GenericTypeFilters { types = types.Where(t => t.GetBaseType()?.Name?.String == parms.GenericParams.MatchBaseClass); } - - if (parms.GenericParams.IgnoreBaseClass is not null and not "") - { - types = types.Where(t => t.GetBaseType()?.Name?.String != parms.GenericParams.IgnoreBaseClass); - } } else if (parms.GenericParams.IsDerived is false) { diff --git a/RecodeItLib/Remapper/ReMapper.cs b/RecodeItLib/Remapper/ReMapper.cs index 4ccf524..2977f49 100644 --- a/RecodeItLib/Remapper/ReMapper.cs +++ b/RecodeItLib/Remapper/ReMapper.cs @@ -180,7 +180,7 @@ public class ReMapper } // Filter down nested objects - if (mapping.SearchParams.GenericParams.IsNested is false or null) + if (mapping.SearchParams.NestedTypes.IsNested is false or null) { types = types.Where(type => tokens!.Any(token => type.Name.StartsWith(token))); } diff --git a/RecodeItLib/Remapper/RenameHelper.cs b/RecodeItLib/Remapper/RenameHelper.cs index 438791c..4c210fe 100644 --- a/RecodeItLib/Remapper/RenameHelper.cs +++ b/RecodeItLib/Remapper/RenameHelper.cs @@ -187,7 +187,7 @@ internal static class RenameHelper if (remap?.TypePrimeCandidate?.Name is null) { continue; } - if (remap.SearchParams.GenericParams.IsNested is true && + if (remap.SearchParams.NestedTypes.IsNested is true && type.IsNested && type.Name == remap.TypePrimeCandidate.Name) { type.Name = remap.NewTypeName; From 1891c872e1c4128c696023223f1976fa84e2dc57 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 21:57:49 -0500 Subject: [PATCH 08/13] Fix mappings --- Assets/mappings.jsonc | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Assets/mappings.jsonc b/Assets/mappings.jsonc index d05b0a9..4bf4ffc 100644 --- a/Assets/mappings.jsonc +++ b/Assets/mappings.jsonc @@ -10281,8 +10281,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, - "NestedTypeParentName": "SkillManager", "IsDerived": false }, "Methods": { @@ -10304,6 +10302,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "SkillManager", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10320,9 +10320,7 @@ "UseForceRename": false, "SearchParams": { "GenericParams": { - "IsPublic": true, - "IsNested": true, - "NestedTypeParentName": "SkillManager" + "IsPublic": true }, "Methods": { "ConstructorParameterCount": -1, @@ -10343,6 +10341,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "SkillManager", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10360,9 +10360,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsAbstract": true, - "IsNested": true, - "NestedTypeParentName": "SkillManager" + "IsAbstract": true }, "Methods": { "ConstructorParameterCount": -1, @@ -10383,6 +10381,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "SkillManager", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10449,8 +10449,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, - "NestedTypeParentName": "TraderDialogScreen", "IsSealed": true }, "Methods": { @@ -10477,6 +10475,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "TraderDialogScreen", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10494,9 +10494,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsAbstract": false, - "IsNested": true, - "NestedTypeParentName": "MatchmakerOfflineRaidScreen" + "IsAbstract": false }, "Methods": { "ConstructorParameterCount": -1, @@ -10521,6 +10519,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "MatchmakerOfflineRaidScreen", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10619,9 +10619,7 @@ "UseForceRename": false, "SearchParams": { "GenericParams": { - "IsPublic": true, - "IsNested": true, - "NestedTypeParentName": "Profile" + "IsPublic": true }, "Methods": { "ConstructorParameterCount": -1, @@ -10646,6 +10644,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "Profile", "NestedTypeCount": -1, "IncludeNestedTypes": [ "ValueInfo" @@ -11018,8 +11018,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, - "NestedTypeParentName": "MatchmakerTimeHasCome", "IsSealed": false }, "Methods": { @@ -11047,6 +11045,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "MatchmakerTimeHasCome", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11199,9 +11199,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": true, - "NestedTypeParentName": "BetterAudio" + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11224,6 +11222,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "BetterAudio", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11241,9 +11241,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": true, - "NestedTypeParentName": "ClientPlayer" + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11267,6 +11265,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "ClientPlayer", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13988,9 +13988,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsAbstract": true, - "IsNested": true, - "NestedTypeParentName": "Player" + "IsAbstract": true }, "Methods": { "ConstructorParameterCount": -1, @@ -14012,6 +14010,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "Player", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15688,9 +15688,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsStruct": true, - "IsNested": true, - "NestedTypeParentName": "WorldInteractiveObject" + "IsStruct": true }, "Methods": { "ConstructorParameterCount": -1, @@ -15717,6 +15715,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "WorldInteractiveObject", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] From 9798d896bae3adc3c755b4a3fc18acb797ff1f77 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 22:12:50 -0500 Subject: [PATCH 09/13] Remove GUI --- Assets/mappings.jsonc | 660 ++++++- RecodeIt.sln | 22 - RecodeItGUI/GUI/Main.Designer.cs | 1619 ----------------- RecodeItGUI/GUI/Main.cs | 994 ---------- RecodeItGUI/GUI/Main.resx | 132 -- RecodeItGUI/Program.cs | 20 - RecodeItGUI/ReCodeItGUI.csproj | 22 - RecodeItGUI/Utils/GUIHelpers.cs | 360 ---- RecodeItLib/Models/RemapModel.cs | 4 +- .../Remapper/Filters/GenericTypeFilters.cs | 2 +- 10 files changed, 564 insertions(+), 3271 deletions(-) delete mode 100644 RecodeItGUI/GUI/Main.Designer.cs delete mode 100644 RecodeItGUI/GUI/Main.cs delete mode 100644 RecodeItGUI/GUI/Main.resx delete mode 100644 RecodeItGUI/Program.cs delete mode 100644 RecodeItGUI/ReCodeItGUI.csproj delete mode 100644 RecodeItGUI/Utils/GUIHelpers.cs diff --git a/Assets/mappings.jsonc b/Assets/mappings.jsonc index 4bf4ffc..fd90f17 100644 --- a/Assets/mappings.jsonc +++ b/Assets/mappings.jsonc @@ -32,6 +32,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -71,6 +72,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -112,6 +114,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -152,6 +155,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -196,6 +200,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -236,6 +241,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -274,6 +280,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -312,6 +319,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -349,6 +357,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -386,6 +395,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -423,6 +433,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -461,6 +472,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -500,6 +512,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -542,6 +555,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -594,6 +608,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -631,6 +646,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -668,6 +684,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -707,6 +724,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -744,6 +762,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -782,6 +801,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -820,6 +840,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -861,6 +882,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -899,6 +921,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -940,6 +963,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -978,6 +1002,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1015,6 +1040,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1053,6 +1079,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1091,6 +1118,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1138,6 +1166,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1176,6 +1205,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1215,6 +1245,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1253,6 +1284,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1291,6 +1323,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1329,6 +1362,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1342,8 +1376,8 @@ "GenericParams": { "IsPublic": true, "IsAbstract": true, - "IsDerived": false, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": false }, "Methods": { "ConstructorParameterCount": -1, @@ -1369,6 +1403,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1407,6 +1442,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1445,6 +1481,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1483,6 +1520,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1495,8 +1533,8 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsDerived": true, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": true }, "Methods": { "ConstructorParameterCount": 2, @@ -1529,6 +1567,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1567,6 +1606,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1605,6 +1645,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1642,6 +1683,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1680,6 +1722,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1718,6 +1761,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1758,6 +1802,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1795,6 +1840,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1833,6 +1879,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1871,6 +1918,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1912,6 +1960,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1951,6 +2000,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -1989,6 +2039,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2028,6 +2079,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2066,6 +2118,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2105,6 +2158,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2144,6 +2198,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2181,6 +2236,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2218,6 +2274,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2257,6 +2314,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2296,6 +2354,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2339,6 +2398,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2378,6 +2438,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2415,6 +2476,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2452,6 +2514,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2489,6 +2552,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2528,6 +2592,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2565,6 +2630,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2603,6 +2669,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2641,6 +2708,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2678,6 +2746,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2716,6 +2785,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2754,6 +2824,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2792,6 +2863,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2830,6 +2902,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2867,6 +2940,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2904,6 +2978,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2942,6 +3017,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -2982,6 +3058,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3020,6 +3097,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3057,6 +3135,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3094,6 +3173,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3136,6 +3216,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3177,6 +3258,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3216,6 +3298,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3255,6 +3338,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3292,6 +3376,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3329,6 +3414,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3368,6 +3454,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3405,6 +3492,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3442,6 +3530,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3479,6 +3568,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3524,6 +3614,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3561,6 +3652,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3600,6 +3692,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3637,6 +3730,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3674,6 +3768,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3711,6 +3806,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3749,6 +3845,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3787,6 +3884,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3828,6 +3926,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3866,6 +3965,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3904,6 +4004,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3942,6 +4043,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -3980,6 +4082,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4018,6 +4121,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4056,6 +4160,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4094,6 +4199,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4132,6 +4238,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4170,6 +4277,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4208,6 +4316,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4247,6 +4356,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4285,6 +4395,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4324,6 +4435,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4362,6 +4474,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4399,6 +4512,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4437,6 +4551,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4475,6 +4590,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4513,6 +4629,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4552,6 +4669,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4591,6 +4709,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4628,6 +4747,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4666,6 +4786,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4704,6 +4825,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4744,6 +4866,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4783,6 +4906,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4821,6 +4945,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4861,6 +4986,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4900,6 +5026,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4937,6 +5064,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -4975,6 +5103,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5013,6 +5142,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5052,6 +5182,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5090,6 +5221,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5130,6 +5262,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5167,6 +5300,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5204,6 +5338,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5242,6 +5377,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5283,6 +5419,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5320,6 +5457,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5357,6 +5495,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5394,6 +5533,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5431,6 +5571,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5469,6 +5610,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5509,6 +5651,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5548,6 +5691,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5587,6 +5731,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5625,6 +5770,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5664,6 +5810,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5704,6 +5851,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5742,6 +5890,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5781,6 +5930,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5821,6 +5971,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5858,6 +6009,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5898,6 +6050,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5938,6 +6091,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -5980,6 +6134,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6018,6 +6173,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6057,6 +6213,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6095,6 +6252,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6139,6 +6297,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6177,6 +6336,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6214,6 +6374,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6252,6 +6413,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6290,6 +6452,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6328,6 +6491,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6366,6 +6530,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6404,6 +6569,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6443,6 +6609,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6482,6 +6649,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6521,6 +6689,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6560,6 +6729,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6599,6 +6769,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6636,6 +6807,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6675,6 +6847,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6716,6 +6889,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6754,6 +6928,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6792,6 +6967,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6832,6 +7008,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6870,6 +7047,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6908,6 +7086,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6948,6 +7127,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -6988,6 +7168,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7027,6 +7208,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7065,6 +7247,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7103,6 +7286,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7141,6 +7325,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7179,6 +7364,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7217,6 +7403,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7256,6 +7443,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7295,6 +7483,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7334,6 +7523,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7374,6 +7564,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7412,6 +7603,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7451,6 +7643,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7490,6 +7683,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7528,6 +7722,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7568,6 +7763,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7607,6 +7803,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7646,6 +7843,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7685,6 +7883,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7725,6 +7924,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7763,6 +7963,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7801,6 +8002,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7839,6 +8041,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7876,6 +8079,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7915,6 +8119,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7954,6 +8159,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -7994,6 +8200,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8031,6 +8238,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8071,6 +8279,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8112,6 +8321,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8150,6 +8360,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8189,6 +8400,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8231,6 +8443,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8274,6 +8487,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8312,6 +8526,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8352,6 +8567,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8390,6 +8606,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8429,6 +8646,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8468,6 +8686,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8508,6 +8727,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8546,6 +8766,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8585,6 +8806,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8625,6 +8847,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8663,6 +8886,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8702,6 +8926,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8741,6 +8966,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8779,6 +9005,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8817,6 +9044,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8855,6 +9083,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8893,6 +9122,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8931,6 +9161,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -8970,6 +9201,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9008,6 +9240,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9047,6 +9280,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9085,6 +9319,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9125,6 +9360,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9163,6 +9399,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9202,6 +9439,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9241,6 +9479,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9280,6 +9519,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9320,6 +9560,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9360,6 +9601,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9400,6 +9642,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9440,6 +9683,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9479,6 +9723,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9519,6 +9764,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9559,6 +9805,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9596,6 +9843,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9636,6 +9884,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9685,6 +9934,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9724,6 +9974,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9762,6 +10013,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9800,6 +10052,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9838,6 +10091,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9878,6 +10132,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9918,6 +10173,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9957,6 +10213,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -9996,6 +10253,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10035,6 +10293,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10073,6 +10332,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10112,6 +10372,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10152,6 +10413,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10191,6 +10453,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10229,6 +10492,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10269,6 +10533,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10309,6 +10574,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10348,6 +10614,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10388,6 +10655,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10437,6 +10705,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10482,6 +10751,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10526,6 +10796,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10538,8 +10809,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsAbstract": false, - "IsNested": false + "IsAbstract": false }, "Methods": { "ConstructorParameterCount": -1, @@ -10568,6 +10838,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10608,6 +10879,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10653,6 +10925,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10693,6 +10966,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10705,8 +10979,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsAbstract": true, - "IsNested": true + "IsAbstract": true }, "Methods": { "ConstructorParameterCount": -1, @@ -10738,6 +11011,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10775,6 +11049,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10815,6 +11090,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10854,6 +11130,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10891,6 +11168,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10930,6 +11208,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -10967,6 +11246,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11006,6 +11286,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11052,6 +11333,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11064,7 +11346,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, "IsSealed": true }, "Methods": { @@ -11091,6 +11372,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11104,7 +11386,6 @@ "GenericParams": { "IsPublic": true, "IsAbstract": true, - "IsNested": false, "IsSealed": false }, "Methods": { @@ -11138,6 +11419,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11150,7 +11432,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": false, "IsSealed": true }, "Methods": { @@ -11187,6 +11468,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11229,6 +11511,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11272,6 +11555,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11284,8 +11568,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": true + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11319,6 +11602,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11331,8 +11615,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": false + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11359,6 +11642,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11372,7 +11656,6 @@ "GenericParams": { "IsPublic": true, "IsInterface": true, - "IsNested": false, "HasGenericParameters": false }, "Methods": { @@ -11402,6 +11685,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11414,8 +11698,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": false + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11447,6 +11730,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11459,8 +11743,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": false + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11495,6 +11778,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11507,8 +11791,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": false + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11544,6 +11827,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11556,8 +11840,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": false + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11589,6 +11872,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11601,8 +11885,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": false + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11630,6 +11913,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11642,8 +11926,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": false + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11680,6 +11963,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11692,8 +11976,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsAbstract": true, - "IsNested": false + "IsAbstract": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11725,6 +12008,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11737,8 +12021,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": false + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11772,6 +12055,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11784,8 +12068,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": false, - "IsNested": false + "IsInterface": false }, "Methods": { "ConstructorParameterCount": -1, @@ -11825,6 +12108,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11837,8 +12121,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": false, - "IsNested": false + "IsInterface": false }, "Methods": { "ConstructorParameterCount": -1, @@ -11872,6 +12155,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11884,8 +12168,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsAbstract": true, - "IsNested": false + "IsAbstract": true }, "Methods": { "ConstructorParameterCount": -1, @@ -11914,6 +12197,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11927,8 +12211,7 @@ "GenericParams": { "IsPublic": true, "IsAbstract": false, - "IsInterface": false, - "IsNested": false + "IsInterface": false }, "Methods": { "ConstructorParameterCount": -1, @@ -11958,6 +12241,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -11970,8 +12254,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsAbstract": false, - "IsNested": false + "IsAbstract": false }, "Methods": { "ConstructorParameterCount": -1, @@ -12006,6 +12289,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12018,8 +12302,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsAbstract": true, - "IsNested": false + "IsAbstract": true }, "Methods": { "ConstructorParameterCount": -1, @@ -12053,6 +12336,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12066,7 +12350,6 @@ "GenericParams": { "IsPublic": true, "IsAbstract": false, - "IsNested": false, "IsSealed": true, "HasGenericParameters": false }, @@ -12100,6 +12383,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12114,7 +12398,6 @@ "IsPublic": true, "IsAbstract": false, "IsStruct": false, - "IsNested": false, "HasAttribute": true, "HasGenericParameters": true }, @@ -12145,6 +12428,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12160,7 +12444,6 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, "HasAttribute": false, "HasGenericParameters": false }, @@ -12196,6 +12479,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12211,7 +12495,6 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, "HasAttribute": false, "HasGenericParameters": false }, @@ -12240,6 +12523,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12255,7 +12539,6 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": true, "HasAttribute": false, "HasGenericParameters": false }, @@ -12286,6 +12569,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12301,10 +12585,9 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, "HasAttribute": false, - "IsDerived": false, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": false }, "Methods": { "ConstructorParameterCount": -1, @@ -12333,6 +12616,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12348,10 +12632,9 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": true, "HasAttribute": false, - "IsDerived": false, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": false }, "Methods": { "ConstructorParameterCount": -1, @@ -12387,6 +12670,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12402,7 +12686,6 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, "HasAttribute": false, "HasGenericParameters": false }, @@ -12435,6 +12718,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12450,9 +12734,8 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, - "IsDerived": false, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": false }, "Methods": { "ConstructorParameterCount": -1, @@ -12483,6 +12766,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12498,9 +12782,8 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, - "IsDerived": true, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": true }, "Methods": { "ConstructorParameterCount": -1, @@ -12527,6 +12810,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12542,9 +12826,8 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, - "IsDerived": true, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": true }, "Methods": { "ConstructorParameterCount": -1, @@ -12574,6 +12857,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12589,7 +12873,6 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": true, - "IsNested": false, "HasGenericParameters": false }, "Methods": { @@ -12620,6 +12903,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12635,9 +12919,8 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, - "IsDerived": false, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": false }, "Methods": { "ConstructorParameterCount": -1, @@ -12665,6 +12948,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12678,7 +12962,6 @@ "GenericParams": { "IsPublic": true, "IsAbstract": false, - "IsNested": false, "IsSealed": true, "IsDerived": true }, @@ -12711,6 +12994,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12726,9 +13010,8 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, - "IsDerived": false, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": false }, "Methods": { "ConstructorParameterCount": -1, @@ -12756,6 +13039,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12771,9 +13055,8 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, - "IsDerived": false, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": false }, "Methods": { "ConstructorParameterCount": -1, @@ -12802,6 +13085,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12817,9 +13101,8 @@ "IsAbstract": false, "IsInterface": false, "IsStruct": false, - "IsNested": false, - "IsDerived": false, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": false }, "Methods": { "ConstructorParameterCount": -1, @@ -12848,6 +13131,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12863,9 +13147,8 @@ "IsAbstract": true, "IsInterface": false, "IsStruct": false, - "IsNested": false, - "IsDerived": false, - "HasGenericParameters": false + "HasGenericParameters": false, + "IsDerived": false }, "Methods": { "ConstructorParameterCount": -1, @@ -12896,6 +13179,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12939,6 +13223,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -12977,6 +13262,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13024,6 +13310,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13064,6 +13351,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13106,6 +13394,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13147,6 +13436,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13184,6 +13474,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13221,6 +13512,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13259,6 +13551,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13299,6 +13592,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13343,6 +13637,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13381,6 +13676,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13419,6 +13715,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13459,6 +13756,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13498,6 +13796,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13538,6 +13837,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13576,6 +13876,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13616,6 +13917,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13657,6 +13959,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13696,6 +13999,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13735,6 +14039,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13777,6 +14082,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13814,6 +14120,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13853,6 +14160,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13895,6 +14203,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13936,6 +14245,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -13976,6 +14286,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14017,6 +14328,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14058,6 +14370,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14100,6 +14413,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14139,6 +14453,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14184,6 +14499,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14229,6 +14545,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14241,8 +14558,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsInterface": true, - "IsNested": true + "IsInterface": true }, "Methods": { "ConstructorParameterCount": -1, @@ -14274,6 +14590,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14286,7 +14603,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, "IsDerived": true }, "Methods": { @@ -14321,6 +14637,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14333,7 +14650,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, "IsDerived": true }, "Methods": { @@ -14369,6 +14685,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14381,7 +14698,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, "IsDerived": true }, "Methods": { @@ -14418,6 +14734,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14430,7 +14747,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, "IsDerived": true }, "Methods": { @@ -14464,6 +14780,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14506,6 +14823,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14548,6 +14866,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14589,6 +14908,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14639,6 +14959,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14682,6 +15003,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14735,6 +15057,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14780,6 +15103,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14826,6 +15150,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14870,6 +15195,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14910,6 +15236,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14954,6 +15281,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -14994,6 +15322,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15035,6 +15364,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15075,6 +15405,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15114,6 +15445,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15156,6 +15488,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15168,8 +15501,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsStruct": true, - "IsNested": true + "IsStruct": true }, "Methods": { "ConstructorParameterCount": -1, @@ -15203,6 +15535,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15215,8 +15548,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsStruct": true, - "IsNested": true + "IsStruct": true }, "Methods": { "ConstructorParameterCount": -1, @@ -15246,6 +15578,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15288,6 +15621,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15328,6 +15662,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15370,6 +15705,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15411,6 +15747,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15461,6 +15798,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15507,6 +15845,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15546,6 +15885,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15590,6 +15930,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15634,6 +15975,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15676,6 +16018,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15722,6 +16065,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15734,8 +16078,7 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsStruct": true, - "IsNested": true + "IsStruct": true }, "Methods": { "ConstructorParameterCount": -1, @@ -15763,6 +16106,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15806,6 +16150,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15818,7 +16163,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, "IsDerived": true }, "Methods": { @@ -15854,6 +16198,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15866,7 +16211,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, "IsDerived": true }, "Methods": { @@ -15899,6 +16243,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15911,7 +16256,6 @@ "SearchParams": { "GenericParams": { "IsPublic": true, - "IsNested": true, "IsDerived": true }, "Methods": { @@ -15945,6 +16289,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -15995,6 +16340,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [ "OnItemFound", "OnItemSearched" @@ -16050,6 +16396,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -16110,6 +16457,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -16121,8 +16469,7 @@ "UseForceRename": false, "SearchParams": { "GenericParams": { - "IsPublic": true, - "IsNested": true + "IsPublic": true }, "Methods": { "ConstructorParameterCount": -1, @@ -16160,6 +16507,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -16208,6 +16556,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -16248,6 +16597,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -16286,6 +16636,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -16334,6 +16685,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -16372,6 +16724,7 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, "IncludeEvents": [], "ExcludeEvents": [] } @@ -16418,6 +16771,115 @@ "ExcludeNestedTypes": [] }, "Events": { + "EventCount": -1, + "IncludeEvents": [], + "ExcludeEvents": [] + } + } + }, + { + "NewTypeName": "IdleWeaponMountingState", + "OriginalTypeName": "GClass1906", + "UseForceRename": false, + "AutoGenerated": true, + "SearchParams": { + "GenericParams": { + "IsPublic": true, + "IsAbstract": false, + "IsInterface": false, + "IsStruct": false, + "IsEnum": false, + "IsSealed": true, + "HasAttribute": false, + "HasGenericParameters": false, + "IsDerived": true, + "MatchBaseClass": "MovementState" + }, + "Methods": { + "ConstructorParameterCount": 2, + "MethodCount": 22, + "IncludeMethods": [ + "Enter", + "StartExiting", + "Exit", + "ManualAnimatorMoveUpdate", + "method_3", + "method_4", + "Rotate", + "Move", + "SetTilt", + "EnableBreath", + "Jump", + "Prone", + "BlindFire", + "ChangePose", + "SetStep", + "Vaulting", + "EnableSprint", + "ChangeSpeed", + "SetBlindFireAnim", + "method_0", + "method_1", + "method_2" + ], + "ExcludeMethods": [ + "CopyTo", + "GetCorners", + "GetPlanes", + "Update", + "UpdateEx", + "Contains", + "GetSphereIntersection", + "CullSpheres", + "IntersectsSphere", + "IntersectsBox", + "GetBoxIntersection", + "CullBoxes", + "IntersectsOrientedBox", + "GetOrientedBoxIntersection", + "GetNearHeight", + "SettingsGroupFactory", + "TryForceUpdate", + "CreateBindings", + "method_5", + "method_6", + "method_7", + "method_8", + "method_9", + "method_10", + "method_11", + "method_12", + "method_13", + "method_14", + "method_15", + "method_16", + "method_17", + "method_18", + "method_19", + "method_20", + "method_21", + "method_22", + "method_23" + ] + }, + "Fields": { + "FieldCount": 24, + "IncludeFields": [], + "ExcludeFields": [] + }, + "Properties": { + "PropertyCount": 2, + "IncludeProperties": [], + "ExcludeProperties": [] + }, + "NestedTypes": { + "IsNested": false, + "NestedTypeCount": 0, + "IncludeNestedTypes": [], + "ExcludeNestedTypes": [] + }, + "Events": { + "EventCount": 0, "IncludeEvents": [], "ExcludeEvents": [] } diff --git a/RecodeIt.sln b/RecodeIt.sln index 0b7b938..26b9d06 100644 --- a/RecodeIt.sln +++ b/RecodeIt.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReCodeItGUI", "RecodeItGUI\ReCodeItGUI.csproj", "{7C4A62CE-8072-454F-9D95-6CB4D837F485}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReCodeItLib", "RecodeItLib\ReCodeItLib.csproj", "{FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReCodeItCLI", "ReCodeItCLI\ReCodeItCLI.csproj", "{E404EC0B-06D2-4964-8ABA-A634F259655C}" @@ -39,26 +37,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|ARM.Build.0 = Debug|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|ARM64.Build.0 = Debug|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|x64.ActiveCfg = Debug|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|x64.Build.0 = Debug|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|x86.ActiveCfg = Debug|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Debug|x86.Build.0 = Debug|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|Any CPU.Build.0 = Release|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|ARM.ActiveCfg = Release|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|ARM.Build.0 = Release|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|ARM64.ActiveCfg = Release|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|ARM64.Build.0 = Release|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|x64.ActiveCfg = Release|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|x64.Build.0 = Release|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|x86.ActiveCfg = Release|Any CPU - {7C4A62CE-8072-454F-9D95-6CB4D837F485}.Release|x86.Build.0 = Release|Any CPU {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|Any CPU.Build.0 = Debug|Any CPU {FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/RecodeItGUI/GUI/Main.Designer.cs b/RecodeItGUI/GUI/Main.Designer.cs deleted file mode 100644 index 93f57a8..0000000 --- a/RecodeItGUI/GUI/Main.Designer.cs +++ /dev/null @@ -1,1619 +0,0 @@ -namespace ReCodeIt.GUI; - -partial class ReCodeItForm -{ - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - GroupBox groupBox6; - GroupBox groupBox7; - button1 = new Button(); - button2 = new Button(); - listBox1 = new ListBox(); - toolTip1 = new ToolTip(components); - DebugLoggingCheckbox = new CheckBox(); - SilentModeCheckbox = new CheckBox(); - GithubLinkLabel = new LinkLabel(); - RenamePropertiesCheckbox = new CheckBox(); - RenameFieldsCheckbox = new CheckBox(); - RunRemapButton = new Button(); - RemoveRemapButton = new Button(); - RemapperPublicicize = new CheckBox(); - SaveRemapButton = new Button(); - RemapperUnseal = new CheckBox(); - PickAssemblyPathButton = new Button(); - LoadMappingFileButton = new Button(); - OutputDirectoryButton = new Button(); - ConstuctorCountUpDown = new NumericUpDown(); - IsPublicComboBox = new ComboBox(); - RemapperUseForceRename = new CheckBox(); - IsAbstractComboBox = new ComboBox(); - PropertyCountUpDown = new NumericUpDown(); - IsSealedComboBox = new ComboBox(); - FieldCountUpDown = new NumericUpDown(); - IsInterfaceComboBox = new ComboBox(); - NestedTypeParentName = new TextBox(); - MethodCountUpDown = new NumericUpDown(); - IsEnumComboBox = new ComboBox(); - BaseClassIncludeTextFIeld = new TextBox(); - OriginalTypeName = new TextBox(); - HasAttributeComboBox = new ComboBox(); - NestedTypeCountUpDown = new NumericUpDown(); - IsDerivedUpDown = new DomainUpDown(); - HasGenericParamsComboBox = new ComboBox(); - IsNestedUpDown = new DomainUpDown(); - BaseClassExcludeTextField = new TextBox(); - IsStructComboBox = new ComboBox(); - NewTypeName = new TextBox(); - LoadedMappingFilePath = new TextBox(); - ResetSearchButton = new Button(); - ValidateRemapButton = new Button(); - SettingsTab = new TabPage(); - groupBox2 = new GroupBox(); - RemapperTabPage = new TabPage(); - label1 = new Label(); - RMSearchBox = new TextBox(); - RemapperOutputDirectoryPath = new TextBox(); - TargetAssemblyPath = new TextBox(); - RemapTreeView = new TreeView(); - groupBox1 = new GroupBox(); - tabControl1 = new TabControl(); - RMBasicTab = new TabPage(); - Inclusions = new TabControl(); - tabPage1 = new TabPage(); - ExcludeMethodTextBox = new TextBox(); - IncludeMethodTextBox = new TextBox(); - MethodExcludeRemoveButton = new Button(); - MethodExcludeAddButton = new Button(); - MethodIncludeRemoveButton = new Button(); - MethodIncludeAddButton = new Button(); - MethodExcludeBox = new ListBox(); - MethodIncludeBox = new ListBox(); - tabPage2 = new TabPage(); - FieldsExcludeTextInput = new TextBox(); - FieldsIncludeTextInput = new TextBox(); - FieldExcludeRemoveButton = new Button(); - FieldExcludeAddButton = new Button(); - FieldIncludeRemoveButton = new Button(); - FIeldIncludeAddButton = new Button(); - FieldExcludeBox = new ListBox(); - FieldIncludeBox = new ListBox(); - tabPage3 = new TabPage(); - PropertiesExcludeTextField = new TextBox(); - PropertiesIncludeTextField = new TextBox(); - PropertiesExcludeRemoveButton = new Button(); - PropertiesExcludeAddButton = new Button(); - PropertiesIncludeRemoveButton = new Button(); - PropertiesIncludeAddButton = new Button(); - PropertiesExcludeBox = new ListBox(); - PropertiesIncludeBox = new ListBox(); - tabPage4 = new TabPage(); - NestedTypesExcludeTextField = new TextBox(); - NestedTypesIncludeTextField = new TextBox(); - NestedTypesExcludeRemoveButton = new Button(); - NestedTypesExlcudeAddButton = new Button(); - NestedTypesRemoveButton = new Button(); - NestedTypesAddButton = new Button(); - NestedTypesExcludeBox = new ListBox(); - NestedTypesIncludeBox = new ListBox(); - tabPage5 = new TabPage(); - EventsExcludeBox = new ListBox(); - EventsIncludeBox = new ListBox(); - EventsExcludeRemoveButton = new Button(); - EventsExcludeAddButton = new Button(); - EventsRemoveButton = new Button(); - EventsAddButton = new Button(); - EventsExcludeTextField = new TextBox(); - EventsIncludeTextField = new TextBox(); - label11 = new Label(); - MethodCountEnabled = new CheckBox(); - label10 = new Label(); - label8 = new Label(); - label9 = new Label(); - label2322 = new Label(); - FieldCountEnabled = new CheckBox(); - label7 = new Label(); - label6 = new Label(); - NestedTypeCountEnabled = new CheckBox(); - label5 = new Label(); - PropertyCountEnabled = new CheckBox(); - ConstructorCountEnabled = new CheckBox(); - tabPage6 = new TabPage(); - RMSearchTab = new TabPage(); - TabControlMain = new TabControl(); - groupBox6 = new GroupBox(); - groupBox7 = new GroupBox(); - groupBox6.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)ConstuctorCountUpDown).BeginInit(); - ((System.ComponentModel.ISupportInitialize)PropertyCountUpDown).BeginInit(); - ((System.ComponentModel.ISupportInitialize)FieldCountUpDown).BeginInit(); - ((System.ComponentModel.ISupportInitialize)MethodCountUpDown).BeginInit(); - ((System.ComponentModel.ISupportInitialize)NestedTypeCountUpDown).BeginInit(); - SettingsTab.SuspendLayout(); - groupBox2.SuspendLayout(); - RemapperTabPage.SuspendLayout(); - groupBox1.SuspendLayout(); - tabControl1.SuspendLayout(); - RMBasicTab.SuspendLayout(); - Inclusions.SuspendLayout(); - tabPage1.SuspendLayout(); - tabPage2.SuspendLayout(); - tabPage3.SuspendLayout(); - tabPage4.SuspendLayout(); - tabPage5.SuspendLayout(); - tabPage6.SuspendLayout(); - TabControlMain.SuspendLayout(); - SuspendLayout(); - // - // groupBox6 - // - groupBox6.Controls.Add(button1); - groupBox6.Controls.Add(button2); - groupBox6.Controls.Add(listBox1); - groupBox6.Location = new Point(6, 7); - groupBox6.Name = "groupBox6"; - groupBox6.Size = new Size(364, 818); - groupBox6.TabIndex = 0; - groupBox6.TabStop = false; - groupBox6.Text = "Advanced Method Search"; - // - // button1 - // - button1.Location = new Point(247, 777); - button1.Name = "button1"; - button1.Size = new Size(111, 33); - button1.TabIndex = 20; - button1.Text = "Remove"; - button1.UseVisualStyleBackColor = true; - // - // button2 - // - button2.Location = new Point(6, 777); - button2.Name = "button2"; - button2.Size = new Size(111, 33); - button2.TabIndex = 19; - button2.Text = "Add"; - button2.UseVisualStyleBackColor = true; - // - // listBox1 - // - listBox1.BackColor = Color.Gray; - listBox1.FormattingEnabled = true; - listBox1.ItemHeight = 25; - listBox1.Location = new Point(6, 542); - listBox1.Name = "listBox1"; - listBox1.Size = new Size(353, 229); - listBox1.TabIndex = 18; - // - // groupBox7 - // - groupBox7.Location = new Point(386, 7); - groupBox7.Name = "groupBox7"; - groupBox7.Size = new Size(354, 818); - groupBox7.TabIndex = 1; - groupBox7.TabStop = false; - groupBox7.Text = "Advanced Property Search"; - // - // DebugLoggingCheckbox - // - DebugLoggingCheckbox.AutoSize = true; - DebugLoggingCheckbox.Location = new Point(6, 30); - DebugLoggingCheckbox.Name = "DebugLoggingCheckbox"; - DebugLoggingCheckbox.Size = new Size(159, 29); - DebugLoggingCheckbox.TabIndex = 0; - DebugLoggingCheckbox.Text = "Debug logging"; - toolTip1.SetToolTip(DebugLoggingCheckbox, "Enables debug logging for the appliaction"); - DebugLoggingCheckbox.UseVisualStyleBackColor = true; - DebugLoggingCheckbox.CheckedChanged += DebugLoggingCheckbox_CheckedChanged; - // - // SilentModeCheckbox - // - SilentModeCheckbox.AutoSize = true; - SilentModeCheckbox.Location = new Point(6, 65); - SilentModeCheckbox.Name = "SilentModeCheckbox"; - SilentModeCheckbox.Size = new Size(133, 29); - SilentModeCheckbox.TabIndex = 2; - SilentModeCheckbox.Text = "Silent Mode"; - toolTip1.SetToolTip(SilentModeCheckbox, "Silent mode stops the ReMapper from prompting you if its okay to continue at every selection"); - SilentModeCheckbox.UseVisualStyleBackColor = true; - SilentModeCheckbox.CheckedChanged += SilentModeCheckbox_CheckedChanged; - // - // GithubLinkLabel - // - GithubLinkLabel.AutoSize = true; - GithubLinkLabel.Location = new Point(6, 313); - GithubLinkLabel.Name = "GithubLinkLabel"; - GithubLinkLabel.Size = new Size(301, 25); - GithubLinkLabel.TabIndex = 3; - GithubLinkLabel.TabStop = true; - GithubLinkLabel.Text = "https://github.com/CJ-SPT/ReCodeIt"; - toolTip1.SetToolTip(GithubLinkLabel, "Be sure to report issues here!"); - GithubLinkLabel.LinkClicked += GithubLinkLabel_LinkClicked; - // - // RenamePropertiesCheckbox - // - RenamePropertiesCheckbox.AutoSize = true; - RenamePropertiesCheckbox.Checked = true; - RenamePropertiesCheckbox.CheckState = CheckState.Checked; - RenamePropertiesCheckbox.Location = new Point(957, 738); - RenamePropertiesCheckbox.Name = "RenamePropertiesCheckbox"; - RenamePropertiesCheckbox.Size = new Size(186, 29); - RenamePropertiesCheckbox.TabIndex = 28; - RenamePropertiesCheckbox.Text = "Rename Properties"; - toolTip1.SetToolTip(RenamePropertiesCheckbox, "Renames all remapped types associated properties (GClass100_0 becomes ReCodeIt_0)"); - RenamePropertiesCheckbox.UseVisualStyleBackColor = true; - RenamePropertiesCheckbox.CheckedChanged += RenamePropertiesCheckbox_CheckedChanged; - // - // RenameFieldsCheckbox - // - RenameFieldsCheckbox.AutoSize = true; - RenameFieldsCheckbox.Checked = true; - RenameFieldsCheckbox.CheckState = CheckState.Checked; - RenameFieldsCheckbox.Location = new Point(783, 738); - RenameFieldsCheckbox.Name = "RenameFieldsCheckbox"; - RenameFieldsCheckbox.Size = new Size(151, 29); - RenameFieldsCheckbox.TabIndex = 26; - RenameFieldsCheckbox.Text = "Rename Fields"; - toolTip1.SetToolTip(RenameFieldsCheckbox, "Renames all remapped types associated fields (_gClass100_0 becomes _reCodeIt_0)"); - RenameFieldsCheckbox.UseVisualStyleBackColor = true; - RenameFieldsCheckbox.CheckedChanged += RenameFieldsCheckbox_CheckedChanged; - // - // RunRemapButton - // - RunRemapButton.BackColor = SystemColors.ButtonShadow; - RunRemapButton.Location = new Point(954, 698); - RunRemapButton.Name = "RunRemapButton"; - RunRemapButton.Size = new Size(169, 33); - RunRemapButton.TabIndex = 16; - RunRemapButton.Text = "Run Remap"; - toolTip1.SetToolTip(RunRemapButton, "Generate a remapped dll based on the paths chosen in the top left"); - RunRemapButton.UseVisualStyleBackColor = false; - RunRemapButton.Click += RunRemapButton_Click; - // - // RemoveRemapButton - // - RemoveRemapButton.BackColor = SystemColors.ButtonShadow; - RemoveRemapButton.Location = new Point(954, 658); - RemoveRemapButton.Name = "RemoveRemapButton"; - RemoveRemapButton.Size = new Size(169, 33); - RemoveRemapButton.TabIndex = 2; - RemoveRemapButton.Text = "Remove Remap"; - toolTip1.SetToolTip(RemoveRemapButton, "Remove a remap from the list"); - RemoveRemapButton.UseVisualStyleBackColor = false; - RemoveRemapButton.Click += RemoveRemapButton_Click; - // - // RemapperPublicicize - // - RemapperPublicicize.AutoSize = true; - RemapperPublicicize.Checked = true; - RemapperPublicicize.CheckState = CheckState.Checked; - RemapperPublicicize.Location = new Point(783, 773); - RemapperPublicicize.Name = "RemapperPublicicize"; - RemapperPublicicize.Size = new Size(106, 29); - RemapperPublicicize.TabIndex = 35; - RemapperPublicicize.Text = "Publicize"; - toolTip1.SetToolTip(RemapperPublicicize, "Publicize all classes, properties and methods. Fields are excluded for technical reasons"); - RemapperPublicicize.UseVisualStyleBackColor = true; - RemapperPublicicize.CheckedChanged += RemapperPublicicize_CheckedChanged; - // - // SaveRemapButton - // - SaveRemapButton.BackColor = SystemColors.ButtonShadow; - SaveRemapButton.Location = new Point(781, 658); - SaveRemapButton.Name = "SaveRemapButton"; - SaveRemapButton.Size = new Size(169, 33); - SaveRemapButton.TabIndex = 4; - SaveRemapButton.Text = "Add Remap"; - toolTip1.SetToolTip(SaveRemapButton, "Add a remap to the list, if the \"New Name\" field contains a remap that already exists, it will be overwritten."); - SaveRemapButton.UseVisualStyleBackColor = false; - SaveRemapButton.Click += AddRemapButton_Click; - // - // RemapperUnseal - // - RemapperUnseal.AutoSize = true; - RemapperUnseal.Checked = true; - RemapperUnseal.CheckState = CheckState.Checked; - RemapperUnseal.Location = new Point(957, 773); - RemapperUnseal.Name = "RemapperUnseal"; - RemapperUnseal.Size = new Size(90, 29); - RemapperUnseal.TabIndex = 36; - RemapperUnseal.Text = "Unseal"; - toolTip1.SetToolTip(RemapperUnseal, "Unseal all sealed classes"); - RemapperUnseal.UseVisualStyleBackColor = true; - RemapperUnseal.CheckedChanged += RemapperUnseal_CheckedChanged; - // - // PickAssemblyPathButton - // - PickAssemblyPathButton.Location = new Point(1221, 577); - PickAssemblyPathButton.Name = "PickAssemblyPathButton"; - PickAssemblyPathButton.Size = new Size(111, 33); - PickAssemblyPathButton.TabIndex = 31; - PickAssemblyPathButton.Text = "Choose"; - toolTip1.SetToolTip(PickAssemblyPathButton, "The programs original assembly you wish to remap.\r\n\r\nTarget the one in the programs install location."); - PickAssemblyPathButton.UseVisualStyleBackColor = true; - PickAssemblyPathButton.Click += PickAssemblyPathButton_Click_1; - // - // LoadMappingFileButton - // - LoadMappingFileButton.BackColor = SystemColors.ButtonShadow; - LoadMappingFileButton.Location = new Point(1161, 877); - LoadMappingFileButton.Name = "LoadMappingFileButton"; - LoadMappingFileButton.Size = new Size(169, 40); - LoadMappingFileButton.TabIndex = 18; - LoadMappingFileButton.Text = "Load Mapping File"; - toolTip1.SetToolTip(LoadMappingFileButton, "Load a standalone mapping file from disk"); - LoadMappingFileButton.UseVisualStyleBackColor = false; - LoadMappingFileButton.Click += LoadMappingFileButton_Click; - // - // OutputDirectoryButton - // - OutputDirectoryButton.Location = new Point(1221, 617); - OutputDirectoryButton.Name = "OutputDirectoryButton"; - OutputDirectoryButton.Size = new Size(111, 33); - OutputDirectoryButton.TabIndex = 32; - OutputDirectoryButton.Text = "Choose"; - toolTip1.SetToolTip(OutputDirectoryButton, "Directory where you want the remapped dll placed."); - OutputDirectoryButton.UseVisualStyleBackColor = true; - OutputDirectoryButton.Click += OutputDirectoryButton_Click_1; - // - // ConstuctorCountUpDown - // - ConstuctorCountUpDown.BackColor = SystemColors.ScrollBar; - ConstuctorCountUpDown.Location = new Point(434, 8); - ConstuctorCountUpDown.Name = "ConstuctorCountUpDown"; - ConstuctorCountUpDown.Size = new Size(54, 31); - ConstuctorCountUpDown.TabIndex = 19; - toolTip1.SetToolTip(ConstuctorCountUpDown, "How many parameters is the constructor take?"); - // - // IsPublicComboBox - // - IsPublicComboBox.BackColor = SystemColors.ScrollBar; - IsPublicComboBox.FormattingEnabled = true; - IsPublicComboBox.Location = new Point(17, 82); - IsPublicComboBox.Name = "IsPublicComboBox"; - IsPublicComboBox.Size = new Size(208, 33); - IsPublicComboBox.TabIndex = 38; - toolTip1.SetToolTip(IsPublicComboBox, "Is the type public? This is required."); - // - // RemapperUseForceRename - // - RemapperUseForceRename.AutoSize = true; - RemapperUseForceRename.Location = new Point(231, 43); - RemapperUseForceRename.Name = "RemapperUseForceRename"; - RemapperUseForceRename.Size = new Size(149, 29); - RemapperUseForceRename.TabIndex = 37; - RemapperUseForceRename.Text = "Force Rename"; - toolTip1.SetToolTip(RemapperUseForceRename, "Should we force the rename and not use a search pattern.\r\n\r\nRequires \"Original Name\" to be filled in."); - RemapperUseForceRename.UseVisualStyleBackColor = true; - // - // IsAbstractComboBox - // - IsAbstractComboBox.BackColor = SystemColors.ScrollBar; - IsAbstractComboBox.FormattingEnabled = true; - IsAbstractComboBox.Location = new Point(17, 118); - IsAbstractComboBox.Name = "IsAbstractComboBox"; - IsAbstractComboBox.Size = new Size(208, 33); - IsAbstractComboBox.TabIndex = 40; - toolTip1.SetToolTip(IsAbstractComboBox, "Is the type abstract? "); - // - // PropertyCountUpDown - // - PropertyCountUpDown.BackColor = SystemColors.ScrollBar; - PropertyCountUpDown.Location = new Point(434, 122); - PropertyCountUpDown.Name = "PropertyCountUpDown"; - PropertyCountUpDown.Size = new Size(54, 31); - PropertyCountUpDown.TabIndex = 5; - toolTip1.SetToolTip(PropertyCountUpDown, "How many properties are there?"); - // - // IsSealedComboBox - // - IsSealedComboBox.BackColor = SystemColors.ScrollBar; - IsSealedComboBox.FormattingEnabled = true; - IsSealedComboBox.Location = new Point(17, 157); - IsSealedComboBox.Name = "IsSealedComboBox"; - IsSealedComboBox.Size = new Size(208, 33); - IsSealedComboBox.TabIndex = 42; - toolTip1.SetToolTip(IsSealedComboBox, "Is the type sealed?"); - // - // FieldCountUpDown - // - FieldCountUpDown.BackColor = SystemColors.ScrollBar; - FieldCountUpDown.Location = new Point(434, 83); - FieldCountUpDown.Name = "FieldCountUpDown"; - FieldCountUpDown.Size = new Size(54, 31); - FieldCountUpDown.TabIndex = 3; - toolTip1.SetToolTip(FieldCountUpDown, "How many fields are there?"); - // - // IsInterfaceComboBox - // - IsInterfaceComboBox.BackColor = SystemColors.ScrollBar; - IsInterfaceComboBox.FormattingEnabled = true; - IsInterfaceComboBox.Location = new Point(17, 197); - IsInterfaceComboBox.Name = "IsInterfaceComboBox"; - IsInterfaceComboBox.Size = new Size(208, 33); - IsInterfaceComboBox.TabIndex = 44; - toolTip1.SetToolTip(IsInterfaceComboBox, "Is the type an interface?"); - // - // NestedTypeParentName - // - NestedTypeParentName.BackColor = SystemColors.ScrollBar; - NestedTypeParentName.Location = new Point(229, 398); - NestedTypeParentName.Name = "NestedTypeParentName"; - NestedTypeParentName.PlaceholderText = "Nested Type Parent Name"; - NestedTypeParentName.Size = new Size(208, 31); - NestedTypeParentName.TabIndex = 0; - toolTip1.SetToolTip(NestedTypeParentName, "The name of the parent class if it is nested. Requires IsNested to be true."); - // - // MethodCountUpDown - // - MethodCountUpDown.BackColor = SystemColors.ScrollBar; - MethodCountUpDown.Location = new Point(434, 45); - MethodCountUpDown.Name = "MethodCountUpDown"; - MethodCountUpDown.Size = new Size(54, 31); - MethodCountUpDown.TabIndex = 6; - toolTip1.SetToolTip(MethodCountUpDown, "How many methods are there?"); - // - // IsEnumComboBox - // - IsEnumComboBox.BackColor = SystemColors.ScrollBar; - IsEnumComboBox.FormattingEnabled = true; - IsEnumComboBox.Location = new Point(17, 273); - IsEnumComboBox.Name = "IsEnumComboBox"; - IsEnumComboBox.Size = new Size(208, 33); - IsEnumComboBox.TabIndex = 46; - toolTip1.SetToolTip(IsEnumComboBox, "Is the type an enum?"); - // - // BaseClassIncludeTextFIeld - // - BaseClassIncludeTextFIeld.BackColor = SystemColors.ScrollBar; - BaseClassIncludeTextFIeld.Location = new Point(229, 433); - BaseClassIncludeTextFIeld.Name = "BaseClassIncludeTextFIeld"; - BaseClassIncludeTextFIeld.PlaceholderText = "Include Base Class"; - BaseClassIncludeTextFIeld.Size = new Size(208, 31); - BaseClassIncludeTextFIeld.TabIndex = 2; - toolTip1.SetToolTip(BaseClassIncludeTextFIeld, "Specifiy the base class. Requires IsDerived to be true"); - // - // OriginalTypeName - // - OriginalTypeName.BackColor = SystemColors.ScrollBar; - OriginalTypeName.Location = new Point(17, 43); - OriginalTypeName.Name = "OriginalTypeName"; - OriginalTypeName.PlaceholderText = "Original Name"; - OriginalTypeName.Size = new Size(208, 31); - OriginalTypeName.TabIndex = 1; - toolTip1.SetToolTip(OriginalTypeName, "The original name of the type, you can leave this blank if not using force rename."); - // - // HasAttributeComboBox - // - HasAttributeComboBox.BackColor = SystemColors.ScrollBar; - HasAttributeComboBox.FormattingEnabled = true; - HasAttributeComboBox.Location = new Point(17, 312); - HasAttributeComboBox.Name = "HasAttributeComboBox"; - HasAttributeComboBox.Size = new Size(208, 33); - HasAttributeComboBox.TabIndex = 48; - toolTip1.SetToolTip(HasAttributeComboBox, "does the type have an attribute?"); - // - // NestedTypeCountUpDown - // - NestedTypeCountUpDown.BackColor = SystemColors.ScrollBar; - NestedTypeCountUpDown.Location = new Point(434, 158); - NestedTypeCountUpDown.Name = "NestedTypeCountUpDown"; - NestedTypeCountUpDown.Size = new Size(54, 31); - NestedTypeCountUpDown.TabIndex = 4; - toolTip1.SetToolTip(NestedTypeCountUpDown, "How many nested types are there?"); - // - // IsDerivedUpDown - // - IsDerivedUpDown.BackColor = SystemColors.ScrollBar; - IsDerivedUpDown.Location = new Point(17, 435); - IsDerivedUpDown.Name = "IsDerivedUpDown"; - IsDerivedUpDown.Size = new Size(206, 31); - IsDerivedUpDown.Sorted = true; - IsDerivedUpDown.TabIndex = 6; - IsDerivedUpDown.Text = "IsDerived"; - toolTip1.SetToolTip(IsDerivedUpDown, "Does the type inherit from another type explicitly?"); - // - // HasGenericParamsComboBox - // - HasGenericParamsComboBox.BackColor = SystemColors.ScrollBar; - HasGenericParamsComboBox.FormattingEnabled = true; - HasGenericParamsComboBox.Location = new Point(17, 352); - HasGenericParamsComboBox.Name = "HasGenericParamsComboBox"; - HasGenericParamsComboBox.Size = new Size(208, 33); - HasGenericParamsComboBox.TabIndex = 50; - toolTip1.SetToolTip(HasGenericParamsComboBox, "Does the type have generic parameters?"); - // - // IsNestedUpDown - // - IsNestedUpDown.BackColor = SystemColors.ScrollBar; - IsNestedUpDown.Location = new Point(17, 398); - IsNestedUpDown.Name = "IsNestedUpDown"; - IsNestedUpDown.Size = new Size(206, 31); - IsNestedUpDown.Sorted = true; - IsNestedUpDown.TabIndex = 3; - IsNestedUpDown.Text = "IsNested"; - toolTip1.SetToolTip(IsNestedUpDown, "Is the type nested within another type?"); - // - // BaseClassExcludeTextField - // - BaseClassExcludeTextField.BackColor = SystemColors.ScrollBar; - BaseClassExcludeTextField.Location = new Point(446, 433); - BaseClassExcludeTextField.Name = "BaseClassExcludeTextField"; - BaseClassExcludeTextField.PlaceholderText = "Exclude Base Class"; - BaseClassExcludeTextField.Size = new Size(208, 31); - BaseClassExcludeTextField.TabIndex = 1; - toolTip1.SetToolTip(BaseClassExcludeTextField, "Exclude a base class. Requires IsDerived to be true"); - // - // IsStructComboBox - // - IsStructComboBox.BackColor = SystemColors.ScrollBar; - IsStructComboBox.FormattingEnabled = true; - IsStructComboBox.Location = new Point(17, 235); - IsStructComboBox.Name = "IsStructComboBox"; - IsStructComboBox.Size = new Size(208, 33); - IsStructComboBox.TabIndex = 52; - toolTip1.SetToolTip(IsStructComboBox, "Is the type an enum?"); - // - // NewTypeName - // - NewTypeName.BackColor = SystemColors.ScrollBar; - NewTypeName.Location = new Point(17, 7); - NewTypeName.Name = "NewTypeName"; - NewTypeName.PlaceholderText = "New Name"; - NewTypeName.Size = new Size(208, 31); - NewTypeName.TabIndex = 0; - toolTip1.SetToolTip(NewTypeName, "The new name of the type you wish to remap"); - // - // LoadedMappingFilePath - // - LoadedMappingFilePath.BackColor = SystemColors.ScrollBar; - LoadedMappingFilePath.Location = new Point(781, 878); - LoadedMappingFilePath.Name = "LoadedMappingFilePath"; - LoadedMappingFilePath.PlaceholderText = "Loaded Mapping File"; - LoadedMappingFilePath.ReadOnly = true; - LoadedMappingFilePath.Size = new Size(363, 31); - LoadedMappingFilePath.TabIndex = 38; - toolTip1.SetToolTip(LoadedMappingFilePath, "Shows which mapping file you are working on, a standalone or a projects mappings"); - // - // ResetSearchButton - // - ResetSearchButton.Location = new Point(1219, 13); - ResetSearchButton.Name = "ResetSearchButton"; - ResetSearchButton.Size = new Size(111, 33); - ResetSearchButton.TabIndex = 40; - ResetSearchButton.Text = "Clear"; - toolTip1.SetToolTip(ResetSearchButton, "The programs original assembly you wish to remap.\r\n\r\nTarget the one in the programs install location."); - ResetSearchButton.UseVisualStyleBackColor = true; - ResetSearchButton.Click += ResetSearchButton_Click; - // - // ValidateRemapButton - // - ValidateRemapButton.BackColor = SystemColors.ButtonShadow; - ValidateRemapButton.Location = new Point(783, 698); - ValidateRemapButton.Name = "ValidateRemapButton"; - ValidateRemapButton.Size = new Size(169, 33); - ValidateRemapButton.TabIndex = 54; - ValidateRemapButton.Text = "Validate Remap"; - toolTip1.SetToolTip(ValidateRemapButton, "Validates the current remap in the editor, saves you from running the entire process to find a match for a single remap."); - ValidateRemapButton.UseVisualStyleBackColor = false; - ValidateRemapButton.Click += ValidateRemapButton_Click; - // - // SettingsTab - // - SettingsTab.BackColor = SystemColors.ControlDarkDark; - SettingsTab.Controls.Add(groupBox2); - SettingsTab.Location = new Point(4, 34); - SettingsTab.Name = "SettingsTab"; - SettingsTab.Padding = new Padding(3, 3, 3, 3); - SettingsTab.Size = new Size(1356, 954); - SettingsTab.TabIndex = 2; - SettingsTab.Text = "Settings"; - // - // groupBox2 - // - groupBox2.Controls.Add(GithubLinkLabel); - groupBox2.Controls.Add(SilentModeCheckbox); - groupBox2.Controls.Add(DebugLoggingCheckbox); - groupBox2.Location = new Point(13, 7); - groupBox2.Name = "groupBox2"; - groupBox2.Size = new Size(446, 350); - groupBox2.TabIndex = 0; - groupBox2.TabStop = false; - groupBox2.Text = "App Settings"; - // - // RemapperTabPage - // - RemapperTabPage.BackColor = SystemColors.ControlDarkDark; - RemapperTabPage.Controls.Add(ValidateRemapButton); - RemapperTabPage.Controls.Add(label1); - RemapperTabPage.Controls.Add(ResetSearchButton); - RemapperTabPage.Controls.Add(LoadedMappingFilePath); - RemapperTabPage.Controls.Add(RMSearchBox); - RemapperTabPage.Controls.Add(RemapperOutputDirectoryPath); - RemapperTabPage.Controls.Add(TargetAssemblyPath); - RemapperTabPage.Controls.Add(RemapTreeView); - RemapperTabPage.Controls.Add(groupBox1); - RemapperTabPage.Controls.Add(OutputDirectoryButton); - RemapperTabPage.Controls.Add(LoadMappingFileButton); - RemapperTabPage.Controls.Add(PickAssemblyPathButton); - RemapperTabPage.Controls.Add(RemapperUnseal); - RemapperTabPage.Controls.Add(SaveRemapButton); - RemapperTabPage.Controls.Add(RemapperPublicicize); - RemapperTabPage.Controls.Add(RemoveRemapButton); - RemapperTabPage.Controls.Add(RunRemapButton); - RemapperTabPage.Controls.Add(RenameFieldsCheckbox); - RemapperTabPage.Controls.Add(RenamePropertiesCheckbox); - RemapperTabPage.Location = new Point(4, 34); - RemapperTabPage.Name = "RemapperTabPage"; - RemapperTabPage.Padding = new Padding(3, 3, 3, 3); - RemapperTabPage.Size = new Size(1356, 954); - RemapperTabPage.TabIndex = 1; - RemapperTabPage.Text = "Remapper"; - // - // label1 - // - label1.AutoSize = true; - label1.Location = new Point(777, 47); - label1.Name = "label1"; - label1.Size = new Size(235, 25); - label1.TabIndex = 41; - label1.Text = "Double click to edit a remap"; - // - // RMSearchBox - // - RMSearchBox.BackColor = SystemColors.ScrollBar; - RMSearchBox.Location = new Point(781, 17); - RMSearchBox.Name = "RMSearchBox"; - RMSearchBox.PlaceholderText = "Search"; - RMSearchBox.Size = new Size(431, 31); - RMSearchBox.TabIndex = 38; - RMSearchBox.TextChanged += SearchTreeView; - // - // RemapperOutputDirectoryPath - // - RemapperOutputDirectoryPath.BackColor = SystemColors.ScrollBar; - RemapperOutputDirectoryPath.Location = new Point(781, 618); - RemapperOutputDirectoryPath.Name = "RemapperOutputDirectoryPath"; - RemapperOutputDirectoryPath.PlaceholderText = "Output Directory"; - RemapperOutputDirectoryPath.ReadOnly = true; - RemapperOutputDirectoryPath.Size = new Size(431, 31); - RemapperOutputDirectoryPath.TabIndex = 34; - // - // TargetAssemblyPath - // - TargetAssemblyPath.BackColor = SystemColors.ScrollBar; - TargetAssemblyPath.Location = new Point(781, 582); - TargetAssemblyPath.Name = "TargetAssemblyPath"; - TargetAssemblyPath.PlaceholderText = "Target Assembly"; - TargetAssemblyPath.ReadOnly = true; - TargetAssemblyPath.Size = new Size(431, 31); - TargetAssemblyPath.TabIndex = 33; - // - // RemapTreeView - // - RemapTreeView.BackColor = Color.Gray; - RemapTreeView.Location = new Point(783, 72); - RemapTreeView.Name = "RemapTreeView"; - RemapTreeView.Size = new Size(547, 502); - RemapTreeView.TabIndex = 1; - // - // groupBox1 - // - groupBox1.Controls.Add(tabControl1); - groupBox1.Location = new Point(6, 7); - groupBox1.Name = "groupBox1"; - groupBox1.Size = new Size(769, 903); - groupBox1.TabIndex = 0; - groupBox1.TabStop = false; - groupBox1.Text = "Remap Editor"; - // - // tabControl1 - // - tabControl1.Controls.Add(RMBasicTab); - tabControl1.Controls.Add(tabPage6); - tabControl1.Controls.Add(RMSearchTab); - tabControl1.Location = new Point(10, 30); - tabControl1.Name = "tabControl1"; - tabControl1.SelectedIndex = 0; - tabControl1.Size = new Size(753, 880); - tabControl1.TabIndex = 54; - // - // RMBasicTab - // - RMBasicTab.BackColor = SystemColors.ControlDarkDark; - RMBasicTab.Controls.Add(NewTypeName); - RMBasicTab.Controls.Add(Inclusions); - RMBasicTab.Controls.Add(label11); - RMBasicTab.Controls.Add(MethodCountEnabled); - RMBasicTab.Controls.Add(IsStructComboBox); - RMBasicTab.Controls.Add(BaseClassExcludeTextField); - RMBasicTab.Controls.Add(label10); - RMBasicTab.Controls.Add(IsNestedUpDown); - RMBasicTab.Controls.Add(HasGenericParamsComboBox); - RMBasicTab.Controls.Add(IsDerivedUpDown); - RMBasicTab.Controls.Add(label8); - RMBasicTab.Controls.Add(NestedTypeCountUpDown); - RMBasicTab.Controls.Add(HasAttributeComboBox); - RMBasicTab.Controls.Add(OriginalTypeName); - RMBasicTab.Controls.Add(label9); - RMBasicTab.Controls.Add(BaseClassIncludeTextFIeld); - RMBasicTab.Controls.Add(IsEnumComboBox); - RMBasicTab.Controls.Add(MethodCountUpDown); - RMBasicTab.Controls.Add(label2322); - RMBasicTab.Controls.Add(NestedTypeParentName); - RMBasicTab.Controls.Add(IsInterfaceComboBox); - RMBasicTab.Controls.Add(FieldCountEnabled); - RMBasicTab.Controls.Add(label7); - RMBasicTab.Controls.Add(FieldCountUpDown); - RMBasicTab.Controls.Add(IsSealedComboBox); - RMBasicTab.Controls.Add(PropertyCountUpDown); - RMBasicTab.Controls.Add(label6); - RMBasicTab.Controls.Add(NestedTypeCountEnabled); - RMBasicTab.Controls.Add(IsAbstractComboBox); - RMBasicTab.Controls.Add(RemapperUseForceRename); - RMBasicTab.Controls.Add(label5); - RMBasicTab.Controls.Add(PropertyCountEnabled); - RMBasicTab.Controls.Add(IsPublicComboBox); - RMBasicTab.Controls.Add(ConstructorCountEnabled); - RMBasicTab.Controls.Add(ConstuctorCountUpDown); - RMBasicTab.Location = new Point(4, 34); - RMBasicTab.Name = "RMBasicTab"; - RMBasicTab.Padding = new Padding(3, 3, 3, 3); - RMBasicTab.Size = new Size(745, 842); - RMBasicTab.TabIndex = 0; - RMBasicTab.Text = "Basic"; - // - // Inclusions - // - Inclusions.Controls.Add(tabPage1); - Inclusions.Controls.Add(tabPage2); - Inclusions.Controls.Add(tabPage3); - Inclusions.Controls.Add(tabPage4); - Inclusions.Controls.Add(tabPage5); - Inclusions.Location = new Point(6, 477); - Inclusions.Name = "Inclusions"; - Inclusions.SelectedIndex = 0; - Inclusions.Size = new Size(751, 363); - Inclusions.TabIndex = 14; - // - // tabPage1 - // - tabPage1.BackColor = SystemColors.ControlDarkDark; - tabPage1.BorderStyle = BorderStyle.FixedSingle; - tabPage1.Controls.Add(ExcludeMethodTextBox); - tabPage1.Controls.Add(IncludeMethodTextBox); - tabPage1.Controls.Add(MethodExcludeRemoveButton); - tabPage1.Controls.Add(MethodExcludeAddButton); - tabPage1.Controls.Add(MethodIncludeRemoveButton); - tabPage1.Controls.Add(MethodIncludeAddButton); - tabPage1.Controls.Add(MethodExcludeBox); - tabPage1.Controls.Add(MethodIncludeBox); - tabPage1.Location = new Point(4, 34); - tabPage1.Name = "tabPage1"; - tabPage1.Padding = new Padding(3, 3, 3, 3); - tabPage1.Size = new Size(743, 325); - tabPage1.TabIndex = 0; - tabPage1.Text = "Methods"; - // - // ExcludeMethodTextBox - // - ExcludeMethodTextBox.BackColor = SystemColors.ScrollBar; - ExcludeMethodTextBox.Location = new Point(381, 7); - ExcludeMethodTextBox.Name = "ExcludeMethodTextBox"; - ExcludeMethodTextBox.PlaceholderText = "Exclude Methods"; - ExcludeMethodTextBox.Size = new Size(353, 31); - ExcludeMethodTextBox.TabIndex = 21; - // - // IncludeMethodTextBox - // - IncludeMethodTextBox.BackColor = SystemColors.ScrollBar; - IncludeMethodTextBox.Location = new Point(6, 7); - IncludeMethodTextBox.Name = "IncludeMethodTextBox"; - IncludeMethodTextBox.PlaceholderText = "Include Methods"; - IncludeMethodTextBox.Size = new Size(353, 31); - IncludeMethodTextBox.TabIndex = 20; - // - // MethodExcludeRemoveButton - // - MethodExcludeRemoveButton.Location = new Point(621, 278); - MethodExcludeRemoveButton.Name = "MethodExcludeRemoveButton"; - MethodExcludeRemoveButton.Size = new Size(111, 37); - MethodExcludeRemoveButton.TabIndex = 19; - MethodExcludeRemoveButton.Text = "Remove"; - MethodExcludeRemoveButton.UseVisualStyleBackColor = true; - MethodExcludeRemoveButton.Click += MethodExcludeRemoveButton_Click; - // - // MethodExcludeAddButton - // - MethodExcludeAddButton.Location = new Point(381, 278); - MethodExcludeAddButton.Name = "MethodExcludeAddButton"; - MethodExcludeAddButton.Size = new Size(111, 33); - MethodExcludeAddButton.TabIndex = 18; - MethodExcludeAddButton.Text = "Add"; - MethodExcludeAddButton.UseVisualStyleBackColor = true; - MethodExcludeAddButton.Click += MethodExcludeAddButton_Click; - // - // MethodIncludeRemoveButton - // - MethodIncludeRemoveButton.Location = new Point(247, 278); - MethodIncludeRemoveButton.Name = "MethodIncludeRemoveButton"; - MethodIncludeRemoveButton.Size = new Size(111, 33); - MethodIncludeRemoveButton.TabIndex = 17; - MethodIncludeRemoveButton.Text = "Remove"; - MethodIncludeRemoveButton.UseVisualStyleBackColor = true; - MethodIncludeRemoveButton.Click += MethodIncludeRemoveButton_Click; - // - // MethodIncludeAddButton - // - MethodIncludeAddButton.Location = new Point(6, 278); - MethodIncludeAddButton.Name = "MethodIncludeAddButton"; - MethodIncludeAddButton.Size = new Size(111, 33); - MethodIncludeAddButton.TabIndex = 16; - MethodIncludeAddButton.Text = "Add"; - MethodIncludeAddButton.UseVisualStyleBackColor = true; - MethodIncludeAddButton.Click += MethodIncludeAddButton_Click; - // - // MethodExcludeBox - // - MethodExcludeBox.BackColor = Color.Gray; - MethodExcludeBox.FormattingEnabled = true; - MethodExcludeBox.ItemHeight = 25; - MethodExcludeBox.Location = new Point(381, 43); - MethodExcludeBox.Name = "MethodExcludeBox"; - MethodExcludeBox.Size = new Size(353, 229); - MethodExcludeBox.TabIndex = 15; - // - // MethodIncludeBox - // - MethodIncludeBox.BackColor = Color.Gray; - MethodIncludeBox.FormattingEnabled = true; - MethodIncludeBox.ItemHeight = 25; - MethodIncludeBox.Location = new Point(6, 43); - MethodIncludeBox.Name = "MethodIncludeBox"; - MethodIncludeBox.Size = new Size(353, 229); - MethodIncludeBox.TabIndex = 14; - // - // tabPage2 - // - tabPage2.BackColor = SystemColors.ControlDarkDark; - tabPage2.Controls.Add(FieldsExcludeTextInput); - tabPage2.Controls.Add(FieldsIncludeTextInput); - tabPage2.Controls.Add(FieldExcludeRemoveButton); - tabPage2.Controls.Add(FieldExcludeAddButton); - tabPage2.Controls.Add(FieldIncludeRemoveButton); - tabPage2.Controls.Add(FIeldIncludeAddButton); - tabPage2.Controls.Add(FieldExcludeBox); - tabPage2.Controls.Add(FieldIncludeBox); - tabPage2.Location = new Point(4, 34); - tabPage2.Name = "tabPage2"; - tabPage2.Padding = new Padding(3, 3, 3, 3); - tabPage2.Size = new Size(743, 325); - tabPage2.TabIndex = 1; - tabPage2.Text = "Fields"; - // - // FieldsExcludeTextInput - // - FieldsExcludeTextInput.BackColor = SystemColors.ScrollBar; - FieldsExcludeTextInput.Location = new Point(381, 7); - FieldsExcludeTextInput.Name = "FieldsExcludeTextInput"; - FieldsExcludeTextInput.PlaceholderText = "Exclude Fields"; - FieldsExcludeTextInput.Size = new Size(353, 31); - FieldsExcludeTextInput.TabIndex = 27; - // - // FieldsIncludeTextInput - // - FieldsIncludeTextInput.BackColor = SystemColors.ScrollBar; - FieldsIncludeTextInput.Location = new Point(6, 7); - FieldsIncludeTextInput.Name = "FieldsIncludeTextInput"; - FieldsIncludeTextInput.PlaceholderText = "Include Fields"; - FieldsIncludeTextInput.Size = new Size(353, 31); - FieldsIncludeTextInput.TabIndex = 26; - // - // FieldExcludeRemoveButton - // - FieldExcludeRemoveButton.BackColor = SystemColors.ButtonShadow; - FieldExcludeRemoveButton.Location = new Point(621, 278); - FieldExcludeRemoveButton.Name = "FieldExcludeRemoveButton"; - FieldExcludeRemoveButton.Size = new Size(111, 33); - FieldExcludeRemoveButton.TabIndex = 25; - FieldExcludeRemoveButton.Text = "Remove"; - FieldExcludeRemoveButton.UseVisualStyleBackColor = false; - FieldExcludeRemoveButton.Click += FieldExcludeRemoveButton_Click; - // - // FieldExcludeAddButton - // - FieldExcludeAddButton.BackColor = SystemColors.ButtonShadow; - FieldExcludeAddButton.Location = new Point(381, 278); - FieldExcludeAddButton.Name = "FieldExcludeAddButton"; - FieldExcludeAddButton.Size = new Size(111, 33); - FieldExcludeAddButton.TabIndex = 24; - FieldExcludeAddButton.Text = "Add"; - FieldExcludeAddButton.UseVisualStyleBackColor = false; - FieldExcludeAddButton.Click += FieldExcludeAddButton_Click; - // - // FieldIncludeRemoveButton - // - FieldIncludeRemoveButton.BackColor = SystemColors.ButtonShadow; - FieldIncludeRemoveButton.Location = new Point(247, 278); - FieldIncludeRemoveButton.Name = "FieldIncludeRemoveButton"; - FieldIncludeRemoveButton.Size = new Size(111, 33); - FieldIncludeRemoveButton.TabIndex = 23; - FieldIncludeRemoveButton.Text = "Remove"; - FieldIncludeRemoveButton.UseVisualStyleBackColor = false; - FieldIncludeRemoveButton.Click += FieldIncludeRemoveButton_Click; - // - // FIeldIncludeAddButton - // - FIeldIncludeAddButton.BackColor = SystemColors.ButtonShadow; - FIeldIncludeAddButton.Location = new Point(6, 278); - FIeldIncludeAddButton.Name = "FIeldIncludeAddButton"; - FIeldIncludeAddButton.Size = new Size(111, 33); - FIeldIncludeAddButton.TabIndex = 22; - FIeldIncludeAddButton.Text = "Add"; - FIeldIncludeAddButton.UseVisualStyleBackColor = false; - FIeldIncludeAddButton.Click += FIeldIncludeAddButton_Click; - // - // FieldExcludeBox - // - FieldExcludeBox.BackColor = Color.Gray; - FieldExcludeBox.FormattingEnabled = true; - FieldExcludeBox.ItemHeight = 25; - FieldExcludeBox.Location = new Point(381, 43); - FieldExcludeBox.Name = "FieldExcludeBox"; - FieldExcludeBox.Size = new Size(353, 229); - FieldExcludeBox.TabIndex = 17; - // - // FieldIncludeBox - // - FieldIncludeBox.BackColor = Color.Gray; - FieldIncludeBox.FormattingEnabled = true; - FieldIncludeBox.ItemHeight = 25; - FieldIncludeBox.Location = new Point(6, 43); - FieldIncludeBox.Name = "FieldIncludeBox"; - FieldIncludeBox.Size = new Size(353, 229); - FieldIncludeBox.TabIndex = 16; - // - // tabPage3 - // - tabPage3.BackColor = SystemColors.ControlDarkDark; - tabPage3.Controls.Add(PropertiesExcludeTextField); - tabPage3.Controls.Add(PropertiesIncludeTextField); - tabPage3.Controls.Add(PropertiesExcludeRemoveButton); - tabPage3.Controls.Add(PropertiesExcludeAddButton); - tabPage3.Controls.Add(PropertiesIncludeRemoveButton); - tabPage3.Controls.Add(PropertiesIncludeAddButton); - tabPage3.Controls.Add(PropertiesExcludeBox); - tabPage3.Controls.Add(PropertiesIncludeBox); - tabPage3.Location = new Point(4, 34); - tabPage3.Name = "tabPage3"; - tabPage3.Padding = new Padding(3, 3, 3, 3); - tabPage3.Size = new Size(743, 325); - tabPage3.TabIndex = 2; - tabPage3.Text = "Properties"; - // - // PropertiesExcludeTextField - // - PropertiesExcludeTextField.BackColor = SystemColors.ScrollBar; - PropertiesExcludeTextField.Location = new Point(381, 7); - PropertiesExcludeTextField.Name = "PropertiesExcludeTextField"; - PropertiesExcludeTextField.PlaceholderText = "Exclude Properties"; - PropertiesExcludeTextField.Size = new Size(353, 31); - PropertiesExcludeTextField.TabIndex = 27; - // - // PropertiesIncludeTextField - // - PropertiesIncludeTextField.BackColor = SystemColors.ScrollBar; - PropertiesIncludeTextField.Location = new Point(6, 7); - PropertiesIncludeTextField.Name = "PropertiesIncludeTextField"; - PropertiesIncludeTextField.PlaceholderText = "Include Properties"; - PropertiesIncludeTextField.Size = new Size(353, 31); - PropertiesIncludeTextField.TabIndex = 26; - // - // PropertiesExcludeRemoveButton - // - PropertiesExcludeRemoveButton.BackColor = SystemColors.ButtonShadow; - PropertiesExcludeRemoveButton.Location = new Point(621, 278); - PropertiesExcludeRemoveButton.Name = "PropertiesExcludeRemoveButton"; - PropertiesExcludeRemoveButton.Size = new Size(111, 33); - PropertiesExcludeRemoveButton.TabIndex = 25; - PropertiesExcludeRemoveButton.Text = "Remove"; - PropertiesExcludeRemoveButton.UseVisualStyleBackColor = false; - PropertiesExcludeRemoveButton.Click += PropertiesExcludeRemoveButton_Click; - // - // PropertiesExcludeAddButton - // - PropertiesExcludeAddButton.BackColor = SystemColors.ButtonShadow; - PropertiesExcludeAddButton.Location = new Point(381, 278); - PropertiesExcludeAddButton.Name = "PropertiesExcludeAddButton"; - PropertiesExcludeAddButton.Size = new Size(111, 33); - PropertiesExcludeAddButton.TabIndex = 24; - PropertiesExcludeAddButton.Text = "Add"; - PropertiesExcludeAddButton.UseVisualStyleBackColor = false; - PropertiesExcludeAddButton.Click += PropertiesExcludeAddButton_Click; - // - // PropertiesIncludeRemoveButton - // - PropertiesIncludeRemoveButton.BackColor = SystemColors.ButtonShadow; - PropertiesIncludeRemoveButton.Location = new Point(247, 278); - PropertiesIncludeRemoveButton.Name = "PropertiesIncludeRemoveButton"; - PropertiesIncludeRemoveButton.Size = new Size(111, 33); - PropertiesIncludeRemoveButton.TabIndex = 23; - PropertiesIncludeRemoveButton.Text = "Remove"; - PropertiesIncludeRemoveButton.UseVisualStyleBackColor = false; - PropertiesIncludeRemoveButton.Click += PropertiesIncludeRemoveButton_Click; - // - // PropertiesIncludeAddButton - // - PropertiesIncludeAddButton.BackColor = SystemColors.ButtonShadow; - PropertiesIncludeAddButton.Location = new Point(6, 278); - PropertiesIncludeAddButton.Name = "PropertiesIncludeAddButton"; - PropertiesIncludeAddButton.Size = new Size(111, 33); - PropertiesIncludeAddButton.TabIndex = 22; - PropertiesIncludeAddButton.Text = "Add"; - PropertiesIncludeAddButton.UseVisualStyleBackColor = false; - PropertiesIncludeAddButton.Click += PropertiesIncludeAddButton_Click; - // - // PropertiesExcludeBox - // - PropertiesExcludeBox.BackColor = Color.Gray; - PropertiesExcludeBox.FormattingEnabled = true; - PropertiesExcludeBox.ItemHeight = 25; - PropertiesExcludeBox.Location = new Point(381, 43); - PropertiesExcludeBox.Name = "PropertiesExcludeBox"; - PropertiesExcludeBox.Size = new Size(353, 229); - PropertiesExcludeBox.TabIndex = 19; - // - // PropertiesIncludeBox - // - PropertiesIncludeBox.BackColor = Color.Gray; - PropertiesIncludeBox.FormattingEnabled = true; - PropertiesIncludeBox.ItemHeight = 25; - PropertiesIncludeBox.Location = new Point(6, 43); - PropertiesIncludeBox.Name = "PropertiesIncludeBox"; - PropertiesIncludeBox.Size = new Size(353, 229); - PropertiesIncludeBox.TabIndex = 18; - // - // tabPage4 - // - tabPage4.BackColor = SystemColors.ControlDarkDark; - tabPage4.Controls.Add(NestedTypesExcludeTextField); - tabPage4.Controls.Add(NestedTypesIncludeTextField); - tabPage4.Controls.Add(NestedTypesExcludeRemoveButton); - tabPage4.Controls.Add(NestedTypesExlcudeAddButton); - tabPage4.Controls.Add(NestedTypesRemoveButton); - tabPage4.Controls.Add(NestedTypesAddButton); - tabPage4.Controls.Add(NestedTypesExcludeBox); - tabPage4.Controls.Add(NestedTypesIncludeBox); - tabPage4.Location = new Point(4, 34); - tabPage4.Name = "tabPage4"; - tabPage4.Padding = new Padding(3, 3, 3, 3); - tabPage4.Size = new Size(743, 325); - tabPage4.TabIndex = 3; - tabPage4.Text = "Nested Types"; - // - // NestedTypesExcludeTextField - // - NestedTypesExcludeTextField.BackColor = SystemColors.ScrollBar; - NestedTypesExcludeTextField.Location = new Point(381, 7); - NestedTypesExcludeTextField.Name = "NestedTypesExcludeTextField"; - NestedTypesExcludeTextField.PlaceholderText = "Exclude Nested Types"; - NestedTypesExcludeTextField.Size = new Size(353, 31); - NestedTypesExcludeTextField.TabIndex = 27; - // - // NestedTypesIncludeTextField - // - NestedTypesIncludeTextField.BackColor = SystemColors.ScrollBar; - NestedTypesIncludeTextField.Location = new Point(6, 7); - NestedTypesIncludeTextField.Name = "NestedTypesIncludeTextField"; - NestedTypesIncludeTextField.PlaceholderText = "Include Nested Types"; - NestedTypesIncludeTextField.Size = new Size(353, 31); - NestedTypesIncludeTextField.TabIndex = 26; - // - // NestedTypesExcludeRemoveButton - // - NestedTypesExcludeRemoveButton.BackColor = SystemColors.ButtonShadow; - NestedTypesExcludeRemoveButton.Location = new Point(621, 278); - NestedTypesExcludeRemoveButton.Name = "NestedTypesExcludeRemoveButton"; - NestedTypesExcludeRemoveButton.Size = new Size(111, 33); - NestedTypesExcludeRemoveButton.TabIndex = 25; - NestedTypesExcludeRemoveButton.Text = "Remove"; - NestedTypesExcludeRemoveButton.UseVisualStyleBackColor = false; - NestedTypesExcludeRemoveButton.Click += NestedTypesExcludeRemoveButton_Click; - // - // NestedTypesExlcudeAddButton - // - NestedTypesExlcudeAddButton.BackColor = SystemColors.ButtonShadow; - NestedTypesExlcudeAddButton.Location = new Point(381, 278); - NestedTypesExlcudeAddButton.Name = "NestedTypesExlcudeAddButton"; - NestedTypesExlcudeAddButton.Size = new Size(111, 33); - NestedTypesExlcudeAddButton.TabIndex = 24; - NestedTypesExlcudeAddButton.Text = "Add"; - NestedTypesExlcudeAddButton.UseVisualStyleBackColor = false; - NestedTypesExlcudeAddButton.Click += NestedTypesExlcudeAddButton_Click; - // - // NestedTypesRemoveButton - // - NestedTypesRemoveButton.BackColor = SystemColors.ButtonShadow; - NestedTypesRemoveButton.Location = new Point(247, 278); - NestedTypesRemoveButton.Name = "NestedTypesRemoveButton"; - NestedTypesRemoveButton.Size = new Size(111, 33); - NestedTypesRemoveButton.TabIndex = 23; - NestedTypesRemoveButton.Text = "Remove"; - NestedTypesRemoveButton.UseVisualStyleBackColor = false; - NestedTypesRemoveButton.Click += NestedTypesRemoveButton_Click; - // - // NestedTypesAddButton - // - NestedTypesAddButton.BackColor = SystemColors.ButtonShadow; - NestedTypesAddButton.Location = new Point(6, 278); - NestedTypesAddButton.Name = "NestedTypesAddButton"; - NestedTypesAddButton.Size = new Size(111, 33); - NestedTypesAddButton.TabIndex = 22; - NestedTypesAddButton.Text = "Add"; - NestedTypesAddButton.UseVisualStyleBackColor = false; - NestedTypesAddButton.Click += NestedTypesAddButton_Click; - // - // NestedTypesExcludeBox - // - NestedTypesExcludeBox.BackColor = Color.Gray; - NestedTypesExcludeBox.FormattingEnabled = true; - NestedTypesExcludeBox.ItemHeight = 25; - NestedTypesExcludeBox.Location = new Point(381, 43); - NestedTypesExcludeBox.Name = "NestedTypesExcludeBox"; - NestedTypesExcludeBox.Size = new Size(353, 229); - NestedTypesExcludeBox.TabIndex = 21; - // - // NestedTypesIncludeBox - // - NestedTypesIncludeBox.BackColor = Color.Gray; - NestedTypesIncludeBox.FormattingEnabled = true; - NestedTypesIncludeBox.ItemHeight = 25; - NestedTypesIncludeBox.Location = new Point(6, 43); - NestedTypesIncludeBox.Name = "NestedTypesIncludeBox"; - NestedTypesIncludeBox.Size = new Size(353, 229); - NestedTypesIncludeBox.TabIndex = 20; - // - // tabPage5 - // - tabPage5.BackColor = SystemColors.ControlDarkDark; - tabPage5.Controls.Add(EventsExcludeBox); - tabPage5.Controls.Add(EventsIncludeBox); - tabPage5.Controls.Add(EventsExcludeRemoveButton); - tabPage5.Controls.Add(EventsExcludeAddButton); - tabPage5.Controls.Add(EventsRemoveButton); - tabPage5.Controls.Add(EventsAddButton); - tabPage5.Controls.Add(EventsExcludeTextField); - tabPage5.Controls.Add(EventsIncludeTextField); - tabPage5.Location = new Point(4, 34); - tabPage5.Margin = new Padding(4, 5, 4, 5); - tabPage5.Name = "tabPage5"; - tabPage5.Size = new Size(743, 325); - tabPage5.TabIndex = 4; - tabPage5.Text = "Events"; - // - // EventsExcludeBox - // - EventsExcludeBox.BackColor = Color.Gray; - EventsExcludeBox.FormattingEnabled = true; - EventsExcludeBox.ItemHeight = 25; - EventsExcludeBox.Location = new Point(381, 43); - EventsExcludeBox.Name = "EventsExcludeBox"; - EventsExcludeBox.Size = new Size(353, 229); - EventsExcludeBox.TabIndex = 34; - // - // EventsIncludeBox - // - EventsIncludeBox.BackColor = Color.Gray; - EventsIncludeBox.FormattingEnabled = true; - EventsIncludeBox.ItemHeight = 25; - EventsIncludeBox.Location = new Point(6, 43); - EventsIncludeBox.Name = "EventsIncludeBox"; - EventsIncludeBox.Size = new Size(353, 229); - EventsIncludeBox.TabIndex = 33; - // - // EventsExcludeRemoveButton - // - EventsExcludeRemoveButton.BackColor = SystemColors.ButtonShadow; - EventsExcludeRemoveButton.Location = new Point(621, 278); - EventsExcludeRemoveButton.Name = "EventsExcludeRemoveButton"; - EventsExcludeRemoveButton.Size = new Size(111, 33); - EventsExcludeRemoveButton.TabIndex = 32; - EventsExcludeRemoveButton.Text = "Remove"; - EventsExcludeRemoveButton.UseVisualStyleBackColor = false; - EventsExcludeRemoveButton.Click += EventsExcludeRemoveButton_Click; - // - // EventsExcludeAddButton - // - EventsExcludeAddButton.BackColor = SystemColors.ButtonShadow; - EventsExcludeAddButton.Location = new Point(381, 278); - EventsExcludeAddButton.Name = "EventsExcludeAddButton"; - EventsExcludeAddButton.Size = new Size(111, 33); - EventsExcludeAddButton.TabIndex = 31; - EventsExcludeAddButton.Text = "Add"; - EventsExcludeAddButton.UseVisualStyleBackColor = false; - EventsExcludeAddButton.Click += EventsExcludeAddButton_Click; - // - // EventsRemoveButton - // - EventsRemoveButton.BackColor = SystemColors.ButtonShadow; - EventsRemoveButton.Location = new Point(247, 278); - EventsRemoveButton.Name = "EventsRemoveButton"; - EventsRemoveButton.Size = new Size(111, 33); - EventsRemoveButton.TabIndex = 30; - EventsRemoveButton.Text = "Remove"; - EventsRemoveButton.UseVisualStyleBackColor = false; - EventsRemoveButton.Click += EventsRemoveButton_Click; - // - // EventsAddButton - // - EventsAddButton.BackColor = SystemColors.ButtonShadow; - EventsAddButton.Location = new Point(6, 278); - EventsAddButton.Name = "EventsAddButton"; - EventsAddButton.Size = new Size(111, 33); - EventsAddButton.TabIndex = 29; - EventsAddButton.Text = "Add"; - EventsAddButton.UseVisualStyleBackColor = false; - EventsAddButton.Click += EventsAddButton_Click; - // - // EventsExcludeTextField - // - EventsExcludeTextField.BackColor = SystemColors.ScrollBar; - EventsExcludeTextField.Location = new Point(381, 7); - EventsExcludeTextField.Name = "EventsExcludeTextField"; - EventsExcludeTextField.PlaceholderText = "Exclude Events"; - EventsExcludeTextField.Size = new Size(353, 31); - EventsExcludeTextField.TabIndex = 28; - // - // EventsIncludeTextField - // - EventsIncludeTextField.BackColor = SystemColors.ScrollBar; - EventsIncludeTextField.Location = new Point(6, 7); - EventsIncludeTextField.Name = "EventsIncludeTextField"; - EventsIncludeTextField.PlaceholderText = "Include Events"; - EventsIncludeTextField.Size = new Size(353, 31); - EventsIncludeTextField.TabIndex = 27; - // - // label11 - // - label11.AutoSize = true; - label11.Location = new Point(231, 242); - label11.Name = "label11"; - label11.Size = new Size(75, 25); - label11.TabIndex = 53; - label11.Text = "Is Struct"; - // - // MethodCountEnabled - // - MethodCountEnabled.AutoSize = true; - MethodCountEnabled.Location = new Point(499, 52); - MethodCountEnabled.Name = "MethodCountEnabled"; - MethodCountEnabled.Size = new Size(154, 29); - MethodCountEnabled.TabIndex = 14; - MethodCountEnabled.Text = "Method Count"; - MethodCountEnabled.UseVisualStyleBackColor = true; - // - // label10 - // - label10.AutoSize = true; - label10.Location = new Point(231, 357); - label10.Name = "label10"; - label10.Size = new Size(197, 25); - label10.TabIndex = 51; - label10.Text = "Has Generic Parameters"; - // - // label8 - // - label8.AutoSize = true; - label8.Location = new Point(231, 320); - label8.Name = "label8"; - label8.Size = new Size(117, 25); - label8.TabIndex = 49; - label8.Text = "Has Attribute"; - // - // label9 - // - label9.AutoSize = true; - label9.Location = new Point(231, 280); - label9.Name = "label9"; - label9.Size = new Size(75, 25); - label9.TabIndex = 47; - label9.Text = "Is Enum"; - // - // label2322 - // - label2322.AutoSize = true; - label2322.Location = new Point(231, 202); - label2322.Name = "label2322"; - label2322.Size = new Size(98, 25); - label2322.TabIndex = 45; - label2322.Text = "Is Interface"; - // - // FieldCountEnabled - // - FieldCountEnabled.AutoSize = true; - FieldCountEnabled.Location = new Point(499, 87); - FieldCountEnabled.Name = "FieldCountEnabled"; - FieldCountEnabled.Size = new Size(128, 29); - FieldCountEnabled.TabIndex = 13; - FieldCountEnabled.Text = "Field Count"; - FieldCountEnabled.UseVisualStyleBackColor = true; - // - // label7 - // - label7.AutoSize = true; - label7.Location = new Point(231, 163); - label7.Name = "label7"; - label7.Size = new Size(82, 25); - label7.TabIndex = 43; - label7.Text = "Is Sealed"; - // - // label6 - // - label6.AutoSize = true; - label6.Location = new Point(231, 125); - label6.Name = "label6"; - label6.Size = new Size(96, 25); - label6.TabIndex = 41; - label6.Text = "Is Abstract"; - // - // NestedTypeCountEnabled - // - NestedTypeCountEnabled.AutoSize = true; - NestedTypeCountEnabled.Location = new Point(499, 157); - NestedTypeCountEnabled.Name = "NestedTypeCountEnabled"; - NestedTypeCountEnabled.Size = new Size(189, 29); - NestedTypeCountEnabled.TabIndex = 12; - NestedTypeCountEnabled.Text = "Nested Type Count"; - NestedTypeCountEnabled.UseVisualStyleBackColor = true; - // - // label5 - // - label5.AutoSize = true; - label5.Location = new Point(231, 87); - label5.Name = "label5"; - label5.Size = new Size(77, 25); - label5.TabIndex = 39; - label5.Text = "Is Public"; - // - // PropertyCountEnabled - // - PropertyCountEnabled.AutoSize = true; - PropertyCountEnabled.Location = new Point(499, 122); - PropertyCountEnabled.Name = "PropertyCountEnabled"; - PropertyCountEnabled.Size = new Size(159, 29); - PropertyCountEnabled.TabIndex = 11; - PropertyCountEnabled.Text = "Property Count"; - PropertyCountEnabled.UseVisualStyleBackColor = true; - // - // ConstructorCountEnabled - // - ConstructorCountEnabled.AutoSize = true; - ConstructorCountEnabled.Location = new Point(499, 13); - ConstructorCountEnabled.Name = "ConstructorCountEnabled"; - ConstructorCountEnabled.Size = new Size(238, 29); - ConstructorCountEnabled.TabIndex = 20; - ConstructorCountEnabled.Text = "Constructor Param Count"; - ConstructorCountEnabled.UseVisualStyleBackColor = true; - // - // tabPage6 - // - tabPage6.BackColor = SystemColors.ControlDarkDark; - tabPage6.Controls.Add(groupBox7); - tabPage6.Controls.Add(groupBox6); - tabPage6.Location = new Point(4, 34); - tabPage6.Name = "tabPage6"; - tabPage6.Padding = new Padding(3, 3, 3, 3); - tabPage6.Size = new Size(745, 842); - tabPage6.TabIndex = 1; - tabPage6.Text = "Advanced"; - // - // RMSearchTab - // - RMSearchTab.BackColor = SystemColors.ControlDarkDark; - RMSearchTab.Location = new Point(4, 34); - RMSearchTab.Name = "RMSearchTab"; - RMSearchTab.Padding = new Padding(3, 3, 3, 3); - RMSearchTab.Size = new Size(745, 842); - RMSearchTab.TabIndex = 2; - RMSearchTab.Text = "Search"; - // - // TabControlMain - // - TabControlMain.Controls.Add(RemapperTabPage); - TabControlMain.Controls.Add(SettingsTab); - TabControlMain.Location = new Point(-6, 2); - TabControlMain.Name = "TabControlMain"; - TabControlMain.SelectedIndex = 0; - TabControlMain.Size = new Size(1364, 992); - TabControlMain.TabIndex = 6; - // - // ReCodeItForm - // - AutoScaleDimensions = new SizeF(10F, 25F); - AutoScaleMode = AutoScaleMode.Font; - BackColor = SystemColors.ControlDarkDark; - ClientSize = new Size(1374, 998); - Controls.Add(TabControlMain); - FormBorderStyle = FormBorderStyle.FixedSingle; - Name = "ReCodeItForm"; - Text = "ReCodeIt V0.3.0"; - groupBox6.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)ConstuctorCountUpDown).EndInit(); - ((System.ComponentModel.ISupportInitialize)PropertyCountUpDown).EndInit(); - ((System.ComponentModel.ISupportInitialize)FieldCountUpDown).EndInit(); - ((System.ComponentModel.ISupportInitialize)MethodCountUpDown).EndInit(); - ((System.ComponentModel.ISupportInitialize)NestedTypeCountUpDown).EndInit(); - SettingsTab.ResumeLayout(false); - groupBox2.ResumeLayout(false); - groupBox2.PerformLayout(); - RemapperTabPage.ResumeLayout(false); - RemapperTabPage.PerformLayout(); - groupBox1.ResumeLayout(false); - tabControl1.ResumeLayout(false); - RMBasicTab.ResumeLayout(false); - RMBasicTab.PerformLayout(); - Inclusions.ResumeLayout(false); - tabPage1.ResumeLayout(false); - tabPage1.PerformLayout(); - tabPage2.ResumeLayout(false); - tabPage2.PerformLayout(); - tabPage3.ResumeLayout(false); - tabPage3.PerformLayout(); - tabPage4.ResumeLayout(false); - tabPage4.PerformLayout(); - tabPage5.ResumeLayout(false); - tabPage5.PerformLayout(); - tabPage6.ResumeLayout(false); - TabControlMain.ResumeLayout(false); - ResumeLayout(false); - } - - #endregion - private CheckBox ForceRenameCheckbox; - private ListView RemapListView; - private Button PickNameMangledPathButton; - private TextBox NameMangledAssemblyTextBox; - private CheckBox UnsealCheckbox; - private CheckBox PublicizeCheckbox; - private TextBox AssemblyPathTextBox; - private TextBox OutputPathTextBox; - private TextBox MappingPathTextBox; - private ToolTip toolTip1; - private TabPage SettingsTab; - private GroupBox groupBox2; - private LinkLabel GithubLinkLabel; - private CheckBox SilentModeCheckbox; - private CheckBox DebugLoggingCheckbox; - private TabPage RemapperTabPage; - private Button ValidateRemapButton; - private Label label1; - private Button ResetSearchButton; - private TextBox LoadedMappingFilePath; - private TextBox RMSearchBox; - private TextBox RemapperOutputDirectoryPath; - private TextBox TargetAssemblyPath; - private TreeView RemapTreeView; - private GroupBox groupBox1; - private TabControl tabControl1; - private TabPage RMBasicTab; - private TextBox NewTypeName; - private TabControl Inclusions; - private TabPage tabPage1; - private TextBox ExcludeMethodTextBox; - private TextBox IncludeMethodTextBox; - private Button MethodExcludeRemoveButton; - private Button MethodExcludeAddButton; - private Button MethodIncludeRemoveButton; - private Button MethodIncludeAddButton; - private ListBox MethodExcludeBox; - private ListBox MethodIncludeBox; - private TabPage tabPage2; - private TextBox FieldsExcludeTextInput; - private TextBox FieldsIncludeTextInput; - private Button FieldExcludeRemoveButton; - private Button FieldExcludeAddButton; - private Button FieldIncludeRemoveButton; - private Button FIeldIncludeAddButton; - private ListBox FieldExcludeBox; - private ListBox FieldIncludeBox; - private TabPage tabPage3; - private TextBox PropertiesExcludeTextField; - private TextBox PropertiesIncludeTextField; - private Button PropertiesExcludeRemoveButton; - private Button PropertiesExcludeAddButton; - private Button PropertiesIncludeRemoveButton; - private Button PropertiesIncludeAddButton; - private ListBox PropertiesExcludeBox; - private ListBox PropertiesIncludeBox; - private TabPage tabPage4; - private TextBox NestedTypesExcludeTextField; - private TextBox NestedTypesIncludeTextField; - private Button NestedTypesExcludeRemoveButton; - private Button NestedTypesExlcudeAddButton; - private Button NestedTypesRemoveButton; - private Button NestedTypesAddButton; - private ListBox NestedTypesExcludeBox; - private ListBox NestedTypesIncludeBox; - private Label label11; - private CheckBox MethodCountEnabled; - private ComboBox IsStructComboBox; - private TextBox BaseClassExcludeTextField; - private Label label10; - private DomainUpDown IsNestedUpDown; - private ComboBox HasGenericParamsComboBox; - private DomainUpDown IsDerivedUpDown; - private Label label8; - private NumericUpDown NestedTypeCountUpDown; - private ComboBox HasAttributeComboBox; - private TextBox OriginalTypeName; - private Label label9; - private TextBox BaseClassIncludeTextFIeld; - private ComboBox IsEnumComboBox; - private NumericUpDown MethodCountUpDown; - private Label label2322; - private TextBox NestedTypeParentName; - private ComboBox IsInterfaceComboBox; - private CheckBox FieldCountEnabled; - private Label label7; - private NumericUpDown FieldCountUpDown; - private ComboBox IsSealedComboBox; - private NumericUpDown PropertyCountUpDown; - private Label label6; - private CheckBox NestedTypeCountEnabled; - private ComboBox IsAbstractComboBox; - private CheckBox RemapperUseForceRename; - private Label label5; - private CheckBox PropertyCountEnabled; - private ComboBox IsPublicComboBox; - private CheckBox ConstructorCountEnabled; - private NumericUpDown ConstuctorCountUpDown; - private TabPage tabPage6; - private Button button1; - private Button button2; - private ListBox listBox1; - private TabPage RMSearchTab; - private Button OutputDirectoryButton; - private Button LoadMappingFileButton; - private Button PickAssemblyPathButton; - private CheckBox RemapperUnseal; - private Button SaveRemapButton; - private CheckBox RemapperPublicicize; - private Button RemoveRemapButton; - private Button RunRemapButton; - private CheckBox RenameFieldsCheckbox; - private CheckBox RenamePropertiesCheckbox; - private TabControl TabControlMain; - private TabPage tabPage5; - private TextBox EventsIncludeTextField; - private TextBox EventsExcludeTextField; - private Button EventsRemoveButton; - private Button EventsAddButton; - private Button EventsExcludeRemoveButton; - private Button EventsExcludeAddButton; - private ListBox EventsIncludeBox; - private ListBox EventsExcludeBox; -} diff --git a/RecodeItGUI/GUI/Main.cs b/RecodeItGUI/GUI/Main.cs deleted file mode 100644 index ab583eb..0000000 --- a/RecodeItGUI/GUI/Main.cs +++ /dev/null @@ -1,994 +0,0 @@ -using ReCodeItLib.Models; -using ReCodeItLib.ReMapper; -using ReCodeItLib.Utils; -using System.Diagnostics; - -namespace ReCodeIt.GUI; - -public partial class ReCodeItForm : Form -{ - private static ReMapper Remapper { get; set; } = new(); - private static Settings AppSettings => DataProvider.Settings; - - private bool _isSearched = false; - public static Dictionary RemapNodes = []; - - private int _selectedRemapTreeIndex = 0; - private int _selectedCCRemapTreeIndex = 0; - - private List _cachedNewTypeNames = []; - - public ReCodeItForm() - { - InitializeComponent(); - - - SubscribeToEvents(); - PopulateDomainUpDowns(); - RefreshSettingsPage(); - LoadMappingFile(); - - var remaps = DataProvider.Remaps; - - ReloadRemapTreeView(remaps); - } - - private void SubscribeToEvents() - { - RemapTreeView.NodeMouseDoubleClick += ManualEditSelectedRemap; - Remapper.OnComplete += ReloadTreeAfterMapping; - - #region MANUAL_REMAPPER - - NewTypeName.GotFocus += (sender, e) => - { - _cachedNewTypeNames.Add(NewTypeName.Text); - }; - - IncludeMethodTextBox.KeyDown += (sender, e) => - { - if (e.KeyCode == Keys.Enter) - { - MethodIncludeAddButton_Click(sender, e); - } - }; - - ExcludeMethodTextBox.KeyDown += (sender, e) => - { - if (e.KeyCode == Keys.Enter) - { - MethodExcludeAddButton_Click(sender, e); - } - }; - - FieldsIncludeTextInput.KeyDown += (sender, e) => - { - if (e.KeyCode == Keys.Enter) - { - FIeldIncludeAddButton_Click(sender, e); - } - }; - - FieldsExcludeTextInput.KeyDown += (sender, e) => - { - if (e.KeyCode == Keys.Enter) - { - FieldExcludeAddButton_Click(sender, e); - } - }; - - PropertiesIncludeTextField.KeyDown += (sender, e) => - { - if (e.KeyCode == Keys.Enter) - { - PropertiesIncludeAddButton_Click(sender, e); - } - }; - - PropertiesExcludeTextField.KeyDown += (sender, e) => - { - if (e.KeyCode == Keys.Enter) - { - PropertiesExcludeAddButton_Click(sender, e); - } - }; - - NestedTypesIncludeTextField.KeyDown += (sender, e) => - { - if (e.KeyCode == Keys.Enter) - { - NestedTypesAddButton_Click(sender, e); - } - }; - - NestedTypesExcludeTextField.KeyDown += (sender, e) => - { - if (e.KeyCode == Keys.Enter) - { - NestedTypesExlcudeAddButton_Click(sender, e); - } - }; - - EventsIncludeTextField.KeyDown += (sender, e) => - { - if (e.KeyCode == Keys.Enter) - { - EventsAddButton_Click(sender, e); - } - }; - - EventsExcludeTextField.KeyDown += (sender, e) => - { - if (e.KeyCode == Keys.Enter) - { - EventsExcludeAddButton_Click(sender, e); - } - }; - - #endregion MANUAL_REMAPPER - } - - #region MANUAL_REMAPPER - - private void LoadMappingFile() - { - DataProvider.Remaps = DataProvider.LoadMappingFile(AppSettings.Remapper.MappingPath); - LoadedMappingFilePath.Text = AppSettings.Remapper.MappingPath; - } - - #region BUTTONS - - #region MAIN_BUTTONS - - private void SearchTreeView(object sender, EventArgs e) - { - if (RemapTreeView.Nodes.Count == 0) { return; } - if (RMSearchBox.Text == string.Empty) { return; } - - bool projectMode = AppSettings.Remapper.UseProjectMappings; - - var remaps = DataProvider.Remaps; - - var matches = remaps - .Where(x => x.NewTypeName == RMSearchBox.Text - || x.NewTypeName.StartsWith(RMSearchBox.Text)); - - if (!matches.Any()) { return; } - - RemapTreeView.Nodes.Clear(); - - foreach (var match in matches) - { - RemapTreeView.Nodes.Add(GUIHelpers.GenerateTreeNode(match, this)); - } - - _isSearched = true; - } - - private void ResetSearchButton_Click(object sender, EventArgs e) - { - bool projectMode = AppSettings.Remapper.UseProjectMappings; - - var remaps = DataProvider.Remaps; - - RemapTreeView.Nodes.Clear(); - ReloadRemapTreeView(remaps); - - RMSearchBox.Clear(); - _isSearched = false; - } - - private RemapModel? CreateRemapFromGUI() - { - if (NewTypeName.Text == string.Empty) - { - MessageBox.Show("Please enter a new type name", "Invalid data"); - return null; - } - - var newRemap = new RemapModel - { - Succeeded = false, - NoMatchReasons = [], - NewTypeName = NewTypeName.Text, - OriginalTypeName = OriginalTypeName.Text == string.Empty ? null : OriginalTypeName.Text, - UseForceRename = RemapperUseForceRename.Checked, - SearchParams = new SearchParams - { - GenericParams = - { - IsPublic = bool.Parse(IsPublicComboBox.GetSelectedItem().AsSpan()), - - IsAbstract = IsAbstractComboBox.SelectedItem as string != "Disabled" - ? bool.Parse(IsAbstractComboBox.GetSelectedItem().AsSpan()) - : null, - - IsSealed = IsSealedComboBox.SelectedItem as string != "Disabled" - ? bool.Parse(IsSealedComboBox.GetSelectedItem().AsSpan()) - : null, - - IsInterface = IsInterfaceComboBox.SelectedItem as string != "Disabled" - ? bool.Parse(IsInterfaceComboBox.GetSelectedItem().AsSpan()) - : null, - - IsStruct = IsStructComboBox.SelectedItem as string != "Disabled" - ? bool.Parse(IsStructComboBox.GetSelectedItem().AsSpan()) - : null, - - IsEnum = IsEnumComboBox.SelectedItem as string != "Disabled" - ? bool.Parse(IsEnumComboBox.GetSelectedItem().AsSpan()) - : null, - - HasAttribute = HasAttributeComboBox.SelectedItem as string != "Disabled" - ? bool.Parse(HasAttributeComboBox.GetSelectedItem().AsSpan()) - : null, - - HasGenericParameters = HasGenericParamsComboBox.SelectedItem as string != "Disabled" - ? bool.Parse(HasGenericParamsComboBox.GetSelectedItem().AsSpan()) - : null, - - - IsDerived = IsDerivedUpDown.GetEnabled(), - - MatchBaseClass = BaseClassIncludeTextFIeld.Text == string.Empty - ? null - : BaseClassIncludeTextFIeld.Text, - }, - - Methods = - { - ConstructorParameterCount = (int)ConstructorCountEnabled.GetCount(ConstuctorCountUpDown), - MethodCount = (int)MethodCountEnabled.GetCount(MethodCountUpDown), - IncludeMethods = GUIHelpers.GetAllEntriesFromListBox(MethodIncludeBox).ToHashSet(), - ExcludeMethods = GUIHelpers.GetAllEntriesFromListBox(MethodExcludeBox).ToHashSet(), - }, - Fields = - { - FieldCount = (int)FieldCountEnabled.GetCount(FieldCountUpDown), - IncludeFields = GUIHelpers.GetAllEntriesFromListBox(FieldIncludeBox).ToHashSet(), - ExcludeFields = GUIHelpers.GetAllEntriesFromListBox(FieldExcludeBox).ToHashSet(), - }, - Properties = - { - PropertyCount = (int)PropertyCountEnabled.GetCount(PropertyCountUpDown), - IncludeProperties = GUIHelpers.GetAllEntriesFromListBox(PropertiesIncludeBox).ToHashSet(), - ExcludeProperties = GUIHelpers.GetAllEntriesFromListBox(PropertiesExcludeBox).ToHashSet(), - }, - NestedTypes = - { - IsNested = IsNestedUpDown.GetEnabled(), - NestedTypeParentName = NestedTypeParentName.Text == string.Empty - ? null - : NestedTypeParentName.Text, - NestedTypeCount = (int)NestedTypeCountEnabled.GetCount(NestedTypeCountUpDown), - IncludeNestedTypes = GUIHelpers.GetAllEntriesFromListBox(NestedTypesIncludeBox).ToHashSet(), - ExcludeNestedTypes = GUIHelpers.GetAllEntriesFromListBox(NestedTypesExcludeBox).ToHashSet(), - }, - Events = - { - IncludeEvents = GUIHelpers.GetAllEntriesFromListBox(EventsIncludeBox).ToHashSet(), - ExcludeEvents = GUIHelpers.GetAllEntriesFromListBox(EventsExcludeBox).ToHashSet() - } - } - }; - - return newRemap; - } - - /// - /// Construct a new remap when the button is pressed - /// - /// - /// - private void AddRemapButton_Click(object sender, EventArgs e) - { - ResetSearchButton_Click(this, e); - - var newRemap = CreateRemapFromGUI(); - - if (newRemap is null) return; - - bool projectMode = AppSettings.Remapper.UseProjectMappings; - - Logger.Log(projectMode); - - var remaps = DataProvider.Remaps; - - var existingRemap = remaps - .FirstOrDefault(remap => remap.NewTypeName == newRemap.NewTypeName); - - if (existingRemap == null) - { - existingRemap = remaps - .FirstOrDefault(remap => _cachedNewTypeNames.Contains(remap.NewTypeName)); - } - - // Handle overwriting an existing remap - if (existingRemap != null) - { - var index = remaps.IndexOf(existingRemap); - - remaps.Remove(existingRemap); - RemapTreeView.Nodes.RemoveAt(index); - - remaps.Insert(index, newRemap); - RemapTreeView.Nodes.Insert(index, GUIHelpers.GenerateTreeNode(newRemap, this)); - - DataProvider.SaveMapping(); - - ReloadRemapTreeView(remaps); - - ResetAllRemapFields(); - return; - } - - DataProvider.Remaps.Add(newRemap); - DataProvider.SaveMapping(); - - var node = GUIHelpers.GenerateTreeNode(newRemap, this); - - node.Clone(); - - //RemapTreeView.Nodes.Remove(node); - RemapTreeView.Nodes.Add(node); - - _cachedNewTypeNames.Clear(); - - ReloadRemapTreeView(remaps); - - ResetAllRemapFields(); - } - - private void RemoveRemapButton_Click(object sender, EventArgs e) - { - foreach (var node in RemapNodes.ToArray()) - { - if (node.Key == RemapTreeView.SelectedNode) - { - bool projectMode = AppSettings.Remapper.UseProjectMappings; - - var remaps = DataProvider.Remaps; - - remaps.Remove(node.Value); - RemapNodes.Remove(node.Key); - RemapTreeView.Nodes.Remove(node.Key); - } - } - - ResetAllRemapFields(); - - DataProvider.SaveMapping(); - } - - private void RunRemapButton_Click(object sender, EventArgs e) - { - if (ReMapper.IsRunning) { return; } - - if (string.IsNullOrEmpty(AppSettings.Remapper.AssemblyPath)) - { - MessageBox.Show("Please select an assembly path", "Assembly not loaded"); - return; - } - - Remapper.InitializeRemap( - DataProvider.LoadMappingFile(AppSettings.Remapper.MappingPath), - AppSettings.Remapper.AssemblyPath, - AppSettings.Remapper.OutputPath); - - ReloadRemapTreeView(DataProvider.Remaps); - } - - private void ValidateRemapButton_Click(object sender, EventArgs e) - { - List validation = []; - - var remapToValidate = CreateRemapFromGUI(); - - if (remapToValidate is null) return; - - validation.Add(remapToValidate); - - Remapper.InitializeRemap( - validation, - AppSettings.Remapper.AssemblyPath, - AppSettings.Remapper.OutputPath, - validate: true); - } - - /// - /// Only used by the manual remap process, not apart of the cross compiler process - /// - private void ReloadTreeAfterMapping() - { - ReloadRemapTreeView(DataProvider.Remaps); - } - - private void SaveMappingFileButton_Click(object sender, EventArgs e) - { - DataProvider.SaveMapping(); - } - - private void LoadMappingFileButton_Click(object sender, EventArgs e) - { - var result = GUIHelpers.OpenFileDialog("Select a mapping file", - "JSON Files (*.json)|*.json|JSONC Files (*.jsonc)|*.jsonc|All Files (*.*)|*.*"); - - if (result == string.Empty) { return; } - - DataProvider.Remaps = DataProvider.LoadMappingFile(result); - AppSettings.Remapper.MappingPath = result; - AppSettings.Remapper.UseProjectMappings = false; - - LoadedMappingFilePath.Text = result; - - RemapTreeView.Nodes.Clear(); - - foreach (var remap in DataProvider.Remaps) - { - RemapTreeView.Nodes.Add(GUIHelpers.GenerateTreeNode(remap, this)); - } - } - - private void PickAssemblyPathButton_Click_1(object sender, EventArgs e) - { - var result = GUIHelpers.OpenFileDialog("Select a DLL file", - "DLL Files (*.dll)|*.dll|All Files (*.*)|*.*"); - - if (result != string.Empty) - { - AppSettings.Remapper.AssemblyPath = result; - TargetAssemblyPath.Text = result; - } - } - - private void OutputDirectoryButton_Click_1(object sender, EventArgs e) - { - var result = GUIHelpers.OpenFolderDialog("Select an output directory"); - - if (result != string.Empty) - { - AppSettings.Remapper.OutputPath = result; - RemapperOutputDirectoryPath.Text = result; - } - } - - #endregion MAIN_BUTTONS - - #region LISTBOX_BUTTONS - - private void MethodIncludeAddButton_Click(object sender, EventArgs e) - { - if (IncludeMethodTextBox.Text == string.Empty) return; - - if (!MethodIncludeBox.Items.Contains(IncludeMethodTextBox.Text)) - { - MethodIncludeBox.Items.Add(IncludeMethodTextBox.Text); - IncludeMethodTextBox.Clear(); - } - } - - private void MethodIncludeRemoveButton_Click(object sender, EventArgs e) - { - if (MethodIncludeBox.SelectedItem != null) - { - MethodIncludeBox.Items.Remove(MethodIncludeBox.SelectedItem); - } - } - - private void MethodExcludeAddButton_Click(object sender, EventArgs e) - { - if (ExcludeMethodTextBox.Text == string.Empty) return; - - if (!MethodExcludeBox.Items.Contains(ExcludeMethodTextBox.Text)) - { - MethodExcludeBox.Items.Add(ExcludeMethodTextBox.Text); - ExcludeMethodTextBox.Clear(); - } - } - - private void MethodExcludeRemoveButton_Click(object sender, EventArgs e) - { - if (MethodExcludeBox.SelectedItem != null) - { - MethodExcludeBox.Items.Remove(MethodExcludeBox.SelectedItem); - } - } - - private void FIeldIncludeAddButton_Click(object sender, EventArgs e) - { - if (FieldsIncludeTextInput.Text == string.Empty) return; - - if (!FieldIncludeBox.Items.Contains(FieldsIncludeTextInput.Text)) - { - FieldIncludeBox.Items.Add(FieldsIncludeTextInput.Text); - FieldsIncludeTextInput.Clear(); - } - } - - private void FieldIncludeRemoveButton_Click(object sender, EventArgs e) - { - if (FieldIncludeBox.SelectedItem != null) - { - FieldIncludeBox.Items.Remove(FieldIncludeBox.SelectedItem); - } - } - - private void FieldExcludeAddButton_Click(object sender, EventArgs e) - { - if (FieldsExcludeTextInput.Text == string.Empty) return; - - if (!FieldExcludeBox.Items.Contains(FieldsExcludeTextInput.Text)) - { - FieldExcludeBox.Items.Add(FieldsExcludeTextInput.Text); - FieldsExcludeTextInput.Clear(); - } - } - - private void FieldExcludeRemoveButton_Click(object sender, EventArgs e) - { - if (FieldExcludeBox.SelectedItem != null) - { - FieldExcludeBox.Items.Remove(FieldExcludeBox.SelectedItem); - } - } - - private void PropertiesIncludeAddButton_Click(object sender, EventArgs e) - { - if (PropertiesIncludeTextField.Text == string.Empty) return; - - if (!PropertiesIncludeBox.Items.Contains(PropertiesIncludeTextField.Text)) - { - PropertiesIncludeBox.Items.Add(PropertiesIncludeTextField.Text); - PropertiesIncludeTextField.Clear(); - } - } - - private void PropertiesIncludeRemoveButton_Click(object sender, EventArgs e) - { - if (PropertiesIncludeBox.SelectedItem != null) - { - PropertiesIncludeBox.Items.Remove(PropertiesIncludeBox.SelectedItem); - } - } - - private void PropertiesExcludeAddButton_Click(object sender, EventArgs e) - { - if (PropertiesExcludeTextField.Text == string.Empty) return; - - if (!PropertiesExcludeBox.Items.Contains(PropertiesExcludeTextField.Text)) - { - PropertiesExcludeBox.Items.Add(PropertiesExcludeTextField.Text); - PropertiesExcludeTextField.Clear(); - } - } - - private void PropertiesExcludeRemoveButton_Click(object sender, EventArgs e) - { - if (PropertiesExcludeBox.SelectedItem != null) - { - PropertiesExcludeBox.Items.Remove(PropertiesExcludeBox.SelectedItem); - } - } - - private void NestedTypesAddButton_Click(object sender, EventArgs e) - { - if (NestedTypesIncludeTextField.Text == string.Empty) return; - - if (!NestedTypesIncludeBox.Items.Contains(NestedTypesIncludeTextField.Text)) - { - NestedTypesIncludeBox.Items.Add(NestedTypesIncludeTextField.Text); - NestedTypesIncludeTextField.Clear(); - } - } - - private void NestedTypesRemoveButton_Click(object sender, EventArgs e) - { - if (NestedTypesIncludeBox.SelectedItem != null) - { - NestedTypesIncludeBox.Items.Remove(NestedTypesIncludeBox.SelectedItem); - } - } - - private void NestedTypesExlcudeAddButton_Click(object sender, EventArgs e) - { - if (NestedTypesExcludeTextField.Text == string.Empty) return; - - if (!NestedTypesExcludeBox.Items.Contains(NestedTypesExcludeTextField.Text)) - { - NestedTypesExcludeBox.Items.Add(NestedTypesExcludeTextField.Text); - NestedTypesExcludeTextField.Clear(); - } - } - - private void NestedTypesExcludeRemoveButton_Click(object sender, EventArgs e) - { - if (NestedTypesExcludeBox.SelectedItem != null) - { - NestedTypesExcludeBox.Items.Remove(NestedTypesExcludeBox.SelectedItem); - } - } - - - private void EventsAddButton_Click(object sender, EventArgs e) - { - if (EventsIncludeTextField.Text == string.Empty) return; - - if (!EventsIncludeBox.Items.Contains(EventsIncludeTextField.Text)) - { - EventsIncludeBox.Items.Add(EventsIncludeTextField.Text); - EventsIncludeTextField.Clear(); - } - } - - private void EventsRemoveButton_Click(object sender, EventArgs e) - { - if (EventsIncludeBox.SelectedItem != null) - { - EventsIncludeBox.Items.Remove(EventsIncludeBox.SelectedItem); - } - } - - private void EventsExcludeAddButton_Click(object sender, EventArgs e) - { - if (EventsExcludeTextField.Text == string.Empty) return; - - if (!EventsExcludeBox.Items.Contains(EventsExcludeTextField.Text)) - { - EventsExcludeBox.Items.Add(EventsExcludeTextField.Text); - EventsExcludeTextField.Clear(); - } - } - - private void EventsExcludeRemoveButton_Click(object sender, EventArgs e) - { - if (EventsExcludeBox.SelectedItem != null) - { - EventsExcludeBox.Items.Remove(EventsExcludeBox.SelectedItem); - } - } - - private void AutoMapperExcludeAddButton_Click(object sender, EventArgs e) - { - MessageBox.Show("Feature has been removed from this build.", "Feature Removed"); - } - - private void AutoMapperExcludeRemoveButton_Click(object sender, EventArgs e) - { - MessageBox.Show("Feature has been removed from this build.", "Feature Removed"); - } - - private void RunAutoRemapButton_Click(object sender, EventArgs e) - { - MessageBox.Show("Feature has been removed from this build.", "Feature Removed"); - } - - #endregion LISTBOX_BUTTONS - - #region CHECKBOX - - private void RemapperUnseal_CheckedChanged(object sender, EventArgs e) - { - AppSettings.Remapper.MappingSettings.Unseal = RemapperUnseal.Checked; - } - - private void RemapperPublicicize_CheckedChanged(object sender, EventArgs e) - { - AppSettings.Remapper.MappingSettings.Publicize = RemapperPublicicize.Checked; - } - - private void RenameFieldsCheckbox_CheckedChanged(object sender, EventArgs e) - { - AppSettings.Remapper.MappingSettings.RenameFields = RenameFieldsCheckbox.Checked; - } - - private void RenamePropertiesCheckbox_CheckedChanged(object sender, EventArgs e) - { - AppSettings.Remapper.MappingSettings.RenameProperties = RenamePropertiesCheckbox.Checked; - } - - #endregion CHECKBOX - - #endregion BUTTONS - - #endregion MANUAL_REMAPPER - - #region SETTINGS_TAB - - public void RefreshSettingsPage() - { - // Settings page - DebugLoggingCheckbox.Checked = AppSettings.AppSettings.Debug; - SilentModeCheckbox.Checked = AppSettings.AppSettings.SilentMode; - - // Remapper page - TargetAssemblyPath.Text = AppSettings.Remapper.AssemblyPath; - RemapperOutputDirectoryPath.Text = AppSettings.Remapper.OutputPath; - RenameFieldsCheckbox.Checked = AppSettings.Remapper.MappingSettings.RenameFields; - RenamePropertiesCheckbox.Checked = AppSettings.Remapper.MappingSettings.RenameProperties; - RemapperPublicicize.Checked = AppSettings.Remapper.MappingSettings.Publicize; - RemapperUnseal.Checked = AppSettings.Remapper.MappingSettings.Unseal; - } - - #region CHECKBOXES - - private void DebugLoggingCheckbox_CheckedChanged(object sender, EventArgs e) - { - DataProvider.Settings.AppSettings.Debug = DebugLoggingCheckbox.Checked; - } - - private void SilentModeCheckbox_CheckedChanged(object sender, EventArgs e) - { - DataProvider.Settings.AppSettings.SilentMode = SilentModeCheckbox.Checked; - } - - #endregion CHECKBOXES - - #endregion SETTINGS_TAB - - // Reset All UI elements to default - private void ResetAllRemapFields() - { - PopulateDomainUpDowns(); - - // Text fields - - NewTypeName.Clear(); - OriginalTypeName.Clear(); - BaseClassIncludeTextFIeld.Clear(); - BaseClassExcludeTextField.Clear(); - NestedTypeParentName.Clear(); - BaseClassExcludeTextField.Clear(); - IncludeMethodTextBox.Clear(); - ExcludeMethodTextBox.Clear(); - FieldsIncludeTextInput.Clear(); - FieldsExcludeTextInput.Clear(); - PropertiesIncludeTextField.Clear(); - PropertiesExcludeTextField.Clear(); - NestedTypesIncludeTextField.Clear(); - NestedTypesExcludeTextField.Clear(); - EventsIncludeTextField.Clear(); - EventsExcludeTextField.Clear(); - - // Numeric UpDowns - - ConstuctorCountUpDown.Value = 0; - MethodCountUpDown.Value = 0; - FieldCountUpDown.Value = 0; - PropertyCountUpDown.Value = 0; - NestedTypeCountUpDown.Value = 0; - - // Check boxes - - RemapperUseForceRename.Checked = false; - ConstructorCountEnabled.Checked = false; - MethodCountEnabled.Checked = false; - FieldCountEnabled.Checked = false; - PropertyCountEnabled.Checked = false; - NestedTypeCountEnabled.Checked = false; - - // List boxes - - MethodIncludeBox.Items.Clear(); - MethodExcludeBox.Items.Clear(); - FieldIncludeBox.Items.Clear(); - FieldExcludeBox.Items.Clear(); - PropertiesIncludeBox.Items.Clear(); - PropertiesExcludeBox.Items.Clear(); - NestedTypesIncludeBox.Items.Clear(); - NestedTypesExcludeBox.Items.Clear(); - EventsIncludeBox.Items.Clear(); - EventsExcludeBox.Items.Clear(); - } - - private void ManualEditSelectedRemap(object? sender, TreeNodeMouseClickEventArgs e) - { - EditSelectedRemap(this, e); - } - - private void EditSelectedRemap( - object? sender, - TreeNodeMouseClickEventArgs e, - bool isComingFromOtherTab = false) - { - if (e?.Node.Level != 0 || RemapTreeView?.SelectedNode?.Index < 0 || RemapTreeView?.SelectedNode?.Index == null) - { - return; - } - - RemapModel remap = null; - - foreach (var node in RemapNodes.ToArray()) - { - if (node.Key == RemapTreeView.SelectedNode) - { - bool projectMode = AppSettings.Remapper.UseProjectMappings; - - var remaps = DataProvider.Remaps; - - remap = remaps.FirstOrDefault(x => x.NewTypeName == node.Value.NewTypeName); - - break; - } - } - - if (remap == null) - { - return; - } - - _selectedRemapTreeIndex = RemapTreeView.SelectedNode.Index; - - ResetAllRemapFields(); - - NewTypeName.Text = remap.NewTypeName; - OriginalTypeName.Text = remap.OriginalTypeName; - RemapperUseForceRename.Checked = remap.UseForceRename; - - BaseClassIncludeTextFIeld.Text = remap.SearchParams.GenericParams.MatchBaseClass; - NestedTypeParentName.Text = remap.SearchParams.NestedTypes.NestedTypeParentName; - - ConstructorCountEnabled.Checked = remap.SearchParams.Methods.ConstructorParameterCount >= 0; - - MethodCountEnabled.Checked = remap.SearchParams.Methods.MethodCount >= 0; - - FieldCountEnabled.Checked = remap.SearchParams.Fields.FieldCount >= 0; - - PropertyCountEnabled.Checked = remap.SearchParams.Properties.PropertyCount >= 0; - - NestedTypeCountEnabled.Checked = remap.SearchParams.NestedTypes.NestedTypeCount >= 0; - - ConstuctorCountUpDown.Value = remap.SearchParams.Methods.ConstructorParameterCount; - - MethodCountUpDown.Value = remap.SearchParams.Methods.MethodCount; - - FieldCountUpDown.Value = remap.SearchParams.Fields.FieldCount; - - PropertyCountUpDown.Value = remap.SearchParams.Properties.PropertyCount; - - NestedTypeCountUpDown.Value = remap.SearchParams.NestedTypes.NestedTypeCount; - - IsPublicComboBox.SelectedItem = remap.SearchParams.GenericParams.IsPublic.ToString(); - - IsAbstractComboBox.SelectedItem = remap.SearchParams.GenericParams.IsAbstract is not null - ? remap.SearchParams.GenericParams.IsAbstract.ToString() - : "Disabled"; - - IsSealedComboBox.SelectedItem = remap.SearchParams.GenericParams.IsSealed is not null - ? remap.SearchParams.GenericParams.IsSealed.ToString() - : "Disabled"; - - IsInterfaceComboBox.SelectedItem = remap.SearchParams.GenericParams.IsInterface is not null - ? remap.SearchParams.GenericParams.IsInterface.ToString() - : "Disabled"; - - IsStructComboBox.SelectedItem = remap.SearchParams.GenericParams.IsStruct is not null - ? remap.SearchParams.GenericParams.IsStruct.ToString() - : "Disabled"; - - IsEnumComboBox.SelectedItem = remap.SearchParams.GenericParams.IsEnum is not null - ? remap.SearchParams.GenericParams.IsEnum.ToString() - : "Disabled"; - - HasAttributeComboBox.SelectedItem = remap.SearchParams.GenericParams.HasAttribute is not null - ? remap.SearchParams.GenericParams.HasAttribute.ToString() - : "Disabled"; - - HasGenericParamsComboBox.SelectedItem = remap.SearchParams.GenericParams.HasGenericParameters is not null - ? remap.SearchParams.GenericParams.HasGenericParameters.ToString() - : "Disabled"; - - IsNestedUpDown.BuildStringList("IsNested", false, remap.SearchParams.NestedTypes.IsNested); - IsDerivedUpDown.BuildStringList("IsDerived", false, remap.SearchParams.GenericParams.IsDerived); - - foreach (var method in remap.SearchParams.Methods.IncludeMethods) - { - MethodIncludeBox.Items.Add(method); - } - - foreach (var method in remap.SearchParams.Methods.ExcludeMethods) - { - MethodExcludeBox.Items.Add(method); - } - - foreach (var method in remap.SearchParams.Fields.IncludeFields) - { - FieldIncludeBox.Items.Add(method); - } - - foreach (var method in remap.SearchParams.Fields.ExcludeFields) - { - FieldExcludeBox.Items.Add(method); - } - - foreach (var method in remap.SearchParams.Properties.IncludeProperties) - { - PropertiesIncludeBox.Items.Add(method); - } - - foreach (var method in remap.SearchParams.Properties.ExcludeProperties) - { - PropertiesExcludeBox.Items.Add(method); - } - - foreach (var method in remap.SearchParams.NestedTypes.IncludeNestedTypes) - { - NestedTypesIncludeBox.Items.Add(method); - } - - foreach (var method in remap.SearchParams.NestedTypes.ExcludeNestedTypes) - { - NestedTypesExcludeBox.Items.Add(method); - } - - foreach (var method in remap.SearchParams.Events.IncludeEvents) - { - EventsIncludeBox.Items.Add(method); - } - - foreach (var method in remap.SearchParams.Events.ExcludeEvents) - { - EventsExcludeBox.Items.Add(method); - } - } - - private void PopulateDomainUpDowns() - { - // Clear them all first just incase - IsPublicComboBox.AddItemsToComboBox(["True", "False"]); - IsPublicComboBox.SelectedItem = "True"; - - IsAbstractComboBox.AddItemsToComboBox(["Disabled", "True", "False"]); - IsAbstractComboBox.SelectedItem = "Disabled"; - - IsSealedComboBox.AddItemsToComboBox(["Disabled", "True", "False"]); - IsSealedComboBox.SelectedItem = "Disabled"; - - IsInterfaceComboBox.AddItemsToComboBox(["Disabled", "True", "False"]); - IsInterfaceComboBox.SelectedItem = "Disabled"; - - IsStructComboBox.AddItemsToComboBox(["Disabled", "True", "False"]); - IsStructComboBox.SelectedItem = "Disabled"; - - IsEnumComboBox.AddItemsToComboBox(["Disabled", "True", "False"]); - IsEnumComboBox.SelectedItem = "Disabled"; - - HasAttributeComboBox.AddItemsToComboBox(["Disabled", "True", "False"]); - HasAttributeComboBox.SelectedItem = "Disabled"; - - HasGenericParamsComboBox.AddItemsToComboBox(["Disabled", "True", "False"]); - HasGenericParamsComboBox.SelectedItem = "Disabled"; - - IsNestedUpDown.BuildStringList("IsNested", false); - IsDerivedUpDown.BuildStringList("IsDerived", false); - } - - /// - /// Subscribes the the remappers OnComplete event - /// - /// - private void ReloadRemapTreeView(List? remaps) - { - RemapTreeView.Nodes.Clear(); - RemapNodes.Clear(); - - if (remaps is null) - { - return; - } - - foreach (var remap in remaps) - { - RemapTreeView.Nodes.Add(GUIHelpers.GenerateTreeNode(remap, this)); - } - } - - private void GithubLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - Process.Start(new ProcessStartInfo - { - FileName = GithubLinkLabel.Text, - UseShellExecute = true - }); - } - -} \ No newline at end of file diff --git a/RecodeItGUI/GUI/Main.resx b/RecodeItGUI/GUI/Main.resx deleted file mode 100644 index 45794b6..0000000 --- a/RecodeItGUI/GUI/Main.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - False - - - False - - - 17, 17 - - - 47 - - \ No newline at end of file diff --git a/RecodeItGUI/Program.cs b/RecodeItGUI/Program.cs deleted file mode 100644 index b095485..0000000 --- a/RecodeItGUI/Program.cs +++ /dev/null @@ -1,20 +0,0 @@ -using ReCodeIt.GUI; -using ReCodeItLib.Utils; - -namespace ReCodeIt; - -internal static class Program -{ - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - DataProvider.LoadAppSettings(); - - // To customize application configuration such as set high DPI settings or default font, see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); - Application.Run(new ReCodeItForm()); - } -} \ No newline at end of file diff --git a/RecodeItGUI/ReCodeItGUI.csproj b/RecodeItGUI/ReCodeItGUI.csproj deleted file mode 100644 index 9543c23..0000000 --- a/RecodeItGUI/ReCodeItGUI.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 0.1.0 - Exe - net8.0-windows10.0.26100.0 - enable - true - enable - - - - - - - - - - - - - \ No newline at end of file diff --git a/RecodeItGUI/Utils/GUIHelpers.cs b/RecodeItGUI/Utils/GUIHelpers.cs deleted file mode 100644 index f436ad4..0000000 --- a/RecodeItGUI/Utils/GUIHelpers.cs +++ /dev/null @@ -1,360 +0,0 @@ -using ReCodeItLib.Models; -using ReCodeItLib.Utils; - -namespace ReCodeIt.GUI; - -internal static class GUIHelpers -{ - /// - /// Returns the value of the count or null if disabled - /// - /// - /// - public static int? GetCount(this CheckBox box, NumericUpDown upDown) - { - if (box.Checked) - { - return (int?)upDown.Value; - } - - return null; - } - - public static bool? GetEnabled(this DomainUpDown domainUpDown) - { - if (domainUpDown.Text == "True") - { - return true; - } - else if (domainUpDown.Text == "False") - { - return false; - } - - return null; - } - - /// - /// Builds the name list for the this updown - /// - /// - /// - public static void BuildStringList(this DomainUpDown domainUpDown, string name, bool required, bool? update = null) - { - domainUpDown.Items.Clear(); - - domainUpDown.Text = required - ? name + @" (Required)" - : name + @" (Disabled)"; - - domainUpDown.ReadOnly = true; - - var list = new List - { - name + " (Disabled)", - "True", - "False", - }; - - if (required) - { - list.RemoveAt(0); - } - - if (update != null) - { - domainUpDown.Text = update.ToString(); - - if (update.ToString() == "True") - { - Logger.Log("Updating!"); - domainUpDown.SelectedItem = "True"; - } - else - { - domainUpDown.SelectedItem = "False"; - } - } - - domainUpDown.Items.AddRange(list); - } - - public static void AddItemsToComboBox(this ComboBox cb, List items) - { - cb.Items.Clear(); - - foreach (var item in items) - { - cb.Items.Add(item); - } - } - - public static T? GetSelectedItem(this ComboBox cb) - { - return (T)cb.SelectedItem; - } - - /// - /// Generates a tree node to display on the GUI - /// - /// - /// - public static TreeNode GenerateTreeNode(RemapModel model, ReCodeItForm gui) - { - var isPublic = model.SearchParams.GenericParams.IsPublic; - var isAbstract = model.SearchParams.GenericParams.IsAbstract == null ? null : model.SearchParams.GenericParams.IsAbstract; - var isInterface = model.SearchParams.GenericParams.IsInterface == null ? null : model.SearchParams.GenericParams.IsInterface; - var isStruct = model.SearchParams.GenericParams.IsStruct == null ? null : model.SearchParams.GenericParams.IsStruct; - var isEnum = model.SearchParams.GenericParams.IsEnum == null ? null : model.SearchParams.GenericParams.IsEnum; - var isNested = model.SearchParams.NestedTypes.IsNested == null ? null : model.SearchParams.NestedTypes.IsNested; - var isSealed = model.SearchParams.GenericParams.IsSealed == null ? null : model.SearchParams.GenericParams.IsSealed; - var HasAttribute = model.SearchParams.GenericParams.HasAttribute == null ? null : model.SearchParams.GenericParams.HasAttribute; - var IsDerived = model.SearchParams.GenericParams.IsDerived == null ? null : model.SearchParams.GenericParams.IsDerived; - var HasGenericParameters = model.SearchParams.GenericParams.HasGenericParameters == null ? null : model.SearchParams.GenericParams.HasGenericParameters; - - var remapTreeItem = new TreeNode($"{model.NewTypeName}"); - - var originalTypeName = new TreeNode($"Original Name: {model.OriginalTypeName}"); - - remapTreeItem.Nodes.Add(originalTypeName); - - if (model.UseForceRename) - { - remapTreeItem.Nodes.Add(new TreeNode($"Force Rename: {model.UseForceRename}")); - } - - remapTreeItem.Nodes.Add(new TreeNode($"IsPublic: {isPublic}")); - - if (isAbstract is not null) - { - remapTreeItem.Nodes.Add(new TreeNode($"IsAbstract: {isAbstract}")); - } - - if (isInterface is not null) - { - remapTreeItem.Nodes.Add(new TreeNode($"IsInterface: {isInterface}")); - } - - if (isStruct is not null) - { - remapTreeItem.Nodes.Add(new TreeNode($"IsStruct: {isStruct}")); - } - - if (isEnum is not null) - { - remapTreeItem.Nodes.Add(new TreeNode($"IsEnum: {isEnum}")); - } - - if (isNested is not null) - { - remapTreeItem.Nodes.Add(new TreeNode($"IsNested: {isNested}")); - } - - if (isSealed is not null) - { - remapTreeItem.Nodes.Add(new TreeNode($"IsSealed: {isSealed}")); - } - - if (HasAttribute is not null) - { - remapTreeItem.Nodes.Add(new TreeNode($"HasAttribute: {HasAttribute}")); - } - - if (IsDerived is not null) - { - remapTreeItem.Nodes.Add(new TreeNode($"IsDerived: {IsDerived}")); - } - - if (HasGenericParameters is not null) - { - remapTreeItem.Nodes.Add(new TreeNode($"HasGenericParameters: {HasGenericParameters}")); - } - - if (model.SearchParams.Methods.ConstructorParameterCount > 0) - { - remapTreeItem.Nodes.Add(new TreeNode($"Constructor Parameter Count: {model.SearchParams.Methods.ConstructorParameterCount}")); - } - - if (model.SearchParams.Methods.MethodCount >= 0) - { - remapTreeItem.Nodes.Add(new TreeNode($"Method Count: {model.SearchParams.Methods.MethodCount}")); - } - - if (model.SearchParams.Fields.FieldCount >= 0) - { - remapTreeItem.Nodes.Add(new TreeNode($"Field Count: {model.SearchParams.Fields.FieldCount}")); - } - - if (model.SearchParams.Properties.PropertyCount >= 0) - { - remapTreeItem.Nodes.Add(new TreeNode($"Property Count: {model.SearchParams.Properties.PropertyCount}")); - } - - if (model.SearchParams.NestedTypes.NestedTypeCount >= 0) - { - remapTreeItem.Nodes.Add(new TreeNode($"Nested OriginalTypeRef Count: {model.SearchParams.NestedTypes.NestedTypeCount}")); - } - - if (model.SearchParams.Methods.IncludeMethods.Count > 0) - { - var includeMethodsNode = - GenerateNodeFromList(model.SearchParams.Methods.IncludeMethods, "Include Methods"); - - remapTreeItem.Nodes.Add(includeMethodsNode); - } - - if (model.SearchParams.Methods.ExcludeMethods?.Count > 0) - { - var excludeMethodsNode = - GenerateNodeFromList(model.SearchParams.Methods.ExcludeMethods, "Exclude Methods"); - - remapTreeItem.Nodes.Add(excludeMethodsNode); - } - - if (model.SearchParams.Fields.IncludeFields?.Count > 0) - { - var includeFieldsNode = - GenerateNodeFromList(model.SearchParams.Fields.IncludeFields, "Include Fields"); - - remapTreeItem.Nodes.Add(includeFieldsNode); - } - - if (model.SearchParams.Fields.ExcludeFields?.Count > 0) - { - var excludeFieldsNode = - GenerateNodeFromList(model.SearchParams.Fields.ExcludeFields, "Exclude Fields"); - - remapTreeItem.Nodes.Add(excludeFieldsNode); - } - - if (model.SearchParams.Properties.IncludeProperties?.Count > 0) - { - var includeProperties = - GenerateNodeFromList(model.SearchParams.Properties.IncludeProperties, "Include Properties"); - - remapTreeItem.Nodes.Add(includeProperties); - } - - if (model.SearchParams.Properties.ExcludeProperties?.Count > 0) - { - var excludeProperties = - GenerateNodeFromList(model.SearchParams.Properties.ExcludeProperties, "Exclude Properties"); - - remapTreeItem.Nodes.Add(excludeProperties); - } - - if (model.SearchParams.NestedTypes.IncludeNestedTypes?.Count > 0) - { - var includeNestedTypes = - GenerateNodeFromList(model.SearchParams.NestedTypes.IncludeNestedTypes, "Include Nested Types"); - - remapTreeItem.Nodes.Add(includeNestedTypes); - } - - if (model.SearchParams.NestedTypes.ExcludeNestedTypes?.Count > 0) - { - var excludeNestedTypes = - GenerateNodeFromList(model.SearchParams.NestedTypes.ExcludeNestedTypes, "Exclude Nested Types"); - - remapTreeItem.Nodes.Add(excludeNestedTypes); - } - - if (model.SearchParams.Events.IncludeEvents?.Count > 0) - { - var includeEvents = - GenerateNodeFromList(model.SearchParams.Events.IncludeEvents, "Include Events"); - - remapTreeItem.Nodes.Add(includeEvents); - } - - if (model.SearchParams.Events.ExcludeEvents?.Count > 0) - { - var excludeEvents = - GenerateNodeFromList(model.SearchParams.Events.ExcludeEvents, "Exclude Events"); - - remapTreeItem.Nodes.Add(excludeEvents); - } - - ReCodeItForm.RemapNodes.Add(remapTreeItem, model); - - return remapTreeItem; - } - - /// - /// Generates a new node from a list of strings - /// - /// - /// - /// A new tree node, or null if the provided list is empty - private static TreeNode GenerateNodeFromList(HashSet items, string name) - { - var node = new TreeNode(name); - - foreach (var item in items) - { - node.Nodes.Add(item); - } - - return node; - } - - /// - /// Buils a list of strings from list box entries - /// - /// - /// - public static List GetAllEntriesFromListBox(ListBox lb) - { - var tmp = new List(); - - foreach (var entry in lb.Items) - { - tmp.Add((string)entry); - } - - return tmp; - } - - /// - /// Opens and returns a path from a file dialogue - /// - /// - /// - /// Path if selected, or empty string - public static string OpenFileDialog(string title, string filter) - { - OpenFileDialog fDialog = new() - { - Title = title, - Filter = filter, - Multiselect = false - }; - - if (fDialog.ShowDialog() == DialogResult.OK) - { - return fDialog.FileName; - } - - return string.Empty; - } - - /// - /// Opens and returns a path from a folder dialogue - /// - /// - /// Path if selected, or empty string - public static string OpenFolderDialog(string description) - { - using FolderBrowserDialog fDialog = new(); - - fDialog.Description = description; - fDialog.ShowNewFolderButton = true; - - if (fDialog.ShowDialog() == DialogResult.OK) - { - return fDialog.SelectedPath; - } - - return string.Empty; - } -} \ No newline at end of file diff --git a/RecodeItLib/Models/RemapModel.cs b/RecodeItLib/Models/RemapModel.cs index 3df2372..95b00c1 100644 --- a/RecodeItLib/Models/RemapModel.cs +++ b/RecodeItLib/Models/RemapModel.cs @@ -96,12 +96,12 @@ public class PropertyParams public class NestedTypeParams { - public bool? IsNested { get; set; } = null; + public bool IsNested { get; set; } /// /// Name of the nested types parent /// - public string? NestedTypeParentName { get; set; } = null; + public string NestedTypeParentName { get; set; } = string.Empty; public int NestedTypeCount { get; set; } = -1; public HashSet IncludeNestedTypes { get; set; } = []; public HashSet ExcludeNestedTypes { get; set; } = []; diff --git a/RecodeItLib/Remapper/Filters/GenericTypeFilters.cs b/RecodeItLib/Remapper/Filters/GenericTypeFilters.cs index 42cd74f..7d76c92 100644 --- a/RecodeItLib/Remapper/Filters/GenericTypeFilters.cs +++ b/RecodeItLib/Remapper/Filters/GenericTypeFilters.cs @@ -50,7 +50,7 @@ internal static class GenericTypeFilters private static IEnumerable FilterNestedByName(IEnumerable types, SearchParams parms) { - if (parms.NestedTypes.NestedTypeParentName is not null) + if (parms.NestedTypes.NestedTypeParentName is not "") { types = types.Where(t => t.DeclaringType.Name.String == parms.NestedTypes.NestedTypeParentName); } From 848a790ba4b2a4353fbca47ec7abf017c61ffd22 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 22:21:30 -0500 Subject: [PATCH 10/13] place de4dot in solution folder --- RecodeIt.sln | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/RecodeIt.sln b/RecodeIt.sln index 26b9d06..0e62f8b 100644 --- a/RecodeIt.sln +++ b/RecodeIt.sln @@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "de4dot.blocks", "de4dot\de4 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "de4dot-x64", "de4dot\de4dot-x64\de4dot-x64.csproj", "{3D0F9399-7814-4EB9-8436-D56BA87F874C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "de4dot", "de4dot", "{B12B2700-C6F1-48F8-82AD-8A8C9083D66F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -244,4 +246,13 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C2C7C51D-6773-404D-B51D-BC279AC9B923} EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {02FBA28C-E86C-49DC-8B44-A69CC542F693} = {B12B2700-C6F1-48F8-82AD-8A8C9083D66F} + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407} = {B12B2700-C6F1-48F8-82AD-8A8C9083D66F} + {3D0F9399-7814-4EB9-8436-D56BA87F874C} = {B12B2700-C6F1-48F8-82AD-8A8C9083D66F} + {8365D905-3BC4-42A0-B072-035598C6AF8C} = {B12B2700-C6F1-48F8-82AD-8A8C9083D66F} + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C} = {B12B2700-C6F1-48F8-82AD-8A8C9083D66F} + {2BCD50E1-77D5-47E3-B317-04568BF051AB} = {B12B2700-C6F1-48F8-82AD-8A8C9083D66F} + {7C68B124-809B-4D4A-960B-467B2DAF2A0A} = {B12B2700-C6F1-48F8-82AD-8A8C9083D66F} + EndGlobalSection EndGlobal From c87e0e0c3a3ea8e939efeeabbd9b9d7ae61370f9 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 22:38:46 -0500 Subject: [PATCH 11/13] Restore removed properties --- Assets/mappings.jsonc | 18 ++++++++++++++++++ RecodeItLib/Remapper/ReMapper.cs | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Assets/mappings.jsonc b/Assets/mappings.jsonc index fd90f17..450d6e0 100644 --- a/Assets/mappings.jsonc +++ b/Assets/mappings.jsonc @@ -11006,6 +11006,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11367,6 +11368,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11597,6 +11599,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12103,6 +12106,7 @@ ] }, "NestedTypes": { + "IsNested": false, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12564,6 +12568,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12665,6 +12670,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14585,6 +14591,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14632,6 +14639,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14680,6 +14688,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14729,6 +14738,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14775,6 +14785,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15528,6 +15539,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [ "EExtraDataType" @@ -15573,6 +15585,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16101,6 +16114,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16193,6 +16207,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16238,6 +16253,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16284,6 +16300,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16502,6 +16519,7 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": true, "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] diff --git a/RecodeItLib/Remapper/ReMapper.cs b/RecodeItLib/Remapper/ReMapper.cs index 2977f49..c5e21b2 100644 --- a/RecodeItLib/Remapper/ReMapper.cs +++ b/RecodeItLib/Remapper/ReMapper.cs @@ -180,7 +180,7 @@ public class ReMapper } // Filter down nested objects - if (mapping.SearchParams.NestedTypes.IsNested is false or null) + if (mapping.SearchParams.NestedTypes.IsNested is false) { types = types.Where(type => tokens!.Any(token => type.Name.StartsWith(token))); } From c9fcf4e5ca4bf9d540ae87292e8e1c22e30d2268 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Wed, 1 Jan 2025 22:48:18 -0500 Subject: [PATCH 12/13] Update doc --- ReCodeItCLI/Commands/AutoMatcher.cs | 4 ++-- ReCodeItCLI/readme.md | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ReCodeItCLI/Commands/AutoMatcher.cs b/ReCodeItCLI/Commands/AutoMatcher.cs index b2edea2..135b085 100644 --- a/ReCodeItCLI/Commands/AutoMatcher.cs +++ b/ReCodeItCLI/Commands/AutoMatcher.cs @@ -7,10 +7,10 @@ using ReCodeItLib.Utils; namespace ReCodeItCLI.Commands; -[Command("AutoMatch", Description = "Automatically tries to generate a mapping object with the provided arguments.")] +[Command("AutoMatch", Description = "This command will automatically try to generate a mapping object given old type and new type names.")] public class AutoMatchCommand : ICommand { - [CommandParameter(0, IsRequired = true, Description = "The absolute path to your obfuscated assembly or exe file, folder must contain all references to be resolved.")] + [CommandParameter(0, IsRequired = true, Description = "The absolute path to your assembly, folder must contain all references to be resolved.")] public required string AssemblyPath { get; init; } [CommandParameter(1, IsRequired = true, Description = "Full old type name including namespace")] diff --git a/ReCodeItCLI/readme.md b/ReCodeItCLI/readme.md index 49bae89..8f54637 100644 --- a/ReCodeItCLI/readme.md +++ b/ReCodeItCLI/readme.md @@ -14,6 +14,17 @@ references needed to be resolved. --- +- `automatch` - This command will Automatically try to generate a mapping object given old type and new type names. + - `AssemblyPath` - The absolute path to your assembly, folder must contain all references to be resolved. + - `OldTypeName` - Full old type name including namespace + - `NewTypeName` - The name you want the type to be renamed to + - `MappingsPath` - Path to your mapping file so it can be updated if a match is found + +- This command will prompt you to append your created mapping to the mapping file. +- It will then prompt you to run the remap process. + +--- + - `remap` - Generates a re-mapped dll provided a mapping file and dll. If the dll is obfuscated, it will automatically de-obfuscate. - Param `MappingJsonPath` - The absolute path to the `mapping.json` file supports both `json` and `jsonc`. - Param `AssemblyPath` - The absolute path to the dll generated from the `deobfuscate` command. From 4da9c42c28682cd1dd0de0eb0145b78308ec22dd Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Thu, 2 Jan 2025 01:21:37 -0500 Subject: [PATCH 13/13] Misc and add new mappings --- Assets/mappings.jsonc | 2161 +++++++++++++++++++++++++++ ReCodeItCLI/Commands/AutoMatcher.cs | 9 +- ReCodeItCLI/readme.md | 6 +- RecodeItLib/Remapper/ReMapper.cs | 5 + RecodeItLib/Remapper/Statistics.cs | 6 +- RecodeItLib/Utils/Logger.cs | 8 + 6 files changed, 2184 insertions(+), 11 deletions(-) diff --git a/Assets/mappings.jsonc b/Assets/mappings.jsonc index 450d6e0..55c888d 100644 --- a/Assets/mappings.jsonc +++ b/Assets/mappings.jsonc @@ -27,6 +27,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -67,6 +69,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -109,6 +113,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -150,6 +156,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -195,6 +203,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -236,6 +246,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -275,6 +287,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -314,6 +328,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -352,6 +368,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -390,6 +408,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -428,6 +448,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -467,6 +489,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -507,6 +531,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -550,6 +576,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": 0, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -603,6 +631,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -641,6 +671,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -679,6 +711,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -719,6 +753,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -757,6 +793,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -796,6 +834,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -835,6 +875,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -877,6 +919,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -916,6 +960,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -958,6 +1004,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -997,6 +1045,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1035,6 +1085,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1074,6 +1126,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1113,6 +1167,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1161,6 +1217,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1200,6 +1258,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1240,6 +1300,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1279,6 +1341,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1318,6 +1382,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1357,6 +1423,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1398,6 +1466,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1437,6 +1507,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1476,6 +1548,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1515,6 +1589,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1562,6 +1638,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1601,6 +1679,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1640,6 +1720,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1678,6 +1760,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1717,6 +1801,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1756,6 +1842,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1797,6 +1885,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1835,6 +1925,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1874,6 +1966,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1913,6 +2007,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1955,6 +2051,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -1995,6 +2093,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": 1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2034,6 +2134,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2074,6 +2176,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2113,6 +2217,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2153,6 +2259,8 @@ ] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2193,6 +2301,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2231,6 +2341,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2269,6 +2381,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2309,6 +2423,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2349,6 +2465,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2393,6 +2511,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2433,6 +2553,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2471,6 +2593,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2509,6 +2633,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2547,6 +2673,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2587,6 +2715,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2625,6 +2755,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2664,6 +2796,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2703,6 +2837,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2741,6 +2877,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2780,6 +2918,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2819,6 +2959,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2858,6 +3000,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2897,6 +3041,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2935,6 +3081,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -2973,6 +3121,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3012,6 +3162,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3053,6 +3205,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3092,6 +3246,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3130,6 +3286,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3168,6 +3326,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3211,6 +3371,8 @@ ] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3253,6 +3415,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3293,6 +3457,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3333,6 +3499,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3371,6 +3539,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3409,6 +3579,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3449,6 +3621,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3487,6 +3661,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3525,6 +3701,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3563,6 +3741,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3609,6 +3789,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3647,6 +3829,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3687,6 +3871,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3725,6 +3911,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3763,6 +3951,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3801,6 +3991,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3840,6 +4032,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3879,6 +4073,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3921,6 +4117,8 @@ ] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3960,6 +4158,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -3999,6 +4199,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4038,6 +4240,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4077,6 +4281,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4116,6 +4322,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4155,6 +4363,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4194,6 +4404,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4233,6 +4445,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4272,6 +4486,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4311,6 +4527,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4351,6 +4569,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4390,6 +4610,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4430,6 +4652,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4469,6 +4693,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4507,6 +4733,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4546,6 +4774,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4585,6 +4815,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4624,6 +4856,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4664,6 +4898,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4704,6 +4940,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4742,6 +4980,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4781,6 +5021,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4820,6 +5062,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4861,6 +5105,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4901,6 +5147,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4940,6 +5188,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -4981,6 +5231,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5021,6 +5273,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5059,6 +5313,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5098,6 +5354,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5137,6 +5395,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5177,6 +5437,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5216,6 +5478,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5257,6 +5521,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5295,6 +5561,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5333,6 +5601,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5372,6 +5642,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5414,6 +5686,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5452,6 +5726,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5490,6 +5766,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5528,6 +5806,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5566,6 +5846,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5605,6 +5887,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5646,6 +5930,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5686,6 +5972,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5726,6 +6014,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5765,6 +6055,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5805,6 +6097,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5846,6 +6140,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5885,6 +6181,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5925,6 +6223,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -5966,6 +6266,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6004,6 +6306,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6045,6 +6349,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6086,6 +6392,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6129,6 +6437,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6168,6 +6478,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6208,6 +6520,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6247,6 +6561,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6292,6 +6608,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": 2, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6331,6 +6649,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6369,6 +6689,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6408,6 +6730,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6447,6 +6771,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6486,6 +6812,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6525,6 +6853,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6564,6 +6894,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6604,6 +6936,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6644,6 +6978,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6684,6 +7020,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6724,6 +7062,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6764,6 +7104,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6802,6 +7144,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6842,6 +7186,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6884,6 +7230,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6923,6 +7271,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -6962,6 +7312,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7003,6 +7355,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7042,6 +7396,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7081,6 +7437,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7122,6 +7480,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7163,6 +7523,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7203,6 +7565,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7242,6 +7606,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7281,6 +7647,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7320,6 +7688,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7359,6 +7729,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7398,6 +7770,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7438,6 +7812,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7478,6 +7854,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7518,6 +7896,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7559,6 +7939,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7598,6 +7980,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7638,6 +8022,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7678,6 +8064,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7717,6 +8105,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7758,6 +8148,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7798,6 +8190,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7838,6 +8232,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7878,6 +8274,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7919,6 +8317,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7958,6 +8358,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -7997,6 +8399,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8036,6 +8440,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8074,6 +8480,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8114,6 +8522,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8152,6 +8562,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "InventoryWarning" @@ -8195,6 +8607,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8233,6 +8647,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8274,6 +8690,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8316,6 +8734,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8355,6 +8775,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8395,6 +8817,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8438,6 +8862,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8482,6 +8908,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8521,6 +8949,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8562,6 +8992,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8601,6 +9033,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8641,6 +9075,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8681,6 +9117,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8722,6 +9160,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8761,6 +9201,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8801,6 +9243,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8842,6 +9286,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8881,6 +9327,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8921,6 +9369,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -8961,6 +9411,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9000,6 +9452,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9039,6 +9493,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9078,6 +9534,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9117,6 +9575,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9156,6 +9616,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9196,6 +9658,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9235,6 +9699,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9275,6 +9741,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9314,6 +9782,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9355,6 +9825,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9394,6 +9866,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9434,6 +9908,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": 1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9474,6 +9950,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9514,6 +9992,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9555,6 +10035,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9596,6 +10078,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9637,6 +10121,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9678,6 +10164,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9718,6 +10206,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9759,6 +10249,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9800,6 +10292,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9838,6 +10332,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9879,6 +10375,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9929,6 +10427,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -9969,6 +10469,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10008,6 +10510,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10047,6 +10551,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10086,6 +10592,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10127,6 +10635,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10168,6 +10678,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10208,6 +10720,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10248,6 +10762,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10288,6 +10804,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10327,6 +10845,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10367,6 +10887,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10408,6 +10930,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10448,6 +10972,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10487,6 +11013,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10528,6 +11056,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10700,6 +11230,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10833,6 +11365,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10874,6 +11408,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -10959,6 +11495,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "Berserk" @@ -11007,6 +11545,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11045,6 +11584,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11086,6 +11627,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11126,6 +11669,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11164,6 +11709,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11204,6 +11751,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": 4, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11242,6 +11791,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11282,6 +11833,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11369,6 +11922,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11416,6 +11970,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11465,6 +12021,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11600,6 +12158,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11640,6 +12199,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11683,6 +12244,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11728,6 +12291,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11776,6 +12341,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11825,6 +12392,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11870,6 +12439,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11911,6 +12482,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -11961,6 +12534,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12006,6 +12581,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12053,6 +12630,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12107,6 +12686,7 @@ }, "NestedTypes": { "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12154,6 +12734,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": 2, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12196,6 +12778,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12240,6 +12824,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12288,6 +12874,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12335,6 +12923,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12382,6 +12972,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12427,6 +13019,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12478,6 +13072,8 @@ ] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12522,6 +13118,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12569,6 +13167,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12616,6 +13215,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12671,6 +13272,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12719,6 +13321,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12767,6 +13371,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12811,6 +13417,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12858,6 +13466,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12904,6 +13514,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12949,6 +13561,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -12995,6 +13609,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13040,6 +13656,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13086,6 +13704,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13132,6 +13752,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13180,6 +13802,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13224,6 +13848,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13263,6 +13889,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13311,6 +13939,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13352,6 +13982,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": 5, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13395,6 +14027,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13437,6 +14071,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13475,6 +14111,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13513,6 +14151,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13552,6 +14192,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13593,6 +14235,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13638,6 +14282,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13677,6 +14323,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13716,6 +14364,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13757,6 +14407,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13797,6 +14449,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13838,6 +14492,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13877,6 +14533,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13918,6 +14576,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -13960,6 +14620,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14000,6 +14662,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14040,6 +14704,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14083,6 +14749,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14121,6 +14789,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14161,6 +14831,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14204,6 +14876,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14246,6 +14920,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14287,6 +14963,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14371,6 +15049,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14412,6 +15092,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "ESyncType" @@ -14454,6 +15136,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14500,6 +15184,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14546,6 +15232,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14592,6 +15280,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14640,6 +15329,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14689,6 +15379,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14739,6 +15430,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14786,6 +15478,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14829,6 +15522,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14872,6 +15567,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -14912,6 +15609,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "FoldCommand" @@ -14963,6 +15662,8 @@ ] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "SwapCommand" @@ -15007,6 +15708,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "MergeCommand" @@ -15061,6 +15764,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "TransferCommand" @@ -15107,6 +15812,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "ApplyCommand" @@ -15154,6 +15861,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "RemoveCommand" @@ -15199,6 +15908,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "SplitCommand" @@ -15242,6 +15953,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15287,6 +16000,8 @@ ] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15328,6 +16043,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15370,6 +16087,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15411,6 +16130,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15451,6 +16172,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15494,6 +16217,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15540,6 +16265,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [ "EExtraDataType" @@ -15586,6 +16312,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15629,6 +16356,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15670,6 +16399,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15713,6 +16444,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15755,6 +16488,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15806,6 +16541,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15853,6 +16590,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15893,6 +16632,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15938,6 +16679,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -15983,6 +16726,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16026,6 +16771,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16115,6 +16862,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16159,6 +16907,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16208,6 +16958,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16254,6 +17005,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16301,6 +17053,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16352,6 +17105,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16408,6 +17163,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16469,6 +17226,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16520,6 +17279,7 @@ }, "NestedTypes": { "IsNested": true, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16569,6 +17329,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16610,6 +17372,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16649,6 +17413,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16698,6 +17464,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16737,6 +17505,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16784,6 +17554,8 @@ "ExcludeProperties": [] }, "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": -1, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] @@ -16892,6 +17664,1395 @@ }, "NestedTypes": { "IsNested": false, + "NestedTypeParentName": "", + "NestedTypeCount": 0, + "IncludeNestedTypes": [], + "ExcludeNestedTypes": [] + }, + "Events": { + "EventCount": 0, + "IncludeEvents": [], + "ExcludeEvents": [] + } + } + }, + { + "NewTypeName": "KillActionDataClass", + "OriginalTypeName": "GClass2011", + "UseForceRename": false, + "AutoGenerated": true, + "SearchParams": { + "GenericParams": { + "IsPublic": true, + "IsAbstract": false, + "IsInterface": false, + "IsStruct": false, + "IsEnum": false, + "IsSealed": false, + "HasAttribute": false, + "HasGenericParameters": false, + "IsDerived": false + }, + "Methods": { + "ConstructorParameterCount": 0, + "MethodCount": 0, + "IncludeMethods": [], + "ExcludeMethods": [ + "op_Implicit", + "Default", + "PerLevel", + "Max", + "Custom", + "Elite", + "Apply", + "add_OnResult", + "remove_OnResult", + "Roll", + "method_0", + "method_1", + "BaseRule", + "EliteRule", + "add_ExternalEvent", + "remove_ExternalEvent", + "Complete", + "Log", + "Begin", + "Factor", + "add_InnerEvent", + "remove_InnerEvent", + "Where", + "method_2", + "method_3", + "method_4", + "method_5", + "method_6", + "method_7", + "method_8", + "method_9", + "method_10", + "method_11", + "method_12", + "method_13", + "method_14", + "method_15", + "method_16", + "method_17" + ] + }, + "Fields": { + "FieldCount": 3, + "IncludeFields": [ + "Distance", + "BodyPart", + "HoldBreath" + ], + "ExcludeFields": [ + "DeltaErgonomics", + "ReloadSpeed", + "RecoilSupression", + "FixSpeed", + "SwapSpeed", + "AimSpeed", + "StiffDraw", + "AimMovementSpeed", + "Maxed", + "DoubleActionRecoilReduce", + "MountingBonusErgo", + "BipodBonusErgo", + "Noise", + "Overweight", + "Fatigue", + "Id", + "BuffType", + "HidenForPlayers", + "BaseRuleFunc", + "EliteRuleFunc", + "Value", + "action_0", + "FactorValue", + "SimpleCalculation", + "float_0", + "action_1", + "class1316_0", + "func_0", + "func_1", + "func_2", + "func_3", + "func_4", + "func_5", + "func_6", + "func_7", + "func_8", + "func_9", + "func_10", + "func_11", + "func_12", + "func_13", + "func_14", + "func_15", + "func_16", + "func_17", + "mastering", + "skill", + "skillManager_0", + "weaponTemplateId", + "group", + "newMastering", + "templateId", + "newSkillInfo", + "skillsRelatedToHealth", + "pointsRate" + ] + }, + "Properties": { + "PropertyCount": 0, + "IncludeProperties": [], + "ExcludeProperties": [ + "ValueObj" + ] + }, + "NestedTypes": { + "IsNested": true, + "NestedTypeParentName": "SkillManager", + "NestedTypeCount": 0, + "IncludeNestedTypes": [], + "ExcludeNestedTypes": [ + "Class1307", + "Class1308", + "Class1309", + "Class1310", + "Class1311", + "Class1312", + "Class1313", + "Class1314", + "Class1315" + ] + }, + "Events": { + "EventCount": 0, + "IncludeEvents": [], + "ExcludeEvents": [ + "OnResult", + "ExternalEvent", + "InnerEvent" + ] + } + } + }, + { + "NewTypeName": "AIProneIdleState", + "OriginalTypeName": "GClass1883", + "UseForceRename": false, + "AutoGenerated": true, + "SearchParams": { + "GenericParams": { + "IsPublic": true, + "IsAbstract": false, + "IsInterface": false, + "IsStruct": false, + "IsEnum": false, + "IsSealed": false, + "HasAttribute": false, + "HasGenericParameters": false, + "IsDerived": true, + "MatchBaseClass": "GClass1882" + }, + "Methods": { + "ConstructorParameterCount": 1, + "MethodCount": 1, + "IncludeMethods": [ + "Rotate" + ], + "ExcludeMethods": [ + "Update", + "CalcPowerOnlyDistToBot", + "GetTarget", + "UpdateNodeByBrain", + "Look", + "GoToStationary", + "SetData", + "SetPatrolMode", + "SetToFollow", + "CanReload", + "Name", + "FindPoint", + "ShallUseNow", + "Come", + "AddNew", + "FindDangerEnemy", + "FirstAidApplied", + "SetLookPointByHearing", + "DebugDraw", + "GetOffset", + "SearchRunToCover", + "IsActive", + "CheckIsBadVal", + "ToString", + "IsAlive", + "Reset", + "AddAim", + "DoCalcCover", + "AddGainSIght", + "BoneHit", + "TrySpawnFreeInner", + "DebugInfo", + "Clone", + "SetActive", + "InternalCreate", + "Test", + "PatchConfig", + "Release", + "PlayOn", + "Compare", + "Info", + "Draw", + "LogError", + "Dispose", + "Process", + "GetStateInfo", + "LogDebugInfo", + "ConvertToLocale", + "Copy", + "OnExit", + "IsAssignableFrom", + "SettingsGroupFactory", + "Configure", + "CreateHeadphones", + "GetHeadphonesTemplateByDeaf", + "method_0", + "IsStairsCondition", + "Tick", + "Approximate", + "ProcessCommand", + "ShotMatches", + "CreateInstance", + "Enter", + "Commit", + "Set", + "method_10", + "TryExpendCharge", + "method_28", + "Execute", + "Emit", + "Met", + "GetReadableName", + "ProcessLocation", + "GetIconNameFromPath", + "Comparer", + "SetupShaderVariableGlobals" + ] + }, + "Fields": { + "FieldCount": 0, + "IncludeFields": [], + "ExcludeFields": [] + }, + "Properties": { + "PropertyCount": 0, + "IncludeProperties": [], + "ExcludeProperties": [] + }, + "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", + "NestedTypeCount": 0, + "IncludeNestedTypes": [], + "ExcludeNestedTypes": [] + }, + "Events": { + "EventCount": 0, + "IncludeEvents": [], + "ExcludeEvents": [] + } + } + }, + { + "NewTypeName": "AIProneMoveState", + "OriginalTypeName": "GClass1892", + "UseForceRename": false, + "AutoGenerated": true, + "SearchParams": { + "GenericParams": { + "IsPublic": true, + "IsAbstract": false, + "IsInterface": false, + "IsStruct": false, + "IsEnum": false, + "IsSealed": false, + "HasAttribute": false, + "HasGenericParameters": false, + "IsDerived": true, + "MatchBaseClass": "GClass1891" + }, + "Methods": { + "ConstructorParameterCount": 1, + "MethodCount": 2, + "IncludeMethods": [ + "LimitMotion", + "Rotate" + ], + "ExcludeMethods": [ + "UpdatePoint", + "DebugDrawSegment", + "Middle", + "method_0", + "DebugDraw", + "ToString", + "Deserialize", + "Serialize", + "GetTarget", + "method_2", + "Dispose", + "UpdateNodeByBrain", + "AimingAndShoot", + "GetAiming", + "method_5", + "method_7", + "UpdateTryThrow", + "Awake", + "ManualUpdate", + "CanReload", + "ReloadAmmo", + "Name", + "EndHoldPosition", + "ShallUseNow", + "EventsPriority", + "ShortName", + "FindDangerEnemy", + "GetDamage", + "RefreshMeds", + "AddLog", + "ClearAndPrint", + "SetXAngle", + "CanSteerToMovingDirection", + "AddWay", + "DrawLastWay", + "FindNextPoint", + "TryToFindWay", + "Update", + "method_6", + "SearchRunToCover", + "SearchTypeAttackMoving", + "FindItemToDropToBot", + "method_1", + "UpdateShootPosition", + "Check", + "SetWeapon", + "Create", + "SetSettings", + "GetSettings", + "TrySpawnFreeInner", + "method_14", + "CanAcceptRaid", + "WriteToBuffer", + "ReadFromBuffer", + "OnStateEnter", + "OnStateExit", + "Enter", + "Exit", + "NextValue", + "AddValue", + "SetBendGoalPosition", + "OnUpdate", + "Enqueue", + "Equals", + "GetHashCode", + "Initialize", + "ApplyVisibleState", + "Replace", + "Restore", + "Progress", + "LockScreen", + "UnlockScreen", + "Add", + "Divide", + "smethod_0", + "SpaceOut", + "UpdateTexture", + "Destroy", + "Click", + "Info", + "ChangeMaterials", + "EFT.ISerializer.Deserialize", + "Write", + "ReadAndWriteToDataContainerAsync", + "GetContainer", + "ReturnContainer", + "Commit", + "StartMeasure", + "StopMeasure", + "Read", + "IsDailyQuestZone", + "TrySpawn", + "CalculateFrom", + "Return", + "OnEnter", + "OnExit", + "GetGroupStatus", + "OnPhraseToldInGroup", + "SetLightSignal", + "StopProcessingLightSignal", + "Start", + "Configure", + "Tick", + "HandleInteraction", + "InitializeStates", + "ProcessCommand", + "CreateInstance", + "RemoveInstance", + "Execute", + "SetGrenadeFireHold", + "Encrypt", + "Decrypt", + "Increment", + "method_11", + "method_9", + "Compare", + "Invoke", + "Reset", + "Emit", + "Accept", + "AcceptAndClose", + "Test" + ] + }, + "Fields": { + "FieldCount": 0, + "IncludeFields": [], + "ExcludeFields": [] + }, + "Properties": { + "PropertyCount": 0, + "IncludeProperties": [], + "ExcludeProperties": [] + }, + "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", + "NestedTypeCount": 0, + "IncludeNestedTypes": [], + "ExcludeNestedTypes": [] + }, + "Events": { + "EventCount": 0, + "IncludeEvents": [], + "ExcludeEvents": [] + } + } + }, + { + "NewTypeName": "LootingState", + "OriginalTypeName": "Class1282", + "UseForceRename": false, + "AutoGenerated": true, + "SearchParams": { + "GenericParams": { + "IsPublic": false, + "IsAbstract": false, + "IsInterface": false, + "IsStruct": false, + "IsEnum": false, + "IsSealed": false, + "HasAttribute": false, + "HasGenericParameters": false, + "IsDerived": true, + "MatchBaseClass": "MovementState" + }, + "Methods": { + "ConstructorParameterCount": 1, + "MethodCount": 4, + "IncludeMethods": [ + "Enter", + "Exit", + "SetTilt", + "Loot" + ], + "ExcludeMethods": [ + "AddClipFTime", + "AddClip", + "Update", + "method_0", + "Draw", + "DrawGL", + "Run", + "Init", + "OnCompleted", + "GetResult" + ] + }, + "Fields": { + "FieldCount": 0, + "IncludeFields": [], + "ExcludeFields": [] + }, + "Properties": { + "PropertyCount": 0, + "IncludeProperties": [], + "ExcludeProperties": [] + }, + "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", + "NestedTypeCount": 0, + "IncludeNestedTypes": [], + "ExcludeNestedTypes": [] + }, + "Events": { + "EventCount": 0, + "IncludeEvents": [], + "ExcludeEvents": [] + } + } + }, + { + "NewTypeName": "PickupState", + "OriginalTypeName": "GClass1894", + "UseForceRename": false, + "AutoGenerated": true, + "SearchParams": { + "GenericParams": { + "IsPublic": true, + "IsAbstract": false, + "IsInterface": false, + "IsStruct": false, + "IsEnum": false, + "IsSealed": false, + "HasAttribute": false, + "HasGenericParameters": false, + "IsDerived": true, + "MatchBaseClass": "MovementState" + }, + "Methods": { + "ConstructorParameterCount": 1, + "MethodCount": 8, + "IncludeMethods": [ + "Enter", + "Exit", + "ManualAnimatorMoveUpdate", + "ChangePose", + "Rotate", + "SetTilt", + "Pickup", + "Examine" + ], + "ExcludeMethods": [ + "AddNodeController", + "RemoveNodeController", + "ListAgents", + "Update", + "Stop", + "Activate", + "method_0", + "OnDrawGizmos", + "TryAdd", + "GetBorderPoints", + "GetNextPoint", + "GetTotalDist", + "DebugDraw", + "UpdateNodeByBrain", + "method_5", + "method_6", + "method_7", + "method_8", + "method_9", + "method_10", + "Awake", + "method_1", + "method_2", + "method_3", + "method_4", + "GoToStationary", + "GetDecision", + "ShallUseNow", + "EndRunToEnemy", + "EndHoldPosition", + "EndRunToCover", + "EndGoToCoverPoint", + "EndShootFromPlace", + "Name", + "FindPoint", + "method_18", + "method_19", + "method_20", + "method_21", + "method_22", + "SetBoss", + "EndSummon", + "EndGoToPoint", + "ManualUpdate", + "Dispose", + "EndDogFight", + "EndLayNode", + "EndGoToCoverPointTactical", + "EndMoveStealthy", + "EventsPriority", + "SetCorePosition", + "ShortName", + "Reset", + "SetVector", + "SetVectorToLook", + "GetLookToPoint", + "DrawGizmosSelected", + "add_OnCurrentCheck", + "remove_OnCurrentCheck", + "GetVision", + "LoseVision", + "PlayerDestroy", + "Take", + "CanProceed", + "CanRequest", + "SetDirection", + "Run", + "AddWave", + "Init", + "AddProfileForBackup", + "AddToTargetBackup", + "Prone", + "BlindFire", + "SetFrom", + "ConvertToStartValue", + "SetRelativeEndValue", + "SetChangeValue", + "GetSpeedBasedDuration", + "EvaluateAndApply", + "Add", + "Remove", + "ResolveGuid", + "ProcessEffectors", + "ApplyTransformations", + "ApplyCameraTransformations", + "LateTransformations", + "ApplyFovAdjustments", + "ResetFovAdjustments", + "OpticCalibration", + "UpdatePossibleTilt", + "Click", + "Draw", + "Info", + "SetValue", + "GetValue", + "Title", + "AddRaycastCommand", + "Execute", + "StoreResults", + "ClearHitData", + "Finalize", + "TryGetClipAndBroadcastTime", + "RegisterBroadcastPlayer", + "ChangePlayerStation", + "Connect", + "Disconnect", + "SendVoiceData", + "ReadMessages", + "SendReliable", + "SendUnreliable", + "DispatchEvents", + "SetHandler", + "ForceSetStatus", + "ClearData", + "OnEnable", + "OnDisable", + "OnDestroy", + "UpdateInput", + "GetInputCount", + "UpdateCommand", + "IsLowerPriority", + "Clone", + "SetCursorPos", + "GetCursorPos", + "GetUpdater", + "smethod_0", + "Move", + "MoveAccordingMousePosition", + "SetPosition", + "Start", + "Complete", + "Cancel", + "OnStart", + "OnComplete", + "OnCancel", + "CanMove", + "CanMoveAutomaticly", + "UpdateRotationAndPosition", + "UpdatePosition", + "HasNoInputForLongTime", + "ChangeSpeed", + "CreateInstance", + "Serialize", + "Deserialize", + "CloneCommand", + "HandelReceive", + "Send", + "HandelResendConnect", + "method_28", + "method_29", + "GetInstalledMods", + "CheckIfAlreadyBuilt", + "Assemble", + "Invoke" + ] + }, + "Fields": { + "FieldCount": 3, + "IncludeFields": [ + "_timeForPikupAnimation" + ], + "ExcludeFields": [ + "railCameraMoveSettings_0" + ] + }, + "Properties": { + "PropertyCount": 0, + "IncludeProperties": [], + "ExcludeProperties": [] + }, + "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", + "NestedTypeCount": 0, + "IncludeNestedTypes": [], + "ExcludeNestedTypes": [] + }, + "Events": { + "EventCount": 0, + "IncludeEvents": [], + "ExcludeEvents": [] + } + } + }, + { + "NewTypeName": "PlantState", + "OriginalTypeName": "GClass1895", + "UseForceRename": false, + "AutoGenerated": true, + "SearchParams": { + "GenericParams": { + "IsPublic": true, + "IsAbstract": false, + "IsInterface": false, + "IsStruct": false, + "IsEnum": false, + "IsSealed": true, + "HasAttribute": false, + "HasGenericParameters": false, + "IsDerived": true, + "MatchBaseClass": "MovementState" + }, + "Methods": { + "ConstructorParameterCount": 1, + "MethodCount": 9, + "IncludeMethods": [ + "Enter", + "Exit", + "ManualAnimatorMoveUpdate", + "ChangePose", + "SetTilt", + "Pickup", + "Examine", + "Plant", + "Cancel" + ], + "ExcludeMethods": [ + "Dispose", + "smethod_0", + "method_0", + "smethod_1", + "method_1", + "method_2", + "Pause", + "Resume", + "method_3", + "Begin", + "End", + "GetIcon", + "RenderModel", + "PoseModelByPivot", + "PoseModelByBounds", + "GetBounds", + "Create", + "ChatShared.IChatMember.Add", + "ChatShared.IChatMember.Remove", + "ChatShared.IChatMember.Receive", + "ChatShared.IChatMember.ReceiveReplay", + "ChatShared.IChatMember.SetBanned", + "ChatShared.IChatMember.SetUnbanned", + "ChatShared.IChatMember.Drop", + "OnUpdate", + "GetEffect", + "OnLateUpdate", + "method_4", + "method_5", + "OnDispose", + "StartFade", + "StopFade", + "Clear", + "ContainsIndex", + "GetNumPixels", + "ToIndexArray", + "ToSamplesArray", + "UnionWith", + "GetCellData", + "GetPixelData", + "DisposeAt", + "GetSample", + "Remap", + "ProcessAnimator", + "GInterface109.OnParameterValueChanged", + "Serialize", + "Deserialize", + "UpdateTimers", + "HandleExits", + "Transit", + "InteractWithTransit", + "Sizes", + "Timers", + "method_16", + "method_17", + "Start", + "Stop", + "method_6", + "add_OnQuit", + "remove_OnQuit", + "ShowDialogScreen", + "ExecuteDialogOption", + "ExecuteQuestAction", + "ExecuteServiceAction", + "SaveDialogState", + "add_SearchStopped", + "remove_SearchStopped", + "add_SearchComplete", + "remove_SearchComplete", + "Search", + "TryPauseFrameRelatedMetrics", + "TryResumeFrameRelatedMetrics", + "Update", + "SetAsCurrent", + "add_OnBuffsUpdated", + "remove_OnBuffsUpdated", + "Add", + "Replace", + "Remove", + "InvokeInternalBuffChange", + "EFT.IExplosiveItem.CreateFragment", + "Contains", + "CanExecute", + "RaiseEvents", + "RollBack", + "Execute", + "ExecuteWithNewCount", + "GInterface143.SetItemInfo", + "GetHashSum", + "GetInfo", + "ExecuteInternal", + "ToDescriptor", + "ToString", + "ToBaseInventoryCommand", + "method_7", + "method_8", + "method_9", + "method_10", + "ExecuteInteractionInternal", + "IsActive", + "IsInteractive", + "method_11", + "GetCommands", + "SetChanges", + "Reset", + "Rollback", + "Save", + "AddTask", + "CreateThread", + "RunInMainTread", + "CheckForFinishedTasks", + "Kill" + ] + }, + "Fields": { + "FieldCount": 2, + "IncludeFields": [], + "ExcludeFields": [] + }, + "Properties": { + "PropertyCount": 0, + "IncludeProperties": [], + "ExcludeProperties": [] + }, + "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", + "NestedTypeCount": 0, + "IncludeNestedTypes": [], + "ExcludeNestedTypes": [] + }, + "Events": { + "EventCount": 0, + "IncludeEvents": [], + "ExcludeEvents": [] + } + } + }, + { + "NewTypeName": "IdleZombieState", + "OriginalTypeName": "GClass1901", + "UseForceRename": false, + "AutoGenerated": true, + "SearchParams": { + "GenericParams": { + "IsPublic": true, + "IsAbstract": false, + "IsInterface": false, + "IsStruct": false, + "IsEnum": false, + "IsSealed": false, + "HasAttribute": false, + "HasGenericParameters": false, + "IsDerived": true, + "MatchBaseClass": "MovementState" + }, + "Methods": { + "ConstructorParameterCount": 1, + "MethodCount": 6, + "IncludeMethods": [ + "Enter", + "Exit", + "Move", + "Rotate", + "BlendMotion", + "ChangeSpeed" + ], + "ExcludeMethods": [ + "GetSearchRadius", + "GetNearGroups", + "method_0", + "method_1", + "method_2", + "Dispose", + "UpdateNodeByBrain", + "method_5", + "method_6", + "method_7", + "method_8", + "GetPoint", + "method_3", + "method_18", + "MoverToMainTarget", + "LookSimple", + "method_19", + "method_20", + "Print", + "Finish", + "AddStep", + "TestNeighbour", + "TestNeighbourVisited", + "TestNeighbourHeuristic", + "Add", + "SetDeprecated", + "IsReach", + "SetPatrolMode", + "Activate", + "BossLogicUpdate", + "GetDecision", + "CanUse", + "EndRunToCover", + "EndHoldPosition", + "ShallUseNow", + "Name", + "method_13", + "FindPoint", + "OnActivate", + "method_17", + "smethod_0", + "method_16", + "EndDogFight", + "SetInside", + "IsPointGood", + "SetBossData", + "EndGestus", + "EndLayNode", + "ManualUpdate", + "EventsPriority", + "ShortName", + "FindDangerEnemy", + "CalcWeight", + "LogToAllPArts", + "SetRandomPartToHeal", + "RefreshMeds", + "FirstAidApplied", + "DrawSelectedGizmosWay", + "DrawDebugWay", + "Complete", + "IsSame", + "FindNextPoint", + "IsWaySuitableByNameId", + "TryToFindWay", + "method_4", + "SetTarget", + "Update", + "ComeToPoint", + "RefreshGoToPoint", + "GoToPoint", + "IsCome", + "FrontPos", + "DrawGizmosSelected", + "IsInRadius", + "CanProceed", + "CanRequest", + "PlayerDestroy", + "Take", + "AddDistShot", + "AddDistHit", + "DebugInfo", + "StartCalcFarthestFromPlayers", + "AddFarthestFromPlayersResult", + "AddFarthestFromPlayers", + "AddNotOccupied", + "AddFinalNoValiedRandom", + "add_OnExplosion", + "remove_OnExplosion", + "OnMineExplosion", + "SetArmedState", + "ReEnter", + "ManualAnimatorMoveUpdate", + "SetTilt", + "Jump", + "Start", + "Stop", + "SetPause", + "Clear", + "IsChoked", + "InstantiateSingleton", + "LoadVoice", + "TakeVoice", + "UnloadVoices", + "Setup", + "SetLifetime", + "Draw", + "GetDropsPositions", + "GetDropsPositionsBleeding", + "ChangeGlassState", + "UpdateTexture", + "add_OnChangeCloseness", + "remove_OnChangeCloseness", + "DrawFields", + "DrawHistory", + "ReInit", + "ReadAndWriteToDataContainerCoroutine", + "Write", + "smethod_1", + "add_OnDataLoaded", + "remove_OnDataLoaded", + "LoadDataAsync", + "Register", + "Unregister", + "PrepareData", + "Schedule", + "Split", + "smethod_2", + "smethod_3", + "Init", + "LookRotation", + "SetCursorLock", + "UpdateCursorLock", + "ToVector3", + "ToAxis", + "GetAxisToPoint", + "GetAxisToDirection", + "GetAxisVectorToPoint", + "GetAxisVectorToDirection", + "add_NatIntroductionRequest", + "remove_NatIntroductionRequest", + "add_NatIntroductionSuccess", + "remove_NatIntroductionSuccess", + "GInterface134.OnNatIntroductionRequest", + "GInterface134.OnNatIntroductionSuccess", + "SetKey", + "ProcessInboundPacket", + "ProcessOutBoundPacket", + "GetDistance", + "MakeMark", + "GetDistanceFromMark", + "Destroy", + "PlayInteractionSound", + "StopInteractionSound", + "CanMove", + "CanMoveAutomaticly", + "SetInteraction", + "ForceStopInteractions", + "SetupParentValues", + "Initialize", + "Process", + "ProcessAtTime", + "ProcessRaw", + "CreateInstance", + "Serialize", + "Deserialize", + "CloneCommand", + "Apply", + "Execute", + "SetGrenadeFireThrow", + "SetGrenadeFireIdle", + "FastForward", + "Listen", + "Shutdown", + "OnConnect", + "OnData", + "OnDisconnect", + "HandelReceive", + "Disconnect", + "Send", + "HandelTimeout", + "Invoke", + "Reset", + "add_Event_0", + "remove_Event_0", + "add_Event_1", + "remove_Event_1", + "RequestGlobalClose", + "RequestGlobalRedraw", + "GetCommandNames", + "IsPlayerGesture", + "GetCommandName", + "Equals", + "Clone", + "ApplyToMesh", + "MultiplyPath", + "ModifyPath", + "Triangulate" + ] + }, + "Fields": { + "FieldCount": 1, + "IncludeFields": [], + "ExcludeFields": [] + }, + "Properties": { + "PropertyCount": 0, + "IncludeProperties": [], + "ExcludeProperties": [] + }, + "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", + "NestedTypeCount": 0, + "IncludeNestedTypes": [], + "ExcludeNestedTypes": [] + }, + "Events": { + "EventCount": 0, + "IncludeEvents": [], + "ExcludeEvents": [] + } + } + }, + { + "NewTypeName": "MoveZombieState", + "OriginalTypeName": "GClass1903", + "UseForceRename": false, + "AutoGenerated": true, + "SearchParams": { + "GenericParams": { + "IsPublic": true, + "IsAbstract": false, + "IsInterface": false, + "IsStruct": false, + "IsEnum": false, + "IsSealed": false, + "HasAttribute": false, + "HasGenericParameters": false, + "IsDerived": true, + "MatchBaseClass": "MovementState" + }, + "Methods": { + "ConstructorParameterCount": 1, + "MethodCount": 8, + "IncludeMethods": [ + "Enter", + "ManualAnimatorMoveUpdate", + "UpdateRotationAndPosition", + "UpdatePosition", + "HasNoInputForLongTime", + "Move", + "ChangeSpeed", + "method_0" + ], + "ExcludeMethods": [ + "AddNodeController", + "RemoveNodeController", + "ListAgents", + "Update", + "Stop", + "Activate", + "OnDrawGizmos", + "TryAdd", + "GetBorderPoints", + "GetNextPoint", + "GetTotalDist", + "DebugDraw", + "UpdateNodeByBrain", + "method_5", + "method_6", + "method_7", + "method_8", + "method_9", + "method_10", + "Awake", + "method_1", + "method_2", + "method_3", + "method_4", + "GoToStationary", + "GetDecision", + "ShallUseNow", + "EndRunToEnemy", + "EndHoldPosition", + "EndRunToCover", + "EndGoToCoverPoint", + "EndShootFromPlace", + "Name", + "FindPoint", + "method_18", + "method_19", + "method_20", + "method_21", + "method_22", + "SetBoss", + "EndSummon", + "EndGoToPoint", + "ManualUpdate", + "Dispose", + "EndDogFight", + "EndLayNode", + "EndGoToCoverPointTactical", + "EndMoveStealthy", + "EventsPriority", + "SetCorePosition", + "ShortName", + "Reset", + "SetVector", + "SetVectorToLook", + "GetLookToPoint", + "DrawGizmosSelected", + "add_OnCurrentCheck", + "remove_OnCurrentCheck", + "GetVision", + "LoseVision", + "PlayerDestroy", + "Take", + "CanProceed", + "CanRequest", + "SetDirection", + "Run", + "AddWave", + "Init", + "AddProfileForBackup", + "AddToTargetBackup", + "Prone", + "Exit", + "BlindFire", + "SetFrom", + "ConvertToStartValue", + "SetRelativeEndValue", + "SetChangeValue", + "GetSpeedBasedDuration", + "EvaluateAndApply", + "Add", + "Remove", + "ResolveGuid", + "ProcessEffectors", + "ApplyTransformations", + "ApplyCameraTransformations", + "LateTransformations", + "ApplyFovAdjustments", + "ResetFovAdjustments", + "OpticCalibration", + "UpdatePossibleTilt", + "Click", + "Draw", + "Info", + "SetValue", + "GetValue", + "Title", + "AddRaycastCommand", + "Execute", + "StoreResults", + "ClearHitData", + "Finalize", + "TryGetClipAndBroadcastTime", + "RegisterBroadcastPlayer", + "ChangePlayerStation", + "Connect", + "Disconnect", + "SendVoiceData", + "ReadMessages", + "SendReliable", + "SendUnreliable", + "DispatchEvents", + "ChangePose", + "Rotate", + "SetTilt", + "Pickup", + "Examine", + "SetHandler", + "ForceSetStatus", + "ClearData", + "OnEnable", + "OnDisable", + "OnDestroy", + "UpdateInput", + "GetInputCount", + "UpdateCommand", + "IsLowerPriority", + "Clone", + "SetCursorPos", + "GetCursorPos", + "GetUpdater", + "smethod_0", + "MoveAccordingMousePosition", + "SetPosition", + "Start", + "Complete", + "Cancel", + "OnStart", + "OnComplete", + "OnCancel", + "CanMove", + "CanMoveAutomaticly", + "CreateInstance", + "Serialize", + "Deserialize", + "CloneCommand", + "HandelReceive", + "Send", + "HandelResendConnect", + "method_28", + "method_29", + "GetInstalledMods", + "CheckIfAlreadyBuilt", + "Assemble", + "Invoke" + ] + }, + "Fields": { + "FieldCount": 2, + "IncludeFields": [ + "float_0", + "float_1" + ], + "ExcludeFields": [ + "gclass851_0", + "dictionary_0", + "freeSpaceCameraMoveSettings_0", + "transform_0" + ] + }, + "Properties": { + "PropertyCount": 0, + "IncludeProperties": [], + "ExcludeProperties": [] + }, + "NestedTypes": { + "IsNested": false, + "NestedTypeParentName": "", "NestedTypeCount": 0, "IncludeNestedTypes": [], "ExcludeNestedTypes": [] diff --git a/ReCodeItCLI/Commands/AutoMatcher.cs b/ReCodeItCLI/Commands/AutoMatcher.cs index 135b085..b1d2bbd 100644 --- a/ReCodeItCLI/Commands/AutoMatcher.cs +++ b/ReCodeItCLI/Commands/AutoMatcher.cs @@ -13,14 +13,15 @@ public class AutoMatchCommand : ICommand [CommandParameter(0, IsRequired = true, Description = "The absolute path to your assembly, folder must contain all references to be resolved.")] public required string AssemblyPath { get; init; } - [CommandParameter(1, IsRequired = true, Description = "Full old type name including namespace")] + [CommandParameter(1, IsRequired = true, Description = "Path to your mapping file so it can be updated if a match is found")] + public string MappingsPath { get; init; } + + [CommandParameter(2, IsRequired = true, Description = "Full old type name including namespace")] public required string OldTypeName { get; init; } - [CommandParameter(2, IsRequired = true, Description = "The name you want the type to be renamed to")] + [CommandParameter(3, IsRequired = true, Description = "The name you want the type to be renamed to")] public required string NewTypeName { get; init; } - [CommandParameter(3, IsRequired = false, Description = "Path to your mapping file so it can be updated if a match is found")] - public string MappingsPath { get; init; } public ValueTask ExecuteAsync(IConsole console) { diff --git a/ReCodeItCLI/readme.md b/ReCodeItCLI/readme.md index 8f54637..88d3efe 100644 --- a/ReCodeItCLI/readme.md +++ b/ReCodeItCLI/readme.md @@ -16,9 +16,9 @@ references needed to be resolved. - `automatch` - This command will Automatically try to generate a mapping object given old type and new type names. - `AssemblyPath` - The absolute path to your assembly, folder must contain all references to be resolved. - - `OldTypeName` - Full old type name including namespace - - `NewTypeName` - The name you want the type to be renamed to - - `MappingsPath` - Path to your mapping file so it can be updated if a match is found + - `MappingsPath` - Path to your mapping file so it can be updated if a match is found. + - `OldTypeName` - Full old type name including namespace. + - `NewTypeName` - The name you want the type to be renamed to. - This command will prompt you to append your created mapping to the mapping file. - It will then prompt you to run the remap process. diff --git a/RecodeItLib/Remapper/ReMapper.cs b/RecodeItLib/Remapper/ReMapper.cs index c5e21b2..4b9e3ab 100644 --- a/RecodeItLib/Remapper/ReMapper.cs +++ b/RecodeItLib/Remapper/ReMapper.cs @@ -184,6 +184,11 @@ public class ReMapper { types = types.Where(type => tokens!.Any(token => type.Name.StartsWith(token))); } + + if (mapping.SearchParams.NestedTypes.NestedTypeParentName != string.Empty) + { + types = types.Where(t => t.DeclaringType != null && t.DeclaringType.Name == mapping.SearchParams.NestedTypes.NestedTypeParentName); + } // Run through a series of filters and report an error if all types are filtered out. var filters = new TypeFilters(); diff --git a/RecodeItLib/Remapper/Statistics.cs b/RecodeItLib/Remapper/Statistics.cs index c6b49aa..819c211 100644 --- a/RecodeItLib/Remapper/Statistics.cs +++ b/RecodeItLib/Remapper/Statistics.cs @@ -76,12 +76,10 @@ public class Statistics( continue; } - if (validate) + if (validate && remap.Succeeded) { - var str = JsonConvert.SerializeObject(remap, Formatting.Indented); - Logger.Log("Generated Model: ", ConsoleColor.Blue); - Logger.Log(str, ConsoleColor.Blue); + Logger.LogRemapModel(remap); Logger.Log("Passed validation", ConsoleColor.Green); return; diff --git a/RecodeItLib/Utils/Logger.cs b/RecodeItLib/Utils/Logger.cs index a929003..30769ba 100644 --- a/RecodeItLib/Utils/Logger.cs +++ b/RecodeItLib/Utils/Logger.cs @@ -1,4 +1,6 @@ using System.Collections.Concurrent; +using Newtonsoft.Json; +using ReCodeItLib.Models; namespace ReCodeItLib.Utils; @@ -119,6 +121,12 @@ public static class Logger Console.ResetColor(); } + public static void LogRemapModel(RemapModel remapModel) + { + var str = JsonConvert.SerializeObject(remapModel, Formatting.Indented); + LogSync(str, ConsoleColor.Blue); + } + private static void LogInternal(LogMessage message) { if (!message.Silent)