Get the gamemode to start again

.addon

@@ -3,17 +3,18 @@
   "Type": "game",
   "Org": "neox",
   "Ident": "tttreborn",
+  "Tags": "",
   "Schema": 1,
   "HasAssets": true,
   "AssetsPath": "",
   "ResourcePaths": [
     "/weapons/*",
     "/sounds/*",
-    "/materials/*"
+    "/materials/*",
+    "/lang/*"
   ],
   "HasCode": true,
   "CodePath": "code",
-  "RootNamespace": "TTTReborn",
   "Metadata": {
     "MapList": [
       "tbt.minecraftcity_v4",
@@ -26,6 +27,49 @@
     "RankType": 0,
     "MapSelect": 0,
     "GameNetworkType": 0,
-    "MaxPlayers": 16
+    "MaxPlayers": 16,
+    "Collision": {
+      "Defaults": {
+        "solid": "Collide",
+        "trigger": "Trigger",
+        "ladder": "Ignore",
+        "water": "Trigger",
+        "corpse": "Collide",
+        "debris": "Unset",
+        "player": "Unset"
+      },
+      "Pairs": [
+        {
+          "a": "solid",
+          "b": "solid",
+          "r": "Collide"
+        },
+        {
+          "a": "trigger",
+          "b": "playerclip",
+          "r": "Ignore"
+        },
+        {
+          "a": "trigger",
+          "b": "solid",
+          "r": "Trigger"
+        },
+        {
+          "a": "solid",
+          "b": "trigger",
+          "r": "Collide"
+        },
+        {
+          "a": "playerclip",
+          "b": "solid",
+          "r": "Collide"
+        },
+        {
+          "a": "corpse",
+          "b": "player",
+          "r": "Ignore"
+        }
+      ]
+    }
   }
-}
+}

code/CameraMode.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sandbox
+{
+    public class CameraMode : EntityComponent
+    {
+        public Vector3 Position
+        {
+            get
+            {
+                return Camera.Position;
+            }
+            set
+            {
+                Camera.Position = value;
+            }
+        }
+        public Rotation Rotation
+        {
+            get
+            {
+                return Camera.Rotation;
+            }
+            set
+            {
+                Camera.Rotation = value;
+            }
+        }
+
+        public float FieldOfView
+        {
+            get
+            {
+                return Camera.FieldOfView;
+            }
+            set
+            {
+                Camera.FieldOfView = value;
+            }
+        }
+
+        public Entity Viewer
+        {
+            get
+            {
+                return Camera.FirstPersonViewer as Entity;
+            }
+            set
+            {
+                Camera.FirstPersonViewer = value;
+            }
+        }
+        public virtual void Deactivated() { }
+        public virtual void Activated() { }
+
+        public virtual void Build()
+        {
+            Update();
+        }
+
+        public virtual void BuildInput() { }
+
+        public virtual void Update()
+        {
+
+        }
+    }
+}

code/gameevents/base/ClientGameEvent.cs

@@ -12,16 +12,16 @@ public partial class ClientGameEvent : NetworkableGameEvent
         public string PlayerName { get; set; }
 
         [JsonIgnore]
-        public Client Client
+        public IClient Client
         {
-            get => Client.All.First((cl) => cl.PlayerId == PlayerId);
+            get => Sandbox.Game.Clients.First((cl) => cl.SteamId == PlayerId);
         }
 
-        public ClientGameEvent(Client client) : base()
+        public ClientGameEvent(IClient client) : base()
         {
             if (client != null)
             {
-                PlayerId = client.PlayerId;
+                PlayerId = client.SteamId;
                 PlayerName = client.Name;
             }
         }

code/gameevents/base/GameEvent.cs

@@ -37,7 +37,7 @@ public GameEvent()
                 Name = attribute.Name;
             }
 
-            BaseRound baseRound = Gamemode.Game.Instance.Round;
+            BaseRound baseRound = Gamemode.TTTGame.Instance.Round;
 
             CreatedAt = baseRound.RoundEndTime - baseRound.StartedAt - baseRound.TimeLeft;
         }
@@ -54,9 +54,9 @@ protected virtual void OnRegister()
 
         internal void ProcessRegister()
         {
-            if (Host.IsServer)
+            if (Game.IsServer)
             {
-                Gamemode.Game.Instance.Round?.GameEvents.Add(this);
+                Gamemode.TTTGame.Instance.Round?.GameEvents.Add(this);
 
                 OnRegister();
             }
@@ -105,7 +105,7 @@ public GameEventScoring(Player player)
         {
             if (player != null && player.Client != null)
             {
-                PlayerId = player.Client.PlayerId;
+                PlayerId = player.Client.SteamId;
             }
         }
     }

code/gameevents/base/ILoggedGameEvent.cs

@@ -13,8 +13,8 @@ public interface ILoggedGameEvent
 
         public float CreatedAt { get; set; }
 
-        public virtual Sandbox.UI.Panel GetEventPanel(Client client = null) => new UI.EventPanel(this);
+        public virtual Sandbox.UI.Panel GetEventPanel(IClient client = null) => new UI.EventPanel(this);
 
-        public virtual bool Contains(Client client) => false;
+        public virtual bool Contains(IClient client) => false;
     }
 }

code/gameevents/base/NetworkableGameEvent.cs

@@ -19,7 +19,7 @@ public virtual void RunNetworked(To to)
 
             base.Run();
 
-            if (Host.IsServer)
+            if (Game.IsServer)
             {
                 ServerCallNetworked(to);
             }

code/gameevents/base/PlayerGameEvent.cs

