From 8e6f8cc5e690c668e19323ecdd0f78a2b498341b Mon Sep 17 00:00:00 2001 From: EvilFactory Date: Wed, 3 May 2023 12:38:29 -0300 Subject: [PATCH] Added support for workshop install for other platforms (MacOS is likely still borked, but I don't have a Mac to test it) --- .../BarotraumaClient/ClientSource/LuaCs/LuaCsInstaller.cs | 2 +- Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs | 3 --- .../BarotraumaServer/ServerSource/LuaCs/LuaCsInstaller.cs | 2 +- .../BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs | 7 +++++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsInstaller.cs b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsInstaller.cs index 074b2ce38..470e94ba2 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsInstaller.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsInstaller.cs @@ -77,7 +77,7 @@ namespace Barotrauma string[] filesToUpdate = new string[] { "Barotrauma.dll", "Barotrauma.deps.json", "Barotrauma.pdb", - "0harmony.dll", "Mono.Cecil.dll", + "0Harmony.dll", "Mono.Cecil.dll", "Sigil.dll", "Mono.Cecil.Mdb.dll", "Mono.Cecil.Pdb.dll", "Mono.Cecil.Rocks.dll", "MonoMod.Common.dll", diff --git a/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs b/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs index d0565c026..f4e355cb2 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs @@ -1272,14 +1272,11 @@ namespace Barotrauma GameMain.LuaCs.ToggleDebugger(port); })); -#if WINDOWS commands.Add(new Command("install_cl_lua|install_cl|install_cl_cs|install_cl_luacs", "Installs Client-Side LuaCs into your client.", (string[] args) => { LuaCsInstaller.Install(); })); -#endif - commands.Add(new Command("randomizeseed", "randomizeseed: Toggles level seed randomization on/off.", (string[] args) => { GameMain.Server.ServerSettings.RandomizeSeed = !GameMain.Server.ServerSettings.RandomizeSeed; diff --git a/Barotrauma/BarotraumaServer/ServerSource/LuaCs/LuaCsInstaller.cs b/Barotrauma/BarotraumaServer/ServerSource/LuaCs/LuaCsInstaller.cs index d795f16ac..8108aa380 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/LuaCs/LuaCsInstaller.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/LuaCs/LuaCsInstaller.cs @@ -24,7 +24,7 @@ namespace Barotrauma string[] filesToCopy = new string[] { "Barotrauma.dll", "Barotrauma.deps.json", "Barotrauma.pdb", - "0harmony.dll", "Mono.Cecil.dll", + "0Harmony.dll", "Mono.Cecil.dll", "Sigil.dll", "Mono.Cecil.Mdb.dll", "Mono.Cecil.Pdb.dll", "Mono.Cecil.Rocks.dll", "MonoMod.Common.dll", diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index 0a5836e77..6c89d4680 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -32,7 +32,14 @@ namespace Barotrauma { public const string LuaSetupFile = "Lua/LuaSetup.lua"; public const string VersionFile = "luacsversion.txt"; +#if WINDOWS public static ContentPackageId LuaForBarotraumaId = new SteamWorkshopId(2559634234); +#elif LINUX + public static ContentPackageId LuaForBarotraumaId = new SteamWorkshopId(2970628943); +#elif OSX + public static ContentPackageId LuaForBarotraumaId = new SteamWorkshopId(2970890020); +#endif + public static ContentPackageId CsForBarotraumaId = new SteamWorkshopId(2795927223);