v0.10.5.1

2020-09-22 11:31:56 -03:00
parent 44032d0ae0
commit 0002ad2c50
343 changed files with 12276 additions and 5023 deletions
@@ -1,13 +1,56 @@
-using System;
+using Barotrauma.Extensions;
+using Barotrauma.Steam;
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using System.Text;

 namespace Barotrauma.Networking
 {
    abstract class ClientPeer
    {
+        protected class ServerContentPackage
+        {
+            public string Name;
+            public string Hash;
+            public UInt64 WorkshopId;
+
+            public ContentPackage RegularPackage
+            {
+                get
+                {
+                    return ContentPackage.RegularPackages.Find(p => p.MD5hash.Hash.Equals(Hash));
+                }
+            }
+
+            public ContentPackage CorePackage
+            {
+                get
+                {
+                    return ContentPackage.CorePackages.Find(p => p.MD5hash.Hash.Equals(Hash));
+                }
+            }
+
+            public ServerContentPackage(string name, string hash, UInt64 workshopId)
+            {
+                Name = name;
+                Hash = hash;
+                WorkshopId = workshopId;
+            }
+        }
+
+        protected string GetPackageStr(ContentPackage contentPackage)
+        {
+            return "\"" + contentPackage.Name + "\" (hash " + contentPackage.MD5hash.ShortHash + ")";
+        }
+        protected string GetPackageStr(ServerContentPackage contentPackage)
+        {
+            return "\"" + contentPackage.Name + "\" (hash " + Md5Hash.GetShortHash(contentPackage.Hash) + ")";
+        }
+
        public delegate void MessageCallback(IReadMessage message);
-        public delegate void DisconnectCallback();
+        public delegate void DisconnectCallback(bool disableReconnect);
        public delegate void DisconnectMessageCallback(string message);
        public delegate void PasswordCallback(int salt, int retries);
        public delegate void InitializationCompleteCallback();
@@ -25,11 +68,150 @@ namespace Barotrauma.Networking
        public NetworkConnection ServerConnection { get; protected set; }

        public abstract void Start(object endPoint, int ownerKey);
-        public abstract void Close(string msg = null);
+        public abstract void Close(string msg = null, bool disableReconnect = false);
        public abstract void Update(float deltaTime);
        public abstract void Send(IWriteMessage msg, DeliveryMethod deliveryMethod);
        public abstract void SendPassword(string password);

+        protected abstract void SendMsgInternal(DeliveryMethod deliveryMethod, IWriteMessage msg);
+
+        protected ConnectionInitialization initializationStep;
+        protected bool contentPackageOrderReceived;
+        protected int ownerKey = 0;
+        protected int passwordSalt;
+        protected Steamworks.AuthTicket steamAuthTicket;
+        protected void ReadConnectionInitializationStep(IReadMessage inc)
+        {
+            ConnectionInitialization step = (ConnectionInitialization)inc.ReadByte();
+
+            IWriteMessage outMsg;
+
+            switch (step)
+            {
+                case ConnectionInitialization.SteamTicketAndVersion:
+                    if (initializationStep != ConnectionInitialization.SteamTicketAndVersion) { return; }
+                    outMsg = new WriteOnlyMessage();
+                    outMsg.Write((byte)PacketHeader.IsConnectionInitializationStep);
+                    outMsg.Write((byte)ConnectionInitialization.SteamTicketAndVersion);
+                    outMsg.Write(Name);
+                    outMsg.Write(ownerKey);
+                    outMsg.Write(SteamManager.GetSteamID());
+                    if (steamAuthTicket == null)
+                    {
+                        outMsg.Write((UInt16)0);
+                    }
+                    else
+                    {
+                        outMsg.Write((UInt16)steamAuthTicket.Data.Length);
+                        outMsg.Write(steamAuthTicket.Data, 0, steamAuthTicket.Data.Length);
+                    }
+                    outMsg.Write(GameMain.Version.ToString());
+                    outMsg.Write(GameMain.Config.Language);
+
+                    SendMsgInternal(DeliveryMethod.Reliable, outMsg);
+                    break;
+                case ConnectionInitialization.ContentPackageOrder:
+                    if (initializationStep == ConnectionInitialization.SteamTicketAndVersion ||
+                        initializationStep == ConnectionInitialization.Password) { initializationStep = ConnectionInitialization.ContentPackageOrder; }
+                    if (initializationStep != ConnectionInitialization.ContentPackageOrder) { return; }
+                    outMsg = new WriteOnlyMessage();
+                    outMsg.Write((byte)PacketHeader.IsConnectionInitializationStep);
+                    outMsg.Write((byte)ConnectionInitialization.ContentPackageOrder);
+
+                    string serverName = inc.ReadString();
+
+                    UInt32 cpCount = inc.ReadVariableUInt32();
+                    ServerContentPackage corePackage = null;
+                    List<ServerContentPackage> regularPackages = new List<ServerContentPackage>();
+                    List<ServerContentPackage> missingPackages = new List<ServerContentPackage>();
+                    for (int i = 0; i < cpCount; i++)
+                    {
+                        string name = inc.ReadString();
+                        string hash = inc.ReadString();
+                        UInt64 workshopId = inc.ReadUInt64();
+                        var pkg = new ServerContentPackage(name, hash, workshopId);
+                        if (pkg.CorePackage != null)
+                        {
+                            corePackage = pkg;
+                        }
+                        else if (pkg.RegularPackage != null)
+                        {
+                            regularPackages.Add(pkg);
+                        }
+                        else
+                        {
+                            missingPackages.Add(pkg);
+                        }
+                    }
+
+                    if (missingPackages.Count > 0)
+                    {
+                        var nonDownloadable = missingPackages.Where(p => p.WorkshopId == 0);
+
+                        if (nonDownloadable.Any())
+                        {
+                            string disconnectMsg;
+                            if (nonDownloadable.Count() == 1)
+                            {
+                                disconnectMsg = $"DisconnectMessage.MissingContentPackage~[missingcontentpackage]={GetPackageStr(missingPackages[0])}";
+                            }
+                            else
+                            {
+                                List<string> packageStrs = new List<string>();
+                                nonDownloadable.ForEach(cp => packageStrs.Add(GetPackageStr(cp)));
+                                disconnectMsg = $"DisconnectMessage.MissingContentPackages~[missingcontentpackages]={string.Join(", ", packageStrs)}";
+                            }
+                            Close(disconnectMsg, disableReconnect: true);
+                        }
+                        else
+                        {
+                            Close(disableReconnect: true);
+
+                            string missingModNames = "\n- " + string.Join("\n\n- ", missingPackages.Select(p => GetPackageStr(p))) + "\n\n";
+
+                            var msgBox = new GUIMessageBox(
+                                TextManager.Get("WorkshopItemDownloadTitle"),
+                                TextManager.GetWithVariable("WorkshopItemDownloadPrompt", "[items]", missingModNames),
+                                new string[] { TextManager.Get("Yes"), TextManager.Get("No") });
+                            msgBox.Buttons[0].OnClicked = (yesBtn, userdata) =>
+                            {
+                                GameMain.ServerListScreen.Select();
+                                GameMain.ServerListScreen.DownloadWorkshopItems(missingPackages.Select(p => p.WorkshopId), serverName, ServerConnection.EndPointString);
+                                return true;
+                            };
+                            msgBox.Buttons[0].OnClicked += msgBox.Close;
+                            msgBox.Buttons[1].OnClicked = msgBox.Close;
+                        }
+
+                        return;
+                    }
+
+                    if (!contentPackageOrderReceived)
+                    {
+                        GameMain.Config.SwapPackages(corePackage.CorePackage, regularPackages.Select(p => p.RegularPackage).ToList());
+                        contentPackageOrderReceived = true;
+                    }
+
+                    SendMsgInternal(DeliveryMethod.Reliable, outMsg);
+                    break;
+                case ConnectionInitialization.Password:
+                    if (initializationStep == ConnectionInitialization.SteamTicketAndVersion) { initializationStep = ConnectionInitialization.Password; }
+                    if (initializationStep != ConnectionInitialization.Password) { return; }
+                    bool incomingSalt = inc.ReadBoolean(); inc.ReadPadBits();
+                    int retries = 0;
+                    if (incomingSalt)
+                    {
+                        passwordSalt = inc.ReadInt32();
+                    }
+                    else
+                    {
+                        retries = inc.ReadInt32();
+                    }
+                    OnRequestPassword?.Invoke(passwordSalt, retries);
+                    break;
+            }
+        }
+
 #if DEBUG
        public abstract void ForceTimeOut();
 #endif