Revert "ACZ fixes (#1573)"

OpenDreamPackaging/DreamPackaging.cs

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

OpenDreamRuntime/DreamMagicAczProvider.cs

@@ -0,0 +1,26 @@
+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 DreamMagicAczProvider : IMagicAczProvider {
+    private readonly IDependencyCollection _dependencies;
+    private readonly string _rootPath;
+    private readonly string[] _resources;
+
+    public DreamMagicAczProvider(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);
+    }
+}

OpenDreamRuntime/DreamManager.cs

@@ -116,7 +116,7 @@ public bool LoadJson(string? jsonPath) {
             }
 
             _compiledJson = json;
-            var rootPath = Path.GetFullPath(Path.GetDirectoryName(jsonPath)!);
+            var rootPath = 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);
 
-            var aczProvider = new DreamAczProvider(_dependencyCollection, rootPath, resources);
-            _statusHost.SetMagicAczProvider(aczProvider);
-            _statusHost.SetFullHybridAczProvider(aczProvider);
+            _statusHost.SetMagicAczProvider(new DreamMagicAczProvider(
+                _dependencyCollection, rootPath, resources
+            ));
 
             return true;
         }

OpenDreamRuntime/EntryPoint.cs

@@ -25,6 +25,10 @@ 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();