ACZ fixes (OpenDreamProject#1573)

* Fix packaging

* Fix ACZ root path being wrong if using relative JSON path

The JSON path is relative to the original working directory of the file. However the server switches working directory during initialization of DreamResourceManager, which invalidates the old path. This old path was still passed to ACZ, so using a relative JSON path would make ACZ unable to find rsc files.

The path is now turned absolute before the working directory switch occurs.

* Add Full Hybrid ACZ provider.

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

Also update RT

* Update OpenDreamPackaging/DreamPackaging.cs

---------

Co-authored-by: wixoa <[email protected]>

OpenDreamPackaging/DreamPackaging.cs

@@ -1,5 +1,6 @@
 using Robust.Packaging;
 using Robust.Packaging.AssetProcessing;
+using Robust.Packaging.AssetProcessing.Passes;
 
 namespace OpenDreamPackaging;
 
@@ -19,13 +20,21 @@ public static async Task WriteResources(
 
         var inputPass = graph.Input;
 
-        await RobustClientPackaging.WriteClientResources(
-            contentDir,
+        await RobustSharedPackaging.WriteContentAssemblies(
             inputPass,
-            cancel);
+            contentDir,
+            "Content.Client",
+            new[] { "OpenDreamClient", "OpenDreamShared" },
+            cancel: cancel);
 
         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.
@@ -35,7 +44,5 @@ await RobustClientPackaging.WriteClientResources(
 
             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

@@ -116,7 +116,7 @@ public bool LoadJson(string? jsonPath) {
             }
 
             _compiledJson = json;
-            var rootPath = Path.GetDirectoryName(jsonPath)!;
+            var rootPath = Path.GetFullPath(Path.GetDirectoryName(jsonPath)!);
             var resources = _compiledJson.Resources ?? Array.Empty<string>();
             _dreamResourceManager.Initialize(rootPath, resources);
             if(!string.IsNullOrEmpty(_compiledJson.Interface) && !_dreamResourceManager.DoesFileExist(_compiledJson.Interface))
@@ -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;
         }

OpenDreamRuntime/EntryPoint.cs

@@ -25,10 +25,6 @@ public sealed class EntryPoint : GameServer {
         private DreamCommandSystem? _commandSystem;
 
         public override void Init() {
-            IoCManager.Resolve<IStatusHost>().SetMagicAczProvider(new DefaultMagicAczProvider(
-                new DefaultMagicAczInfo("Content.Client", new[] {"OpenDreamClient", "OpenDreamShared"}),
-                IoCManager.Resolve<IDependencyCollection>()));
-
             IComponentFactory componentFactory = IoCManager.Resolve<IComponentFactory>();
             componentFactory.DoAutoRegistrations();