Replace job instantiation that does not use JobMaker (#338)

* Replace job instantiation that does not use JobMaker

* Fix the missing return statement for the created job

* Fixed an errror that occurred when attempting to set out on a caravan while out of fuel (#336)

* Fixed an errror that occurred when attempting to set out on a caravan while out of fuel

* Added draft check within LoadToilTick to LordToil_PrepareCaravan_LeaveWithVehicles

Author: oelsart

Source/Vehicles/AI/JobGivers/JobGiver_AwaitOrders.cs

@@ -24,11 +24,10 @@ protected override Job TryGiveJob(Pawn pawn)
       {
         vehicle.vehiclePather.EngageBrakes();
       }
-      Job job = new(JobDefOf_Vehicles.IdleVehicle, vehicle)
-      {
-        checkOverrideOnExpire = true,
-        expiryInterval = overrideExpiryInterval > 0 ? overrideExpiryInterval : 180
-      };
+
+      Job job = JobMaker.MakeJob(JobDefOf_Vehicles.IdleVehicle, vehicle);
+      job.checkOverrideOnExpire = true;
+      job.expiryInterval = overrideExpiryInterval > 0 ? overrideExpiryInterval : 180;
       return job;
     }
   }

Source/Vehicles/AI/JobGivers/JobGiver_BoardVehicle.cs

@@ -27,15 +27,14 @@ protected override Job TryGiveJob(Pawn pawn)
         if (!JobDriver_FollowClose.FarEnoughAndPossibleToStartJob(pawn, assignedSeat.Vehicle,
           FollowRadius))
           return null;
-        return new Job(JobDefOf.FollowClose, assignedSeat.Vehicle)
-        {
-          lord = pawn.GetLord(),
-          expiryInterval = 140,
-          checkOverrideOnExpire = true,
-          followRadius = FollowRadius
-        };
+        Job job = JobMaker.MakeJob(JobDefOf.FollowClose, assignedSeat.Vehicle);
+        job.lord = pawn.GetLord();
+        job.expiryInterval = 140;
+        job.checkOverrideOnExpire = true;
+        job.followRadius = FollowRadius;
+        return job;
       }
-      return new Job(JobDefOf_Vehicles.Board, assignedSeat.Vehicle);
+      return JobMaker.MakeJob(JobDefOf_Vehicles.Board, assignedSeat.Vehicle);
     }
     return null;
   }

Source/Vehicles/AI/JobGivers/JobGiver_GotoTravelDestinationVehicle.cs

@@ -38,11 +38,9 @@ protected override Job TryGiveJob(Pawn pawn)
       {
         return null;
       }
-      Job job = new(JobDefOf.Goto, cell)
-      {
-        locomotionUrgency = LocomotionUrgency.Jog,
-        expiryInterval = jobMaxDuration
-      };
+      Job job = JobMaker.MakeJob(JobDefOf.Goto, cell);
+      job.locomotionUrgency = LocomotionUrgency.Jog;
+      job.expiryInterval = jobMaxDuration;
       if (vehicle.InhabitedCellsProjected(cell, Rot8.Invalid)
           .Any(projCell => pawn.Map.exitMapGrid.IsExitCell(projCell)))
       {

Source/Vehicles/AI/JobGivers/JobGiver_PrepareVehicleCaravan_GatheringItems.cs

@@ -22,9 +22,8 @@ protected override Job TryGiveJob(Pawn pawn)
 		if (thing is null)
 			return null;
 
-		return new Job(JobDef, thing)
-		{
-			lord = lord
-		};
-	}
+    Job job = JobMaker.MakeJob(JobDef, thing);
+    job.lord = lord;
+    return job;
+  }
 }

Source/Vehicles/AI/JobGivers/JobGiver_SendSlavesToVehicle.cs

