From fbadb57a369dc99d50e8f81457a3e0194e5d468c Mon Sep 17 00:00:00 2001
From: Mark Suckerberg <mark@suckerberg.gay>
Date: Thu, 2 Nov 2023 09:51:01 -0500
Subject: [PATCH] Makes connections a bit more smooth, adds port selection with
 proper IP parsing

---
 .run/Blocktest (Local Multiplayer).run.xml |  2 +-
 .run/DedicatedServer.run.xml               |  2 +-
 Blocktest/BlocktestGame.cs                 |  5 +++--
 Blocktest/Code/Networking/Client.cs        | 15 ++++++++++++---
 Blocktest/Code/Scenes/GameScene.cs         |  7 ++++---
 Blocktest/Code/Scenes/MainMenuScene.cs     | 17 +++++++++--------
 Blocktest/Code/UI/ConnectionWindow.cs      | 16 ++++++++++++----
 Blocktest/Program.cs                       |  4 ++--
 8 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/.run/Blocktest (Local Multiplayer).run.xml b/.run/Blocktest (Local Multiplayer).run.xml
index 4914f9a..da70c15 100644
--- a/.run/Blocktest (Local Multiplayer).run.xml	
+++ b/.run/Blocktest (Local Multiplayer).run.xml	
@@ -2,7 +2,7 @@
   <configuration default="false" name="Blocktest (Local Multiplayer)" type="DotNetProject" factoryName=".NET Project"
                  singleton="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/Blocktest/bin/Debug/net7.0/Blocktest.exe" />
-    <option name="PROGRAM_PARAMETERS" value="connect 127.0.0.1" />
+    <option name="PROGRAM_PARAMETERS" value="connect 127.0.0.1:9050"/>
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Blocktest/bin/Debug/net7.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
diff --git a/.run/DedicatedServer.run.xml b/.run/DedicatedServer.run.xml
index fa659f6..b310e19 100644
--- a/.run/DedicatedServer.run.xml
+++ b/.run/DedicatedServer.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DedicatedServer" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/DedicatedServer/bin/Debug/net7.0/DedicatedServer" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/DedicatedServer/bin/Debug/net7.0/DedicatedServer.exe"/>
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/DedicatedServer/bin/Debug/net7.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
diff --git a/Blocktest/BlocktestGame.cs b/Blocktest/BlocktestGame.cs
index 7bd63b9..9bfd4cc 100644
--- a/Blocktest/BlocktestGame.cs
+++ b/Blocktest/BlocktestGame.cs
@@ -1,3 +1,4 @@
+using System.Net;
 using Blocktest.Block_System;
 using Blocktest.Scenes;
 using Myra;
