diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsLua.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsLua.cs deleted file mode 100644 index 956342c72..000000000 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsLua.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Barotrauma; -using MoonSharp.Interpreter; -using System.Collections.Generic; - -namespace Barotrauma -{ - partial class LuaCsSetup { - public class CsLua - { - private LuaCsSetup setup; - public Table Globals { get; private set; } - - public CsLua(LuaCsSetup setup) - { - this.setup = setup; - Globals = setup.lua.Globals; - } - - public DynValue DoString(string code) => setup.lua.DoString(code); - } - } -} \ No newline at end of file diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs index 495b2907e..384ef9289 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs @@ -255,10 +255,10 @@ namespace Barotrauma } - private static MethodInfo miPatchPrefix = typeof(LuaCsHook).GetMethod("PatchPrefix", BindingFlags.NonPublic | BindingFlags.Static); - private static MethodInfo miPatchPostfix = typeof(LuaCsHook).GetMethod("PatchPostfix", BindingFlags.NonPublic | BindingFlags.Static); - private static MethodInfo miPatchPrefixWithReturn = typeof(LuaCsHook).GetMethod("PatchPrefixWithReturn", BindingFlags.NonPublic | BindingFlags.Static); - private static MethodInfo miPatchPostfixWithReturn = typeof(LuaCsHook).GetMethod("PatchPostfixWithReturn", BindingFlags.NonPublic | BindingFlags.Static); + private static readonly MethodInfo miPatchPrefix = typeof(LuaCsHook).GetMethod("PatchPrefix", BindingFlags.NonPublic | BindingFlags.Static); + private static readonly MethodInfo miPatchPostfix = typeof(LuaCsHook).GetMethod("PatchPostfix", BindingFlags.NonPublic | BindingFlags.Static); + private static readonly MethodInfo miPatchPrefixWithReturn = typeof(LuaCsHook).GetMethod("PatchPrefixWithReturn", BindingFlags.NonPublic | BindingFlags.Static); + private static readonly MethodInfo miPatchPostfixWithReturn = typeof(LuaCsHook).GetMethod("PatchPostfixWithReturn", BindingFlags.NonPublic | BindingFlags.Static); private static MethodInfo ResolveMethod(string className, string methodName, string[] parameterNames) { diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index 57cb230d1..7e3115dbf 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -67,8 +67,6 @@ namespace Barotrauma private LuaRequire require { get; set; } public CsScriptLoader CsScriptLoader { get; private set; } - public CsLua Lua { get; private set; } - public LuaCsSetupConfig Config { get; private set; } public LuaCsSetup() @@ -335,7 +333,6 @@ namespace Barotrauma PerformanceCounter = new LuaCsPerformanceCounter(); LuaScriptLoader = null; lua = null; - Lua = null; CsScript = null; Config = null; @@ -359,7 +356,10 @@ namespace Barotrauma using (var file = File.Open(configFileName, FileMode.Open, FileAccess.Read)) Config = LuaCsConfig.Load(file); } - else Config = new LuaCsSetupConfig(); + else + { + Config = new LuaCsSetupConfig(); + } bool csActive = GetPackage("CsForBarotrauma", false, true) != null; @@ -372,7 +372,6 @@ namespace Barotrauma lua.Options.DebugPrint = PrintMessage; lua.Options.ScriptLoader = LuaScriptLoader; lua.Options.CheckThreadAccess = false; - Lua = new CsLua(this); CsScript = new CsScriptRunner(this); require = new LuaRequire(lua); @@ -437,22 +436,7 @@ namespace Barotrauma Config.FirstTimeCsWarning = false; UpdateConfig(); - Timer.Wait((args) => PrintCsError(@" - ----==== ====---- - - WARNING! - -- -- -- -- -- -- - !Cs Package Enabled! - - Cs Mods are questionably -sandboxed, as they have -access to reflection, due to -modding needs. - - USE ON YOUR OWN RISK! - - ----==== ====---- -"), 200); + DebugConsole.AddWarning("Cs package active! Cs mods are NOT sandboxed, use it at your own risk!"); } CsScriptLoader = new CsScriptLoader(this);