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

Fixed immediate errors (untested).

Browse Source
This commit is contained in:
Maplewheels
2026-02-02 02:57:34 -05:00
parent b325a01eea
commit 0cab7954f8
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/Compatibility/ILuaCsHook.cs
+1
View File
@@ -12,6 +12,7 @@ public interface ILuaCsHook : ILuaCsShim
// Does anyone use this? TODO: Analyze old Lua mods for usage scenarios. // Does anyone use this? TODO: Analyze old Lua mods for usage scenarios.
//bool Exists(string eventName, string identifier); //bool Exists(string eventName, string identifier);
object Call(string eventName, params object[] args); object Call(string eventName, params object[] args);
T Call<T>(string eventName, params object[] args);
// Hook/Method Patching // Hook/Method Patching
string Patch(string identifier, string className, string methodName, string[] parameterTypes, LuaCsPatchFunc patch, EventService.HookMethodType hookType = EventService.HookMethodType.Before); string Patch(string identifier, string className, string methodName, string[] parameterTypes, LuaCsPatchFunc patch, EventService.HookMethodType hookType = EventService.HookMethodType.Before);
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/EventService.cs
+5
View File
@@ -149,6 +149,11 @@ public partial class EventService : IEventService
return returnValue; return returnValue;
} }
public T Call<T>(string eventName, params object[] args)
{
return (T)Call(eventName, args);
}
public void Subscribe<T>(string identifier, IDictionary<string, LuaCsFunc> callbacks) where T : IEvent<T> public void Subscribe<T>(string identifier, IDictionary<string, LuaCsFunc> callbacks) where T : IEvent<T>
{ {
Guard.IsNotNullOrWhiteSpace(identifier, nameof(identifier)); Guard.IsNotNullOrWhiteSpace(identifier, nameof(identifier));
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/Safe/LuaClasses/LuaPatcherCompat.cs
+11 -11
View File
@@ -18,8 +18,8 @@ namespace Barotrauma.LuaCs.Services
{ {
partial class EventService partial class EventService
{ {
private Dictionary<long, HashSet<(string, LuaCsCompatPatchFunc, ACsMod)>> compatHookPrefixMethods = new Dictionary<long, HashSet<(string, LuaCsCompatPatchFunc, ACsMod)>>(); private Dictionary<long, HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)>> compatHookPrefixMethods = new Dictionary<long, HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)>>();
private Dictionary<long, HashSet<(string, LuaCsCompatPatchFunc, ACsMod)>> compatHookPostfixMethods = new Dictionary<long, HashSet<(string, LuaCsCompatPatchFunc, ACsMod)>>(); private Dictionary<long, HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)>> compatHookPostfixMethods = new Dictionary<long, HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)>>();
private static void _hookLuaCsPatch(MethodBase __originalMethod, object[] __args, object __instance, out object result, HookMethodType hookType) private static void _hookLuaCsPatch(MethodBase __originalMethod, object[] __args, object __instance, out object result, HookMethodType hookType)
{ {
@@ -28,7 +28,7 @@ namespace Barotrauma.LuaCs.Services
try try
{ {
var funcAddr = ((long)__originalMethod.MethodHandle.GetFunctionPointer()); var funcAddr = ((long)__originalMethod.MethodHandle.GetFunctionPointer());
HashSet<(string, LuaCsCompatPatchFunc, ACsMod)> methodSet = null; HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)> methodSet = null;
switch (hookType) switch (hookType)
{ {
case HookMethodType.Before: case HookMethodType.Before:
@@ -50,10 +50,10 @@ namespace Barotrauma.LuaCs.Services
args.Add(@params[i].Name, __args[i]); args.Add(@params[i].Name, __args[i]);
} }
var outOfSocpe = new HashSet<(string, LuaCsCompatPatchFunc, ACsMod)>(); var outOfSocpe = new HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)>();
foreach (var tuple in methodSet) foreach (var tuple in methodSet)
{ {
if (tuple.Item3 != null && tuple.Item3.IsDisposed) if (tuple.Item3 != null)
{ {
outOfSocpe.Add(tuple); outOfSocpe.Add(tuple);
} }
@@ -126,7 +126,7 @@ namespace Barotrauma.LuaCs.Services
private static MethodInfo _miHookLuaCsPatchRetPostfix = typeof(EventService).GetMethod("HookLuaCsPatchRetPostfix", BindingFlags.NonPublic | BindingFlags.Static); private static MethodInfo _miHookLuaCsPatchRetPostfix = typeof(EventService).GetMethod("HookLuaCsPatchRetPostfix", BindingFlags.NonPublic | BindingFlags.Static);
// TODO: deprecate this // TODO: deprecate this
public void HookMethod(string identifier, MethodBase method, LuaCsCompatPatchFunc patch, HookMethodType hookType = HookMethodType.Before, ACsMod owner = null) public void HookMethod(string identifier, MethodBase method, LuaCsCompatPatchFunc patch, HookMethodType hookType = HookMethodType.Before, IAssemblyPlugin owner = null)
{ {
if (identifier == null || method == null || patch == null) if (identifier == null || method == null || patch == null)
{ {
@@ -155,7 +155,7 @@ namespace Barotrauma.LuaCs.Services
} }
} }
if (compatHookPrefixMethods.TryGetValue(funcAddr, out HashSet<(string, LuaCsCompatPatchFunc, ACsMod)> methodSet)) if (compatHookPrefixMethods.TryGetValue(funcAddr, out HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)> methodSet))
{ {
if (identifier != "") if (identifier != "")
{ {
@@ -166,7 +166,7 @@ namespace Barotrauma.LuaCs.Services
} }
else if (patch != null) else if (patch != null)
{ {
compatHookPrefixMethods.Add(funcAddr, new HashSet<(string, LuaCsCompatPatchFunc, ACsMod)>() { (identifier, patch, owner) }); compatHookPrefixMethods.Add(funcAddr, new HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)>() { (identifier, patch, owner) });
} }
} }
@@ -187,7 +187,7 @@ namespace Barotrauma.LuaCs.Services
} }
} }
if (compatHookPostfixMethods.TryGetValue(funcAddr, out HashSet<(string, LuaCsCompatPatchFunc, ACsMod)> methodSet)) if (compatHookPostfixMethods.TryGetValue(funcAddr, out HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)> methodSet))
{ {
if (identifier != "") if (identifier != "")
{ {
@@ -198,7 +198,7 @@ namespace Barotrauma.LuaCs.Services
} }
else if (patch != null) else if (patch != null)
{ {
compatHookPostfixMethods.Add(funcAddr, new HashSet<(string, LuaCsCompatPatchFunc, ACsMod)>() { (identifier, patch, owner) }); compatHookPostfixMethods.Add(funcAddr, new HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)>() { (identifier, patch, owner) });
} }
} }
} }
@@ -224,7 +224,7 @@ namespace Barotrauma.LuaCs.Services
{ {
var funcAddr = (long)method.MethodHandle.GetFunctionPointer(); var funcAddr = (long)method.MethodHandle.GetFunctionPointer();
Dictionary<long, HashSet<(string, LuaCsCompatPatchFunc, ACsMod)>> methods; Dictionary<long, HashSet<(string, LuaCsCompatPatchFunc, IAssemblyPlugin)>> methods;
if (hookType == HookMethodType.Before) methods = compatHookPrefixMethods; if (hookType == HookMethodType.Before) methods = compatHookPrefixMethods;
else if (hookType == HookMethodType.After) methods = compatHookPostfixMethods; else if (hookType == HookMethodType.After) methods = compatHookPostfixMethods;
else throw null; else throw null;