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

only run cs mods if package is present

Browse Source
This commit is contained in:
Evil Factory
2022-04-17 15:09:24 -03:00
parent 6277a6ce5d
commit edb665a22c
3 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsUpdateChecker.cs
+4 -4
View File
@@ -9,13 +9,13 @@ namespace Barotrauma
{ {
if (!File.Exists(LuaCsSetup.VERSION_FILE)) { return; } if (!File.Exists(LuaCsSetup.VERSION_FILE)) { return; }
ContentPackage luaCsPackage = LuaCsSetup.GetPackage(); ContentPackage luaPackage = LuaCsSetup.GetPackage("LuaForBarotraumaUnstable");
string luaCsPath = Path.GetDirectoryName(luaCsPackage.Path); string luaCsPath = Path.GetDirectoryName(luaPackage.Path);
if (luaCsPackage == null) { return; } if (luaPackage == null) { return; }
string clientVersion = File.ReadAllText(LuaCsSetup.VERSION_FILE); string clientVersion = File.ReadAllText(LuaCsSetup.VERSION_FILE);
string workshopVersion = luaCsPackage.ModVersion; string workshopVersion = luaPackage.ModVersion;
if (clientVersion == workshopVersion) { return; } if (clientVersion == workshopVersion) { return; }
Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs
+5 -5
View File
@@ -1255,11 +1255,11 @@ namespace Barotrauma
GameMain.LuaCs.Initialize(); GameMain.LuaCs.Initialize();
})); }));
commands.Add(new Command("install_cl_lua", "Installs client-Side Lua into your client.", (string[] args) => commands.Add(new Command("install_cl_lua", "Installs Client-Side Lua into your client.", (string[] args) =>
{ {
ContentPackage luaCsPackage = LuaCsSetup.GetPackage(); ContentPackage luaPackage = LuaCsSetup.GetPackage("LuaForBarotraumaUnstable");
if (luaCsPackage == null) if (luaPackage == null)
{ {
GameMain.Server.SendChatMessage("Couldn't find the LuaCsForBarotrauma package.", ChatMessageType.ServerMessageBox); GameMain.Server.SendChatMessage("Couldn't find the LuaCsForBarotrauma package.", ChatMessageType.ServerMessageBox);
return; return;
@@ -1267,7 +1267,7 @@ namespace Barotrauma
try try
{ {
string path = Path.GetDirectoryName(luaCsPackage.Path); string path = Path.GetDirectoryName(luaPackage.Path);
string[] filesToCopy = new string[] string[] filesToCopy = new string[]
{ {
@@ -1297,7 +1297,7 @@ namespace Barotrauma
File.Copy(Path.Combine(path, "Binary", file), file, true); File.Copy(Path.Combine(path, "Binary", file), file, true);
} }
File.WriteAllText(LuaCsSetup.VERSION_FILE, luaCsPackage.ModVersion); File.WriteAllText(LuaCsSetup.VERSION_FILE, luaPackage.ModVersion);
} }
catch (UnauthorizedAccessException e) catch (UnauthorizedAccessException e)
{ {
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
+21 -17
View File
@@ -43,11 +43,11 @@ namespace Barotrauma
} }
public static ContentPackage GetPackage() public static ContentPackage GetPackage(Identifier name)
{ {
foreach (ContentPackage package in ContentPackageManager.LocalPackages) foreach (ContentPackage package in ContentPackageManager.LocalPackages)
{ {
if (package.NameMatches(new Identifier("LuaCsForBarotraumaUnstable"))) if (package.NameMatches(name))
{ {
return package; return package;
} }
@@ -55,7 +55,7 @@ namespace Barotrauma
foreach (ContentPackage package in ContentPackageManager.AllPackages) foreach (ContentPackage package in ContentPackageManager.AllPackages)
{ {
if (package.NameMatches(new Identifier("LuaCsForBarotraumaUnstable"))) if (package.NameMatches(name))
{ {
return package; return package;
} }
@@ -302,8 +302,6 @@ namespace Barotrauma
LuaScriptLoader = new LuaScriptLoader(); LuaScriptLoader = new LuaScriptLoader();
LuaScriptLoader.ModulePaths = new string[] { }; LuaScriptLoader.ModulePaths = new string[] { };
NetScriptLoader = new CsScriptLoader(this);
LuaCustomConverters.RegisterAll(); LuaCustomConverters.RegisterAll();
lua = new Script(CoreModules.Preset_SoftSandbox | CoreModules.Debug); lua = new Script(CoreModules.Preset_SoftSandbox | CoreModules.Debug);
@@ -358,21 +356,27 @@ namespace Barotrauma
// LuaDocs.GenerateDocsAll(); // LuaDocs.GenerateDocsAll();
ContentPackage csPackage = GetPackage("CsForBarotrauma");
NetScriptLoader.SearchFolders();
if (NetScriptLoader == null) throw new Exception("LuaCsSetup was not properly initialized."); if (csPackage != null)
try
{ {
var modTypes = NetScriptLoader.Compile(); NetScriptLoader = new CsScriptLoader(this);
modTypes.ForEach(t => t.GetConstructor(new Type[] { })?.Invoke(null));
} NetScriptLoader.SearchFolders();
catch (Exception ex) try
{ {
HandleException(ex, exceptionType: ExceptionType.CSharp); var modTypes = NetScriptLoader.Compile();
modTypes.ForEach(t => t.GetConstructor(new Type[] { })?.Invoke(null));
}
catch (Exception ex)
{
HandleException(ex, exceptionType: ExceptionType.CSharp);
}
} }
ContentPackage luaCsPackage = GetPackage(); ContentPackage luaPackage = GetPackage("LuaForBarotraumaUnstable");
if (File.Exists(LUASETUP_FILE)) if (File.Exists(LUASETUP_FILE))
{ {
@@ -385,9 +389,9 @@ namespace Barotrauma
HandleException(e); HandleException(e);
} }
} }
else if (luaCsPackage != null) else if (luaPackage != null)
{ {
string path = Path.GetDirectoryName(luaCsPackage.Path); string path = Path.GetDirectoryName(luaPackage.Path);
try try
{ {