Merge pull request #731 from starfi5h/pr-update

Nebula 0.9.17 for DSP 0.10.32.25779 Update

Author: starfi5h

.github/scripts/thunderstore_bundle.js

@@ -123,7 +123,7 @@ function generateManifest() {
       BEPINEX_DEPENDENCY,
       `nebula-${apiPluginInfo.name}-${apiPluginInfo.version}`,
       "PhantomGamers-IlLine-1.0.0",
-      "starfi5h-BulletTime-1.5.5",
+      "starfi5h-BulletTime-1.5.8",
     ],
     website_url: "https://github.com/hubastard/nebula"
   };

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+0.9.17:
+- Compatible with game version 0.10.32.25779
+
 0.9.16:
 - Compatible with game version 0.10.32.25682
 

NebulaNetwork/PacketProcessors/Factory/Foundation/FoundationBlueprintPasteProcessor.cs

@@ -137,7 +137,7 @@ static void UpdateGeothermalStrength(PlanetFactory factory)
             ref PowerGeneratorComponent generator = ref generatorPool[generatorIndex];
             if (generator.id == generatorIndex && generator.geothermal && generator.entityId > 0)
             {
-                generator.gthStrength = powerSystem.CalculateGeothermalStrenth(
+                generator.gthStrength = powerSystem.CalculateGeothermalStrength(
                     entityPool[generator.entityId].pos,
                     entityPool[generator.entityId].rot,
                     generator.baseRuinId

NebulaNetwork/PacketProcessors/Planet/PlanetDataRequestProcessor.cs

@@ -69,7 +69,7 @@ private static byte[] PlanetCompute(int planetId)
                 planetAlgorithm.GenerateVegetables();
                 planetAlgorithm.GenerateVeins();
             }
-            planet.CalculateVeinGroups();
+            planet.SummarizeVeinGroups();
         }
 
         byte[] data;

NebulaNetwork/PacketProcessors/Planet/PlanetDetailRequestProcessor.cs

@@ -22,9 +22,9 @@ protected override void ProcessPacket(PlanetDetailRequest packet, NebulaConnecti
             return;
         }
         var planetData = GameMain.galaxy.PlanetById(packet.PlanetID);
-        if (!planetData.calculated)
+        if (!planetData.scanned)
         {
-            planetData.calculating = true;
+            planetData.scanning = true;
             Task.Run(() =>
             {
                 try
@@ -44,9 +44,9 @@ protected override void ProcessPacket(PlanetDetailRequest packet, NebulaConnecti
                         planetAlgorithm.GenerateVegetables();
                         planetAlgorithm.GenerateVeins();
                     }
-                    planetData.CalculateVeinGroups();
+                    planetData.SummarizeVeinGroups();
                     planetData.GenBirthPoints();
-                    planetData.NotifyCalculated();
+                    planetData.NotifyScanEnded();
                     conn.SendPacket(new PlanetDetailResponse(planetData.id,
                         planetData.runtimeVeinGroups ?? Array.Empty<VeinGroup>(), planetData.landPercent));
                     Log.Info($"PlanetCalculateThread:{planetData.displayName} time:{highStopwatch.duration:F4}s");

NebulaNetwork/PacketProcessors/Planet/PlanetDetailResponseProcessor.cs

@@ -39,10 +39,10 @@ protected override void ProcessPacket(PlanetDetailResponse packet, NebulaConnect
             }
         }
         planet.landPercent = packet.LandPercent;
-        planet.landPercentDirty = false;
+        planet.landPercentDirtyFlag = false;
 
         //planet.NotifyCalculated();
-        planet.calculating = false;
-        planet.calculated = true;
+        planet.scanning = false;
+        planet.scanned = true;
     }
 }

NebulaPatcher/Patches/Dynamic/GalaxyData_Patch.cs

@@ -0,0 +1,20 @@
+#region
+
+using HarmonyLib;
+using NebulaWorld;
+
+#endregion
+
+namespace NebulaPatcher.Patches.Dynamic;
+
+[HarmonyPatch(typeof(GalaxyData))]
+internal class GalaxyData_Patch
+{
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(GalaxyData.UpdateScanningProcedure))]
+    public static bool UpdateScanningProcedure_Prefix()
+    {
+        // The scanning in multiplayer should be triggered by user interactions, instead of vanilla behavior (auto call for every 10s)
+        return !Multiplayer.IsActive;
+    }
+}

