Merge pull request #723 from starfi5h/pr-refactor

Bugfix and refactor (2025-1-25)

Author: starfi5h

CHANGELOG.md

@@ -1,9 +1,15 @@
 ## Changelog
 
+0.9.14:
+- @starfi5h: Add `Enable Other Player Sounds` config settings in multiplayer general tab  
+- @starfi5h: Fix headless server error
+- @starfi5h: When GalacticScale is present, hide New Game (Host) button due to compatibility
+- @starfi5h: Fix lastSaveTime initialization and the issue of hearing other player audio on the other planet
+
 0.9.13:
 - Compatible with game version 0.10.32.25552
 - @starfi5h: Sync ejector auto orbit and blueprint paste foundation
-- @starfi5h: Force enable drone and shield brust for client
+- @starfi5h: Force enable drone and shield burst for client
 - Note: The dashboard is not synced. Clients will lose their custom stats when they leave the star system
 
 0.9.12:

NebulaModel/MultiplayerOptions.cs

@@ -124,6 +124,9 @@ public bool StreamerMode
     [Description("Toggle to enable achievement in multiplayer game")]
     public bool EnableAchievement { get; set; } = true;
 
+    [DisplayName("Enable Other Player Sounds")]
+    public bool EnableOtherPlayerSounds { get; set; } = true;
+
     [DisplayName("Chat Hotkey")]
     [Category("Chat")]
     [Description("Keyboard shortcut to toggle the chat window")]

NebulaModel/Networking/Serialization/NebulaNetPacketProcessor.cs

@@ -16,9 +16,11 @@ public class NebulaNetPacketProcessor : NetPacketProcessor, INetPacketProcessor
     private readonly List<DelayedPacket> delayedPackets = [];
     private readonly Queue<PendingPacket> pendingPackets = new();
 
+#if DEBUG
     private readonly Random simulationRandom = new();
     private readonly int SimulatedMaxLatency = 50;
     private readonly int SimulatedMinLatency = 20;
+#endif
 
     public bool SimulateLatency { get; set; } = false;
 

NebulaModel/Packets/Factory/Belt/BeltReverseRequestPacket.cs

@@ -9,7 +9,7 @@ public BeltReverseRequestPacket(int beltId, int planetId, int authorId)
         BeltId = beltId;
         PlanetId = planetId;
         AuthorId = authorId;
-     }
+    }
 
     public int BeltId { get; set; }
     public int PlanetId { get; set; }

NebulaNetwork/PacketProcessors/GameStates/GameStateSaveInfoProcessor.cs

@@ -19,6 +19,6 @@ public class GameStateSaveInfoProcessor : PacketProcessor<GameStateSaveInfoPacke
     protected override void ProcessPacket(GameStateSaveInfoPacket packet, NebulaConnection conn)
     {
         GameStatesManager.LastSaveTime = packet.LastSaveTime;
-        Log.Info("LastSaveTime: " + DateTimeOffset.FromUnixTimeSeconds(packet.LastSaveTime).ToString());
+        Log.Info("LastSaveTime: " + DateTimeOffset.FromUnixTimeSeconds(packet.LastSaveTime).LocalDateTime.ToString());
     }
 }

NebulaNetwork/PacketProcessors/GameStates/GameStateUpdateProcessor.cs

@@ -1,15 +1,10 @@
 #region
 
-using System;
 using NebulaAPI.Packets;
-using NebulaModel;
-using NebulaModel.Logger;
 using NebulaModel.Networking;
 using NebulaModel.Packets;
 using NebulaModel.Packets.GameStates;
 using NebulaWorld;
-using NebulaWorld.GameStates;
-using UnityEngine;
 
 #endregion
 
