Rename MelvinTarget to MelvinTargetable to match other components

Author: aonkeeper4

src/CommunalHelperModule.cs

@@ -115,7 +115,7 @@ public override void Load()
         PoisonGas.Load();
         AffectSpriteTrigger.Load();
 
-        MelvinTarget.Load();
+        MelvinTargetable.Load();
 
         #region Imports
 
@@ -209,7 +209,7 @@ public override void Unload()
         PoisonGas.Unload();
         AffectSpriteTrigger.Unload();
 
-        MelvinTarget.Unload();
+        MelvinTargetable.Unload();
 
         LaserEmitter.Unload();
     }

src/Components/MelvinTarget.cs src/Components/MelvinTargetable.cssrc/Components/MelvinTarget.cs renamed to src/Components/MelvinTargetable.cs

@@ -1,41 +1,41 @@
-namespace Celeste.Mod.CommunalHelper.Components;
-
-/// <summary>
-/// Component to mark entities which should be attacked by Melvins.
-/// </summary>
-[Tracked]
-public class MelvinTarget : Component
-{
-    public MelvinTarget() : base(false, false)
-    {
-    }
-    
-    #region Hooks
-
-    internal static void Load()
-    {
-        Everest.Events.Player.OnSpawn += OnSpawn;
-        Everest.Events.AssetReload.OnBeforeReload += OnBeforeReload;
-    }
-
-    internal static void Unload()
-    {
-        Everest.Events.Player.OnSpawn -= OnSpawn;
-        Everest.Events.AssetReload.OnBeforeReload -= OnBeforeReload;
-    }
-
-    private static void OnSpawn(Player player)
-    {
-        if (player.Get<MelvinTarget>() is null)
-            player.Add(new MelvinTarget());
-    }
-
-    private static void OnBeforeReload(bool silent)
-    {
-        // Remove component before reload so the player doesn't end up with more than 1
-        if (Engine.Scene?.Tracker?.GetEntity<Player>() is Player player)
-            player.Remove(player.Get<MelvinTarget>());
-    }
-    
-    #endregion
-}
+namespace Celeste.Mod.CommunalHelper.Components;
+
+/// <summary>
+/// Component to mark entities which should be attacked by Melvins.
+/// </summary>
+[Tracked]
+public class MelvinTargetable : Component
+{
+    public MelvinTargetable() : base(false, false)
+    {
+    }
+    
+    #region Hooks
+
+    internal static void Load()
+    {
+        Everest.Events.Player.OnSpawn += OnSpawn;
+        Everest.Events.AssetReload.OnBeforeReload += OnBeforeReload;
+    }
+
+    internal static void Unload()
+    {
+        Everest.Events.Player.OnSpawn -= OnSpawn;
+        Everest.Events.AssetReload.OnBeforeReload -= OnBeforeReload;
+    }
+
+    private static void OnSpawn(Player player)
+    {
+        if (player.Get<MelvinTargetable>() is null)
+            player.Add(new MelvinTargetable());
+    }
+
+    private static void OnBeforeReload(bool silent)
+    {
+        // Remove component before reload so the player doesn't end up with more than 1
+        if (Engine.Scene?.Tracker?.GetEntity<Player>() is Player player)
+            player.Remove(player.Get<MelvinTargetable>());
+    }
+    
+    #endregion
+}

src/Entities/Misc/Melvin.cs

@@ -859,7 +859,7 @@ private bool IsPlayerSeen(Rectangle rect, ArrowDir dir)
 
     private IEnumerable<Entity> GetTargetsByDistance()
     {
-        List<Component> targets = SceneAs<Level>().Tracker.GetComponents<MelvinTarget>();
+        List<Component> targets = SceneAs<Level>().Tracker.GetComponents<MelvinTargetable>();
         targets.Sort((target1, target2) => Vector2.DistanceSquared(Center, target1.Entity.Position).CompareTo(Vector2.DistanceSquared(Center, target2.Entity.Position)));
         return targets.Select(t => t.Entity);
     }

src/Exports.cs

@@ -63,9 +63,9 @@ public static class Entities
 
         #region Melvin
 
-        public static Component MelvinTarget()
+        public static Component MelvinTargetable()
         {
-            return new MelvinTarget();
+            return new MelvinTargetable();
         }
 
         #endregion