@@ -7,12 +8,12 @@ namespace Blocktest;
 /// <inheritdoc />
 public sealed class BlocktestGame : Game {
     private readonly bool _connect;
-    private readonly string? _ip;
+    private readonly IPEndPoint? _ip;
     private IScene? _currentScene;
     private GraphicsDeviceManager _graphics;
 
     /// <inheritdoc />
-    public BlocktestGame(string? newIp = null) {
+    public BlocktestGame(IPEndPoint? newIp = null) {
         _connect = newIp != null;
         _ip = newIp;
         _graphics = new GraphicsDeviceManager(this);
diff --git a/Blocktest/Code/Networking/Client.cs b/Blocktest/Code/Networking/Client.cs
index abb0631..fd9c4b9 100644
--- a/Blocktest/Code/Networking/Client.cs
+++ b/Blocktest/Code/Networking/Client.cs
@@ -1,4 +1,7 @@
+using System.Net;
 using Blocktest.Rendering;
+using Blocktest.Scenes;
+using Blocktest.UI;
 using LiteNetLib;
 using LiteNetLib.Utils;
 using Shared.Code;
@@ -16,9 +19,12 @@ public sealed class Client {
     private readonly WorldState _worldState;
     public TickBuffer ClientTickBuffer;
 
-    public Client(WorldState worldState, Camera camera) {
+    private readonly BlocktestGame _game;
+
+    public Client(WorldState worldState, Camera camera, BlocktestGame game) {
         _worldState = worldState;
         _camera = camera;
+        _game = game;
         ClientTickBuffer = new TickBuffer(0, _worldState);
         _listener = new EventBasedNetListener();
         _manager = new NetManager(_listener);
@@ -30,8 +36,8 @@ public Client(WorldState worldState, Camera camera) {
 
     public NetPeer? Server { get; private set; }
 
-    public void Start(string ip, int port, string key) {
-        _manager.Connect(ip, port, key);
+    public void Start(IPEndPoint ipEndPoint, string key) {
+        _manager.Connect(ipEndPoint, key);
     }
 
     public void Stop() {
@@ -54,6 +60,9 @@ private void PeerConnected(NetPeer peer) {
 
     private void PeerDisconnected(NetPeer peer, DisconnectInfo disconnectInfo) {
         Console.WriteLine("Disconnected from server");
+
+        _game.SetScene(new MainMenuScene(_game,
+            new DialogueWindow("Disconnected from server.", $"{disconnectInfo.Reason}")));
     }
 
     /// <summary>
diff --git a/Blocktest/Code/Scenes/GameScene.cs b/Blocktest/Code/Scenes/GameScene.cs
index 71462cc..8d9b5f3 100644
--- a/Blocktest/Code/Scenes/GameScene.cs
+++ b/Blocktest/Code/Scenes/GameScene.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Net;
 using Blocktest.Block_System;
 using Blocktest.Misc;
 using Blocktest.Networking;
@@ -28,7 +29,7 @@ public sealed class GameScene : IScene {
 
     private KeyboardState _previousKeyboardState;
 
-    public GameScene(BlocktestGame game, bool doConnect, string? ip) {
+    public GameScene(BlocktestGame game, bool doConnect, IPEndPoint? ip) {
         _connect = doConnect;
         _spriteBatch = new SpriteBatch(game.GraphicsDevice);
         _game = game;
@@ -37,12 +38,12 @@ public GameScene(BlocktestGame game, bool doConnect, string? ip) {
 
         _backgroundTilemapSprites = new RenderableTilemap(_worldState.Foreground, _camera);
         _foregroundTilemapSprites = new RenderableTilemap(_worldState.Background, _camera);
-        _networkingClient = new Client(_worldState, _camera);
+        _networkingClient = new Client(_worldState, _camera, game);
 
         _blockStrings = BlockManagerShared.AllBlocks.Keys.ToArray();
 
         if (_connect && ip != null) {
-            _networkingClient.Start(ip, 9050, "testKey");
+            _networkingClient.Start(ip, "testKey");
             return;
         }
 
diff --git a/Blocktest/Code/Scenes/MainMenuScene.cs b/Blocktest/Code/Scenes/MainMenuScene.cs
index c0e4a1b..af70472 100644
--- a/Blocktest/Code/Scenes/MainMenuScene.cs
+++ b/Blocktest/Code/Scenes/MainMenuScene.cs
@@ -6,10 +6,9 @@ namespace Blocktest.Scenes;
 
 public class MainMenuScene : IScene {
     private readonly Desktop _desktop;
-    private readonly VerticalStackPanel _mainMenu;
 
-    public MainMenuScene(BlocktestGame game) {
-        _mainMenu = new VerticalStackPanel {
+    public MainMenuScene(BlocktestGame game, Window? modal = null) {
+        VerticalStackPanel mainMenu = new() {
             HorizontalAlignment = HorizontalAlignment.Center,
             VerticalAlignment = VerticalAlignment.Center,
             BorderThickness = new Thickness(1),
@@ -23,7 +22,7 @@ public MainMenuScene(BlocktestGame game) {
             VerticalAlignment = VerticalAlignment.Center,
             Padding = new Thickness(8)
         };
-        _mainMenu.Widgets.Add(titleLabel);
+        mainMenu.Widgets.Add(titleLabel);
 
         TextButton newGameButton = new() {
             Text = "New Game",
@@ -31,7 +30,7 @@ public MainMenuScene(BlocktestGame game) {
             Padding = new Thickness(5)
         };
         newGameButton.Click += (_, _) => { game.SetScene(new GameScene(game, false, null)); };
-        _mainMenu.Widgets.Add(newGameButton);
+        mainMenu.Widgets.Add(newGameButton);
 
         TextButton connectButton = new() {
             Text = "Connect",
@@ -39,7 +38,7 @@ public MainMenuScene(BlocktestGame game) {
             Padding = new Thickness(5)
         };
         connectButton.Click += (_, _) => { new ConnectionWindow(game).ShowModal(_desktop); };
-        _mainMenu.Widgets.Add(connectButton);
+        mainMenu.Widgets.Add(connectButton);
 
         TextButton exitButton = new() {
             Text = "Exit",
@@ -47,9 +46,11 @@ public MainMenuScene(BlocktestGame game) {
             Padding = new Thickness(5)
         };
         exitButton.Click += (_, _) => { game.Exit(); };
-        _mainMenu.Widgets.Add(exitButton);
+        mainMenu.Widgets.Add(exitButton);
 
-        _desktop = new Desktop { Root = _mainMenu };
+        _desktop = new Desktop { Root = mainMenu };
+
+        modal?.ShowModal(_desktop);
     }
 
     public void Update(GameTime gameTime) { }
diff --git a/Blocktest/Code/UI/ConnectionWindow.cs b/Blocktest/Code/UI/ConnectionWindow.cs
index 6071f9b..165d9a9 100644
--- a/Blocktest/Code/UI/ConnectionWindow.cs
+++ b/Blocktest/Code/UI/ConnectionWindow.cs
@@ -1,3 +1,4 @@
+using System.Net;
 using Blocktest.Scenes;
 using Myra.Graphics2D;
 using Myra.Graphics2D.UI;
@@ -20,13 +21,13 @@ public ConnectionWindow(BlocktestGame game) {
         };
         windowGrid.Widgets.Add(label1);
 
-        TextBox textBox = new() {
-            Text = "127.0.0.1",
+        TextBox ipBox = new() {
+            Text = "127.0.0.1:9050",
             Padding = new Thickness(5),
             GridColumn = 1,
             GridRow = 0
         };
-        windowGrid.Widgets.Add(textBox);
+        windowGrid.Widgets.Add(ipBox);
 
         TextButton button = new() {
             Text = "Connect",
@@ -37,9 +38,16 @@ public ConnectionWindow(BlocktestGame game) {
             HorizontalAlignment = HorizontalAlignment.Stretch
         };
 
-        button.Click += (_, _) => { game.SetScene(new GameScene(game, true, textBox.Text)); };
+        button.Click += (_, _) => {
+            if (!IPEndPoint.TryParse(ipBox.Text, out IPEndPoint? ip)) {
+                new DialogueWindow("Connect to server", "Invalid IP address.").ShowModal(Desktop);
+                return;
+            }
+            game.SetScene(new GameScene(game, true, ip));
+        };
         windowGrid.Widgets.Add(button);
 
+        Title = "Connect to server";
         Content = windowGrid;
     }
 }
\ No newline at end of file
diff --git a/Blocktest/Program.cs b/Blocktest/Program.cs
index f56e832..6694acb 100644
--- a/Blocktest/Program.cs
+++ b/Blocktest/Program.cs
@@ -9,11 +9,11 @@ public static void Main(string[] args) {
                 Console.WriteLine("Invalid argument.");
                 return;
             }
-            if (!IPAddress.TryParse(args[1], out IPAddress? _)) {
+            if (!IPEndPoint.TryParse(args[1], out IPEndPoint? ip)) {
                 Console.WriteLine("Invalid IP address.");
                 return;
             }
-            using BlocktestGame game = new(args[1]);
+            using BlocktestGame game = new(ip);
             game.Run();
         } else {
             using BlocktestGame game = new();