From 43f172a190cdb205572527b8fa736b8e1a5a7e7a Mon Sep 17 00:00:00 2001 From: Jacobin Date: Wed, 4 May 2022 11:27:46 +1000 Subject: [PATCH 1/2] Remove exception handling on Require This was just eating exceptions; exceptions should instead propagate to a more appropriate handler (`pcall` should now work). --- .../SharedSource/LuaCs/LuaCsSetup.cs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index 5ebfe331b..d44f519f4 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -318,18 +318,7 @@ namespace Barotrauma return null; } - public DynValue Require(string moduleName, Table globalContexts) - { - try - { - return require.Require(moduleName, globalContexts); - } - catch (Exception e) - { - HandleException(e); - } - return null; - } + public object CallLuaFunction(object function, params object[] arguments) { try @@ -444,7 +433,7 @@ namespace Barotrauma lua.Globals["dofile"] = (Func)DoFile; lua.Globals["loadfile"] = (Func)LoadFile; - lua.Globals["require"] = (Func)Require; + lua.Globals["require"] = (Func)require.Require; lua.Globals["dostring"] = (Func)DoString; lua.Globals["load"] = (Func)LoadString; From 95a9c618e623423563e8f2e2c978c893baf67bbe Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Wed, 4 May 2022 07:56:54 -0300 Subject: [PATCH 2/2] fix naming --- .../ClientSource/LuaCs/LuaCsUpdateChecker.cs | 6 +++--- .../ClientSource/Screens/MainMenuScreen.cs | 2 +- Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs | 2 +- .../BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsUpdateChecker.cs b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsUpdateChecker.cs index 6806e0698..332fdad83 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsUpdateChecker.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsUpdateChecker.cs @@ -8,14 +8,14 @@ namespace Barotrauma { public static void Check() { - if (!File.Exists(LuaCsSetup.VERSION_FILE)) { return; } + if (!File.Exists(LuaCsSetup.VersionFile)) { return; } ContentPackage luaPackage = LuaCsSetup.GetPackage("Lua For Barotrauma"); string luaCsPath = Path.GetDirectoryName(luaPackage.Path); if (luaPackage == null) { return; } - string clientVersion = File.ReadAllText(LuaCsSetup.VERSION_FILE); + string clientVersion = File.ReadAllText(LuaCsSetup.VersionFile); string workshopVersion = luaPackage.ModVersion; if (clientVersion == workshopVersion) { return; } @@ -53,7 +53,7 @@ namespace Barotrauma File.Copy(Path.Combine(luaCsPath, "Binary", file), file, true); } - File.WriteAllText(LuaCsSetup.VERSION_FILE, workshopVersion); + File.WriteAllText(LuaCsSetup.VersionFile, workshopVersion); } catch (Exception e) { diff --git a/Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen.cs b/Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen.cs index fdaf001a0..82405dbd7 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen.cs @@ -449,7 +449,7 @@ namespace Barotrauma } }; - string version = File.Exists(LuaCsSetup.VERSION_FILE) ? File.ReadAllText(LuaCsSetup.VERSION_FILE) : "Github"; + string version = File.Exists(LuaCsSetup.VersionFile) ? File.ReadAllText(LuaCsSetup.VersionFile) : "Github"; new GUITextBlock(new RectTransform(new Point(300, 30), Frame.RectTransform, Anchor.TopLeft) { AbsoluteOffset = new Point(10, 10) }, $"Using Lua{additional}ForBarotrauma revision {AssemblyInfo.GitRevision} version {version}", Color.Red) { diff --git a/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs b/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs index d827b04c2..d2a737eda 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs @@ -1301,7 +1301,7 @@ namespace Barotrauma File.Copy(Path.Combine(path, "Binary", file), file, true); } - File.WriteAllText(LuaCsSetup.VERSION_FILE, luaPackage.ModVersion); + File.WriteAllText(LuaCsSetup.VersionFile, luaPackage.ModVersion); } catch (UnauthorizedAccessException e) { diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index d44f519f4..6f11aee09 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -26,8 +26,8 @@ namespace Barotrauma partial class LuaCsSetup { - public const string LUASETUP_FILE = "Lua/LuaSetup.lua"; - public const string VERSION_FILE = "luacsversion.txt"; + public const string LuaSetupFile = "Lua/LuaSetup.lua"; + public const string VersionFile = "luacsversion.txt"; private const string configFileName = "LuaCsSetupConfig.xml"; @@ -503,11 +503,11 @@ modding needs. ContentPackage luaPackage = GetPackage("Lua For Barotrauma"); - if (File.Exists(LUASETUP_FILE)) + if (File.Exists(LuaSetupFile)) { try { - lua.Call(lua.LoadFile(LUASETUP_FILE), Path.GetDirectoryName(Path.GetFullPath(LUASETUP_FILE))); + lua.Call(lua.LoadFile(LuaSetupFile), Path.GetDirectoryName(Path.GetFullPath(LuaSetupFile))); } catch (Exception e) {