From 2bd4bf12a40b7232904d0bb68ea0cda1c480b305 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 6 Jan 2021 22:49:19 +1100
Subject: [PATCH] Utensils changes (#2929)

* Utensils changes

* Burn it all

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
---
 .../Components/Nutrition/FoodComponent.cs     |  3 --
 .../Components/Utensil/UtensilComponent.cs    | 42 +++++++++++--------
 .../Utensil/SharedUtensilComponent.cs         | 21 ----------
 3 files changed, 24 insertions(+), 42 deletions(-)
 delete mode 100644 Content.Shared/GameObjects/Components/Utensil/SharedUtensilComponent.cs

diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
index bea683e309..1b07a6bdce 100644
--- a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
+++ b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
@@ -10,9 +10,6 @@ using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Utensil;
 using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Behavior;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Utensil;
 using Content.Shared.Interfaces;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Utility;
diff --git a/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs b/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs
index 870931026e..b3dfe87c6b 100644
--- a/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs
+++ b/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs
@@ -1,13 +1,14 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.GameObjects.Components.Utensil;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Utility;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
@@ -18,21 +19,22 @@ using Robust.Shared.ViewVariables;
 namespace Content.Server.GameObjects.Components.Utensil
 {
     [RegisterComponent]
-    public class UtensilComponent : SharedUtensilComponent, IAfterInteract
+    public class UtensilComponent : Component, IAfterInteract
     {
-        [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
+        public override string Name => "Utensil";
 
-        protected UtensilType _types = UtensilType.None;
+        private UtensilType _types = UtensilType.None;
 
         [ViewVariables]
-        public override UtensilType Types
+        public UtensilType Types
         {
             get => _types;
             set
             {
+                if (_types.Equals(value))
+                    return;
+
                 _types = value;
-                Dirty();
             }
         }
 
@@ -47,7 +49,7 @@ namespace Content.Server.GameObjects.Components.Utensil
         /// The sound to be played if the utensil breaks.
         /// </summary>
         [ViewVariables]
-        private string _breakSound;
+        private string? _breakSound;
 
         public void AddType(UtensilType type)
         {
@@ -61,7 +63,7 @@ namespace Content.Server.GameObjects.Components.Utensil
 
         public bool HasType(UtensilType type)
         {
-            return _types.HasFlag(type);
+            return (_types & type) != 0;
         }
 
         public void RemoveType(UtensilType type)
@@ -71,9 +73,9 @@ namespace Content.Server.GameObjects.Components.Utensil
 
         internal void TryBreak(IEntity user)
         {
-            if (_random.Prob(_breakChance))
+            if (_breakSound != null && IoCManager.Resolve<IRobustRandom>().Prob(_breakChance))
             {
-                _entitySystem.GetEntitySystem<AudioSystem>()
+                EntitySystem.Get<AudioSystem>()
                     .PlayFromEntity(_breakSound, user, AudioParams.Default.WithVolume(-2f));
                 Owner.Delete();
             }
@@ -112,12 +114,7 @@ namespace Content.Server.GameObjects.Components.Utensil
 
         private void TryUseUtensil(IEntity user, IEntity target)
         {
-            if (user == null || target == null)
-            {
-                return;
-            }
-
-            if (!target.TryGetComponent(out FoodComponent food))
+            if (!target.TryGetComponent(out FoodComponent? food))
             {
                 return;
             }
@@ -130,4 +127,13 @@ namespace Content.Server.GameObjects.Components.Utensil
             food.TryUseFood(user, null, this);
         }
     }
+
+    [Flags]
+    public enum UtensilType : byte
+    {
+        None = 0,
+        Fork = 1,
+        Spoon = 1 << 1,
+        Knife = 1 << 2
+    }
 }
diff --git a/Content.Shared/GameObjects/Components/Utensil/SharedUtensilComponent.cs b/Content.Shared/GameObjects/Components/Utensil/SharedUtensilComponent.cs
deleted file mode 100644
index faccf1287d..0000000000
--- a/Content.Shared/GameObjects/Components/Utensil/SharedUtensilComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using Robust.Shared.GameObjects;
-
-namespace Content.Shared.GameObjects.Components.Utensil
-{
-    [Flags]
-    public enum UtensilType : byte
-    {
-        None = 0,
-        Fork = 1,
-        Spoon = 1 << 1,
-        Knife = 1 << 2
-    }
-
-    public class SharedUtensilComponent : Component
-    {
-        public override string Name => "Utensil";
-
-        public virtual UtensilType Types { get; set; }
-    }
-}