Merge branch 'main' into release

config_player.xml

@@ -3,10 +3,11 @@
   <contentpackages>
     <corepackage path="Content/ContentPackages/Vanilla.xml" />
     <regularpackages>
+      <package path="LocalMods/LuaCsForBarotrauma/filelist.xml" />
       <package path="LocalMods/NT Informative Descriptions/filelist.xml" />
-      <package path="LocalMods/LuaCsClientSideEnforced/filelist.xml" />
       <package path="LocalMods/Total Russian Translation (TRT)/filelist.xml" />
       <package path="LocalMods/Endgame Reforged/filelist.xml" />
+      <package path="LocalMods/BaroCraftables (No Limits)/filelist.xml" />
       <package path="LocalMods/Dont Open Debug Console On Errors/filelist.xml" />
       <package path="LocalMods/Enhanced Loading/filelist.xml" />
       <package path="LocalMods/MicroLua/filelist.xml" />
@@ -32,22 +33,20 @@
       <package path="LocalMods/Bigger Deconstructor/filelist.xml" />
       <package path="LocalMods/NT Medical Exosuit 醫療外骨骼/filelist.xml" />
       <package path="LocalMods/Decon pls/filelist.xml" />
-      <package path="LocalMods/Bigger Deconstructor Barocraftables+ (No Limits)/filelist.xml" />
       <package path="LocalMods/Visual Variety Pack Modified/filelist.xml" />
       <package path="LocalMods/Enhanced Immersion (NO ITEMS OVERRIDE)/filelist.xml" />
       <package path="LocalMods/Epic accordion/filelist.xml" />
       <package path="LocalMods/Press-R-to-Reload/filelist.xml" />
       <package path="LocalMods/Better Genes/filelist.xml" />
       <package path="LocalMods/More Content for Europa/filelist.xml" />
-      <package path="LocalMods/Thalassophobia Restored/filelist.xml" />
       <package path="LocalMods/Blueprints/filelist.xml" />
       <package path="LocalMods/Monospaced Text Display/filelist.xml" />
       <package path="LocalMods/Sunken Tapes/filelist.xml" />
       <package path="LocalMods/TSFX/filelist.xml" />
       <package path="LocalMods/Fourth Empire Posters/filelist.xml" />
-      <package path="LocalMods/NCT-Spike Mod. 2/filelist.xml" />
       <package path="LocalMods/VT-MOFS Mod. 4/filelist.xml" />
       <package path="LocalMods/ADX-Atlas IV/filelist.xml" />
+      <package path="LocalMods/NCT-Spike Mod.1/filelist.xml" />
     </regularpackages>
   </contentpackages>
 </Barotrauma>

prep

@@ -10,7 +10,9 @@ PREPARE_LOCAL = os.path.join(BASE, "prepare_local")
 AUTOGEN = os.path.join(BASE, "scripts", "autogen_config.py")
 LOCALMODS_DIR = os.path.join(BASE, "LocalMods")
 
-RSYNC_DEST = "root@homelabvm:/opt/barotrauma/LocalMods/"
+RSYNC_DEST = "root@barotrauma:/opt/barotrauma/LocalMods/"
+CONFIG_PATH = os.path.join(BASE, "config_player.xml")
+RSYNC_SSH = "ssh -p 22"
 
 
 def log_ok(msg):
@@ -27,31 +29,40 @@ def main():
     msg = " ".join(sys.argv[1:]) if len(sys.argv) > 1 else "Update LocalMods"
 
     print()
-    print("╔═══════════════════════════════════════╗")
-    print("║  Prep: mods → rsync → config → commit║")
-    print("╚═══════════════════════════════════════╝")
+    print("╔══════════════════════════════════════════╗")
+    print("║  Prep: mods → config → rsync → commit   ║")
+    print("╚══════════════════════════════════════════╝")
     print()
 
-    log_info("Step 1/4: Copy mods from workshop...")
+    log_info("Step 1/5: Copy mods from workshop...")
     subprocess.run([sys.executable, PREPARE_LOCAL], check=True)
     log_ok("LocalMods ready")
     print()
 
-    log_info("Step 2/4: Rsyncing LocalMods/ to server...")
-    subprocess.run([
-        "rsync", "-avz", "--delete",
-        "-e", "ssh -p 22",
-        LOCALMODS_DIR + "/", RSYNC_DEST
-    ], check=True)
-    log_ok("LocalMods synced to homelabvm")
-    print()
-
-    log_info("Step 3/4: Generating config_player.xml...")
+    log_info("Step 2/5: Generating config_player.xml...")
     subprocess.run([sys.executable, AUTOGEN], check=True)
     log_ok("config_player.xml generated")
     print()
 
-    log_info("Step 4/4: Committing...")
+    log_info("Step 3/5: Rsyncing LocalMods/ to server...")
+    subprocess.run([
+        "rsync", "-avz", "--delete",
+        "-e", RSYNC_SSH,
+        LOCALMODS_DIR + "/", RSYNC_DEST
+    ], check=True)
+    log_ok("LocalMods synced")
+    print()
+
+    log_info("Step 4/5: Rsyncing config_player.xml to server...")
+    subprocess.run([
+        "rsync", "-avz",
+        "-e", RSYNC_SSH,
+        CONFIG_PATH, "root@barotrauma:/opt/barotrauma/config_player.xml"
+    ], check=True)
+    log_ok("config_player.xml synced")
+    print()
+
+    log_info("Step 5/5: Committing...")
     subprocess.run(["git", "add", "-A"], cwd=BASE, check=True)
     subprocess.run(["git", "commit", "-m", msg], cwd=BASE, check=True)
     log_ok(f"Committed: {msg}")