Move all event manager instances to static Events class

Valks-Games · Mar 11, 2023 · 3e0dc05 · 3e0dc05
1 parent 41bc05d
commit 3e0dc05
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 56 deletions.
diff --git a/Scripts/Entities/Level/Coin.cs b/Scripts/Entities/Level/Coin.cs
@@ -12,7 +12,7 @@ private void _on_Area_area_entered(Area2D area)
     {
         if (area.GetParent() is Player)
         {
-			GameManager.Events.Notify(Event.OnCoinPickup);
+			Events.Generic.Notify(EventGeneric.OnCoinPickup);
 			GameManager.PlayerManager.AddCoins();
 			GameManager.LevelUI.SetLabelCoins(GameManager.PlayerManager.Coins);
             QueueFree();

diff --git a/Scripts/Entities/Level/LevelScene.cs b/Scripts/Entities/Level/LevelScene.cs
@@ -37,7 +37,7 @@ public override void _Ready()
             }
         }
 
-        GameManager.Events.AddListener(Event.OnGameClientLeft, (args) => 
+		Events.Generic.AddListener(EventGeneric.OnGameClientLeft, (args) => 
         {
             var id = (byte)args[0];
             OtherPlayers[id].QueueFree();

diff --git a/Scripts/Entities/Player/Commands/PlayerCommandDash.cs b/Scripts/Entities/Player/Commands/PlayerCommandDash.cs
@@ -32,7 +32,7 @@ public override void Start()
 
 			if (DashDir != Vector2.Zero)
 			{
-				GameManager.EventsPlayer.Notify(EventPlayer.OnDash);
+				Events.Player.Notify(EventPlayer.OnDash);
 				Entity.GravityEnabled = false;
 				DashCount++;
 				DashReady = false;

diff --git a/Scripts/Entities/Player/Commands/PlayerCommandDeath.cs b/Scripts/Entities/Player/Commands/PlayerCommandDeath.cs
@@ -12,7 +12,7 @@ public override void Start()
 
 		Entity.HaltLogic = true;
 
-		GameManager.EventsPlayer.Notify(EventPlayer.OnDied);
+		Events.Player.Notify(EventPlayer.OnDied);
 
 		Entity.LevelScene.Camera.StopFollowingPlayer();
 		Entity.AnimatedSprite.Stop();

diff --git a/Scripts/Entities/Player/Player.cs b/Scripts/Entities/Player/Player.cs
@@ -113,7 +113,7 @@ public override void UpdatePhysics()
 					HoldingJumpKey = true;
 					JumpForceLossCounter = 0;
 
-					GameManager.EventsPlayer.Notify(EventPlayer.OnJump);
+					Events.Player.Notify(EventPlayer.OnJump);
 
 					JumpCount++;
 					//Velocity = new Vector2(Velocity.X, 0); // reset velocity before jump (is this really needed?)
@@ -168,7 +168,7 @@ public override void UpdatePhysicsAir()
 
 	public void OnWallJump(object _, EventArgs _2)
 	{
-		GameManager.EventsPlayer.Notify(EventPlayer.OnJump);
+		Events.Player.Notify(EventPlayer.OnJump);
 
 		// Lock movement
 		PreventMovement = true;

diff --git a/Scripts/Managers/GameManager.cs b/Scripts/Managers/GameManager.cs
@@ -30,10 +30,6 @@ public class GameManager
     public static UIMenu Menu { get; private set; }
 	public static PlayerManager PlayerManager { get; private set; }
 
-	// notifications
-	public static EventManager<Event> Events {  get; private set; } = new();
-	public static EventManager<EventPlayer> EventsPlayer { get; private set; } = new();
-
     private static Node NodeMap { get; set; }
 
     public GameManager(Linker linker) 
@@ -75,7 +71,7 @@ public static void LoadMap()
         Map = (Map)Prefabs.Map.Instantiate(); 
 
         NodeMap.CallDeferred("add_child", Map); // need to wait for the engine because we are dealing with areas with is physics related
-        GameManager.Events.Notify(Event.OnMapLoaded);
+        Events.Generic.Notify(EventGeneric.OnMapLoaded);
     }
 
     public static void DestroyMap() => NodeMap.QueueFreeChildren();

diff --git a/Scripts/Netcode/Client/GameClient.cs b/Scripts/Netcode/Client/GameClient.cs
@@ -51,7 +51,7 @@ protected override void Receive(PacketReader reader)
 
     protected override void Connect(ref Event netEvent)
     {
-        GodotCommands.Enqueue(GodotOpcode.NetEvent, Sankari.Event.OnGameClientConnected);
+        GodotCommands.Enqueue(GodotOpcode.NetEvent, Sankari.EventGeneric.OnGameClientConnected);
         Log("Client connected");
     }
 
@@ -62,7 +62,7 @@ protected override void Leave(ref Event netEvent)
 
     protected override void Stopped()
     {
-        GodotCommands.Enqueue(GodotOpcode.NetEvent, Sankari.Event.OnGameClientStopped);
+        GodotCommands.Enqueue(GodotOpcode.NetEvent, Sankari.EventGeneric.OnGameClientStopped);
         Log("Client stopped");
     }
 

diff --git a/Scripts/Netcode/Packets/SPacketGameInfo.cs b/Scripts/Netcode/Packets/SPacketGameInfo.cs
@@ -125,14 +125,14 @@ public override async Task Handle()
     private void HandlePlayerJoinLeave()
     {
         if (Joining)
-            GameManager.Events.Notify(Event.OnGameClientJoined, Id, Username);
+            Events.Generic.Notify(EventGeneric.OnGameClientJoined, Id, Username);
         else
-            GameManager.Events.Notify(Event.OnGameClientLeft, Id);
+			Events.Generic.Notify(EventGeneric.OnGameClientLeft, Id);
     }
 
     private void HandlePlayersOnServer() 
     {
-        GameManager.Events.Notify(Event.OnReceivePlayersFromServer, Usernames);
+		Events.Generic.Notify(EventGeneric.OnReceivePlayersFromServer, Usernames);
     }
 
     private async Task HandleStartLevel()

diff --git a/Scripts/Static/Audio.cs b/Scripts/Static/Audio.cs
@@ -18,34 +18,30 @@ public static void Init(GAudioStreamPlayer musicPlayer, Node sfxPlayers)
 		LoadSoundEffects();
 		LoadSoundTracks();
 
-		var eventsPlayer = GameManager.EventsPlayer;
-
 		// Player
-		eventsPlayer.AddListener(EventPlayer.OnJump, (args) => 
+		Events.Player.AddListener(EventPlayer.OnJump, (args) => 
 		{
 			PlaySFX("player_jump", 80);
 		});
 
-		eventsPlayer.AddListener(EventPlayer.OnDied, (args) => 
+		Events.Player.AddListener(EventPlayer.OnDied, (args) => 
 		{
 			StopMusic();
 			PlaySFX("game_over_1");	
 		});
 
-		eventsPlayer.AddListener(EventPlayer.OnDash, (args) => 
+		Events.Player.AddListener(EventPlayer.OnDash, (args) => 
 		{
 			PlaySFX("dash");
 		});
 
 		// Game
-		var events = GameManager.Events;
-
-		events.AddListener(Event.OnCoinPickup, (args) => 
+		Events.Generic.AddListener(EventGeneric.OnCoinPickup, (args) => 
 		{
 			PlaySFX("coin_pickup_1", 30);	
 		});
 
-		events.AddListener(Event.OnMapLoaded, (args) => 
+		Events.Generic.AddListener(EventGeneric.OnMapLoaded, (args) => 
 		{
 			//PlayMusic("map_grassy");	
 		});

diff --git a/Scripts/Static/EventManager.cs b/Scripts/Static/EventManager.cs
@@ -1,29 +1,5 @@
 namespace Sankari;
 
-public enum Event
-{
-    OnKeyboardInput,
-    OnMouseButtonInput,
-    OnMouseMotionInput,
-    OnJoypadButtonInput,
-    OnSceneChanged,
-    OnGameClientStopped,
-    OnGameClientConnected,
-    OnLevelLoaded,
-    OnGameClientLeft,
-    OnGameClientJoined,
-    OnReceivePlayersFromServer,
-	OnCoinPickup,
-	OnMapLoaded
-}
-
-public enum EventPlayer 
-{
-	OnJump,
-	OnDied,
-	OnDash
-}
-
 /// <summary>
 /// This class was created to attempt to simplify the process of creating C# for gamedev.
 /// 

diff --git a/Scripts/Static/Events.cs b/Scripts/Static/Events.cs
@@ -0,0 +1,31 @@
+namespace Sankari;
+
+public static class Events
+{
+	public static EventManager<EventGeneric> Generic { get; private set; } = new();
+	public static EventManager<EventPlayer>  Player  { get; private set; } = new();
+}
+
+public enum EventGeneric
+{
+	OnKeyboardInput,
+	OnMouseButtonInput,
+	OnMouseMotionInput,
+	OnJoypadButtonInput,
+	OnSceneChanged,
+	OnGameClientStopped,
+	OnGameClientConnected,
+	OnLevelLoaded,
+	OnGameClientLeft,
+	OnGameClientJoined,
+	OnReceivePlayersFromServer,
+	OnCoinPickup,
+	OnMapLoaded
+}
+
+public enum EventPlayer
+{
+	OnJump,
+	OnDied,
+	OnDash
+}
diff --git a/Scripts/Static/GodotCommands.cs b/Scripts/Static/GodotCommands.cs
@@ -40,7 +40,7 @@ public static async Task Update()
                     packetReader.Dispose();
                     break;
                 case GodotOpcode.NetEvent:
-                    GameManager.Events.Notify((Event)cmd.Data);
+                    Events.Generic.Notify((EventGeneric)cmd.Data);
                     break;
                 case GodotOpcode.SpawnPopupMessage:
                     var dataMessage = (GodotCmdPopupMessage)cmd.Data;

diff --git a/Scripts/Static/LevelManager.cs b/Scripts/Static/LevelManager.cs
@@ -97,7 +97,7 @@ private static void LoadALevel()
     public static async Task CompleteLevel(string levelName)
     {
         // the level scene is no longer active, clean it up
-        GameManager.Events.RemoveAllListenersForEventType(Event.OnGameClientLeft);
+        Events.Generic.RemoveAllListenersForEventType(EventGeneric.OnGameClientLeft);
         GameManager.LevelScene = null;
 
         await GameManager.Transition.AlphaToBlackAndBack();

diff --git a/Scripts/Static/Net.cs b/Scripts/Static/Net.cs
@@ -30,7 +30,7 @@ public static void Init()
 
         var mapScript = GameManager.UIMapMenu;
 
-        GameManager.Events.AddListener(Event.OnGameClientStopped, (args) =>
+        Events.Generic.AddListener(EventGeneric.OnGameClientStopped, (args) =>
         {
             Client.ExecuteCode((client) => client.TryingToConnect = false);
             mapScript.BtnJoin.Disabled = false;
@@ -39,7 +39,7 @@ public static void Init()
             GameManager.UIPlayerList.RemoveAllPlayers();
         });
 
-        GameManager.Events.AddListener(Event.OnGameClientConnected, (args) =>
+        Events.Generic.AddListener(EventGeneric.OnGameClientConnected, (args) =>
         {
             Client.Send(ClientPacketOpcode.GameInfo, new CPacketGameInfo
             {

diff --git a/Scripts/UI/UIPlayerList.cs b/Scripts/UI/UIPlayerList.cs
@@ -13,17 +13,17 @@ public override void _Ready()
 
     public void SetupListeners() 
     {
-        GameManager.Events.AddListener(Event.OnGameClientLeft, (args) => 
+        Events.Generic.AddListener(EventGeneric.OnGameClientLeft, (args) => 
         {
             RemovePlayer((byte)args[0]);
         });
 
-        GameManager.Events.AddListener(Event.OnGameClientJoined, (args) => 
+		Events.Generic.AddListener(EventGeneric.OnGameClientJoined, (args) => 
         {
             AddPlayer((byte)args[0], (string)args[1]);
         });
 
-        GameManager.Events.AddListener(Event.OnReceivePlayersFromServer, (args) => 
+		Events.Generic.AddListener(EventGeneric.OnReceivePlayersFromServer, (args) => 
         {
             var usernames = (Dictionary<byte, string>)args[0];