Add Full Hybrid ACZ provider.

This permits rsc resources to be combined with the Content.Client.zip Hybrid ACZ.

Also update RT

OpenDreamPackaging/DreamPackaging.cs

@@ -1,5 +1,6 @@
 using Robust.Packaging;
 using Robust.Packaging.AssetProcessing;
+using Robust.Packaging.AssetProcessing.Passes;
 
 namespace OpenDreamPackaging;
 
@@ -28,6 +29,13 @@ await RobustSharedPackaging.WriteContentAssemblies(
 
         await RobustClientPackaging.WriteClientResources(contentDir, inputPass, cancel);
 
+        WriteRscResources(dreamRootDir, resources, inputPass);
+
+        inputPass.InjectFinished();
+    }
+
+    public static void WriteRscResources(string dreamRootDir, string[] resources, AssetPassPipe inputPass)
+    {
         for (var i = 0; i < resources.Length; i++) {
             var resource = resources[i].Replace('\\', Path.DirectorySeparatorChar);
             // The game client only knows a resource ID, so that's what we name the files.
@@ -37,7 +45,5 @@ await RobustSharedPackaging.WriteContentAssemblies(
 
             inputPass.InjectFileFromDisk(path, diskPath);
         }
-
-        inputPass.InjectFinished();
     }
 }

OpenDreamRuntime/DreamAczProvider.cs

@@ -0,0 +1,43 @@
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using OpenDreamPackaging;
+using Robust.Packaging;
+using Robust.Packaging.AssetProcessing;
+using Robust.Server.ServerStatus;
+
+namespace OpenDreamRuntime;
+
+public sealed class DreamAczProvider : IMagicAczProvider, IFullHybridAczProvider {
+    private readonly IDependencyCollection _dependencies;
+    private readonly string _rootPath;
+    private readonly string[] _resources;
+
+    public DreamAczProvider(IDependencyCollection dependencies, string rootPath, string[] resources) {
+        _dependencies = dependencies;
+        _rootPath = rootPath;
+        _resources = resources;
+    }
+
+    public async Task Package(AssetPass pass, IPackageLogger logger, CancellationToken cancel) {
+        var contentDir = DefaultMagicAczProvider.FindContentRootPath(_dependencies);
+
+        await DreamPackaging.WriteResources(contentDir, _rootPath, _resources, pass, logger, cancel);
+    }
+
+    public Task Package(AssetPass hybridPackageInput, AssetPass output, IPackageLogger logger, CancellationToken cancel) {
+        var clientAssetGraph = new RobustClientAssetGraph();
+        var resourceInput = clientAssetGraph.Input;
+        output.AddDependency(clientAssetGraph.Output);
+        output.AddDependency(hybridPackageInput);
+
+        AssetGraph.CalculateGraph(
+            clientAssetGraph.AllPasses.Concat(new[] { hybridPackageInput, output }).ToArray(),
+            logger);
+
+        DreamPackaging.WriteRscResources(_rootPath, _resources, resourceInput);
+        resourceInput.InjectFinished();
+
+        return Task.CompletedTask;
+    }
+}

OpenDreamRuntime/DreamManager.cs

@@ -146,9 +146,9 @@ public bool LoadJson(string? jsonPath) {
 
             _dreamMapManager.LoadMaps(_compiledJson.Maps);
 
-            _statusHost.SetMagicAczProvider(new DreamMagicAczProvider(
-                _dependencyCollection, rootPath, resources
-            ));
+            var aczProvider = new DreamAczProvider(_dependencyCollection, rootPath, resources);
+            _statusHost.SetMagicAczProvider(aczProvider);
+            _statusHost.SetFullHybridAczProvider(aczProvider);
 
             return true;
         }