Merge remote-tracking branch 'upstream/master' into patch-1

NebulaClient/PacketProcessors/Logistics/ILSAddStationComponentProcessor.cs

@@ -0,0 +1,37 @@
+using NebulaModel.Attributes;
+using NebulaModel.Networking;
+using NebulaModel.Packets.Logistics;
+using NebulaModel.Packets.Processors;
+using NebulaModel.Logger;
+using NebulaWorld.Logistics;
+
+namespace NebulaClient.PacketProcessors.Logistics
+{
+    [RegisterPacketProcessor]
+    public class ILSAddStationComponentProcessor: IPacketProcessor<ILSAddStationComponent>
+    {
+        public void ProcessPacket(ILSAddStationComponent packet, NebulaConnection conn)
+        {
+            Log.Info($"ILSAddStationComponentProcessor processing packet for planet {packet.PlanetId}, station {packet.StationId} with gId of {packet.StationGId}");
+
+            using (ILSShipManager.PatchLockILS.On())
+            {
+                GalacticTransport galacticTransport = GameMain.data.galacticTransport;
+
+                if (packet.PlanetId == GameMain.localPlanet?.id)
+                {
+                    // If we're on the same planet as the new station was created on, should be able to find
+                    // it in our local PlanetTransport.stationPool
+                    StationComponent stationComponent = GameMain.localPlanet.factory.transport.stationPool[packet.StationId];
+                    galacticTransport.AddStationComponent(packet.PlanetId, stationComponent);
+                }
+                else
+                {
+                    // If we're not on the same planet as the new station was create on, we need to create a 
+                    // "fake" station that we can put into the GalacticTransport.stationPool instead of a real on
+                    ILSShipManager.CreateFakeStationComponent(packet.StationGId, packet.PlanetId, true);
+                }
+            }
+        }
+    }
+}

NebulaHost/PacketProcessors/Logistics/ILSRequestShipDockProcessor.cs

@@ -3,6 +3,7 @@
 using NebulaModel.Packets.Logistics;
 using NebulaModel.Packets.Processors;
 using NebulaModel.DataStructures;