@@ -20,7 +20,7 @@ public PlayerGameEvent(TTTReborn.Player player) : base()
         {
             if (player != null && player.Client != null)
             {
-                PlayerId = player.Client.PlayerId;
+                PlayerId = player.Client.SteamId;
                 PlayerName = player.Client.Name;
             }
         }

code/gameevents/game/FinishEvent.cs

@@ -77,6 +77,6 @@ protected override void OnRegister()
             }
         }
 
-        public bool Contains(Client client) => true;
+        public bool Contains(IClient client) => true;
     }
 }

code/gameevents/player/ConnectedEvent.cs

@@ -9,6 +9,6 @@ public partial class ConnectedEvent : ClientGameEvent
         /// Occurs when a player connects.
         /// <para>The <strong><see cref="Client"/></strong> instance of the player who connected.</para>
         /// </summary>
-        public ConnectedEvent(Client client) : base(client) { }
+        public ConnectedEvent(IClient client) : base(client) { }
     }
 }

code/gameevents/player/DiedEvent.cs

@@ -84,6 +84,6 @@ protected override void OnRegister()
             };
         }
 
-        public bool Contains(Client client) => PlayerName == client.Name || LastAttackerName == client.Name;
+        public bool Contains(IClient client) => PlayerName == client.Name || LastAttackerName == client.Name;
     }
 }

code/gameevents/player/InitialSpawnEvent.cs

@@ -7,8 +7,8 @@ public partial class InitialSpawnEvent : ClientGameEvent
     {
         /// <summary>
         /// Occurs when a player initializes.
-        /// <para>The <strong><see cref="Client"/></strong> instance of the player who spawned initially.</para>
+        /// <para>The <strong><see cref="IClient"/></strong> instance of the player who spawned initially.</para>
         /// </summary>
-        public InitialSpawnEvent(Client client) : base(client) { }
+        public InitialSpawnEvent(IClient client) : base(client) { }
     }
 }

code/gameevents/player/SpawnEvent.cs

@@ -15,6 +15,6 @@ public partial class SpawnEvent : PlayerGameEvent, ILoggedGameEvent
         /// </summary>
         public SpawnEvent(TTTReborn.Player player) : base(player) { }
 
-        public bool Contains(Client client) => PlayerName == client.Name;
+        public bool Contains(IClient client) => PlayerName == client.Name;
     }
 }

code/gameevents/player/TakeDamageEvent.cs

@@ -54,7 +54,7 @@ public TakeDamageEvent(TTTReborn.Player player, float damage, Entity attacker) :
                 if (attacker is TTTReborn.Player)
                 {
                     AttackerName = attacker.Client.Name;
-                    AttackerPlayerId = attacker.Client.PlayerId;
+                    AttackerPlayerId = attacker.Client.SteamId;
                 }
                 else
                 {
@@ -121,7 +121,7 @@ public static void OnLoggedGameEventEvaluate(List<ILoggedGameEvent> gameEvents)
             }
         }
 
-        public bool Contains(Client client) => PlayerName == client.Name || AttackerName == client.Name;
+        public bool Contains(IClient client) => PlayerName == client.Name || AttackerName == client.Name;
 
         protected override void OnRegister()
         {
@@ -136,7 +136,7 @@ protected override void OnRegister()
                 {
                     new(attacker)
                     {
-                        Karma = Gamemode.Game.Instance.Karma.CalculatePenalty(Math.Min(Damage, Player.Health))
+                        Karma = Gamemode.TTTGame.Instance.Karma.CalculatePenalty(Math.Min(Damage, Player.Health))
                     }
                 };
             }

code/gameevents/player/role/SelectEvent.cs

@@ -23,6 +23,6 @@ public SelectEvent(TTTReborn.Player player) : base(player)
             }
         }
 
-        public bool Contains(Client client) => PlayerName == client.Name;
+        public bool Contains(IClient client) => PlayerName == client.Name;
     }
 }

code/gamemode/Karma.cs

@@ -27,7 +27,7 @@ public partial class KarmaSystem
         // [ServerVar("ttt_karma_penalty_max", Help = "The maximum amount of karma loss per player.")]
         // public static int TTTKarmaPenaltyMax { get; set; } = 100;
 
-        public void RegisterPlayer(Client client)
+        public void RegisterPlayer(IClient client)
         {
             client.SetInt("karma", 1000);
         }
@@ -47,7 +47,7 @@ public void RegisterPlayerDamage(Player attacker, Player victim, float damage)
 
         public void UpdatePlayerKarma(Player player, int delta)
         {
-            UpdatePlayerIdKarma(player.Client.PlayerId, delta);
+            UpdatePlayerIdKarma(player.Client.SteamId, delta);
         }
 
         public void UpdatePlayerIdKarma(long playerId, int delta)
@@ -84,7 +84,7 @@ public void ResolveKarma()
             // DamageRecords = new();
         }
 
-        public bool IsBanned(Client client)
+        public bool IsBanned(IClient client)
         {
             // TODO: Once network dictionaries are supported, implement. Return false meanwhile...
             // return (KarmaRecords[player.PlayerId] < TTTKarmaMin && TTTKarmaBan);

code/gamemode/Game.Precache.cs → code/gamemode/TTTGame.Precache.cs

@@ -6,11 +6,11 @@
 
 namespace TTTReborn.Gamemode
 {
-    public partial class Game
+    public partial class TTTGame
     {
         public static void PrecacheFiles()
         {
-            Host.AssertServer();
+            Game.AssertServer();
 
             Precache.Add("particles/impact.generic.vpcf");
             Precache.Add("particles/impact.flesh.vpcf");