From d2559c72de61955ec610cd3ec5954f2ee6a647ec Mon Sep 17 00:00:00 2001
From: copygirl <copygirl@mcft.net>
Date: Mon, 10 May 2021 19:19:11 +0200
Subject: [PATCH] Add radial menu selection

Pressing middle mouse now shows a
radial menu HUD element that allows
selecting active controlled element.

At the moment there only is "Creative
Building" but in the future you may be
able to select weapons and such.

Currently not networked.

- Add IntegratedServer to ClientScene
- Prevent _Draw from being called by
  making Player invisible on server
- Use _UnhandledInput in CreativeBuilding
- Add Cursor.ScreenPosition property
---
 project.godot                    |   5 ++
 scene/ClientScene.tscn           |  41 +++++++++--
 scene/Player.tscn                |  12 +++-
 src/CreativeBuilding.cs          |  61 ++++++++--------
 src/Cursor.cs                    |   5 +-
 src/EscapeMenu.cs                |   4 +-
 src/EscapeMenuMultiplayer.cs     |  49 +++++--------
 src/{Network => IO}/WorldSave.cs |   0
 src/Network/IntegratedServer.cs  |   6 +-
 src/Objects/LocalPlayer.cs       |   1 +
 src/Objects/Player.cs            |   3 +
 src/RadialMenu.cs                | 115 +++++++++++++++++++++++++++++++
 src/Scenes/Client.cs             |   6 +-
 src/World.cs                     |   2 +-
 14 files changed, 236 insertions(+), 74 deletions(-)
 rename src/{Network => IO}/WorldSave.cs (100%)
 create mode 100644 src/RadialMenu.cs

diff --git a/project.godot b/project.godot
index e4e204e..f53cc80 100644
--- a/project.godot
+++ b/project.godot
@@ -78,6 +78,11 @@ move_jump={
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
+interact_select={
+"deadzone": 0.5,
+"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":3,"pressed":false,"doubleclick":false,"script":null)
+ ]
+}
 interact_place={
 "deadzone": 0.5,
 "events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null)
diff --git a/scene/ClientScene.tscn b/scene/ClientScene.tscn
index cdd2d76..156907d 100644
--- a/scene/ClientScene.tscn
+++ b/scene/ClientScene.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://scene/GameScene.tscn" type="PackedScene" id=1]
 [ext_resource path="res://src/Cursor.cs" type="Script" id=2]
@@ -8,18 +8,26 @@
 [ext_resource path="res://src/Viewport.cs" type="Script" id=6]
 [ext_resource path="res://scene/EscapeMenu.tscn" type="PackedScene" id=7]
 [ext_resource path="res://src/Scenes/Client.cs" type="Script" id=8]
+[ext_resource path="res://src/Network/IntegratedServer.cs" type="Script" id=9]
+[ext_resource path="res://ui_theme.tres" type="Theme" id=10]
+[ext_resource path="res://src/RadialMenu.cs" type="Script" id=11]
 
 [node name="Client" instance=ExtResource( 1 )]
 script = ExtResource( 8 )
+IntegratedServerPath = NodePath("IntegratedServer")
 CursorPath = NodePath("CursorLayer/Cursor")
 
-[node name="Viewport" type="Node" parent="." index="0"]
+[node name="IntegratedServer" type="Node" parent="." index="0"]
+script = ExtResource( 9 )
+
+[node name="Viewport" type="Node" parent="." index="1"]
 script = ExtResource( 6 )
 
-[node name="Background" type="TextureRect" parent="." index="1"]
+[node name="Background" type="TextureRect" parent="." index="2"]
 modulate = Color( 0.278431, 0.286275, 0.301961, 1 )
 margin_right = 1280.0
 margin_bottom = 720.0
+mouse_filter = 2
 texture = ExtResource( 4 )
 stretch_mode = 2
 script = ExtResource( 5 )
@@ -28,12 +36,33 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="HUD" type="CanvasLayer" parent="." index="3"]
+[node name="HUD" type="CanvasLayer" parent="." index="4"]
+
+[node name="RadialMenu" type="Node2D" parent="HUD" index="0"]
+visible = false
+script = ExtResource( 11 )
+
+[node name="ActiveName" type="Label" parent="HUD/RadialMenu" index="0"]
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+margin_left = -36.0
+margin_top = -16.0
+margin_right = 36.0
+margin_bottom = 16.0
+theme = ExtResource( 10 )
+align = 1
+valign = 1
+autowrap = true
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
-[node name="EscapeMenu" parent="HUD" index="0" instance=ExtResource( 7 )]
+[node name="EscapeMenu" parent="HUD" index="1" instance=ExtResource( 7 )]
 visible = false
 
