vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MakeMethodAccessible and MakeFieldAccessible now are recursive, so they include private members in inherit members

Browse Source
This commit is contained in:
Evil Factory
2022-04-02 20:54:54 -03:00
parent 2520fe7268
commit 34ffbea69d
1 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Barotrauma/BarotraumaShared/SharedSource/Lua/LuaClasses/LuaUserData.cs
View File

@@ -110,6 +110,18 @@ namespace Barotrauma
return result;
}
private static FieldInfo FindFieldRecursively(Type type, string fieldName)
{
var field = type.GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static);
if (field == null && type.BaseType != null)
{
return FindFieldRecursively(type.BaseType, fieldName);
}
return field;
}
public static void MakeFieldAccessible(IUserDataDescriptor IUUD, string fieldName)
{
if (IUUD == null)
@@ -121,6 +133,11 @@ namespace Barotrauma
var descriptor = (StandardUserDataDescriptor)IUUD;
var field = IUUD.Type.GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static);
if (field == null)
{
field = FindFieldRecursively(IUUD.Type, fieldName);
}
if (field == null)
{
GameMain.Lua.HandleLuaException(new Exception($"Tried to make field '{fieldName}' accessible, but the field doesn't exist."));
@@ -131,6 +148,18 @@ namespace Barotrauma
descriptor.AddMember(fieldName, new FieldMemberDescriptor(field, InteropAccessMode.Default));
}
private static MethodInfo FindMethodRecursively(Type type, string methodName)
{
var method = type.GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static);
if (method == null && type.BaseType != null)
{
return FindMethodRecursively(type.BaseType, methodName);
}
return method;
}
public static void MakeMethodAccessible(IUserDataDescriptor IUUD, string methodName)
{
if (IUUD == null)
@@ -144,7 +173,12 @@ namespace Barotrauma
if (method == null)
{
GameMain.Lua.HandleLuaException(new Exception($"Tried to make method '{method}' accessible, but the method doesn't exist."));
method = FindMethodRecursively(IUUD.Type, methodName);
}
if (method == null)
{
GameMain.Lua.HandleLuaException(new Exception($"Tried to make method '{methodName}' accessible, but the method doesn't exist."));
return;
}