optimized batch building

CheatEnabler/CheatEnabler.csproj

@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
   </ItemGroup>
 

CheatEnabler/Patches/FactoryPatch.cs

@@ -175,7 +175,6 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
                     if (!architect) continue;
                     pb.itemRequired = 0;
                 }
-                CargoTrafficPatch.TryStartBatchBuilding(factory);
                 CargoTrafficPatch.InstantBuild(player, factory, i);
             }
             CargoTrafficPatch.TryEndBatchBuilding(factory);
@@ -201,6 +200,8 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
         private static readonly HashSet<int> _alterPathRendererIds = [];
         private static readonly HashSet<int> _refreshPathUVIds = [];
 
+        public static bool IsBatchBuilding => _isBatchBuilding;
+
         public static void StartBatchBuilding(PlanetFactory factory)
         {
             factory.BeginFlattenTerrain();
@@ -211,12 +212,6 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
             _anyBelt = false;
         }
 
-        public static void TryStartBatchBuilding(PlanetFactory factory)
-        {
-            if (_isBatchBuilding) return;
-            StartBatchBuilding(factory);
-        }
-
         public static void EndBatchBuilding(PlanetFactory factory)
         {
             PlanetFactory.batchBuild = false;
@@ -260,6 +255,7 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
 
         public static void InstantBuild(Player player, PlanetFactory factory, int id)
         {
+            if (!_isBatchBuilding) StartBatchBuilding(factory);
             _anyBelt = _anyBelt || _beltIds.Contains(factory.prebuildPool[id].protoId);
             factory.BuildFinally(player, id, false);
         }
@@ -442,41 +438,85 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
             return matcher.InstructionEnumeration();
         }
 
-        [HarmonyTranspiler]
+        [HarmonyPrefix]
-        [HarmonyPatch(typeof(ConstructionModuleComponent), nameof(ConstructionModuleComponent.PlaceItems))]
-        private static IEnumerable<CodeInstruction> ConstructionModuleComponent_PlaceItems_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
-        {
-            var matcher = new CodeMatcher(instructions, generator);
-            matcher.MatchForward(false,
-                new CodeMatch(OpCodes.Ldarg_1),
-                new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(PlanetFactory), nameof(PlanetFactory.constructionSystem))),
-                new CodeMatch(ci => ci.IsLdloc()),
-                new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(PrebuildData), nameof(PrebuildData.id))),
-                new CodeMatch(ci => ci.IsLdloc()),
-                new CodeMatch(OpCodes.Ldflda, AccessTools.Field(typeof(PrebuildData), nameof(PrebuildData.pos))),
-                new CodeMatch(OpCodes.Callvirt, AccessTools.Method(typeof(ConstructionSystem), nameof(ConstructionSystem.AddBuildTargetToModules)))
-            );
-            matcher.Repeat(codeMatcher =>
-            {
-                codeMatcher.Advance(4).InsertAndAdvance(
-                    new CodeInstruction(OpCodes.Dup),
-                    new CodeInstruction(OpCodes.Ldarg_1),
-                    Transpilers.EmitDelegate((int objId, PlanetFactory factory) =>
-                    {
-                        CargoTrafficPatch.TryStartBatchBuilding(factory);
-                        CargoTrafficPatch.InstantBuild(GameMain.mainPlayer, factory, objId);
-                    })
-                )
-                .Advance(3);
-            });
-            return matcher.InstructionEnumeration();
-        }
-
-        [HarmonyPostfix]
         [HarmonyPatch(typeof(ConstructionSystem), nameof(ConstructionSystem.GameTick))]
