From cd3e23b42745c3df3932922c2b46731be615fa9d Mon Sep 17 00:00:00 2001
From: Syntriax <Syntriax@gmail.com>
Date: Sun, 11 May 2025 00:02:10 +0300
Subject: [PATCH] refactor: cleaned up some code

---
 Shared/GamePong.cs | 93 ++++++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/Shared/GamePong.cs b/Shared/GamePong.cs
index 44d4516..2e55304 100644
--- a/Shared/GamePong.cs
+++ b/Shared/GamePong.cs
@@ -62,74 +62,71 @@ public class GamePong : Game
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IUniverseObject UniverseObjectCamera = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Camera"); ;
-        UniverseObjectCamera.BehaviourController.AddBehaviour<Transform2D>();
-
-        UniverseObjectCamera.BehaviourController.AddBehaviour<CameraController>();
-        cameraBehaviour = UniverseObjectCamera.BehaviourController.AddBehaviour<MonoGameCamera2DBehaviour>(graphics);
+        cameraBehaviour = universe.InstantiateUniverseObject().SetUniverseObject("Camera")
+            .BehaviourController.AddBehaviour<Transform2D>()
+            .BehaviourController.AddBehaviour<CameraController>()
+            .BehaviourController.AddBehaviour<MonoGameCamera2DBehaviour>(graphics);
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IUniverseObject UniverseObjectPongManager = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Pong Game Manager");
-        pongManager = UniverseObjectPongManager.BehaviourController.AddBehaviour<PongManagerBehaviour>(5);
+        pongManager = universe.InstantiateUniverseObject().SetUniverseObject("Pong Game Manager")
+            .BehaviourController.AddBehaviour<PongManagerBehaviour>(5);
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IUniverseObject UniverseObjectBall = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Ball");
-        UniverseObjectBall.BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(0, 0f), scale: new Vector2D(10f, 10f));
-
-        UniverseObjectBall.BehaviourController.AddBehaviour<CircleBehaviour>(new Circle(Vector2D.Zero, 1f));
-        UniverseObjectBall.BehaviourController.AddBehaviour<BallBehaviour>();
-        UniverseObjectBall.BehaviourController.AddBehaviour<RigidBody2D>();
+        universe.InstantiateUniverseObject().SetUniverseObject("Ball")
+            .BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(0, 0f), scale: new Vector2D(10f, 10f))
+            .BehaviourController.AddBehaviour<CircleBehaviour>(new Circle(Vector2D.Zero, 1f))
+            .BehaviourController.AddBehaviour<BallBehaviour>()
+            .BehaviourController.AddBehaviour<RigidBody2D>();
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IUniverseObject UniverseObjectLeftPaddle = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Left Paddle");
-        UniverseObjectLeftPaddle.BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(-468f, 0f), scale: new Vector2D(15f, 60f));
+        universe.InstantiateUniverseObject().SetUniverseObject("Left Paddle")
+            .BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(-468f, 0f), scale: new Vector2D(15f, 60f))
+            .BehaviourController.AddBehaviour<PaddleBehaviour>(Keys.W, Keys.S, 228f, -228f, 400f)
+            .BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square)
+            .BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
 
-        UniverseObjectLeftPaddle.BehaviourController.AddBehaviour<PaddleBehaviour>(Keys.W, Keys.S, 228f, -228f, 400f);
-        UniverseObjectLeftPaddle.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square);
-        UniverseObjectLeftPaddle.BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
-
-        IUniverseObject UniverseObjectRightPaddle = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Right Paddle");
-        UniverseObjectRightPaddle.BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(468f, 0f), scale: new Vector2D(15f, 60f));
-        UniverseObjectRightPaddle.BehaviourController.AddBehaviour<PaddleBehaviour>(Keys.Up, Keys.Down, 228f, -228f, 400f);
-        UniverseObjectRightPaddle.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square);
-        UniverseObjectRightPaddle.BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
+        universe.InstantiateUniverseObject().SetUniverseObject("Right Paddle")
+            .BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(468f, 0f), scale: new Vector2D(15f, 60f))
+            .BehaviourController.AddBehaviour<PaddleBehaviour>(Keys.Up, Keys.Down, 228f, -228f, 400f)
+            .BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square)
+            .BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IUniverseObject UniverseObjectWallTop = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Wall Top");
-        UniverseObjectWallTop.BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(0f, 308f), scale: new Vector2D(552f, 20f));
-        UniverseObjectWallTop.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square);
-        UniverseObjectWallTop.BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
+        universe.InstantiateUniverseObject().SetUniverseObject("Wall Top")
+            .BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(0f, 308f), scale: new Vector2D(552f, 20f))
+            .BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square)
+            .BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
 
