From dc5cbd085b2daff4b9b0982bda7eae61501df1f3 Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers+git@gmail.com>
Date: Sat, 26 Jul 2025 02:08:34 +0200
Subject: [PATCH] Enable RSI packing pass in RobustClientAssetGraph

---
 Robust.Packaging/RobustClientAssetGraph.cs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Robust.Packaging/RobustClientAssetGraph.cs b/Robust.Packaging/RobustClientAssetGraph.cs
index c6404cf83..1d5b3c6b8 100644
--- a/Robust.Packaging/RobustClientAssetGraph.cs
+++ b/Robust.Packaging/RobustClientAssetGraph.cs
@@ -17,7 +17,7 @@ public sealed class RobustClientAssetGraph
     public AssetPassNormalizeText NormalizeText { get; }
     public AssetPassMergeTextDirectories MergePrototypeDirectories { get; }
     public AssetPassMergeTextDirectories MergeLocaleDirectories { get; }
-    // internal AssetPassPackRsis PackRsis { get; }
+    public AssetPassPackRsis PackRsis { get; }
 
     /// <summary>
     /// Collection of all passes in this preset graph.
@@ -50,21 +50,24 @@ public sealed class RobustClientAssetGraph
         {
             Name = "RobustClientAssetGraphMergeLocaleDirectories"
         };
-        // PackRsis = new AssetPassPackRsis
-        // {
-        //     Name = "RobustClientAssetGraphPackRsis",
-        // };
+        PackRsis = new AssetPassPackRsis
+        {
+            Name = "RobustClientAssetGraphPackRsis",
+        };
 
         PresetPasses.AddDependency(Input);
-        //PackRsis.AddDependency(PresetPasses).AddBefore(NormalizeText);
+        PackRsis.AddDependency(PresetPasses).AddBefore(NormalizeText);
         MergePrototypeDirectories.AddDependency(PresetPasses).AddBefore(NormalizeText);
         MergeLocaleDirectories.AddDependency(PresetPasses).AddBefore(NormalizeText);
         NormalizeText.AddDependency(PresetPasses).AddBefore(Output);
+        // RSI packing goes through text normalization,
+        // to catch meta.jsons that have been skipped by the RSI packing pass.
+        NormalizeText.AddDependency(PackRsis).AddBefore(Output);
         Output.AddDependency(PresetPasses);
         Output.AddDependency(NormalizeText);
         Output.AddDependency(MergePrototypeDirectories);
         Output.AddDependency(MergeLocaleDirectories);
-        //Output.AddDependency(PackRsis);
+        Output.AddDependency(PackRsis);
 
         AllPasses = new AssetPass[]
         {
@@ -74,7 +77,7 @@ public sealed class RobustClientAssetGraph
             NormalizeText,
             MergePrototypeDirectories,
             MergeLocaleDirectories,
-            // texPackRsis
+            PackRsis
         };
     }
 }