DrakiaXYZ/AssemblyTool
0
0
Fork 0
Code Pull Requests Activity

Potential fix for publicizer

Browse Source
This commit is contained in:
Cj 2024-06-28 18:02:14 -04:00
parent 95ac115306
commit 427db1ce5a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RecodeItLib/Remapper/Publicizer.cs
View File

@ -53,18 +53,21 @@ internal static class SPTPublicizer
// !type.Namespace.Contains("UI") || !string.IsNullOrWhiteSpace(type.Namespace)) // if // !type.Namespace.Contains("UI") || !string.IsNullOrWhiteSpace(type.Namespace)) // if
// (type.Namespace.Length > 0 && type.Namespace[0] > 'E') PublicizeField(field); } // (type.Namespace.Length > 0 && type.Namespace[0] > 'E') PublicizeField(field); }
var nestedTypesToPublicize = type.NestedTypes.ToArray(); var nestedTypesToPublicize = type.NestedTypes
.Where(t => !t.Interfaces.Any(i => i.Interface.Name == "IEffect"))
.ToList();
// Workaround to not publicize some nested types that cannot be patched easily and cause // Workaround to not publicize some nested types that cannot be patched easily and cause
// issues Specifically, we want to find any type that implements the "IHealthController" // issues Specifically, we want to find any type that implements the "IHealthController"
// interface and make sure none of it's nested types that implement "IEffect" are changed // interface and make sure none of it's nested types that implement "IEffect" are changed
/*
if (GetFlattenedInterfacesRecursive(type).Any(i => i.Interface.Name == "IHealthController")) if (GetFlattenedInterfacesRecursive(type).Any(i => i.Interface.Name == "IHealthController"))
{ {
// Specifically, any type that implements the IHealthController interface needs to not // Specifically, any type that implements the IHealthController interface needs to not
// publicize any nested types that implement the IEffect interface // publicize any nested types that implement the IEffect interface
nestedTypesToPublicize = type.NestedTypes.Where(t => t.IsAbstract || t.Interfaces.All(i => i.Interface.Name != "IEffect")).ToArray(); nestedTypesToPublicize = type.NestedTypes.Where(t => t.IsAbstract || t.Interfaces.All(i => i.Interface.Name != "IEffect")).ToArray();
} }
*/
foreach (var nestedType in nestedTypesToPublicize) foreach (var nestedType in nestedTypesToPublicize)
{ {
PublicizeType(nestedType); PublicizeType(nestedType);
@ -121,7 +124,7 @@ internal static class SPTPublicizer
if (type.BaseType != null && !type.BaseType.Name.Contains("Object")) if (type.BaseType != null && !type.BaseType.Name.Contains("Object"))
{ {
var baseTypeDefinition = MainModule?.Find(type.BaseType); var baseTypeDefinition = MainModule?.Find(type.BaseType).ResolveTypeDef();
var baseTypeInterfaces = GetFlattenedInterfacesRecursive(baseTypeDefinition); var baseTypeInterfaces = GetFlattenedInterfacesRecursive(baseTypeDefinition);
if (baseTypeInterfaces.Any()) if (baseTypeInterfaces.Any())