@@ -19,91 +14,8 @@ namespace NebulaNetwork.PacketProcessors.GameStates;
 // ReSharper disable once UnusedType.Global
 public class GameStateUpdateProcessor : PacketProcessor<GameStateUpdate>
 {
-    private readonly float BUFFERING_TICK = 60f;
-    private readonly float BUFFERING_TIME = 30f;
-    private float averageUPS = 60f;
-
-    private int averageRTT;
-    private bool hasChanged;
-
     protected override void ProcessPacket(GameStateUpdate packet, NebulaConnection conn)
     {
-        var rtt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() - packet.SentTime;
-        averageRTT = (int)(averageRTT * 0.8 + rtt * 0.2);
-        averageUPS = averageUPS * 0.8f + packet.UnitsPerSecond * 0.2f;
-        Multiplayer.Session.World.UpdatePingIndicator($"Ping: {averageRTT}ms");
-
-        // We offset the tick received to account for the time it took to receive the packet
-        var tickOffsetSinceSent = (long)Math.Round(packet.UnitsPerSecond * rtt / 2 / 1000);
-        var currentGameTick = packet.GameTick + tickOffsetSinceSent;
-        var diff = currentGameTick - GameMain.gameTick;
-
-        // Discard abnormal packet (usually after host saving the file)
-        if (rtt > 2 * averageRTT || averageUPS - packet.UnitsPerSecond > 15)
-        {
-            // Initial connection
-            if (GameMain.gameTick < 1200L)
-            {
-                averageRTT = (int)rtt;
-                GameMain.gameTick = currentGameTick;
-            }
-            Log.Debug(
-                $"GameStateUpdate unstable. RTT:{rtt}(avg{averageRTT}) UPS:{packet.UnitsPerSecond:F2}(avg{averageUPS:F2})");
-            return;
-        }
-
-        if (!Config.Options.SyncUps)
-        {
-            // We allow for a small drift of 5 ticks since the tick offset using the ping is only an approximation
-            if (GameMain.gameTick > 0 && Mathf.Abs(diff) > 5)
-            {
-                Log.Debug($"Game Tick desync. {GameMain.gameTick} skip={diff} UPS:{packet.UnitsPerSecond:F2}(avg{averageUPS:F2})");
-                GameMain.gameTick = currentGameTick;
-            }
-            // Reset FixUPS when user turns off the option
-            if (!hasChanged)
-            {
-                return;
-            }
-            FPSController.SetFixUPS(0);
-            hasChanged = false;
-            return;
-        }
-
-        // Adjust client's UPS to match game tick with server, range 30~120 UPS
-        var ups = diff / 1f + averageUPS;
-        long skipTick = 0;
-        switch (ups)
-        {
-            case > GameStatesManager.MaxUPS:
-                {
-                    // Try to distribute game tick difference into BUFFERING_TIME (seconds)
-                    if (diff / BUFFERING_TIME + averageUPS > GameStatesManager.MaxUPS)
-                    {
-                        // The difference is too large, need to skip ticks to catch up
-                        skipTick = (long)(ups - GameStatesManager.MaxUPS);
-                    }
-                    ups = GameStatesManager.MaxUPS;
-                    break;
-                }
-            case < GameStatesManager.MinUPS:
-                {
-                    if (diff + averageUPS - GameStatesManager.MinUPS < -BUFFERING_TICK)
-                    {
-                        skipTick = (long)(ups - GameStatesManager.MinUPS);
-                    }
-                    ups = GameStatesManager.MinUPS;
-                    break;
-                }
-        }
-        if (skipTick != 0)
-        {
-            Log.Debug($"Game Tick desync. skip={skipTick} diff={diff,2}, RTT={rtt}ms, UPS={packet.UnitsPerSecond:F2}(avg{averageUPS:F2})");
-            GameMain.gameTick += skipTick;
-        }
-        FPSController.SetFixUPS(ups);
-        hasChanged = true;
-        // Tick difference in the next second. Expose for other mods
-        GameStatesManager.NotifyTickDifference(diff / 1f + averageUPS - ups);
+        Multiplayer.Session.State.ProcessGameStateUpdatePacket(packet.SentTime, packet.GameTick, packet.UnitsPerSecond);
     }
 }

NebulaNetwork/PacketProcessors/Planet/VegeMinedProcessor.cs

@@ -1,5 +1,6 @@
 #region
 
+using NebulaAPI;
 using NebulaAPI.Packets;
 using NebulaModel.Networking;
 using NebulaModel.Packets;
@@ -24,6 +25,7 @@ protected override void ProcessPacket(VegeMinedPacket packet, NebulaConnection c
         }
         using (Multiplayer.Session.Planets.IsIncomingRequest.On())
         {
+            Multiplayer.Session.Factories.TargetPlanet = packet.PlanetId;
             if (packet.Amount == 0)
             {
                 if (packet.IsVein)
@@ -68,6 +70,7 @@ protected override void ProcessPacket(VegeMinedPacket packet, NebulaConnection c
                 factory.veinPool[packet.VegeId].amount = packet.Amount;
                 veinGroups[groupIndex].amount -= 1L;
             }
+            Multiplayer.Session.Factories.TargetPlanet = NebulaModAPI.PLANET_NONE;
         }
     }
 }

NebulaNetwork/PacketProcessors/Session/GlobalGameDataResponseProcessor.cs

@@ -4,7 +4,7 @@
 using NebulaModel.Networking;
 using NebulaModel.Packets;
 using NebulaModel.Packets.Session;
-using NebulaWorld.GameStates;
+using NebulaWorld;
 
 #endregion
 
@@ -18,6 +18,6 @@ protected override void ProcessPacket(GlobalGameDataResponse packet, NebulaConne
         if (IsHost) return;
 
         // Store the binary data in GameStatesManager then later overwrite those system in GameData.NewGame
-        GameStatesManager.ImportGlobalGameData(packet);
+        Multiplayer.Session.State.ImportGlobalGameData(packet);
     }
 }

NebulaPatcher/GlobalSuppressions.cs

@@ -7,3 +7,6 @@
 [assembly:
     SuppressMessage("CodeQuality", "IDE0079:Remove unnecessary suppression",
         Justification = "If warnings are suppressed it is necessary")]
+[assembly:
+    SuppressMessage("Style", "IDE1006:Naming Styles",
+        Justification = "HarmonyX parameters use underscore prefix")]

NebulaPatcher/Patches/Dynamic/GameData_Patch.cs

@@ -311,7 +311,7 @@ public static void NewGame_Postfix(GameData __instance)
         if (!Multiplayer.IsActive || Multiplayer.Session.LocalPlayer.IsHost) return;
 
         // Overwrite from binaryData in GlobalGameDataResponse
-        GameStatesManager.OverwriteGlobalGameData(__instance);
+        Multiplayer.Session.State.OverwriteGlobalGameData(__instance);
     }
 
     [HarmonyPostfix]
@@ -399,7 +399,7 @@ private static void InitLandingPlace(GameData gameData, PlanetData planet)
 
     [HarmonyPrefix]
     [HarmonyPatch(nameof(GameData.LeaveStar))]
-    public static void LeaveStar_Prefix(GameData __instance)
+    public static void LeaveStar_Prefix()
     {
         //Client should unload all factories once they leave the star system
         if (!Multiplayer.IsActive || Multiplayer.Session.LocalPlayer.IsHost)