Predict Forensics V2.0

Content.Client/Forensics/ForensicScannerBoundUserInterface.cs

@@ -29,24 +29,15 @@ protected override void Open()
 
         private void Print()
         {
-            SendMessage(new ForensicScannerPrintMessage());
+            SendPredictedMessage(new ForensicScannerPrintMessage());
 
             if (_window != null)
                 _window.UpdatePrinterState(true);
-
-            // This UI does not require pinpoint accuracy as to when the Print
-            // button is available again, so spawning client-side timers is
-            // fine. The server will make sure the cooldown is honored.
-            Timer.Spawn(_printCooldown, () =>
-            {
-                if (_window != null)
-                    _window.UpdatePrinterState(false);
-            });
         }
 
         private void Clear()
         {
-            SendMessage(new ForensicScannerClearMessage());
+            SendPredictedMessage(new ForensicScannerClearMessage());
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
@@ -60,15 +51,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 return;
 
             _printCooldown = cast.PrintCooldown;
-
-            // TODO: Fix this
-            if (cast.PrintReadyAt > _gameTiming.CurTime)
-                Timer.Spawn(cast.PrintReadyAt - _gameTiming.CurTime, () =>
-                {
-                    if (_window != null)
-                        _window.UpdatePrinterState(false);
-                });
-
             _window.UpdateState(cast);
         }
     }

Content.Client/Forensics/ForensicScannerMenu.xaml.cs

@@ -54,13 +54,13 @@ public void UpdateState(ForensicScannerBoundUserInterfaceState msg)
             }
             text.AppendLine();
             text.AppendLine(Loc.GetString("forensic-scanner-interface-dnas"));
-            foreach (var dna in msg.TouchDNAs)
+            foreach (var dna in msg.Dnas)
             {
                 text.AppendLine(dna);
             }
             foreach (var dna in msg.SolutionDNAs)
             {
-                if (msg.TouchDNAs.Contains(dna))
+                if (msg.Dnas.Contains(dna))
                     continue;
                 text.AppendLine(dna);
             }

Content.Server/Body/Systems/BloodstreamSystem.cs

@@ -40,7 +40,6 @@ private void OnComponentInit(Entity<BloodstreamComponent> entity, ref ComponentI
         bloodSolution.AddReagent(new ReagentId(entity.Comp.BloodReagent, GetEntityBloodData(entity.Owner)), entity.Comp.BloodMaxVolume - bloodSolution.Volume);
     }
 
-    // forensics is not predicted yet
     private void OnDnaGenerated(Entity<BloodstreamComponent> entity, ref GenerateDnaEvent args)
     {
         if (SolutionContainer.ResolveSolution(entity.Owner, entity.Comp.BloodSolutionName, ref entity.Comp.BloodSolution, out var bloodSolution))

Content.Server/Cloning/CloningSystem.Subscriptions.cs

@@ -1,7 +1,8 @@
-using Content.Server.Forensics;
 using Content.Server.Speech.EntitySystems;
 using Content.Shared.Cloning.Events;
 using Content.Shared.FixedPoint;
+using Content.Shared.Forensics.Components;
+using Content.Shared.Forensics.Systems;
 using Content.Shared.Inventory;
 using Content.Shared.Labels.Components;
 using Content.Shared.Labels.EntitySystems;
@@ -82,7 +83,7 @@ private void OnCloneItemPaper(Entity<PaperComponent> ent, ref CloningItemEvent a
     private void OnCloneItemForensics(Entity<ForensicsComponent> ent, ref CloningItemEvent args)
     {
         // copy any forensics to the cloned item
-        _forensics.CopyForensicsFrom(ent.Comp, args.CloneUid);
+        _forensics.CopyForensicsFrom(ent.Owner, args.CloneUid);
     }
 
     private void OnCloneItemStore(Entity<StoreComponent> ent, ref CloningItemEvent args)

Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs

@@ -1,7 +1,6 @@
 using System.Numerics;
-using Content.Server.Forensics;
-using Content.Server.Stack;
 using Content.Shared.Destructible.Thresholds;
+using Content.Shared.Forensics.Components;
 using Content.Shared.Prototypes;
 using Content.Shared.Stacks;
 using Robust.Server.GameObjects;