NebulaPatcher/Patches/Dynamic/GameData_Patch.cs

@@ -207,7 +207,7 @@ public static bool OnActivePlanetFactoryLoaded_Prefix(GameData __instance, Plane
                     {
                         planet.dirtyFlags[i] = true;
                     }
-                    planet.landPercentDirty = true;
+                    planet.landPercentDirtyFlag = true;
                     try
                     {
                         planet.UpdateDirtyMeshes();

NebulaPatcher/Patches/Dynamic/PlanetModelingManager_Patch.cs

@@ -156,22 +156,22 @@ private static void InternalLoadPlanetsRequestGenerator(IEnumerable<PlanetData>
     }
 
     [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlanetModelingManager.RequestCalcPlanet))]
-    public static bool RequestCalcPlanet_Prefix(PlanetData planet)
+    [HarmonyPatch(nameof(PlanetModelingManager.RequestScanPlanet))]
+    public static bool RequestScanPlanet_Prefix(PlanetData planet)
     {
         // Run the original method if this is the master client or in single player games
         if (!Multiplayer.IsActive || Multiplayer.Session.LocalPlayer.IsHost)
         {
             return true;
         }
 
-        RequestCalcPlanet(planet);
+        RequestScanPlanet(planet);
         return false;
     }
 
     [HarmonyPrefix]
-    [HarmonyPatch(nameof(PlanetModelingManager.RequestCalcStar))]
-    public static bool RequestCalcStar_Prefix(StarData star)
+    [HarmonyPatch(nameof(PlanetModelingManager.RequestScanStar))]
+    public static bool RequestScanStar_Prefix(StarData star)
     {
         // Run the original method if this is the master client or in single player games
         if (!Multiplayer.IsActive || Multiplayer.Session.LocalPlayer.IsHost)
@@ -181,22 +181,22 @@ public static bool RequestCalcStar_Prefix(StarData star)
 
         foreach (var planet in star.planets)
         {
-            RequestCalcPlanet(planet);
+            RequestScanPlanet(planet);
         }
         return false;
     }
 
-    private static void RequestCalcPlanet(PlanetData planet)
+    private static void RequestScanPlanet(PlanetData planet)
     {
-        if (planet.calculated || planet.calculating || planet.data != null)
+        if (planet.scanned || planet.scanning || planet.data != null)
         {
             return;
         }
         if (planet.loaded || planet.loading)
         {
             return;
         }
-        planet.calculating = true;
+        planet.scanning = true;
         Multiplayer.Session.Network.SendPacket(new PlanetDetailRequest(planet.id));
     }
 }

NebulaPatcher/Patches/Transpilers/ConstructionSystem_Transpiler.cs

@@ -24,14 +24,15 @@ public static IEnumerable<CodeInstruction> AddBuildTargetToModules_Transpiler(IE
         try
         {
             /*  Sync Prebuild.itemRequired changes by player, insert local method call after player.package.TakeTailItems
-                Replace: if (num8 <= num) { this.player.mecha.constructionModule.InsertBuildTarget ... }
-                With:    if (num8 <= num && IsClosestPlayer(ref pos)) { this.player.mecha.constructionModule.InsertBuildTarget ... }
+                Replace: if (num9 <= num2) { this.player.mecha.constructionModule.InsertBuildTarget ... }
+                With:    if (num9 <= num2 && IsClosestPlayer(ref pos)) { this.player.mecha.constructionModule.InsertBuildTarget ... }
             */
 
-            var codeMatcher = new CodeMatcher(instructions)
-                .MatchForward(true,
+            var codeMatcher = new CodeMatcher(instructions).End()
+                .MatchBack(false, new CodeMatch(OpCodes.Callvirt, AccessTools.Method(typeof(ConstructionModuleComponent), nameof(ConstructionModuleComponent.InsertBuildTarget))))
+                .MatchBack(true,
                     new CodeMatch(OpCodes.Ldloc_S),
-                    new CodeMatch(OpCodes.Ldloc_0),
+                    new CodeMatch(i => i.IsLdloc()),
                     new CodeMatch(OpCodes.Bgt_Un)
                 );
             var sqrDist = codeMatcher.InstructionAt(-2).operand;