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

Fix remaining remaps

Browse Source
This commit is contained in:
Cj 2025-01-09 13:43:08 -05:00
parent c312269906
commit 4dcab4c10f
2 changed files with 113 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
Assets/mappings.jsonc
View File

@ -11581,6 +11581,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -11964,6 +11970,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -12212,6 +12224,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -13191,7 +13209,7 @@
"UseForceRename": false, "UseForceRename": false,
"SearchParams": { "SearchParams": {
"GenericParams": { "GenericParams": {
"IsPublic": true, "IsPublic": false,
"IsAbstract": false, "IsAbstract": false,
"IsInterface": false, "IsInterface": false,
"IsStruct": false, "IsStruct": false,
@ -13221,6 +13239,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -13326,6 +13350,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -15340,6 +15370,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -15389,6 +15425,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -15439,6 +15481,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -15490,6 +15538,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -15538,6 +15592,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -16296,7 +16356,7 @@
"UseForceRename": false, "UseForceRename": false,
"SearchParams": { "SearchParams": {
"GenericParams": { "GenericParams": {
"IsPublic": true, "IsPublic": false,
"IsStruct": true "IsStruct": true
}, },
"Methods": { "Methods": {
@ -16325,6 +16385,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [ "IncludeNestedTypes": [
@ -16345,7 +16411,7 @@
"UseForceRename": false, "UseForceRename": false,
"SearchParams": { "SearchParams": {
"GenericParams": { "GenericParams": {
"IsPublic": true, "IsPublic": false,
"IsStruct": true "IsStruct": true
}, },
"Methods": { "Methods": {
@ -16372,6 +16438,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -16928,6 +17000,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -17024,6 +17102,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -17071,6 +17155,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -17119,6 +17209,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],
@ -17345,6 +17441,12 @@
}, },
"NestedTypes": { "NestedTypes": {
"IsNested": true, "IsNested": true,
"IsNestedAssembly": false,
"IsNestedFamily": false,
"IsNestedPrivate": false,
"IsNestedPublic": true,
"IsNestedFamilyAndAssembly": false,
"IsNestedFamilyOrAssembly": false,
"NestedTypeParentName": "", "NestedTypeParentName": "",
"NestedTypeCount": -1, "NestedTypeCount": -1,
"IncludeNestedTypes": [], "IncludeNestedTypes": [],

7
RecodeItLib/Remapper/ReMapper.cs
View File

@ -175,7 +175,12 @@ public class ReMapper
// Filter down nested objects // Filter down nested objects
types = !mapping.SearchParams.NestedTypes.IsNested types = !mapping.SearchParams.NestedTypes.IsNested
? types.Where(type => tokens!.Any(token => type.Name.StartsWith(token))) ? types.Where(type => tokens!.Any(token => type.Name.StartsWith(token)))
: types.Where(t => t.DeclaringType != null && t.DeclaringType.Name == mapping.SearchParams.NestedTypes.NestedTypeParentName); : types.Where(t => t.DeclaringType != null);
if (mapping.SearchParams.NestedTypes.NestedTypeParentName != string.Empty)
{
types = types.Where(t => t.DeclaringType.Name == mapping.SearchParams.NestedTypes.NestedTypeParentName);
}
// Run through a series of filters and report an error if all types are filtered out. // Run through a series of filters and report an error if all types are filtered out.
var filters = new TypeFilters(); var filters = new TypeFilters();