Fix Packaging TEST

Content.Packaging/ClientPackaging.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO.Compression;
 using Robust.Packaging;
 using Robust.Packaging.AssetProcessing;
@@ -10,7 +10,6 @@ namespace Content.Packaging;
 
 public static class ClientPackaging
 {
-    private static readonly bool UseSecrets = File.Exists(Path.Combine("Secrets", "CorvaxSecrets.sln")); // Corvax-Secrets
     /// <summary>
     /// Be advised this can be called from server packaging during a HybridACZ build.
     /// </summary>
@@ -35,24 +34,6 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
                     "/m"
                 }
             });
-            if (UseSecrets)
-            {
-                await ProcessHelpers.RunCheck(new ProcessStartInfo
-                {
-                    FileName = "dotnet",
-                    ArgumentList =
-                    {
-                        "build",
-                        Path.Combine("Secrets","Content.Corvax.Client", "Content.Corvax.Client.csproj"),
-                        "-c", "Release",
-                        "--nologo",
-                        "/v:m",
-                        "/t:Rebuild",
-                        "/p:FullRelease=true",
-                        "/m"
-                    }
-                });
-            }
         }
 
         logger.Info("Packaging client...");
@@ -84,40 +65,15 @@ public static async Task WriteResources(
 
         var inputPass = graph.Input;
 
-        // Corvax-Secrets-Start: Add Corvax interfaces to Magic ACZ
-        var assemblies = new List<string> { "Content.Client", "Content.Shared", "Content.Shared.Database", "Content.Corvax.Interfaces.Client", "Content.Corvax.Interfaces.Shared" };
-        if (UseSecrets)
-            assemblies.AddRange(new[] { "Content.Corvax.Shared", "Content.Corvax.Client" });
-        // Corvax-Secrets-End
-
         await RobustSharedPackaging.WriteContentAssemblies(
             inputPass,
             contentDir,
             "Content.Client",
-            assemblies, // Corvax-Secrets
+            new[] { "Content.Client", "Content.Shared", "Content.Shared.Database" },
             cancel: cancel);
 
-        await WriteClientResources(contentDir, pass, cancel); // Corvax-Secrets: Support content resource ignore to ignore server-only prototypes
+        await RobustClientPackaging.WriteClientResources(contentDir, pass, cancel);
 
         inputPass.InjectFinished();
     }
-
-    // Corvax-Secrets-Start
-    public static IReadOnlySet<string> ContentClientIgnoredResources { get; } = new HashSet<string>
-    {
-        "CorvaxSecretsServer"
-    };
-
-    private static async Task WriteClientResources(
-        string contentDir,
-        AssetPass pass,
-        CancellationToken cancel = default)
-    {
-        var ignoreSet = RobustClientPackaging.ClientIgnoredResources
-            .Union(RobustSharedPackaging.SharedIgnoredResources)
-            .Union(ContentClientIgnoredResources).ToHashSet();
-
-        await RobustSharedPackaging.DoResourceCopy(Path.Combine(contentDir, "Resources"), pass, ignoreSet, cancel: cancel);
-    }
-    // Corvax-Secrets-End
 }

Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs

@@ -12,7 +12,7 @@ public sealed class PanicBunkerStatus
     public bool ShowReason;
     public int MinAccountAgeMinutes;
     public int MinOverallMinutes;
-    public bool DenyVpn; // Corvax-VPNGuard
+    //public bool DenyVpn; // Corvax-VPNGuard
 }
 
 [Serializable, NetSerializable]

Resources/ConfigPresets/Corvax/athara.toml

@@ -11,7 +11,7 @@ enabled = true
 show_reason = true
 min_account_age = 0
 min_overall_minutes = 0
-deny_vpn = true
+#deny_vpn = true #FIX ADT
 enable_without_admins = true
 disable_with_admins = true
 

Resources/ConfigPresets/Corvax/elysium.toml

@@ -11,7 +11,7 @@ enabled = true
 show_reason = true
 min_account_age = 0
 min_overall_minutes = 0
-deny_vpn = true
+#deny_vpn = true #ADT Fix
 enable_without_admins = true
 disable_with_admins = true
 

Resources/ConfigPresets/Corvax/main.toml

@@ -11,7 +11,7 @@ enabled = true
 show_reason = true
 min_account_age = 0
 min_overall_minutes = 0
-deny_vpn = true
+#deny_vpn = true # Fix ADT
 enable_without_admins = true
 disable_with_admins = true
 

Resources/ConfigPresets/Corvax/nebula.toml

@@ -11,7 +11,7 @@ enabled = true
 show_reason = true
 min_account_age = 0
 min_overall_minutes = 0
-deny_vpn = true
+#deny_vpn = true # FIX ADT
 enable_without_admins = true
 disable_with_admins = true
 

Resources/ConfigPresets/Corvax/solaris.toml

@@ -11,7 +11,7 @@ enabled = true
 show_reason = true
 min_account_age = 0
 min_overall_minutes = 0
-deny_vpn = true
+#deny_vpn = true #ADT Fix
 enable_without_admins = true
 disable_with_admins = true