Convert SetDesiredTimeSpeed to property setter

Author: mibac138

Source/Client/AsyncTime/AsyncTimeComp.cs

@@ -50,11 +50,10 @@ public float TickRateMultiplier(TimeSpeed speed)
             }
         }
 
-        public TimeSpeed DesiredTimeSpeed => timeSpeedInt;
-
-        public void SetDesiredTimeSpeed(TimeSpeed speed)
+        public TimeSpeed DesiredTimeSpeed
         {
-            timeSpeedInt = speed;
+            get => timeSpeedInt;
+            set => timeSpeedInt = value;
         }
 
         public bool Paused => this.ActualRateMultiplier(DesiredTimeSpeed) == 0f;
@@ -269,7 +268,7 @@ public void ExecuteCmd(ScheduledCommand cmd)
                 if (cmdType == CommandType.MapTimeSpeed && Multiplayer.GameComp.asyncTime)
                 {
                     TimeSpeed speed = (TimeSpeed)data.ReadByte();
-                    SetDesiredTimeSpeed(speed);
+                    DesiredTimeSpeed = speed;
 
                     MpLog.Debug("Set map time speed " + speed);
                 }

Source/Client/AsyncTime/AsyncTimePatches.cs

@@ -1,10 +1,10 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using HarmonyLib;
 using Multiplayer.Client.Factions;
 using RimWorld;
 using RimWorld.Planet;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using Verse;
 
 namespace Multiplayer.Client.AsyncTime
@@ -205,7 +205,7 @@ private static void PauseOnLetter(TickManager manager)
             if (Multiplayer.GameComp.asyncTime)
             {
                 var tickable = (ITickable)Multiplayer.MapContext.AsyncTime() ?? Multiplayer.AsyncWorldTime;
-                tickable.SetDesiredTimeSpeed(TimeSpeed.Paused);
+                tickable.DesiredTimeSpeed = TimeSpeed.Paused;
                 Multiplayer.GameComp.ResetAllTimeVotes(tickable.TickableId);
             }
             else

Source/Client/AsyncTime/AsyncWorldTimeComp.cs

@@ -44,15 +44,14 @@ public float TickRateMultiplier(TimeSpeed speed)
     }
 
     // Run at the speed of the fastest map or at chosen speed if there are no maps
-    public TimeSpeed DesiredTimeSpeed => !Find.Maps.Any() ?
-        timeSpeedInt :
-        Find.Maps.Select(m => m.AsyncTime())
-        .Where(a => a.ActualRateMultiplier(a.DesiredTimeSpeed) != 0f)
-        .Max(a => a?.DesiredTimeSpeed) ?? TimeSpeed.Paused;
-
-    public void SetDesiredTimeSpeed(TimeSpeed speed)
+    public TimeSpeed DesiredTimeSpeed
     {
-        timeSpeedInt = speed;
+        get => !Find.Maps.Any()
+            ? timeSpeedInt
+            : Find.Maps.Select(m => m.AsyncTime())
+                .Where(a => a.ActualRateMultiplier(a.DesiredTimeSpeed) != 0f)
+                .Max(a => a?.DesiredTimeSpeed) ?? TimeSpeed.Paused;
+        set => timeSpeedInt = value;
     }
 
     public Queue<ScheduledCommand> Cmds => cmds;
@@ -274,16 +273,16 @@ private static void CreateJoinPointAndSendIfHost()
     public void SetTimeEverywhere(TimeSpeed speed)
     {
         foreach (var map in Find.Maps)
-            map.AsyncTime().SetDesiredTimeSpeed(speed);
-        SetDesiredTimeSpeed(speed);
+            map.AsyncTime().DesiredTimeSpeed = speed;
+        DesiredTimeSpeed = speed;
     }
 
     public static float lastSpeedChange;
 
     private void HandleTimeSpeed(ScheduledCommand cmd, ByteReader data)
     {
         TimeSpeed speed = (TimeSpeed)data.ReadByte();
-        SetDesiredTimeSpeed(speed);
+        DesiredTimeSpeed = speed;
 
         if (!Multiplayer.GameComp.asyncTime)
         {
@@ -311,7 +310,7 @@ private void HandleTimeVote(ScheduledCommand cmd, ByteReader data)
         if (!Multiplayer.GameComp.asyncTime || vote == TimeVote.ResetGlobal)
             SetTimeEverywhere(Multiplayer.GameComp.GetLowestTimeVote(TickableId));
         else if (TickPatch.TickableById(tickableId) is { } tickable)
-            tickable.SetDesiredTimeSpeed(Multiplayer.GameComp.GetLowestTimeVote(tickableId));
+            tickable.DesiredTimeSpeed = Multiplayer.GameComp.GetLowestTimeVote(tickableId);
     }
 
     public void FinalizeInit()

Source/Client/AsyncTime/ITickable.cs

@@ -1,5 +1,5 @@
-using Multiplayer.Common;
 using System.Collections.Generic;
+using Multiplayer.Common;
 using Verse;
 
 namespace Multiplayer.Client
@@ -12,9 +12,7 @@ public interface ITickable
 
         float TimeToTickThrough { get; set; }
 
-        TimeSpeed DesiredTimeSpeed { get; }
-
-        void SetDesiredTimeSpeed(TimeSpeed speed);
+        TimeSpeed DesiredTimeSpeed { get; set; }
 
         float TickRateMultiplier(TimeSpeed speed);
 

Source/Client/MultiplayerStatic.cs

@@ -220,7 +220,7 @@ void LoadNextReplay()
 
                         Replay.LoadReplay(Replay.SavedReplayFile(current[1]), true, () =>
                         {
-                            TickPatch.AllTickables.Do(t => t.SetDesiredTimeSpeed(TimeSpeed.Normal));
+                            TickPatch.AllTickables.Do(t => t.DesiredTimeSpeed = TimeSpeed.Normal);
 
                             void TickBatch()
                             {

Source/Client/Networking/HostUtil.cs

@@ -93,9 +93,9 @@ private static void PrepareGame()
 
         private static void SetGameState(ServerSettings settings)
         {
-            Multiplayer.AsyncWorldTime.SetDesiredTimeSpeed(TimeSpeed.Paused);
+            Multiplayer.AsyncWorldTime.DesiredTimeSpeed = TimeSpeed.Paused;
             foreach (var map in Find.Maps)
-                map.AsyncTime().SetDesiredTimeSpeed(TimeSpeed.Paused);
+                map.AsyncTime().DesiredTimeSpeed = TimeSpeed.Paused;
 
             Find.TickManager.CurTimeSpeed = TimeSpeed.Paused;