From 6026a0246d40a73dcbc714f5cb578e88501a0584 Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Thu, 17 Mar 2022 11:56:34 -0300 Subject: [PATCH] move InstallClientSideLua Function --- .../ServerSource/DebugConsole.cs | 30 ++++++++++++++- .../SharedSource/Lua/LuaSetup.cs | 37 ------------------- 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs b/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs index 121457d5c..1969043d6 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs @@ -1256,7 +1256,35 @@ namespace Barotrauma commands.Add(new Command("install_cl_lua", "Installs client-side lua into your client.", (string[] args) => { - LuaSetup.InstallClientSideLua(); + if (!File.Exists("Mods/LuaForBarotrauma/clientside_files.zip")) + { + GameMain.Server.SendChatMessage("clientside_files.zip doesn't exist, Github version?", ChatMessageType.ServerMessageBox); + + return; + } + + try + { + + System.IO.Compression.ZipFile.ExtractToDirectory("Mods/LuaForBarotrauma/clientside_files.zip", ".", true); + + System.IO.File.Move("Barotrauma.dll", "Barotrauma.dll.temp", true); + System.IO.File.Move("Barotrauma.deps.json", "Barotrauma.deps.json.temp", true); + + System.IO.File.Move("Barotrauma.dll.original", "Barotrauma.dll"); + System.IO.File.Move("Barotrauma.deps.json.original", "Barotrauma.deps.json"); + + System.IO.File.Move("Barotrauma.dll.temp", "Barotrauma.dll.original", true); + System.IO.File.Move("Barotrauma.deps.json.temp", "Barotrauma.deps.json.original", true); + } + catch (Exception e) + { + GameMain.Lua.HandleLuaException(e); + + return; + } + + GameMain.Server.SendChatMessage("Client-Side Lua installed, restart your game to apply changes.", ChatMessageType.ServerMessageBox); })); commands.Add(new Command("randomizeseed", "randomizeseed: Toggles level seed randomization on/off.", (string[] args) => diff --git a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs index 3f284d48e..c1953b735 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs @@ -222,43 +222,6 @@ namespace Barotrauma return value * 2; } - -#if SERVER - public static void InstallClientSideLua() - { - if (!File.Exists("Mods/LuaForBarotrauma/clientside_files.zip")) - { - GameMain.Server.SendChatMessage("clientside_files.zip doesn't exist, Github version?", ChatMessageType.ServerMessageBox); - - return; - } - - try - { - - ZipFile.ExtractToDirectory("Mods/LuaForBarotrauma/clientside_files.zip", ".", true); - - File.Move("Barotrauma.dll", "Barotrauma.dll.temp", true); - File.Move("Barotrauma.deps.json", "Barotrauma.deps.json.temp", true); - - File.Move("Barotrauma.dll.original", "Barotrauma.dll"); - File.Move("Barotrauma.deps.json.original", "Barotrauma.deps.json"); - - File.Move("Barotrauma.dll.temp", "Barotrauma.dll.original", true); - File.Move("Barotrauma.deps.json.temp", "Barotrauma.deps.json.original", true); - } - catch (Exception e) - { - LuaSetup.luaSetup.HandleLuaException(e); - - return; - } - - GameMain.Server.SendChatMessage("Client-Side Lua installed, restart your game to apply changes.", ChatMessageType.ServerMessageBox); - } - -#endif - public void Stop() { if (harmony != null)