Created BaseToolHandler to abstract common tasks when sending and rec…

…eiving commands

src/csm/CSM.csproj

@@ -117,6 +117,7 @@
     <Compile Include="Injections\Tools\BuildingToolHandler.cs" />
     <Compile Include="Injections\Tools\DefaultToolHandler.cs" />
     <Compile Include="Injections\Tools\ToolManagerOverlayRenderer.cs" />
+    <Compile Include="Injections\Tools\BaseToolHandler.cs" />
     <Compile Include="Models\ColorSurrogate.cs" />
     <Compile Include="Models\QuaternionSurrogate.cs" />
     <Compile Include="Models\ControlPointSurrogate.cs" />
@@ -180,4 +181,4 @@
     <PostBuildEvent Condition="$([MSBuild]::IsOsPlatform('linux'))">pwsh "$(SolutionDir)scripts/build.ps1" -OutputDirectory "$(TargetDir)" -Install</PostBuildEvent>
     <PostBuildEvent Condition="$([MSBuild]::IsOsPlatform('osx'))">pwsh "$(SolutionDir)scripts/build.ps1" -OutputDirectory "$(TargetDir)" -Install</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

src/csm/Injections/Tools/BaseToolHandler.cs

@@ -0,0 +1,32 @@
+using CSM.API;
+using CSM.API.Commands;
+using CSM.Networking;
+using CSM.BaseGame.Helpers;
+using CSM.API.Helpers;
+using ColossalFramework;
+using ICities;
+using CSM.BaseGame;
+using CSM.Helpers;
+using UnityEngine;
+
+namespace CSM.Injections.Tools
+{
+    public abstract class BaseToolCommandHandler<Command, Tool> : CommandHandler<Command> where Command: CommandBase where Tool: ToolBase 
+    {
+
+        protected override void Handle(Command command)
+        {
+            if (!MultiplayerManager.Instance.IsConnected())
+            {
+                // Ignore packets while not connected
+                return;
+            }
+            var buildingTool = Singleton<ToolSimulator>.instance.GetTool<Tool>(command.SenderId);
+
+            Configure(buildingTool, command);
+
+        }
+
+        protected abstract void Configure(Tool tool, Command command);
+    }
+}

src/csm/Injections/Tools/BuildingToolHandler.cs

@@ -1,5 +1,3 @@
-using System.Xml.Serialization;
-using System.Collections.ObjectModel;
 using System;
 using CSM.API.Commands;
 using CSM.Networking;
@@ -39,7 +37,6 @@ public static void Postfix(BuildingTool __instance, Vector3 ___m_cachedPosition,
                 // Send info to all clients
                 var newCommand = new PlayerBuildingToolCommandHandler.Command
                 {
-                    PlayerName = playerName,
                     Prefab = (ushort)Mathf.Clamp(__instance.m_prefab.m_prefabDataIndex, 0, 65535),
                     Relocating = __instance.m_relocate,
                     Position = ___m_cachedPosition,
@@ -56,64 +53,46 @@ public static void Postfix(BuildingTool __instance, Vector3 ___m_cachedPosition,
         }    
     }
 
-    public class PlayerBuildingToolCommandHandler : CommandHandler<PlayerBuildingToolCommandHandler.Command>
+    public class PlayerBuildingToolCommandHandler : BaseToolCommandHandler<PlayerBuildingToolCommandHandler.Command, BuildingTool>
     {
 
         [ProtoContract]
         public class Command : CommandBase, IEquatable<Command>
         {
             [ProtoMember(1)]
-            public string PlayerName { get; set; }
-            [ProtoMember(2)]
             public ushort Prefab { get; set; }
-            [ProtoMember(3)]
+            [ProtoMember(2)]
             public int Relocating { get; set; }
-            [ProtoMember(4)]
+            [ProtoMember(3)]
             public Vector3 Position { get; set; }
-            [ProtoMember(5)]
+            [ProtoMember(4)]
             public float Angle { get; set; }
-            [ProtoMember(6)]
+            [ProtoMember(5)]
             public Segment3 Segment { get; set; }
-            [ProtoMember(7)]
+            [ProtoMember(6)]
             public int Elevation { get; set; }
 
 
             public bool Equals(Command other)
             {
-                return object.Equals(this.PlayerName, other.PlayerName) &&
-                object.Equals(this.Prefab, other.Prefab) &&
+                return object.Equals(this.Prefab, other.Prefab) &&
                 object.Equals(this.Relocating, other.Relocating) &&
                 object.Equals(this.Position, other.Position) &&
-                object.Equals(this.Segment, other.Segment) &&
                 object.Equals(this.Angle, other.Angle) &&
+                object.Equals(this.Segment, other.Segment) &&
                 object.Equals(this.Elevation, other.Elevation);
             }
 
         }
 
-        public PlayerBuildingToolCommandHandler()
-        {
-            TransactionCmd = false;
-        }
-
-        protected override void Handle(Command command)
-        {
-            if (!MultiplayerManager.Instance.IsConnected())
-            {
-                // Ignore packets while not connected
-                return;
-            }
-            var buildingTool = ToolSimulator.GetTool<BuildingTool>(command.SenderId);
-
+        protected override void Configure(BuildingTool tool, Command command) {
             BuildingInfo prefab = PrefabCollection<BuildingInfo>.GetPrefab(command.Prefab);
-
-            ReflectionHelper.SetAttr(buildingTool, "m_prefab", prefab);
-            ReflectionHelper.SetAttr(buildingTool, "m_relocate", command.Relocating);
-            ReflectionHelper.SetAttr(buildingTool, "m_cachedPosition", command.Position);
-            ReflectionHelper.SetAttr(buildingTool, "m_cachedAngle", command.Angle);
-            ReflectionHelper.SetAttr(buildingTool, "m_cachedSegment", command.Segment);
-            ReflectionHelper.SetAttr(buildingTool, "m_elevation", command.Elevation);
-
+            ReflectionHelper.SetAttr(tool, "m_prefab", prefab);
+            ReflectionHelper.SetAttr(tool, "m_relocate", command.Relocating);
+            ReflectionHelper.SetAttr(tool, "m_cachedPosition", command.Position);
+            ReflectionHelper.SetAttr(tool, "m_cachedAngle", command.Angle);
+            ReflectionHelper.SetAttr(tool, "m_cachedSegment", command.Segment);
+            ReflectionHelper.SetAttr(tool, "m_elevation", command.Elevation);
         }
     }
 

src/csm/Injections/Tools/DefaultToolHandler.cs

@@ -78,11 +78,6 @@ public class Command : CommandBase
 
         }
 
-        public PlayerDefaultToolCommandHandler()
-        {
-            TransactionCmd = false;
-        }
-
         protected override void Handle(Command command)
         {
             if (!MultiplayerManager.Instance.IsConnected())