@@ -18,11 +18,10 @@ protected override Job TryGiveJob(Pawn pawn)
 				return null;
 			VehiclePawn vehicle = FindShipToDeposit(pawn, pawn2);
 			VehicleRoleHandler handler = vehicle.handlers.Find(x => x.role.HandlingTypes == HandlingType.None);
-			return new Job(JobDefOf.PrepareCaravan_GatherDownedPawns, pawn2)
-			{
-				count = 1
-			};
-		}
+      Job job = JobMaker.MakeJob(JobDefOf.PrepareCaravan_GatherDownedPawns, pawn2);
+      job.count = 1;
+      return job;
+    }
 
 		private Pawn FindPrisoner(Pawn pawn)
 		{

Source/Vehicles/AI/JobGivers/NPC/JobGiver_SabotageVehicle.cs

@@ -41,7 +41,7 @@ protected override Job TryGiveJob(Pawn pawn)
           IntVec3 jobCell = vehicle.SurroundingCells.RandomOrFallback(cell =>
               resMgr.CanReserve<LocalTargetInfo, VehicleTargetReservation>(vehicle, pawn, cell),
             IntVec3.Invalid);
-          return new Job(JobDefOf_Vehicles.SabotageVehicle, vehicle, jobCell);
+          return JobMaker.MakeJob(JobDefOf_Vehicles.SabotageVehicle, vehicle, jobCell);
         }
       }
     }

Source/Vehicles/Components/Vehicles/FloatOptionProviders/FloatMenuOptionProvider_OrderVehicle.cs

@@ -119,7 +119,7 @@ internal static void PawnGotoAction(IntVec3 clickCell, VehiclePawn vehicle, IntV
 
     if (!IsFeatureEnabled(PathFinderV2))
     {
-      Job job = new(JobDefOf.Goto, gotoLoc);
+      Job job = JobMaker.MakeJob(JobDefOf.Goto, gotoLoc);
       vehicle.jobs.TryTakeOrderedJob(job, JobTag.Misc);
       return;
     }

Source/Vehicles/Components/Vehicles/VehiclePathFollower.cs

@@ -413,10 +413,8 @@ public bool TryOrderMoveTo(in PathOrderData data)
       return true;
     }
 
-    Job job = new(JobDefOf.Goto, new LocalTargetInfo(data.destination))
-    {
-      exitMapOnArrival = data.exitMapOnArrival
-    };
+    Job job = JobMaker.MakeJob(JobDefOf.Goto, new LocalTargetInfo(data.destination));
+    job.exitMapOnArrival = data.exitMapOnArrival;
     if (vehicle.jobs.TryTakeOrderedJob(job, JobTag.Misc))
     {
       endRot = data.endRotation;

Source/Vehicles/Components/Vehicles/VehiclePawn/VehiclePawn_Rendering.cs

@@ -991,7 +991,7 @@ public void PromptToBoardVehicle(Pawn pawn, VehicleRoleHandler handler)
       return;
     }
 
-    Job job = new(JobDefOf_Vehicles.Board, this);
+    Job job = JobMaker.MakeJob(JobDefOf_Vehicles.Board, this);
     GiveLoadJob(pawn, handler);
     pawn.jobs.TryTakeOrderedJob(job, JobTag.DraftedOrder);
     if (!pawn.Spawned)

Source/Vehicles/Comps/FueledTravel/CompFueledTravel.cs

@@ -483,7 +483,7 @@ public override IEnumerable<FloatMenuOption> CompFloatMenuOptions(Pawn selPawn)
     yield return new FloatMenuOption("Refuel".Translate().ToString(),
       delegate
       {
-        Job job = new(JobDefOf_Vehicles.RefuelVehicle, parent, ClosestFuelAvailable(selPawn));
+        Job job = JobMaker.MakeJob(JobDefOf_Vehicles.RefuelVehicle, parent, ClosestFuelAvailable(selPawn));
         selPawn.jobs.TryTakeOrderedJob(job, JobTag.DraftedOrder);
       });
   }