-        private static void ConstructionSystem_GameTick_Postfix(ConstructionSystem __instance)
+        private static void ConstructionSystem_GameTick_Prefix(ConstructionSystem __instance, long time)
         {
-            CargoTrafficPatch.TryEndBatchBuilding(__instance.factory);
+            if (time % 6 != 0) return;
+            var factory = __instance.factory;
+            if (factory.prebuildCount <= 0) return;
+            var player = GameMain.mainPlayer;
+            var total = factory.prebuildCursor - 1;
+            var stepCount = total switch {
+                < 256 => 1,
+                < 2048 => 3,
+                < 16384 => 10,
+                _ => 20,
+            };
+            var step = (int)(time / 6 % stepCount);
+            var start = 1 + total * step / stepCount;
+            var end = 1 + total * (step + 1) / stepCount;
+            for (var i = start; i < end; i++)
+            {
+                ref var prebuild = ref factory.prebuildPool[i];
+                if (prebuild.id != i || prebuild.isDestroyed) continue;
+                if (prebuild.itemRequired > 0)
+                {
+                    int itemId = prebuild.protoId;
+                    int count = prebuild.itemRequired;
+                    player.package.TakeTailItems(ref itemId, ref count, out var _, false);
+                    if (count > 0)
+                    {
+                        prebuild.itemRequired -= count;
+                        if (prebuild.itemRequired <= 0)
+                        {
+                            CargoTrafficPatch.InstantBuild(player, factory, i);
+                        }
+                    }
+                }
+            }
+            if (CargoTrafficPatch.IsBatchBuilding)
+            {
+                for (var i = start - 1; i > 0; i--)
+                {
+                    ref var prebuild = ref factory.prebuildPool[i];
+                    if (prebuild.id != i || prebuild.isDestroyed) continue;
+                    if (prebuild.itemRequired > 0)
+                    {
+                        int itemId = prebuild.protoId;
+                        int count = prebuild.itemRequired;
+                        player.package.TakeTailItems(ref itemId, ref count, out var _, false);
+                        if (count > 0)
+                        {
+                            prebuild.itemRequired -= count;
+                            if (prebuild.itemRequired <= 0)
+                            {
+                                CargoTrafficPatch.InstantBuild(player, factory, i);
+                            }
+                        }
+                    }
+                }
+                for (var i = end; i <= total; i++)
+                {
+                    ref var prebuild = ref factory.prebuildPool[i];
+                    if (prebuild.id != i || prebuild.isDestroyed) continue;
+                    if (prebuild.itemRequired > 0)
+                    {
+                        int itemId = prebuild.protoId;
+                        int count = prebuild.itemRequired;
+                        player.package.TakeTailItems(ref itemId, ref count, out var _, false);
+                        if (count > 0)
+                        {
+                            prebuild.itemRequired -= count;
+                            if (prebuild.itemRequired <= 0)
+                            {
+                                CargoTrafficPatch.InstantBuild(player, factory, i);
+                            }
+                        }
+                    }
+                }
+                CargoTrafficPatch.EndBatchBuilding(factory);
+            }
         }
 
         /*

Dustbin/Dustbin.csproj

@@ -19,7 +19,7 @@
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
     <PackageReference Include="DysonSphereProgram.Modding.DSPModSave" Version="1.*" />
     <PackageReference Include="DysonSphereProgram.Modding.NebulaMultiplayerModApi" Version="2.0.0" />
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>

DustbinPreloader/DustbinPreloader.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>

HideTips/HideTips.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>

LabOpt/LabOpt.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>

LabOptPreloader/LabOptPreloader.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>

LogisticMiner/LogisticMiner.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>

LuaScriptEngine/LuaScriptEngine.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="NLua" Version="1.*" />
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
     <PackageReference Include="obs-websocket-dotnet" Version="5.*" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" /> -->
   </ItemGroup>

MechaDronesTweaks/MechaDronesTweaks.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>

OverclockEverything/OverclockEverything.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
     <PackageReference Include="DysonSphereProgram.Modding.DSPModSave" Version="1.*" />
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>

PoolOpt/PoolOpt.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>

UXAssist/UXAssist.csproj

@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
     <PackageReference Include="DysonSphereProgram.Modding.CommonAPI" Version="1.*" />
     <PackageReference Include="DysonSphereProgram.Modding.DSPModSave" Version="1.*" />

UniverseGenTweaks/UniverseGenTweaks.csproj

@@ -15,7 +15,7 @@
   <ItemGroup>
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
     <PackageReference Include="DysonSphereProgram.Modding.DSPModSave" Version="1.*" />
   </ItemGroup>

UserCloak/UserCloak.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="BepInEx.Core" Version="5.*" />
     <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
     <!-- <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" /> -->
-    <PackageReference Include="UnityEngine.Modules" Version="2022.3.53" IncludeAssets="compile" />
+    <PackageReference Include="UnityEngine.Modules" Version="2022.3.62" IncludeAssets="compile" />
   </ItemGroup>
 
   <ItemGroup>