-        IUniverseObject UniverseObjectWallBottom = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Wall Bottom");
-        UniverseObjectWallBottom.BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(0f, -308f), scale: new Vector2D(552f, 20f));
-        UniverseObjectWallBottom.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square);
-        UniverseObjectWallBottom.BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
+        universe.InstantiateUniverseObject().SetUniverseObject("Wall Bottom")
+            .BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(0f, -308f), scale: new Vector2D(552f, 20f))
+            .BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square)
+            .BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
 
-        IUniverseObject UniverseObjectWallRight = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Wall Right");
-        UniverseObjectWallRight.BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(532f, 0f), scale: new Vector2D(20f, 328f));
-        UniverseObjectWallRight.BehaviourController.AddBehaviour<WallScoreBehaviour>((Action)pongManager.ScoreToLeft);
-        UniverseObjectWallRight.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square);
-        UniverseObjectWallRight.BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
+        universe.InstantiateUniverseObject().SetUniverseObject("Wall Right")
+            .BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(532f, 0f), scale: new Vector2D(20f, 328f))
+            .BehaviourController.AddBehaviour<WallScoreBehaviour>((Action)pongManager.ScoreToLeft)
+            .BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square)
+            .BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
 
-        IUniverseObject UniverseObjectWallLeft = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Wall Left");
-        UniverseObjectWallLeft.BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(-532f, 0f), scale: new Vector2D(20f, 328f));
-        UniverseObjectWallLeft.BehaviourController.AddBehaviour<WallScoreBehaviour>((Action)pongManager.ScoreToRight);
-        UniverseObjectWallLeft.BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square);
-        UniverseObjectWallLeft.BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
+        universe.InstantiateUniverseObject().SetUniverseObject("Wall Left")
+            .BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(-532f, 0f), scale: new Vector2D(20f, 328f))
+            .BehaviourController.AddBehaviour<WallScoreBehaviour>((Action)pongManager.ScoreToRight)
+            .BehaviourController.AddBehaviour<ShapeBehaviour>(Shape2D.Square)
+            .BehaviourController.AddBehaviour<RigidBody2D>().IsStatic = true;
 
         ////////////////////////////////////////////////////////////////////////////////////
 
-        IUniverseObject UniverseObjectLeftScoreText = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Score Left");
-        UniverseObjectLeftScoreText.BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(-250f, 250f), scale: Vector2D.One * .25f);
-        UniverseObjectLeftScoreText.BehaviourController.AddBehaviour<TextScoreBehaviour>(true, spriteFont);
+        universe.InstantiateUniverseObject().SetUniverseObject("Score Left")
+            .BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(-250f, 250f), scale: Vector2D.One * .25f)
+            .BehaviourController.AddBehaviour<TextScoreBehaviour>(true, spriteFont);
 
-        IUniverseObject UniverseObjectRightScoreText = universe.InstantiateUniverseObject<UniverseObject>().SetUniverseObject("Score Right");
-        UniverseObjectRightScoreText.BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(250f, 250f), scale: Vector2D.One * .25f);
-        UniverseObjectRightScoreText.BehaviourController.AddBehaviour<TextScoreBehaviour>(false, spriteFont);
+        universe.InstantiateUniverseObject().SetUniverseObject("Score Right")
+            .BehaviourController.AddBehaviour<Transform2D>().SetTransform(position: new Vector2D(250f, 250f), scale: Vector2D.One * .25f)
+            .BehaviourController.AddBehaviour<TextScoreBehaviour>(false, spriteFont);
     }
 
     protected override void Update(GameTime gameTime)