-[node name="CursorLayer" type="CanvasLayer" parent="." index="4"]
+[node name="CursorLayer" type="CanvasLayer" parent="." index="5"]
 layer = 2
 follow_viewport_enable = true
 
diff --git a/scene/Player.tscn b/scene/Player.tscn
index beaeb26..c65acd6 100644
--- a/scene/Player.tscn
+++ b/scene/Player.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://ui_theme.tres" type="Theme" id=1]
 [ext_resource path="res://gfx/player.png" type="Texture" id=2]
 [ext_resource path="res://src/Objects/Player.cs" type="Script" id=3]
 [ext_resource path="res://src/CreativeBuilding.cs" type="Script" id=4]
+[ext_resource path="res://gfx/block.png" type="Texture" id=6]
 
 [sub_resource type="CircleShape2D" id=1]
 radius = 8.0
@@ -38,5 +39,12 @@ __meta__ = {
 z_index = -5
 texture = ExtResource( 2 )
 
-[node name="CreativeBuilding" type="Node2D" parent="."]
+[node name="Items" type="Node2D" parent="."]
+
+[node name="Creative Building" type="Node2D" parent="Items"]
+visible = false
 script = ExtResource( 4 )
+
+[node name="Icon" type="Sprite" parent="Items/Creative Building"]
+visible = false
+texture = ExtResource( 6 )
diff --git a/src/CreativeBuilding.cs b/src/CreativeBuilding.cs
index 78bf99b..26c7495 100644
--- a/src/CreativeBuilding.cs
+++ b/src/CreativeBuilding.cs
@@ -30,38 +30,43 @@ public class CreativeBuilding : Node2D
         _blockTex = GD.Load<Texture>("res://gfx/block.png");
 
         Cursor = this.GetClient()?.Cursor;
-        Player = GetParent<Player>();
+        Player = GetParent().GetParent<Player>();
+    }
+
+    public override void _UnhandledInput(InputEvent ev)
+    {
+        if (!(Player is LocalPlayer) || !Visible) return;
+
+        if (ev.IsActionPressed("interact_place")) {
+            GetTree().SetInputAsHandled();
+            _currentMode = (((_currentMode == null) && _canBuild) ? BuildMode.Placing : (BuildMode?)null);
+        }
+        if (ev.IsActionPressed("interact_break")) {
+            GetTree().SetInputAsHandled();
+            _currentMode = ((_currentMode == null) ? BuildMode.Breaking : (BuildMode?)null);
+        }
+        // NOTE: These ternary operations require extra brackets for some
+        //       reason or else the syntax highlighting in VS Code breaks?!
     }
 
     public override void _Process(float delta)
     {
         if (!(Player is LocalPlayer)) return;
-        Update(); // Make sure _Draw is being called.
+        if (!Visible) _currentMode = null;
+
+        if (_currentMode == BuildMode.Placing) {
+            if (!_canBuild) _currentMode = null;
+            else if (!Input.IsActionPressed("interact_place")) {
+                RpcId(1, nameof(PlaceLine), _startPos.X, _startPos.Y, _direction, _length);
+                _currentMode = null;
+            }
+        }
 
-        if (EscapeMenu.Instance.Visible || !Cursor.Visible)
-            { _currentMode = null; return; }
-
-        switch (_currentMode) {
-            case null:
-                if (Input.IsActionJustPressed("interact_place"))
-                    if (_canBuild) _currentMode = BuildMode.Placing;
-                if (Input.IsActionJustPressed("interact_break"))
-                    _currentMode = BuildMode.Breaking;
-                break;
-            case BuildMode.Placing:
-                if (Input.IsActionJustPressed("interact_break")) _currentMode = null;
-                else if (!Input.IsActionPressed("interact_place")) {
-                    if (_canBuild) RpcId(1, nameof(PlaceLine), _startPos.X, _startPos.Y, _direction, _length);
-                    _currentMode = null;
-                }
-                break;
-            case BuildMode.Breaking:
-                if (Input.IsActionJustPressed("interact_place")) _currentMode = null;
-                else if (!Input.IsActionPressed("interact_break")) {
-                    RpcId(1, nameof(BreakLine), _startPos.X, _startPos.Y, _direction, _length);
-                    _currentMode = null;
-                }
-                break;
+        if (_currentMode == BuildMode.Breaking) {
+            if (!Input.IsActionPressed("interact_break")) {
+                RpcId(1, nameof(BreakLine), _startPos.X, _startPos.Y, _direction, _length);
+                _currentMode = null;
+            }
         }
 
         if (_currentMode != null) {
@@ -77,11 +82,13 @@ public class CreativeBuilding : Node2D
         var world = this.GetWorld();
         bool IsBlockAt(BlockPos pos) => world.GetBlockAt(pos) != null;
         _canBuild = !IsBlockAt(_startPos) && Facings.All.Any(pos => IsBlockAt(_startPos + pos.ToBlockPos()));
+
+        Update(); // Make sure _Draw is being called.
     }
 
     public override void _Draw()
     {
-        if ((this.GetGame() is Server) || !Cursor.Visible || EscapeMenu.Instance.Visible) return;
+        if (!Cursor.Visible || EscapeMenu.Instance.Visible) return;
 
         var green = Color.FromHsv(1.0F / 3, 1.0F, 1.0F, 0.4F);
         var red   = Color.FromHsv(0.0F, 1.0F, 1.0F, 0.4F);
diff --git a/src/Cursor.cs b/src/Cursor.cs
index 48214b4..1da9c34 100644
--- a/src/Cursor.cs
+++ b/src/Cursor.cs
@@ -2,6 +2,8 @@ using Godot;
 
 public class Cursor : Node2D
 {
+    public Vector2 ScreenPosition { get; private set; }
+
     public override void _Ready()
     {
         Input.SetMouseMode(Input.MouseMode.Hidden);
@@ -19,6 +21,7 @@ public class Cursor : Node2D
 
     public override void _Process(float delta)
     {
-        Position = GetGlobalMousePosition() - GetViewport().CanvasTransform.origin;
+        ScreenPosition = GetGlobalMousePosition();
+        Position       = ScreenPosition - GetViewport().CanvasTransform.origin;
     }
 }
diff --git a/src/EscapeMenu.cs b/src/EscapeMenu.cs
index c9416ce..9176d41 100644
--- a/src/EscapeMenu.cs
+++ b/src/EscapeMenu.cs
@@ -15,9 +15,7 @@ public class EscapeMenu : Control
     }
 
     public override void _UnhandledInput(InputEvent @event)
-    {
-        if (@event.IsActionPressed("ui_menu")) Toggle();
-    }
+        { if (@event.IsActionPressed("ui_menu")) Toggle(); }
 
 
     public void Toggle()
diff --git a/src/EscapeMenuMultiplayer.cs b/src/EscapeMenuMultiplayer.cs
index cf03e08..913c19f 100644
--- a/src/EscapeMenuMultiplayer.cs
+++ b/src/EscapeMenuMultiplayer.cs
@@ -19,8 +19,6 @@ public class EscapeMenuMultiplayer : Container
     public Button ClientDisConnect { get; private set; }
     public LineEdit ClientAddress { get; private set; }
 
-    public IntegratedServer IntegratedServer { get; private set; }
-
     public override void _Ready()
     {
         Status           = GetNode<Label>(StatusPath);
@@ -33,22 +31,11 @@ public class EscapeMenuMultiplayer : Container
         ClientAddress.PlaceholderText = $"localhost:{DEFAULT_PORT}";
 
         this.GetClient().StatusChanged += OnStatusChanged;
-        CallDeferred(nameof(SetupIntegratedServer));
-    }
-    private void SetupIntegratedServer()
-    {
-        IntegratedServer = new IntegratedServer();
-        this.GetClient().AddChild(IntegratedServer);
-        CallDeferred(nameof(StartIntegratedServerAndConnect));
-    }
-    private void StartIntegratedServerAndConnect()
-    {
-        var port = IntegratedServer.Server.StartSingleplayer();
-        this.GetClient().Connect("127.0.0.1", port);
     }
 
     private void OnStatusChanged(ConnectionStatus status)
     {
+        var server = this.GetClient().IntegratedServer.Server;
         switch (status) {
             case ConnectionStatus.Disconnected:
                 Status.Text     = "Disconnected";
@@ -59,10 +46,10 @@ public class EscapeMenuMultiplayer : Container
                 Status.Modulate = Colors.Yellow;
                 break;
             case ConnectionStatus.Connected:
-                if (IntegratedServer == null) {
+                if (!server.IsRunning) {
                     Status.Text     = "Connected!";
                     Status.Modulate = Colors.Green;
-                } else if (IntegratedServer.Server.IsSingleplayer) {
+                } else if (server.IsSingleplayer) {
                     Status.Text     = "Singleplayer";
                     Status.Modulate = Colors.White;
                 } else {
@@ -72,15 +59,16 @@ public class EscapeMenuMultiplayer : Container
                 break;
         }
 
-        ServerPort.Editable      = IntegratedServer != null;
-        ServerOpenClose.Disabled = IntegratedServer == null;
-        ServerOpenClose.Text     = (IntegratedServer?.Server.IsSingleplayer == false) ? "Close Server" : "Open Server";
-        ClientDisConnect.Text = ((IntegratedServer != null) || (status == ConnectionStatus.Disconnected)) ? "Connect" : "Disconnect";
 
-        var isSingleplayer = IntegratedServer?.Server.IsSingleplayer == true;
-        var pauseMode      = isSingleplayer ? PauseModeEnum.Stop : PauseModeEnum.Process;
-        this.GetWorld().PauseMode = pauseMode;
-        if (IntegratedServer != null) IntegratedServer.Server.GetWorld().PauseMode = pauseMode;
+        ServerPort.Editable      =  server.IsRunning;
+        ServerOpenClose.Disabled = !server.IsRunning;
+        ServerOpenClose.Text     = (server.IsRunning && !server.IsSingleplayer) ? "Close Server" : "Open Server";
+        ClientDisConnect.Text     = (server.IsSingleplayer || (status == ConnectionStatus.Disconnected)) ? "Connect" : "Disconnect";
+        ClientDisConnect.Disabled = server.IsRunning && !server.IsSingleplayer;
+
+        var pauseMode = server.IsSingleplayer ? PauseModeEnum.Stop : PauseModeEnum.Process;
+        this.GetWorld().PauseMode   = pauseMode;
+        server.GetWorld().PauseMode = pauseMode;
 
         // TODO: Allow starting up the integrated server again when disconnected.
     }
@@ -107,8 +95,8 @@ public class EscapeMenuMultiplayer : Container
 
     private void _on_ServerOpenClose_pressed()
     {
-        var server = IntegratedServer?.Server;
         var client = this.GetClient();
+        var server = client.IntegratedServer.Server;
         if (server?.IsRunning != true) throw new InvalidOperationException();
 
         if (server.IsSingleplayer) {
@@ -133,12 +121,12 @@ public class EscapeMenuMultiplayer : Container
     private void _on_ClientDisConnect_pressed()
     {
         var client = this.GetClient();
+        var server = client.IntegratedServer.Server;
 
-        if (IntegratedServer != null) {
-            IntegratedServer.Server.Stop();
-            client.RemoveChild(IntegratedServer);
-            IntegratedServer.QueueFree();
-            IntegratedServer = null;
+        if (server.IsRunning) {
+            server.Stop();
+            server.GetWorld().ClearPlayers();
+            server.GetWorld().ClearBlocks();
 
             client.Disconnect();
             this.GetWorld().ClearPlayers();
@@ -156,6 +144,7 @@ public class EscapeMenuMultiplayer : Container
             }
             client.Connect(address, port);
         } else {
+            client.Disconnect();
             this.GetWorld().ClearPlayers();
             this.GetWorld().ClearBlocks();
         }
diff --git a/src/Network/WorldSave.cs b/src/IO/WorldSave.cs
similarity index 100%
rename from src/Network/WorldSave.cs
rename to src/IO/WorldSave.cs
diff --git a/src/Network/IntegratedServer.cs b/src/Network/IntegratedServer.cs
index e369268..aa7a02e 100644
--- a/src/Network/IntegratedServer.cs
+++ b/src/Network/IntegratedServer.cs
@@ -5,9 +5,6 @@ public class IntegratedServer : Node
     private SceneTree _sceneTree;
     public Server Server { get; private set; }
 
-    public IntegratedServer()
-        => Name = "IntegratedServer";
-
     public override void _Ready()
     {
         _sceneTree = new SceneTree();
@@ -26,6 +23,9 @@ public class IntegratedServer : Node
             var color = Color.FromHsv(GD.Randf(), 0.1F, 1.0F);
             world.SpawnBlock(x, 3, color, true);
         }
+
+        var port = Server.StartSingleplayer();
+        this.GetClient().Connect("127.0.0.1", port);
     }
 
     public override void _Process(float delta) => _sceneTree.Idle(delta);
diff --git a/src/Objects/LocalPlayer.cs b/src/Objects/LocalPlayer.cs
index 6aaa28e..00a89ec 100644
--- a/src/Objects/LocalPlayer.cs
+++ b/src/Objects/LocalPlayer.cs
@@ -15,6 +15,7 @@ public class LocalPlayer : Player
     public float GroundFriction { get; set; } = 0.2F;
     public float AirFriction { get; set; } = 0.05F;
 
+
     public Vector2 Velocity = Vector2.Zero;
     private DateTime? _jumpPressed = null;
     private DateTime? _lastOnFloor = null;
diff --git a/src/Objects/Player.cs b/src/Objects/Player.cs
index eb97eb8..77011cb 100644
--- a/src/Objects/Player.cs
+++ b/src/Objects/Player.cs
@@ -24,6 +24,9 @@ public class Player : KinematicBody2D, IInitializable
         RsetConfig(nameof(Color), MultiplayerAPI.RPCMode.Puppetsync);
     }
 
+    public override void _Ready()
+        => Visible = this.GetGame() is Client;
+
     public override void _Process(float delta)
     {
         if ((Position.y > 9000) && (this.GetGame() is Server))
diff --git a/src/RadialMenu.cs b/src/RadialMenu.cs
new file mode 100644
index 0000000..90f9d48
--- /dev/null
+++ b/src/RadialMenu.cs
@@ -0,0 +1,115 @@
+using System;
+using Godot;
+
+public class RadialMenu : Node2D
+{
+    [Export] public int InnerRadius { get; set; } = 32;
+    [Export] public int OuterRadius { get; set; } = 64;
+    [Export] public int MinElements { get; set; } = 8;
+    [Export] public float Separation { get; set; } = 2F;
+
+    public Cursor Cursor { get; private set; }
+    public Label ActiveName { get; private set; }
+
+    private float _startAngle;
+    public Node2D Selected { get; private set; } = null;
+    public int? SelectedIndex => (Selected != null) ? Selected.GetIndex() : (int?)null;
+
+    public override void _Ready()
+    {
+        _startAngle = (-Mathf.Tau / 4) - (Mathf.Tau / MinElements / 2);
+
+        Cursor     = this.GetClient()?.Cursor;
+        ActiveName = GetNode<Label>("ActiveName");
+    }
+
+    public Node GetItems()
+        => this.GetClient().LocalPlayer?.GetNode<Node2D>("Items");
+
+    public void Select(Node2D node)
+    {
+        if (node == Selected) return;
+        if ((node != null) && (node.GetParent() != GetItems())) throw new ArgumentException();
+
+        ActiveName.Text = node?.Name ?? "";
+        if (Visible)
+            Update();
+        else {
+            SetActive(Selected, false);
+            SetActive(node, true);
+        }
+        Selected = node;
+    }
+    private static void SetActive(Node2D node, bool value) {
+        if (node == null) return;
+        node.SetProcessInput(value);
+        node.SetProcessUnhandledInput(value);
+        node.Visible = value;
+    }
+
+    public override void _UnhandledInput(InputEvent ev)
+    {
+        if (ev.IsActionPressed("interact_select")) {
+            Position = this.GetClient().Cursor.ScreenPosition.Round();
+            Visible = true;
+            SetActive(Selected, false);
+            Update();
+        }
+        // TODO: Add scrollwheel support.
+    }
+
+    public override void _Process(float delta)
+    {
+        if (!Visible) return;
+
+        var cursorPos = ToLocal(this.GetClient().Cursor.ScreenPosition);
+        var angle = cursorPos.Angle() - _startAngle;
+        var index = (int)((angle / Mathf.Tau + 1) % 1 * MinElements);
+        var items = GetItems();
+        if ((cursorPos.Length() > InnerRadius) && (index < items.GetChildCount()))
+            Select(items.GetChild<Node2D>(index));
+
+        if (!Input.IsActionPressed("interact_select")) {
+            Visible = false;
+            SetActive(Selected, true);
+            Update();
+        }
+    }
+
+    public override void _Draw()
+    {
+        var vertices = new Vector2[5];
+        var colors   = new Color[5];
+
+        for (var i = 0; i < MinElements; i++) {
+            var angle1 = _startAngle + Mathf.Tau * ( i      / (float)MinElements);
+            var angle3 = _startAngle + Mathf.Tau * ((i + 1) / (float)MinElements);
+            var angle2 = (angle1 + angle3) / 2;
+
+            var sep1 = new Vector2(Mathf.Cos(angle1 + Mathf.Tau / 4), Mathf.Sin(angle1 + Mathf.Tau / 4)) * Separation;
+            var sep2 = new Vector2(Mathf.Cos(angle3 - Mathf.Tau / 4), Mathf.Sin(angle3 - Mathf.Tau / 4)) * Separation;
+
+            var isSelected  = i == SelectedIndex;
+            var innerRadius = InnerRadius + (isSelected ? 5 : 0);
+            var outerRadius = OuterRadius + (isSelected ? 5 : 0);
+
+            vertices[0] = new Vector2(Mathf.Cos(angle1), Mathf.Sin(angle1)) * innerRadius + sep1;
+            vertices[1] = new Vector2(Mathf.Cos(angle1), Mathf.Sin(angle1)) * outerRadius + sep1;
+            vertices[2] = new Vector2(Mathf.Cos(angle2), Mathf.Sin(angle2)) * (outerRadius + Separation);
+            vertices[3] = new Vector2(Mathf.Cos(angle3), Mathf.Sin(angle3)) * outerRadius + sep2;
+            vertices[4] = new Vector2(Mathf.Cos(angle3), Mathf.Sin(angle3)) * innerRadius + sep2;
+
+            var color = new Color(0.1F, 0.1F, 0.1F, isSelected ? 0.7F : 0.4F);
+            for (var j = 0; j < colors.Length; j++) colors[j] = color;
+
+            DrawPolygon(vertices, colors, antialiased: true);
+
+            var items = GetItems();
+            if ((i < items.GetChildCount()) && (items.GetChild(i)?.GetNodeOrNull("Icon") is Sprite sprite)) {
+                var pos = new Vector2(Mathf.Cos(angle2), Mathf.Sin(angle2)) * (innerRadius + outerRadius) / 2;
+                if (sprite.Centered) pos -= sprite.Texture.GetSize() / 2;
+                DrawTexture(sprite.Texture, sprite.Offset + pos, sprite.Modulate);
+            }
+        }
+    }
+}
diff --git a/src/Scenes/Client.cs b/src/Scenes/Client.cs
index 74708c3..5580162 100644
--- a/src/Scenes/Client.cs
+++ b/src/Scenes/Client.cs
@@ -4,7 +4,10 @@ using static Godot.NetworkedMultiplayerPeer;
 
 public class Client : Game
 {
+    [Export] public NodePath IntegratedServerPath { get; set; }
     [Export] public NodePath CursorPath { get; set; }
+
+    public IntegratedServer IntegratedServer { get; private set; }
     public Cursor Cursor { get; private set; }
 
     public NetworkedMultiplayerENet Peer => (NetworkedMultiplayerENet)Multiplayer.NetworkPeer;
@@ -19,7 +22,8 @@ public class Client : Game
     public override void _Ready()
     {
         base._Ready();
-        Cursor = GetNode<Cursor>(CursorPath);
+        Cursor           = GetNode<Cursor>(CursorPath);
+        IntegratedServer = GetNode<IntegratedServer>(IntegratedServerPath);
 
         Multiplayer.Connect("connected_to_server", this, nameof(OnConnectedToServer));
         Multiplayer.Connect("connection_failed", this, nameof(Disconnect));
diff --git a/src/World.cs b/src/World.cs
index e3b4a20..165418c 100644
--- a/src/World.cs
+++ b/src/World.cs
@@ -27,7 +27,7 @@ public class World : Node
     public IEnumerable<Player> Players
         => PlayerContainer.GetChildren().Cast<Player>();
     public Player GetPlayer(int networkID)
-        => PlayerContainer.GetNode<Player>(networkID.ToString());
+        => PlayerContainer.GetNodeOrNull<Player>(networkID.ToString());
     public void ClearPlayers()
         { foreach (var player in Players) player.RemoveFromParent(); }