+using NebulaModel.Logger;
 using System.Collections.Generic;
 
 /*
@@ -23,12 +24,15 @@ public ILSRequestShipDockProcessor()
         }
         public void ProcessPacket(ILSRequestShipDock packet, NebulaConnection conn)
         {
+            Log.Info($"Parsing ILSRequestShipDock for gId {packet.StationGId}");
+
             Player player = playerManager.GetPlayer(conn);
+
             if(player == null)
             {
                 player = playerManager.GetSyncingPlayer(conn);
             }
-            if (player != null && GameMain.data.galacticTransport.stationCapacity > packet.stationGId)
+            if (player != null && GameMain.data.galacticTransport.stationCapacity > packet.StationGId)
             {
                 List<int> shipOtherGId = new List<int>();
                 List<int> shipIndex = new List<int>();
@@ -46,7 +50,7 @@ public void ProcessPacket(ILSRequestShipDock packet, NebulaConnection conn)
 
                         for (int j = 0; j < shipData.Length; j++)
                         {
-                            if (shipData[j].otherGId == packet.stationGId)
+                            if (shipData[j].otherGId == packet.StationGId)
                             {
                                 shipOtherGId.Add(shipData[i].otherGId);
                                 shipIndex.Add(j);
@@ -60,21 +64,21 @@ public void ProcessPacket(ILSRequestShipDock packet, NebulaConnection conn)
                 }
                 // also add add ships of current station as they use the dock pos too in the pos calculation
                 // NOTE: we need to set this stations gid as otherStationGId so that the client accesses the array in the right way
-                ShipData[] shipData2 = GameMain.data.galacticTransport.stationPool[packet.stationGId].workShipDatas;
+                ShipData[] shipData2 = GameMain.data.galacticTransport.stationPool[packet.StationGId].workShipDatas;
 
                 for(int i = 0; i < shipData2.Length; i++)
                 {
-                    shipOtherGId.Add(packet.stationGId);
+                    shipOtherGId.Add(packet.StationGId);
                     shipIndex.Add(i);
                     shipPos.Add(new Double3(shipData2[i].uPos.x, shipData2[i].uPos.y, shipData2[i].uPos.z));
                     shipRot.Add(new Float4(shipData2[i].uRot));
                     shipPPosTemp.Add(new Double3(shipData2[i].pPosTemp.x, shipData2[i].pPosTemp.y, shipData2[i].pPosTemp.z));
                     shipPRotTemp.Add(new Float4(shipData2[i].pRotTemp));
                 }
 
-                ILSShipDock packet2 = new ILSShipDock(packet.stationGId,
-                                                                    GameMain.data.galacticTransport.stationPool[packet.stationGId].shipDockPos,
-                                                                    GameMain.data.galacticTransport.stationPool[packet.stationGId].shipDockRot,
+                ILSShipDock packet2 = new ILSShipDock(packet.StationGId,
+                                                                    GameMain.data.galacticTransport.stationPool[packet.StationGId].shipDockPos,
+                                                                    GameMain.data.galacticTransport.stationPool[packet.StationGId].shipDockRot,
                                                                     shipOtherGId.ToArray(),
                                                                     shipIndex.ToArray(),
                                                                     shipPos.ToArray(),

NebulaModel/Packets/Logistics/ILSAddStationComponent.cs

@@ -0,0 +1,19 @@
+using UnityEngine;
+using NebulaModel.DataStructures;
+
+namespace NebulaModel.Packets.Logistics
+{
+    public class ILSAddStationComponent
+    {
+        public int PlanetId { get; set; }
+        public int StationId { get; set; }
+        public int StationGId { get; set; }
+        public ILSAddStationComponent() { }
+        public ILSAddStationComponent(int planetId, int stationId, int stationGId)
+        {
+            StationGId = stationGId;
+            PlanetId = planetId;
+            StationId = stationId;
+        }
+    }
+}

NebulaModel/Packets/Logistics/ILSRequestShipDock.cs

@@ -2,11 +2,11 @@
 {
     public class ILSRequestShipDock
     {
-        public int stationGId { get; set; }
+        public int StationGId { get; set; }
         public ILSRequestShipDock() { }
         public ILSRequestShipDock(int stationGId)
         {
-            this.stationGId = stationGId;
+            StationGId = stationGId;
         }
     }
 }

NebulaPatcher/Patches/Dynamic/GalacticTransport_Patch.cs

@@ -1,4 +1,5 @@
 using HarmonyLib;
+using NebulaModel.Logger;
 using NebulaWorld;
 using NebulaModel.Packets.Logistics;
 using NebulaWorld.Logistics;
@@ -19,32 +20,6 @@ public static void SetForNewGame_Postfix()
             }
         }
 
-        [HarmonyPrefix]
-        [HarmonyPatch("AddStationComponent")]
-        public static bool AddStationComponent_Prefix(GalacticTransport __instance, int planetId, StationComponent station)
-        {
-            if (!SimulatedWorld.Initialized || LocalPlayer.IsMasterClient || ILSShipManager.PatchLockILS)
-            {
-                return true;
-            }
-            if (!ILSShipManager.AddStationComponentQueue.ContainsKey(planetId))
-            {
-                ILSShipManager.AddStationComponentQueue.Add(planetId, new List<StationComponent>());
-            }
-            // use a queue here as we need to wait for the GId sent by server
-            ILSShipManager.AddStationComponentQueue[planetId].Add(station);
-            LocalPlayer.SendPacket(new ILSAddStationComponentRequest(planetId, station.shipDockPos));
-
-            // if we are a client and have no fake station then just add the new one normally
-            // this should happen when a player places an ILS on a FactoryData known to this client
-            // or when this client arrives at a planet for the first time which contains ILS
-
-            //TODO: i think this should be false and only added via ILSAddStationComponentResponseProcessor
-            // but when client builds a ILS on a remote planet the shipDockPos is 0 and thus the checks fail.
-            // all in all there is some investigation needed here
-            return true;
-        }
-
         [HarmonyPrefix]
         [HarmonyPatch("RemoveStationComponent")]
         public static bool RemoveStationComponent_Prefix(GalacticTransport __instance, int gid)

NebulaPatcher/Patches/Dynamic/PlanetTransport_Patch.cs

@@ -1,4 +1,5 @@
 using HarmonyLib;
+using NebulaModel.Logger;
 using NebulaModel.Packets.Logistics;
 using NebulaWorld;
 using NebulaWorld.Logistics;
@@ -35,18 +36,36 @@ public static bool SetStationStorage_Postfix(PlanetTransport __instance, int sta
         // as the game does not do that for some reason, we need to do it here
         [HarmonyPostfix]
         [HarmonyPatch("NewStationComponent")]
-        public static void NewStationComponent_Postfix(PlanetTransport __instance, StationComponent __result, int _entityId, int _pcId, PrefabDesc _desc)
+        public static void NewStationComponent_AddPlanetId_Postfix(PlanetTransport __instance, StationComponent __result, int _entityId, int _pcId, PrefabDesc _desc)
         {
             if (!SimulatedWorld.Initialized)
             {
                 return;
             }
+
             if (!__result.isStellar && __result.planetId == 0)
             {
                 __result.planetId = __instance.planet.id;
             }
         }
 
+        [HarmonyPostfix]
+        [HarmonyPatch("NewStationComponent")]
+        public static void NewStationComponent_BroadcastNewILS_Postfix(PlanetTransport __instance, StationComponent __result, int _entityId, int _pcId, PrefabDesc _desc)
+        {
+            if (!SimulatedWorld.Initialized || !LocalPlayer.IsMasterClient) return;
+
+            // We don't need to do this for PLS
+            if (__result.gid == 0) return;
+
+            // After host has added the StationComponent it has planetId, id and gId, now we can inform all clients about this station
+            // so they can add it to their GalacticTransport as they don't do that. Note that we're doing this in
+            // PlanetTransport.NewStationComponent and not GalacticTransport.AddStationComponent because stationId will be set at this point.
+            Log.Info($"Sending packet about new station component to all clients for planet {__result.planetId}, id {__result.id} with gId of {__result.gid}");
+            LocalPlayer.SendPacket(new ILSAddStationComponent(__result.planetId, __result.id, __result.gid));
+        }
+
+
         [HarmonyPostfix]
         [HarmonyPatch("Import")]
         public static void Import_Postfix(PlanetTransport __instance)

NebulaWorld/Logistics/ILSShipManager.cs

@@ -1,17 +1,15 @@
 using NebulaModel.Packets.Logistics;
 using HarmonyLib;
 using UnityEngine;
-using System.Collections.Generic;
 using System;
 using System.Reflection;
 using NebulaModel.DataStructures;
+using NebulaModel.Logger;
 
 namespace NebulaWorld.Logistics
 {
     public static class ILSShipManager
     {
-        public static Dictionary<int,List<StationComponent>> AddStationComponentQueue = new Dictionary<int,List<StationComponent>>();
-
         private static AccessTools.FieldRef<object, int> FR_stationId;
         private static AccessTools.FieldRef<object, UIStationStorage[]> FR_storageUIs;
         private static MethodInfo MI_RefreshValues = null;
@@ -162,6 +160,7 @@ public static void CreateFakeStationComponent(int GId, int planetId, bool comput
                 AccessTools.Method(typeof(GalacticTransport), "SetStationCapacity").Invoke(GameMain.data.galacticTransport, args);
             }
 
+
             GameMain.data.galacticTransport.stationPool[GId] = new StationComponent();
             StationComponent stationComponent = GameMain.data.galacticTransport.stationPool[GId];
             stationComponent.isStellar = true;
@@ -283,28 +282,18 @@ private static void RefreshValuesUI(StationComponent stationComponent, int stora
 
         public static void UpdateSlotData(ILSUpdateSlotData packet)
         {
-            // PLS
-            if (packet.StationGId == 0)
+            Log.Info($"Updating slot data for planet {packet.PlanetId}, station {packet.StationId} gid {packet.StationGId}. Index {packet.Index}, storageIdx {packet.StorageIdx}");
+
+            // Clients only care about what happens on their planet, hosts always need to apply this.
+            // Using PlanetFactory to prevent getting the "fakes" that are creates on clients.
+            if (LocalPlayer.IsMasterClient || (!LocalPlayer.IsMasterClient && packet.PlanetId == GameMain.localPlanet?.id))
             {
                 PlanetData pData = GameMain.galaxy.PlanetById(packet.PlanetId);
-                if (pData?.factory?.transport != null && packet.StationId < pData.factory.transport.stationPool.Length)
+                StationComponent stationComponent = pData?.factory?.transport?.stationPool[packet.StationId];
+
+                if (stationComponent?.slots != null)
                 {
-                    StationComponent stationComponent = pData.factory.transport.stationPool[packet.StationId];
-                    if (stationComponent?.slots != null)
-                    {
-                        stationComponent.slots[packet.Index].storageIdx = packet.StorageIdx;
-                    }
-                }
-            }
-            else // ILS
-            {
-                if (packet.StationGId < GameMain.data.galacticTransport.stationPool.Length)
-                {
-                    StationComponent stationComponent = GameMain.data.galacticTransport.stationPool[packet.StationGId];
-                    if (stationComponent?.slots != null)
-                    {
-                        stationComponent.slots[packet.Index].storageIdx = packet.StorageIdx;
-                    }
+                    stationComponent.slots[packet.Index].storageIdx = packet.StorageIdx;
                 }
             }
         }