fixes for nexus v3

2025-07-28 03:58:25 +07:00
parent 32ae6569a8
commit aa323f1ff6
17 changed files with 1766 additions and 2392 deletions
--- a/Messages/WorldRequest.cs
+++ b/Messages/WorldRequest.cs
@@ -1,72 +1,55 @@
-using NLog;
+using System.Reflection;
+using NLog;
 using ProtoBuf;
 using Sandbox.Engine.Multiplayer;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using VRage.Game;
-using VRage.ObjectBuilders;
+using VRage.ObjectBuilders.Private;

-namespace SeamlessClientPlugin.Messages
+namespace SeamlessClientPlugin.Messages;
+
+[ProtoContract]
+public class WorldRequest
 {
-    [ProtoContract]
-    public class WorldRequest
+    private static readonly Logger Log = LogManager.GetCurrentClassLogger();
+
+    [ProtoMember(5)] public MyObjectBuilder_Gps GpsCollection;
+
+    [ProtoMember(2)] public long IdentityId;
+
+    [ProtoMember(1)] public ulong PlayerId;
+
+    [ProtoMember(3)] public string PlayerName;
+
+    [ProtoMember(4)] public byte[] WorldData;
+
+    public WorldRequest(ulong playerId, long playerIdentity, string name)
    {
-        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
-
-        [ProtoMember(1)]
-        public ulong PlayerID;
-        [ProtoMember(2)]
-        public long IdentityID;
-        [ProtoMember(3)]
-        public string PlayerName;
-        [ProtoMember(4)]
-        public byte[] WorldData;
-
-        [ProtoMember(5)]
-        public MyObjectBuilder_Gps gpsCollection;
-
-        public WorldRequest(ulong PlayerID,long PlayerIdentity, string Name)
-        {
-            this.PlayerID = PlayerID;
-            this.PlayerName = Name;
-            this.IdentityID = PlayerIdentity;
-        }
-
-        public WorldRequest() { }
-
-        public void SerializeWorldData(MyObjectBuilder_World WorldData)
-        {
-            MethodInfo CleanupData = typeof(MyMultiplayerServerBase).GetMethod("CleanUpData", BindingFlags.Static | BindingFlags.NonPublic, null, new Type[3]
-{
-            typeof(MyObjectBuilder_World),
-            typeof(ulong),
-            typeof(long),
-}, null);
-            object[] Data = new object[] { WorldData, PlayerID, IdentityID };
-            CleanupData.Invoke(null, Data);
-            WorldData = (MyObjectBuilder_World)Data[0];
-            using (MemoryStream memoryStream = new MemoryStream())
-            {
-                MyObjectBuilderSerializer.SerializeXML(memoryStream, WorldData, MyObjectBuilderSerializer.XmlCompression.Gzip);
-                this.WorldData = memoryStream.ToArray();
-                Log.Warn("Successfully Converted World");
-            }
-        }
-
-        public MyObjectBuilder_World DeserializeWorldData()
-        {
-            MyObjectBuilderSerializer.DeserializeGZippedXML<MyObjectBuilder_World>(new MemoryStream(WorldData), out var objectBuilder);
-            objectBuilder.Checkpoint.Gps.Dictionary.Add(IdentityID, gpsCollection);
-            
-
-
-            return objectBuilder;
-        }
-
+        this.PlayerId = playerId;
+        PlayerName = name;
+        IdentityId = playerIdentity;
    }
-}
+
+    public WorldRequest()
+    {
+    }
+
+    public void SerializeWorldData(MyObjectBuilder_World worldData)
+    {
+        MyMultiplayerServerBase.CleanUpData(worldData, PlayerId, IdentityId);
+        using var memoryStream = new MemoryStream();
+        MyObjectBuilderSerializerKeen.SerializeXML(memoryStream, worldData,
+            MyObjectBuilderSerializerKeen.XmlCompression.Gzip);
+        WorldData = memoryStream.ToArray();
+        Log.Warn("Successfully Converted World");
+    }
+
+    public MyObjectBuilder_World DeserializeWorldData()
+    {
+        MyObjectBuilderSerializerKeen.DeserializeGZippedXML<MyObjectBuilder_World>(new MemoryStream(WorldData),
+            out var objectBuilder);
+        objectBuilder.Checkpoint.Gps.Dictionary.Add(IdentityId, GpsCollection);
+
+
+        return objectBuilder;
+    }
+}