DrakiaXYZ/AssemblyTool
DrakiaXYZ/AssemblyTool
0
0
Fork 0
Code Pull Requests Activity

Fix IEffect members not being publicized

Browse Source
This commit is contained in:
Cj 2024-07-02 19:01:46 -04:00
parent bb3f1249a5
commit 8f1fdeadfd
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RecodeItLib/Remapper/Publicizer.cs
View File

@ -26,8 +26,11 @@ internal static class SPTPublicizer
if (!type.IsNested && !type.IsPublic || type.IsNested && !type.IsNestedPublic) if (!type.IsNested && !type.IsPublic || type.IsNested && !type.IsNestedPublic)
{ {
type.Attributes &= ~TypeAttributes.VisibilityMask; // Remove all visibility mask attributes if (!type.Interfaces.Any(i => i.Interface.Name == "IEffect"))
type.Attributes |= type.IsNested ? TypeAttributes.NestedPublic : TypeAttributes.Public; // Apply a public visibility attribute {
type.Attributes &= ~TypeAttributes.VisibilityMask; // Remove all visibility mask attributes
type.Attributes |= type.IsNested ? TypeAttributes.NestedPublic : TypeAttributes.Public; // Apply a public visibility attribute
}
} }
if (type.IsSealed) if (type.IsSealed)
@ -52,11 +55,7 @@ internal static class SPTPublicizer
// // if (type.Name.StartsWith("GClass") || !type.Namespace.Contains("EFT") || // // if (type.Name.StartsWith("GClass") || !type.Namespace.Contains("EFT") ||
// !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
.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
@ -68,7 +67,7 @@ internal static class SPTPublicizer
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 type.NestedTypes)
{ {
PublicizeType(nestedType); PublicizeType(nestedType);
} }