diff --git a/Barotrauma/BarotraumaServer/ServerSource/Program.cs b/Barotrauma/BarotraumaServer/ServerSource/Program.cs index 4704aaca4..bf83d1bf8 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Program.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Program.cs @@ -53,7 +53,7 @@ namespace Barotrauma string executableDir = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location); Directory.SetCurrentDirectory(executableDir); - + if (File.Exists("filelist.xml")) Directory.SetCurrentDirectory(executableDir + "/../.."); // sweet diff --git a/Workshop/WorkshopInstaller/Program.cs b/Workshop/WorkshopInstaller/Program.cs new file mode 100644 index 000000000..6a3a81169 --- /dev/null +++ b/Workshop/WorkshopInstaller/Program.cs @@ -0,0 +1,24 @@ +using System; +using System.IO; +using System.IO.Compression; + + +namespace WorkshopInstaller +{ + class Program + { + static void Main(string[] args) + { + if (File.Exists("Barotrauma.exe")) + { + Directory.SetCurrentDirectory("Mods/LuaForBarotrauma/"); + } + + ZipFile.ExtractToDirectory("blacklist_files.zip", "."); + + File.Move("DedicatedServer.exe", "WorkshopInstaller.exe"); + File.Move("DedicatedServer.exe.original", "DedicatedServer.exe"); + File.Create("DedicatedServer.exe.original"); + } + } +} diff --git a/Workshop/WorkshopInstaller/WorkshopInstaller.csproj b/Workshop/WorkshopInstaller/WorkshopInstaller.csproj new file mode 100644 index 000000000..2fc56856f --- /dev/null +++ b/Workshop/WorkshopInstaller/WorkshopInstaller.csproj @@ -0,0 +1,10 @@ + + + + Exe + netcoreapp3.1 + false + false + + + diff --git a/Workshop/WorkshopInstaller/WorkshopInstaller.sln b/Workshop/WorkshopInstaller/WorkshopInstaller.sln new file mode 100644 index 000000000..361a4d1c9 --- /dev/null +++ b/Workshop/WorkshopInstaller/WorkshopInstaller.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31129.286 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkshopInstaller", "WorkshopInstaller.csproj", "{B72BA20A-E0E9-4B41-BD12-67AC62D549AE}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B72BA20A-E0E9-4B41-BD12-67AC62D549AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B72BA20A-E0E9-4B41-BD12-67AC62D549AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B72BA20A-E0E9-4B41-BD12-67AC62D549AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B72BA20A-E0E9-4B41-BD12-67AC62D549AE}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {07CADD5B-22A1-40E4-97C5-63C715CD535A} + EndGlobalSection +EndGlobal diff --git a/Workshop/blacklist_files.zip b/Workshop/blacklist_files.zip new file mode 100644 index 000000000..04ba3622b Binary files /dev/null and b/Workshop/blacklist_files.zip differ diff --git a/docs/lua/Vectors.lua b/docs/lua/Vectors.lua index 85a8b1b37..f4a2c1861 100644 --- a/docs/lua/Vectors.lua +++ b/docs/lua/Vectors.lua @@ -20,9 +20,9 @@ function CreateVector2(path) end --- Create Vector3 -- @treturn Vector3 -- @realm shared -function CreateVector2(path) end +function CreateVector3(path) end --- Create Vector4 -- @treturn Vector4 -- @realm shared -function CreateVector2(path) end \ No newline at end of file +function CreateVector4(path) end \ No newline at end of file