Fix #175: simply add Ghost colliding logic

.editorconfig

@@ -4,6 +4,10 @@ root = true
 indent_style = space
 indent_size = 4
 
+[*.js]
+indent_style = space
+indent_size = 2
+
 # https://kent-boogaart.com/blog/editorconfig-reference-for-c-developers
 
 csharp_indent_block_contents = true

.gitignore

@@ -1,6 +1,12 @@
+# publishing byproducts
 PubClient/
+PubServer/
 CelesteNet.Client.zip
 
+# celeste reference libraries, in case someone really doesn't
+# want cnet to be cloned in the Mods folder
+lib-stripped/
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##

CelesteNet.Client/CelesteNet.Client.csproj

@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <LangVersion>9</LangVersion> <!-- FIXME: Figure out why dotnet needs this! -->
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <AssemblyName>CelesteNet.Client</AssemblyName>
     <RootNamespace>Celeste.Mod.CelesteNet.Client</RootNamespace>
-    <Nullable>disable</Nullable>
+      <!-->Nullable>disable</Nullable-->
   </PropertyGroup>
 
   <Import Project="..\CelesteNet.props" />

CelesteNet.Client/CelesteNetClient.cs

@@ -1,28 +1,26 @@
-using Celeste.Mod.CelesteNet.DataTypes;
-using MonoMod.Utils;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
-using System.Reflection;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
+using Celeste.Mod.CelesteNet.DataTypes;
 
 namespace Celeste.Mod.CelesteNet.Client {
+
+    using cIDSendMode = CelesteNetClientSettings.ClientIDSendMode;
+
     public class CelesteNetClient : IDisposable {
 
         public readonly CelesteNetClientSettings Settings;
         public readonly CelesteNetClientOptions Options;
 
         public readonly DataContext Data;
 
-        public CelesteNetConnection Con;
+        public CelesteNetConnection? Con;
         public readonly IConnectionFeature[] ConFeatures;
-        public volatile bool EndOfStream = false, SafeDisposeTriggered = false;
+        public volatile bool EndOfStream = false, SafeDisposeTriggered = false, Disposed = false;
+        public ConnectionErrorCodeException? LastConnectionError;
 
         private bool _IsAlive;
         public bool IsAlive {
@@ -38,11 +36,11 @@ public bool IsAlive {
         public bool IsReady { get; protected set; }
         private readonly ManualResetEventSlim _ReadyEvent;
 
-        public DataPlayerInfo PlayerInfo;
+        public DataPlayerInfo? PlayerInfo;
 
         private readonly object StartStopLock = new();
 
-        private System.Timers.Timer HeartbeatTimer;
+        private System.Timers.Timer? HeartbeatTimer;
 
         public CelesteNetClient()
             : this(new(), new()) {
@@ -52,22 +50,43 @@ public CelesteNetClient(CelesteNetClientSettings settings, CelesteNetClientOptio
             Settings = settings;
             Options = options;
 
+            Options.AvatarsDisabled = !Settings.ReceivePlayerAvatars;
+            Options.ClientID = Settings.ClientID;
+            Options.InstanceID = Settings.InstanceID;
+
+            Options.SupportedClientFeatures |= CelesteNetSupportedClientFeatures.LocateCommand;
+
+            bool isServerLocalhost = Settings.Host == "localhost" || Settings.Host == "127.0.0.1";
+
+            if (Settings.ClientIDSending == cIDSendMode.Off || (Settings.ClientIDSending == cIDSendMode.NotOnLocalhost && isServerLocalhost))
+                Options.ClientID = 0;
+
+            Logger.Log(LogLevel.DEV, "lifecycle", $"CelesteNetClient created");
+
             Data = new();
+
+            Logger.Log(LogLevel.INF, "data", "Rescanning all data types");
+            Data.IDToDataType.Clear();
+            Data.DataTypeToID.Clear();
+
+            Data.RescanDataTypes(CelesteNetClientModule.GetTypes());
+
             Data.RegisterHandlersIn(this);
 
             _ReadyEvent = new(false);
 
             // Find connection features
             List<IConnectionFeature> conFeatures = new();
-            foreach (Type type in CelesteNetUtils.GetTypes()) {
+            foreach (Type type in CelesteNetClientModule.GetTypes()) {
                 try {
                     if (!typeof(IConnectionFeature).IsAssignableFrom(type) || type.IsAbstract)
                         continue;
-                } catch {
+                } catch (Exception e) {
+                    Logger.Log(LogLevel.VVV, "main", $"CelesteNetClient - conFeature threw {e.Message}");
                     continue;
                 }
 
-                IConnectionFeature feature = (IConnectionFeature) Activator.CreateInstance(type);
+                IConnectionFeature? feature = (IConnectionFeature?) Activator.CreateInstance(type);
                 if (feature == null)
                     throw new Exception($"Cannot create instance of connection feature {type.FullName}");
                 Logger.Log(LogLevel.VVV, "main", $"Found connection feature: {type.FullName}");
@@ -77,16 +96,20 @@ public CelesteNetClient(CelesteNetClientSettings settings, CelesteNetClientOptio
         }
 
         public void Start(CancellationToken token) {
-            if (IsAlive)
+            if (IsAlive) {
+                Logger.Log(LogLevel.DEV, "lifecycle", $"CelesteNetClient: Start called but IsAlive already");
                 return;
+            }
             IsAlive = true;
 
             lock (StartStopLock) {
-                if (IsReady)
+                if (IsReady) {
+                    Logger.Log(LogLevel.DEV, "lifecycle", $"CelesteNetClient: Start called but IsReady already");
                     return;
+                }
                 Logger.Log(LogLevel.CRI, "main", $"Startup");
 
-                switch (Settings.ConnectionType) {
+                switch (Settings.Debug.ConnectionType) {
                     case ConnectionType.Auto:
                     case ConnectionType.TCPUDP:
                     case ConnectionType.TCP:
@@ -100,7 +123,8 @@ public void Start(CancellationToken token) {
                             sockAll.Add(new Socket(AddressFamily.InterNetworkV6, SocketType.Stream, ProtocolType.Tcp));
                         if (Socket.OSSupportsIPv4)
                             sockAll.Add(new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp));
-                        Socket sock = null;
+                        Socket? sock = null;
+                        LastConnectionError = null;
                         try {
                             uint conToken;
                             IConnectionFeature[] conFeatures;
@@ -114,9 +138,9 @@ public void Start(CancellationToken token) {
                                     sockTry.Dispose();
                                 }
                             })) {
-                                Exception sockEx = null;
+                                Exception? sockEx = null;
                                 IPAddress[] addresses = Dns.GetHostAddresses(Settings.Host);
-                                Tuple<uint, IConnectionFeature[], CelesteNetTCPUDPConnection.Settings> teapotRes = null;
+                                Tuple<uint, IConnectionFeature[], CelesteNetTCPUDPConnection.Settings>? teapotRes = null;
 
                                 foreach (Socket sockTry in sockAll)
                                     Logger.Log(LogLevel.DBG, "main", $"... with socket type {sockTry.AddressFamily}");
@@ -133,8 +157,11 @@ public void Start(CancellationToken token) {
                                             sock = sockTry;
                                             sock.ReceiveTimeout = sock.SendTimeout = 2000;
                                             sock.Connect(address, Settings.Port);
+
+                                            LastConnectionError = sockEx as ConnectionErrorCodeException;
+
                                             // Do the teapot handshake here, as a successful "connection" doesn't mean that the server can handle IPv6.
-                                            teapotRes = Handshake.DoTeapotHandshake<CelesteNetClientTCPUDPConnection.Settings>(sock, ConFeatures, Settings.Name, Options);
+                                            teapotRes = Handshake.DoTeapotHandshake<CelesteNetClientTCPUDPConnection.Settings>(sock, ConFeatures, Settings.NameKey, Options);
                                             Logger.Log(LogLevel.INF, "main", $"Connecting to {address} ({address.AddressFamily}) succeeded");
                                             break;
                                         } catch (Exception e) {
@@ -156,7 +183,8 @@ public void Start(CancellationToken token) {
                                         continue;
                                     try {
                                         sockTry.Close();
-                                    } catch {
+                                    } catch (Exception e) {
+                                        Logger.Log(LogLevel.DEV, "lifecycle", $"CelesteNetClient Start: sock close caught '{e.Message}'");
                                     }
                                     sockTry.Dispose();
                                 }
@@ -177,21 +205,21 @@ public void Start(CancellationToken token) {
                                 conToken = teapotRes.Item1;
                                 conFeatures = teapotRes.Item2;
                                 settings = teapotRes.Item3;
-                                Logger.Log(LogLevel.INF, "main", $"Teapot handshake success: token {conToken} conFeatures '{conFeatures.Select(f => f.GetType().FullName).Aggregate((string) null, (a, f) => (a == null) ? f : $"{a}, {f}")}'");
+                                Logger.Log(LogLevel.INF, "main", $"Teapot handshake success: token {conToken} conFeatures '{conFeatures.Select(f => f.GetType().FullName).Aggregate((string?) null, (a, f) => (a == null) ? f : $"{a}, {f}")}'");
                                 sock.ReceiveTimeout = sock.SendTimeout = (int) (settings.HeartbeatInterval * settings.MaxHeartbeatDelay);
                             }
 
                             // Create a connection and start the heartbeat timer
                             CelesteNetClientTCPUDPConnection con = new(this, conToken, settings, sock);
                             con.OnDisconnect += _ => Dispose();
-                            if (Settings.ConnectionType == ConnectionType.TCP)
+                            if (Settings.Debug.ConnectionType == ConnectionType.TCP)
                                 con.UseUDP = false;
 
                             // Initialize the heartbeat timer
                             HeartbeatTimer = new(settings.HeartbeatInterval);
                             HeartbeatTimer.AutoReset = true;
                             HeartbeatTimer.Elapsed += (_, _) => {
-                                string disposeReason = con.DoHeartbeatTick();
+                                string? disposeReason = con.DoHeartbeatTick();
                                 if (disposeReason != null) {
                                     Logger.Log(LogLevel.CRI, "main", disposeReason);
                                     Dispose();
@@ -200,16 +228,18 @@ public void Start(CancellationToken token) {
                             HeartbeatTimer.Start();
 
                             // Do the regular connection handshake
-                            Handshake.DoConnectionHandshake(Con, conFeatures, token);
+                            Handshake.DoConnectionHandshake(con, conFeatures, token);
                             Logger.Log(LogLevel.INF, "main", $"Connection handshake success");
 
                             Con = con;
-                        } catch {
+                        } catch (Exception e) {
+                            Logger.Log(LogLevel.DEV, "lifecycle", $"CelesteNetClient Start: Caught exception, will throw: '{e.Message}'");
                             Con?.Dispose();
                             foreach (Socket sockTry in sockAll) {
                                 try {
                                     sockTry.Close();
-                                } catch {
+                                } catch (Exception se) {
+                                    Logger.Log(LogLevel.DEV, "lifecycle", $"CelesteNetClient Start: sock close caught '{se.Message}'");
                                 }
                                 sockTry.Dispose();
                             }
@@ -220,10 +250,11 @@ public void Start(CancellationToken token) {
                         break;
 
                     default:
-                        throw new NotSupportedException($"Unsupported connection type {Settings.ConnectionType}");
+                        throw new NotSupportedException($"Unsupported connection type {Settings.Debug.ConnectionType}");
                 }
             }
 
+            Logger.Log(LogLevel.VVV, "main", $"Client Start: Waiting for Ready");
             // Wait until the server sent the ready packet
             _ReadyEvent.Wait(token);
             SendFilterList();
@@ -233,8 +264,11 @@ public void Start(CancellationToken token) {
         }
 
         public void Dispose() {
-            if (!IsAlive)
+            if (Disposed) {
+                Logger.Log(LogLevel.DEV, "lifecycle", $"CelesteNetClient Dispose called but already disposed");
                 return;
+            }
+            Disposed = true;
             IsAlive = false;
 
             lock (StartStopLock) {
@@ -271,21 +305,48 @@ public T Send<T>(T data) where T : DataType<T> {
         }
 
         public DataType SendAndHandle(DataType data) {
-            Con?.Send(data);
-            Data.Handle(null, data);
+            if (Con != null) {
+                Con.Send(data);
+                Data.Handle(Con, data);
+            }
             return data;
         }
 
         public T SendAndHandle<T>(T data) where T : DataType<T> {
-            Con?.Send(data);
-            Data.Handle(null, data);
+            if (Con != null) {
+                Con.Send(data);
+                Data.Handle(Con, data);
+            }
             return data;
         }
 
         public void Handle(CelesteNetConnection con, DataPlayerInfo info) {
             // The first DataPlayerInfo sent from the server is our own
-            if (PlayerInfo == null || PlayerInfo.ID == info.ID)
+            if (PlayerInfo == null || PlayerInfo.ID == info.ID) {
                 PlayerInfo = info;
+
+                if (Settings.NameKey == "Guest" && info.Name == "Guest") {
+                    // strip off any '#x' suffix
+                    int i = info.FullName.IndexOf('#');
+                    string newName = i > 0 ? info.FullName.Substring(0, i) : info.FullName;
+
+                    // take on the 'generated' Guest name
+                    if (newName != "Guest") {
+                        Logger.Log(LogLevel.INF, "playerinfo", $"Connected as Guest, but got '{newName}'. Saving fixed Guest name to config.");
+                        Settings.Name = newName;
+                    }
+                }
+            }
+        }
+
+        public bool Filter(CelesteNetConnection con, DataPlayerInfo info) {
+            if (info == null)
+                return false;
+
+            if(Options.AvatarsDisabled) {
+                info.DisplayName = info.FullName;
+            }
+            return true;
         }
 
         public void Handle(CelesteNetConnection con, DataReady ready) {