vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added settings that allow you to force turn on CSharp, treat forced mods as normal and allow for the workshop lua setup to be the preferred one

Browse Source
This commit is contained in:
EvilFactory
2022-12-29 13:02:25 -03:00
parent 8fdf2156dc
commit c665d3e9c7
5 changed files with 153 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Lua/ModLoader.lua
+19 -29
View File
@@ -89,35 +89,28 @@ local function ProcessPackages(packages, fn)
end
end
ProcessPackages(
ContentPackageManager.EnabledPackages.All,
function(pkg, pkgPath)
table.insert(package.path, pkgPath .. LUA_MOD_REQUIRE_PATH)
local autorunPath = pkgPath .. LUA_MOD_AUTORUN_PATH
if File.DirectoryExists(autorunPath) then
QueueAutorun.Add(autorunPath, pkgPath, pkg)
end
ProcessPackages(ContentPackageManager.EnabledPackages.All, function(pkg, pkgPath)
table.insert(package.path, pkgPath .. LUA_MOD_REQUIRE_PATH)
local autorunPath = pkgPath .. LUA_MOD_AUTORUN_PATH
if File.DirectoryExists(autorunPath) then
QueueAutorun.Add(autorunPath, pkgPath, pkg)
end
)
end)
-- we don't want to execute workshop ForcedAutorun if we have a local Package
local executedLocalPackages = {}
ProcessPackages(
ContentPackageManager.EnabledPackages.All,
function(pkg, pkgPath)
table.insert(package.path, pkgPath .. LUA_MOD_REQUIRE_PATH)
local forcedAutorunPath = pkgPath .. LUA_MOD_FORCEDAUTORUN_PATH
if File.DirectoryExists(forcedAutorunPath) then
QueueForcedAutorun.Add(forcedAutorunPath, pkgPath, pkg)
executedLocalPackages[pkg.Name] = true
end
ProcessPackages(ContentPackageManager.EnabledPackages.All, function(pkg, pkgPath)
table.insert(package.path, pkgPath .. LUA_MOD_REQUIRE_PATH)
local forcedAutorunPath = pkgPath .. LUA_MOD_FORCEDAUTORUN_PATH
if File.DirectoryExists(forcedAutorunPath) then
QueueForcedAutorun.Add(forcedAutorunPath, pkgPath, pkg)
executedLocalPackages[pkg.Name] = true
end
)
end)
ProcessPackages(
ContentPackageManager.LocalPackages,
function(pkg, pkgPath)
if not LuaCsConfig.TreatForcedModsAsNormal then
ProcessPackages(ContentPackageManager.LocalPackages, function(pkg, pkgPath)
if not executedLocalPackages[pkg.Name] then
table.insert(package.path, pkgPath .. LUA_MOD_REQUIRE_PATH)
local forcedAutorunPath = pkgPath .. LUA_MOD_FORCEDAUTORUN_PATH
@@ -126,12 +119,9 @@ ProcessPackages(
executedLocalPackages[pkg.Name] = true
end
end
end
)
end)
ProcessPackages(
ContentPackageManager.AllPackages,
function(pkg, pkgPath)
ProcessPackages(ContentPackageManager.AllPackages, function(pkg, pkgPath)
if not executedLocalPackages[pkg.Name] then
table.insert(package.path, pkgPath .. LUA_MOD_REQUIRE_PATH)
local forcedAutorunPath = pkgPath .. LUA_MOD_FORCEDAUTORUN_PATH
@@ -139,8 +129,8 @@ ProcessPackages(
QueueForcedAutorun.Add(forcedAutorunPath, pkgPath, pkg)
end
end
end
)
end)
end
setmodulepaths(package.path)
setmodulepaths = nil
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs
+1 -1
View File
@@ -55,7 +55,7 @@ namespace Barotrauma
LuaCsLogger.LogMessage($"Added {cp.Name} {cp.ModVersion} to Cs compilation. (Standard)");
return true;
}
else if (rtValue == RunType.Forced)
else if (rtValue == RunType.Forced && (isEnabled || !GameMain.LuaCs.Config.TreatForcedModsAsNormal))
{
LuaCsLogger.LogMessage($"Added {cp.Name} {cp.ModVersion} to Cs compilation. (Forced)");
return true;
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
+40 -38
View File
@@ -1,8 +1,7 @@
using System;
using System.IO;
using Barotrauma.Networking;
using System.Collections.Generic;
using MoonSharp.Interpreter;
using Microsoft.Xna.Framework;
using MoonSharp.Interpreter.Interop;
using System.Runtime.CompilerServices;
using System.Linq;
@@ -17,6 +16,9 @@ namespace Barotrauma
class LuaCsSetupConfig
{
public bool FirstTimeCsWarning = true;
public bool ForceCsScripting = false;
public bool TreatForcedModsAsNormal = false;
public bool PreferToUseWorkshopLuaSetup = false;
public LuaCsSetupConfig() { }
}
@@ -70,6 +72,19 @@ namespace Barotrauma
Game = new LuaGame();
Networking = new LuaCsNetworking();
if (File.Exists(configFileName))
{
using (var file = File.Open(configFileName, FileMode.Open, FileAccess.Read))
{
Config = LuaCsConfig.Load<LuaCsSetupConfig>(file);
}
}
else
{
Config = new LuaCsSetupConfig();
}
}
public void UpdateConfig()
@@ -236,7 +251,6 @@ namespace Barotrauma
LuaScriptLoader = null;
Lua = null;
CsScript = null;
Config = null;
if (CsScriptLoader != null)
{
@@ -252,17 +266,7 @@ namespace Barotrauma
LuaCsLogger.LogMessage("Lua! Version " + AssemblyInfo.GitRevision);
if (File.Exists(configFileName))
{
using (var file = File.Open(configFileName, FileMode.Open, FileAccess.Read))
Config = LuaCsConfig.Load<LuaCsSetupConfig>(file);
}
else
{
Config = new LuaCsSetupConfig();
}
bool csActive = GetPackage(CsForBarotraumaId, false, true) != null;
bool csActive = GetPackage(CsForBarotraumaId, false, true) != null || Config.ForceCsScripting;
LuaScriptLoader = new LuaScriptLoader();
LuaScriptLoader.ModulePaths = new string[] { };
@@ -287,11 +291,11 @@ namespace Barotrauma
ModStore.Initialize();
UserData.RegisterType<LuaCsConfig>();
UserData.RegisterType<LuaCsSetupConfig>();
UserData.RegisterType<LuaCsAction>();
UserData.RegisterType<LuaCsFile>();
UserData.RegisterType<LuaCsCompatPatchFunc>();
UserData.RegisterType<LuaCsPatchFunc>();
UserData.RegisterType<LuaCsConfig>();
UserData.RegisterType<CsScriptRunner>();
UserData.RegisterType<LuaGame>();
UserData.RegisterType<LuaCsTimer>();
@@ -323,6 +327,7 @@ namespace Barotrauma
Lua.Globals["Networking"] = Networking;
Lua.Globals["Steam"] = Steam;
Lua.Globals["PerformanceCounter"] = PerformanceCounter;
Lua.Globals["LuaCsConfig"] = Config;
Lua.Globals["ExecutionNumber"] = executionNumber;
Lua.Globals["CSActive"] = csActive;
@@ -376,39 +381,36 @@ namespace Barotrauma
ContentPackage luaPackage = GetPackage(LuaForBarotraumaId);
if (File.Exists(LuaSetupFile))
void runLocal()
{
LuaCsLogger.LogMessage("Using LuaSetup.lua from the Barotrauma Lua/ folder.");
try
{
DynValue function = Lua.LoadFile(LuaSetupFile);
CallLuaFunction(function, Path.GetDirectoryName(Path.GetFullPath(LuaSetupFile)));
}
catch (Exception e)
{
LuaCsLogger.HandleException(e, LuaCsMessageOrigin.LuaMod);
}
string luaPath = LuaSetupFile;
CallLuaFunction(Lua.LoadFile(luaPath), Path.GetDirectoryName(Path.GetFullPath(luaPath)));
}
else if (luaPackage != null)
void runWorkshop()
{
LuaCsLogger.LogMessage("Using LuaSetup.lua from the content package.");
string luaPath = Path.Combine(Path.GetDirectoryName(luaPackage.Path), "Binary/Lua/LuaSetup.lua");
CallLuaFunction(Lua.LoadFile(luaPath), Path.GetDirectoryName(Path.GetFullPath(luaPath)));
}
string path = Path.GetDirectoryName(luaPackage.Path);
void runNone()
{
LuaCsLogger.LogError("LuaSetup.lua not found! Lua/LuaSetup.lua, no Lua scripts will be executed or work.", LuaCsMessageOrigin.LuaMod);
}
try
{
string luaPath = Path.Combine(path, "Binary/Lua/LuaSetup.lua");
CallLuaFunction(Lua.LoadFile(luaPath), Path.GetDirectoryName(Path.GetFullPath(luaPath)));
}
catch (Exception e)
{
LuaCsLogger.HandleException(e, LuaCsMessageOrigin.LuaMod);
}
if (Config.PreferToUseWorkshopLuaSetup)
{
if (luaPackage != null) { runWorkshop(); }
else if (File.Exists(LuaSetupFile)) { runLocal(); }
else { runNone(); }
}
else
{
LuaCsLogger.LogError("LuaSetup.lua not found! Lua/LuaSetup.lua, no Lua scripts will be executed or work.", LuaCsMessageOrigin.LuaMod);
if (File.Exists(LuaSetupFile)) { runLocal(); }
else if (luaPackage != null) { runWorkshop(); }
else { runNone(); }
}
executionNumber++;