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

OBT/1.2.0(Spring Update)

Browse Source 
Sync with Upstream
This commit is contained in:
NotAlwaysTrue
2026-04-25 13:25:41 +08:00
committed by GitHub
parent 5207b381b7
commit 59bc21973a
421 changed files with 24090 additions and 11391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaTest/LuaCs/HookPatchHelpers.cs
+18 -14
View File
@@ -1,12 +1,14 @@
extern alias Client;
using Client::Barotrauma;
extern alias Server;
using Client::Barotrauma.LuaCs;
using Client::Barotrauma;
using MoonSharp.Interpreter;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Text;
using System.Threading;
using Server::Barotrauma.LuaCs.Compatibility;
using Xunit;
namespace TestProject.LuaCs
@@ -63,17 +65,18 @@ namespace TestProject.LuaCs
string methodName,
string[]? parameters,
string function,
LuaCsHook.HookMethodType patchType)
ILuaCsHook.HookMethodType patchType)
{
var args = BuildHookPatchArgsList(patchId, className, methodName, parameters);
args.Add(function);
args.Add(patchType switch
{
LuaCsHook.HookMethodType.Before => "Hook.HookMethodType.Before",
LuaCsHook.HookMethodType.After => "Hook.HookMethodType.After",
ILuaCsHook.HookMethodType.Before => "Hook.HookMethodType.Before",
ILuaCsHook.HookMethodType.After => "Hook.HookMethodType.After",
_ => throw new NotImplementedException(),
});
return luaCs.Lua.DoString($"return Hook.Patch({string.Join(", ", args)})");
throw new NotImplementedException();
//return luaCs.Lua.DoString($"return Hook.Patch({string.Join(", ", args)})");
}
private static DynValue DoHookRemovePatch(
@@ -82,16 +85,17 @@ namespace TestProject.LuaCs
string className,
string methodName,
string[]? parameters,
LuaCsHook.HookMethodType patchType)
ILuaCsHook.HookMethodType patchType)
{
var args = BuildHookPatchArgsList(patchId, className, methodName, parameters);
args.Add(patchType switch
{
LuaCsHook.HookMethodType.Before => "Hook.HookMethodType.Before",
LuaCsHook.HookMethodType.After => "Hook.HookMethodType.After",
ILuaCsHook.HookMethodType.Before => "Hook.HookMethodType.Before",
ILuaCsHook.HookMethodType.After => "Hook.HookMethodType.After",
_ => throw new NotImplementedException(),
});
return luaCs.Lua.DoString($"return Hook.RemovePatch({string.Join(", ", args)})");
throw new NotImplementedException();
//return luaCs.Lua.DoString($"return Hook.RemovePatch({string.Join(", ", args)})");
}
public static PatchHandle AddPrefix<T>(this LuaCsSetup luaCs, string body, string methodName, string[]? parameters = null, string? patchId = null)
@@ -101,7 +105,7 @@ namespace TestProject.LuaCs
function(instance, ptable)
{body}
end
", LuaCsHook.HookMethodType.Before);
", ILuaCsHook.HookMethodType.Before);
Assert.Equal(DataType.String, returnValue.Type);
return new(returnValue.String, () => luaCs.RemovePrefix<T>(returnValue.String, methodName, parameters));
}
@@ -113,7 +117,7 @@ namespace TestProject.LuaCs
function(instance, ptable)
{body}
end
", LuaCsHook.HookMethodType.After);
", ILuaCsHook.HookMethodType.After);
Assert.Equal(DataType.String, returnValue.Type);
return new(returnValue.String, () => luaCs.RemovePostfix<T>(returnValue.String, methodName, parameters));
}
@@ -121,7 +125,7 @@ namespace TestProject.LuaCs
public static bool RemovePrefix<T>(this LuaCsSetup luaCs, string patchId, string methodName, string[]? parameters = null)
{
var className = typeof(T).FullName!;
var returnValue = luaCs.DoHookRemovePatch(patchId, className, methodName, parameters, LuaCsHook.HookMethodType.Before);
var returnValue = luaCs.DoHookRemovePatch(patchId, className, methodName, parameters, ILuaCsHook.HookMethodType.Before);
Assert.Equal(DataType.Boolean, returnValue.Type);
return returnValue.Boolean;
}
@@ -129,7 +133,7 @@ namespace TestProject.LuaCs
public static bool RemovePostfix<T>(this LuaCsSetup luaCs, string patchId, string methodName, string[]? parameters = null)
{
var className = typeof(T).FullName!;
var returnValue = luaCs.DoHookRemovePatch(patchId, className, methodName, parameters, LuaCsHook.HookMethodType.After);
var returnValue = luaCs.DoHookRemovePatch(patchId, className, methodName, parameters, ILuaCsHook.HookMethodType.After);
Assert.Equal(DataType.Boolean, returnValue.Type);
return returnValue.Boolean;
}
Barotrauma/BarotraumaTest/LuaCs/HookPatchTests.cs
+12 -5
View File
@@ -1,4 +1,5 @@
extern alias Client;
/*
extern alias Client;
using Client::Barotrauma;
using Microsoft.Xna.Framework;
@@ -7,6 +8,8 @@ using System;
using Xunit;
using Xunit.Abstractions;
// TODO: Rewrite all of this.
namespace TestProject.LuaCs
{
[Collection("LuaCs")]
@@ -16,6 +19,7 @@ namespace TestProject.LuaCs
public HookPatchTests(LuaCsFixture luaCsFixture, ITestOutputHelper output)
{
// XXX: we can't have multiple instances of LuaCs patching the
// same methods, otherwise we get script ownership exceptions.
luaCs = luaCsFixture.LuaCs;
@@ -36,10 +40,12 @@ namespace TestProject.LuaCs
UserData.RegisterType<PatchTargetAmbiguous>();
UserData.RegisterType<PatchTargetConstructor>();
UserData.RegisterType<PatchTargetNumbers>();
luaCs.Initialize();
luaCs.Lua.Globals["TestValueType"] = UserData.CreateStatic<TestValueType>();
luaCs.Lua.Globals["InterfaceImplementingType"] = UserData.CreateStatic<InterfaceImplementingType>();
luaCs.ForceRunState(RunState.Running);
throw new NotImplementedException();
//luaCs.Initialize();
//luaCs.Lua.Globals["TestValueType"] = UserData.CreateStatic<TestValueType>();
//luaCs.Lua.Globals["InterfaceImplementingType"] = UserData.CreateStatic<InterfaceImplementingType>();
}
private class PatchTargetSimple
@@ -664,3 +670,4 @@ namespace TestProject.LuaCs
}
}
}
*/
Barotrauma/BarotraumaTest/LuaCs/LuaCsFixture.cs
+5 -1
View File
@@ -1,9 +1,12 @@
extern alias Client;
/*
extern alias Client;
using Client::Barotrauma;
using System;
using System.Runtime.ExceptionServices;
// TODO: Rewrite all of this.
namespace TestProject.LuaCs
{
/// <summary>
@@ -31,3 +34,4 @@ namespace TestProject.LuaCs
void IDisposable.Dispose() => LuaCs.Stop();
}
}
*/