Unstable v0.19.1.0

2022-08-19 13:59:08 -03:00
parent 6b55adcdd9
commit 1219615d64
192 changed files with 3875 additions and 2648 deletions
@@ -0,0 +1,33 @@
+#nullable enable
+
+namespace Barotrauma.Networking
+{
+    abstract class Endpoint
+    {
+        public abstract string StringRepresentation { get; }
+        
+        public abstract LocalizedString ServerTypeString { get; }
+
+        public readonly Address Address;
+
+        public Endpoint(Address address)
+        {
+            Address = address;
+        }
+        
+        public abstract override bool Equals(object? obj);
+
+        public abstract override int GetHashCode();
+
+        public override string ToString() => StringRepresentation;
+
+        public static Option<Endpoint> Parse(string str)
+            => ReflectionUtils.ParseDerived<Endpoint>(str);
+
+        public static bool operator ==(Endpoint a, Endpoint b)
+            => a.Equals(b);
+
+        public static bool operator !=(Endpoint a, Endpoint b)
+            => !(a == b);
+    }
+}
@@ -0,0 +1,63 @@
+#nullable enable
+using System.Linq;
+using System.Net;
+
+namespace Barotrauma.Networking
+{
+    sealed class LidgrenEndpoint : Endpoint
+    {
+        public readonly IPEndPoint NetEndpoint;
+
+        public int Port => NetEndpoint.Port;
+
+        public override string StringRepresentation
+            => NetEndpoint.ToString();
+
+        public override LocalizedString ServerTypeString { get; } = TextManager.Get("DedicatedServer");
+
+        public LidgrenEndpoint(IPAddress address, int port) : this(new IPEndPoint(address, port)) { }
+
+        public LidgrenEndpoint(IPEndPoint netEndpoint) : base(new LidgrenAddress(netEndpoint.Address))
+        {
+            NetEndpoint = netEndpoint;
+        }
+
+        public new static Option<LidgrenEndpoint> Parse(string endpointStr)
+        {
+            if (IPEndPoint.TryParse(endpointStr, out IPEndPoint? netEndpoint))
+            {
+                return Option<LidgrenEndpoint>.Some(new LidgrenEndpoint(netEndpoint!));
+            }
+
+            if (endpointStr.Count(c => c == ':') == 1)
+            {
+                string[] split = endpointStr.Split(':');
+                string hostName = split[0];
+                if (LidgrenAddress.Parse(hostName).TryUnwrap(out var adr)
+                    && int.TryParse(split[1], out var port))
+                {
+                    return Option<LidgrenEndpoint>.Some(new LidgrenEndpoint(adr.NetAddress, port));
+                }
+            }
+
+            return LidgrenAddress.Parse(endpointStr)
+                .Select(adr => new LidgrenEndpoint(adr.NetAddress, NetConfig.DefaultPort));
+        }
+
+        public override bool Equals(object? obj)
+            => obj switch
+            {
+                LidgrenEndpoint otherEndpoint => this == otherEndpoint,
+                _ => false
+            };
+
+        public override int GetHashCode()
+            => NetEndpoint.GetHashCode();
+
+        public static bool operator ==(LidgrenEndpoint a, LidgrenEndpoint b)
+            => a.Address.Equals(b.Address) && a.Port == b.Port;
+
+        public static bool operator !=(LidgrenEndpoint a, LidgrenEndpoint b)
+            => !(a == b);
+    }
+}
@@ -0,0 +1,37 @@
+#nullable enable
+
+namespace Barotrauma.Networking
+{
+    sealed class SteamP2PEndpoint : Endpoint
+    {
+        public readonly SteamId SteamId;
+
+        public override string StringRepresentation => SteamId.StringRepresentation;
+
+        public override LocalizedString ServerTypeString { get; } = TextManager.Get("SteamP2PServer");
+        
+        public SteamP2PEndpoint(SteamId steamId) : base(new SteamP2PAddress(steamId))
+        {
+            SteamId = steamId;
+        }
+
+        public new static Option<SteamP2PEndpoint> Parse(string endpointStr)
+            => SteamId.Parse(endpointStr).Select(steamId => new SteamP2PEndpoint(steamId));
+        
+        public override bool Equals(object? obj)
+            => obj switch
+            {
+                SteamP2PEndpoint otherEndpoint => this == otherEndpoint,
+                _ => false
+            };
+
+        public override int GetHashCode()
+            => SteamId.GetHashCode();
+
+        public static bool operator ==(SteamP2PEndpoint a, SteamP2PEndpoint b)
+            => a.SteamId == b.SteamId;
+
+        public static bool operator !=(SteamP2PEndpoint a, SteamP2PEndpoint b)
+            => !(a == b);
+    }
+}