Fixed spacing and comments

Author: ameliakratzer-code

src/main/java/com/dinosaur/dinosaurexploder/components/LifeComponent.java

@@ -95,8 +95,7 @@ public void clearEntity() {
 
     /**
      * Summary :
-     * This method is overriding the superclass method to increase the life to the
-     * current life without exceeding
+     * This method is overriding the superclass method to increase the life to the current life without exceeding
      * the maximum number of lives allowed
      */
     @Override
@@ -107,8 +106,7 @@ public int increaseLife(int i) {
 
     /**
      * Summary :
-     * This method is overriding the superclass method to decrease the life to the
-     * current life
+     * This method is overriding the superclass method to decrease the life to the current life
      */
     @Override
     public int decreaseLife(int i) {

src/main/java/com/dinosaur/dinosaurexploder/controller/DinosaurController.java

@@ -24,8 +24,7 @@
 
 /**
  * Summary :
- * The Factory handles the Dinosaur , player controls and collision detection of
- * all entities in the game
+  *      The Factory handles the Dinosaur , player controls and collision detection of all entities in the game
  */
 public class DinosaurController {
     LanguageManager languageManager = LanguageManager.getInstance();
@@ -43,12 +42,11 @@ public class DinosaurController {
 
     /**
      * Summary :
-     * Detecting the player damage to decrease the lives and checking if the game is
-     * over
+     *      Detecting the player damage to decrease the lives and checking if the game is over
      */
     public void damagePlayer() {
-        if (player.getComponent(PlayerComponent.class).isInvincible()) {
-            return;
+            if(player.getComponent(PlayerComponent.class).isInvincible()){
+                return; 
         }
         int lives = life.getComponent(LifeComponent.class).decreaseLife(1);
         var flash = new Rectangle(DinosaurGUI.WIDTH, DinosaurGUI.HEIGHT, Color.rgb(190, 10, 15, 0.5));
@@ -68,7 +66,7 @@ public void damagePlayer() {
 
     /**
      * Summary :
-     * To move the space shuttle in forward , backward , right , left directions
+    *      To move the space shuttle in forward , backward , right , left directions
      */
     public void initInput() {
         onKey(KeyCode.UP, () -> player.getComponent(PlayerComponent.class).moveUp());
@@ -89,10 +87,10 @@ public void initInput() {
     public void initGame() {
         initGameEntities();
         levelManager = new LevelManager();
-        bossSpawner = new BossSpawner(settings, levelManager);
+        bossSpawner = new BossSpawner(settings,levelManager);
         CoinSpawner coinSpawner = new CoinSpawner(10, 1.0);
 
-        if (!settings.isMuted()) {
+        if(!settings.isMuted()) {
             FXGL.play(GameConstants.BACKGROUND_SOUND);
         }
 
@@ -103,7 +101,7 @@ public void initGame() {
         });
     }
 
-    private void initGameEntities() {
+    private void initGameEntities(){
         spawn("background", 0, 0);
         player = spawn("player", getAppCenter().getX() - 45, getAppHeight() - 200);
         levelDisplay = spawn("Level", getAppCenter().getX() - 270, getAppCenter().getY() + 350);
@@ -117,19 +115,19 @@ private void initGameEntities() {
 
     /**
      * Summary :
-     * This method is used to spawn the enemies
-     * and set the spawn rate of the enemies
+     *      This method is used to spawn the enemies
+     *      and set the spawn rate of the enemies
      */
     private void spawnEnemies() {
-        if (enemySpawnTimer != null) {
+        if(enemySpawnTimer != null) {
             enemySpawnTimer.expire();
         }
 
         enemySpawnTimer = run(() -> {
-            if (levelManager.getCurrentLevel() % 5 == 0) {
+            if(levelManager.getCurrentLevel() % 5 == 0) {
                 pauseEnemySpawning();
                 bossSpawner.spawnNewBoss();
-            } else {
+            }else {
                 if (!isSpawningPaused && random(0, 2) < 2) {
                     Entity greenDino = spawn("greenDino", random(0, getAppWidth() - 80), -50);
                     greenDino.getComponent(GreenDinoComponent.class).setMuted(settings.isMuted());
@@ -140,11 +138,11 @@ private void spawnEnemies() {
 
     /**
      * Summary :
-     * This method is used to pause the enemy spawning
+     *      This method is used to pause the enemy spawning
      */
-    private void pauseEnemySpawning() {
+    private void pauseEnemySpawning(){
         isSpawningPaused = true;
-        if (enemySpawnTimer != null) {
+        if(enemySpawnTimer != null) {
             enemySpawnTimer.pause();
         }
     }
@@ -153,33 +151,32 @@ private void pauseEnemySpawning() {
      * Summary :
      * This method is used to resume the enemy spawning
      */
-    private void resumeEnemySpawning() {
+    private void resumeEnemySpawning(){
         isSpawningPaused = false;
-        if (enemySpawnTimer != null) {
+        if(enemySpawnTimer != null){
             enemySpawnTimer.resume();
-        } else {
+        } else{
             spawnEnemies();
         }
     }
 
     /**
      * Summary :
-     * Handles level progression when enemies are defeated
-     * and shows a message when the level is changed
+     *      Handles level progression when enemies are defeated
+     *      and shows a message when the level is changed
      */
-    private void showLevelMessage() {
-        // Pause game elements during level transition
+    private void showLevelMessage(){
+        //Pause game elements during level transition
         FXGL.getGameWorld().getEntitiesByType(EntityType.GREEN_DINO).forEach(e -> {
-            if (e.hasComponent(GreenDinoComponent.class)) {
+            if(e.hasComponent(GreenDinoComponent.class)) {
                 e.getComponent(GreenDinoComponent.class).setPaused(true);
             }
         });
 
         pauseEnemySpawning();
 
         // Display centered level notification
-        Text levelText = getUIFactoryService()
-                .newText(languageManager.getTranslation("level") + levelManager.getCurrentLevel(), Color.WHITE, 24);
+        Text levelText = getUIFactoryService().newText(languageManager.getTranslation("level") + levelManager.getCurrentLevel(), Color.WHITE, 24);
         levelText.setStroke(Color.BLACK);
         levelText.setStrokeWidth(1.5);
         centerText(levelText);
@@ -196,7 +193,7 @@ private void showLevelMessage() {
             updateLevelDisplay();
 
             FXGL.getGameWorld().getEntitiesByType(EntityType.GREEN_DINO).forEach(e -> {
-                if (e.hasComponent(GreenDinoComponent.class)) {
+                if(e.hasComponent(GreenDinoComponent.class)){
                     e.getComponent(GreenDinoComponent.class).setPaused(false);
                 }
             });
@@ -205,7 +202,7 @@ private void showLevelMessage() {
 
             player.getComponent(PlayerComponent.class).setInvincible(true);
             runOnce(() -> {
-                if (player != null && player.isActive()) {
+                if(player != null && player.isActive()){
                     player.getComponent(PlayerComponent.class).setInvincible(false);
                 }
             }, seconds(3));
@@ -214,14 +211,14 @@ private void showLevelMessage() {
 
     /**
      * Summary :
-     * Center the text on the screen
+     *      Center the text on the screen
      */
-    private void centerText(Text text) {
+    private void centerText(Text text){
         text.setX((getAppWidth() - text.getLayoutBounds().getWidth()) / 2.0);
         text.setY(getAppHeight() / 2.0);
     }
 
-    public void updateLevelDisplay() {
+    public void updateLevelDisplay(){
         Text levelText = (Text) levelDisplay.getViewComponent().getChildren().get(0);
         levelText.setText(languageManager.getTranslation("level") + ": " + levelManager.getCurrentLevel());
 
@@ -233,27 +230,26 @@ public void updateLevelDisplay() {
 
     /**
      * Summary :
-     * Detect the collision between the game elements.
+     *      Detect the collision between the game elements.
      */
     public void initPhysics() {
         /*
-         * After collision between projectile and greenDino there hava explosion
-         * animation
+         * After collision between projectile and greenDino there hava explosion animation
          * and there have 5% chance to spawn a heart
          */
         onCollisionBegin(EntityType.PROJECTILE, EntityType.GREEN_DINO, (projectile, greenDino) -> {
             spawn("explosion", greenDino.getX() - 25, greenDino.getY() - 30);
             if (random(0, 100) < 5) {
                 spawn("heart", greenDino.getX(), greenDino.getY());
             }
-            if (!settings.isMuted()) {
+            if(!settings.isMuted()) {
                 FXGL.play(GameConstants.ENEMY_EXPLODE_SOUND);
             }
             projectile.removeFromWorld();
             greenDino.removeFromWorld();
             score.getComponent(ScoreComponent.class).incrementScore(1);
             levelManager.incrementDefeatedEnemies();
-            if (levelManager.shouldAdvanceLevel()) {
+            if(levelManager.shouldAdvanceLevel()) {
                 levelManager.nextLevel();
                 showLevelMessage();
                 System.out.println("Level up!");
@@ -272,7 +268,7 @@ public void initPhysics() {
         onCollisionBegin(EntityType.PROJECTILE, EntityType.RED_DINO, (projectile, redDino) -> {
             spawn("explosion", redDino.getX() - 25, redDino.getY() - 30);
             projectile.removeFromWorld();
-            if (!settings.isMuted()) {
+            if(!settings.isMuted()) {
                 FXGL.play(GameConstants.ENEMY_EXPLODE_SOUND);
             }
             redDino.getComponent(RedDinoComponent.class).damage(1);
@@ -281,32 +277,32 @@ public void initPhysics() {
                 // if the boss is defeated it drops 100% a heart
                 spawn("heart", redDino.getX(), redDino.getY());
                 // if the boss dino is defeated it drops as many coins as the current level
-                for (int i = 0; i < levelManager.getCurrentLevel(); i++) {
-                    spawn("coin", redDino.getX() + random(-25, 25), redDino.getY() + random(-25, 25));
+                for (int i = 0; i<levelManager.getCurrentLevel(); i++){
+                    spawn("coin", redDino.getX()+random(-25,25), redDino.getY()+random(-25,25));
                 }
                 bossSpawner.removeBossEntities();
 
                 score.getComponent(ScoreComponent.class).incrementScore(levelManager.getCurrentLevel());
                 levelManager.nextLevel();
                 showLevelMessage();
                 System.out.println("Level up!");
-            } else {
+            } else{
                 bossSpawner.updateHealthBar();
             }
 
         });
 
         onCollisionBegin(EntityType.PROJECTILE, EntityType.ENEMY_PROJECTILE, (projectile, enemyProjectile) -> {
             spawn("explosion", enemyProjectile.getX() - 25, enemyProjectile.getY() - 30);
-            if (!settings.isMuted()) {
+            if(!settings.isMuted()) {
                 FXGL.play(GameConstants.ENEMY_EXPLODE_SOUND);
             }
             projectile.removeFromWorld();
             enemyProjectile.removeFromWorld();
         });
 
         onCollisionBegin(EntityType.ENEMY_PROJECTILE, EntityType.PLAYER, (projectile, player) -> {
-            if (!settings.isMuted()) {
+            if(!settings.isMuted()) {
                 FXGL.play(GameConstants.PLAYER_HIT_SOUND);
             }
             projectile.removeFromWorld();
@@ -315,7 +311,7 @@ public void initPhysics() {
         });
 
         onCollisionBegin(EntityType.PLAYER, EntityType.GREEN_DINO, (player, greenDino) -> {
-            if (!settings.isMuted()) {
+            if(!settings.isMuted()) {
                 FXGL.play(GameConstants.PLAYER_HIT_SOUND);
             }
             greenDino.removeFromWorld();
@@ -324,15 +320,15 @@ public void initPhysics() {
         });
 
         onCollisionBegin(EntityType.PLAYER, EntityType.RED_DINO, (player, redDino) -> {
-            if (!settings.isMuted()) {
+            if(!settings.isMuted()) {
                 FXGL.play(GameConstants.PLAYER_HIT_SOUND);
             }
             System.out.println("You touched a red dino !");
             damagePlayer();
         });
 
         onCollisionBegin(EntityType.PLAYER, EntityType.COIN, (player, coin) -> {
-            if (!settings.isMuted()) {
+            if(!settings.isMuted()) {
                 FXGL.play(GameConstants.COIN_GAIN);
             }
             coin.removeFromWorld();
@@ -346,7 +342,7 @@ public void initPhysics() {
         });
 
         onCollisionBegin(EntityType.PLAYER, EntityType.HEART, (player, heart) -> {
-            if (!settings.isMuted()) {
+            if(!settings.isMuted()) {
                 FXGL.play(GameConstants.HEART_HIT_SOUND);
             }
             heart.removeFromWorld();
@@ -357,7 +353,7 @@ public void initPhysics() {
 
     /**
      * Summary :
-     * To detect whether the player lives are empty or not
+     *      To detect whether the player lives are empty or not
      */
     public void gameOver() {
         new GameOverDialog(languageManager).createDialog();

src/main/java/com/dinosaur/dinosaurexploder/model/GameEntityFactory.java

@@ -147,34 +147,34 @@ public Entity newGreenDino(SpawnData data) {
         public Entity newCoin(SpawnData data) {
                 System.out.println("Loading coin texture: " + GameConstants.COIN_IMAGE_FILE);
                 return entityBuilderBase(data, EntityType.COIN)
-                                .with(new OffscreenCleanComponent())
-                                .view(texture(GameConstants.COIN_IMAGE_FILE, 40, 40))
-                                .bbox(new HitBox(BoundingShape.box(40, 40)))
-                                .collidable()
-                                .with(new CoinComponent())
-                                .build();
+                        .with(new OffscreenCleanComponent())
+                        .view(texture(GameConstants.COIN_IMAGE_FILE, 40, 40))
+                        .bbox(new HitBox(BoundingShape.box(40, 40)))
+                        .collidable()
+                        .with(new CoinComponent())
+                        .build();
         }
 
         @Spawns("redDino")
         public Entity newRedDino(SpawnData data) {
                 return entityBuilderBase(data, EntityType.RED_DINO)
-                                .with(new OffscreenCleanComponent())
-                                .view(texture(GameConstants.RED_DINO_IMAGE_FILE, 100, 80))
-                                .bbox(new HitBox(BoundingShape.box(65, 55)))
-                                .collidable()
-                                .with(new RedDinoComponent())
-                                .build();
+                        .with(new OffscreenCleanComponent())
+                        .view(texture(GameConstants.RED_DINO_IMAGE_FILE, 100, 80))
+                        .bbox(new HitBox(BoundingShape.box(65, 55)))
+                        .collidable()
+                        .with(new RedDinoComponent())
+                        .build();
         }
 
-        @Spawns("healthBar")
-        public Entity newHealthbar(SpawnData data) {
-                Rectangle healthbar = new Rectangle(200.0, 25.0, Color.RED);
-                return entityBuilderBase(data, EntityType.HEALTHBAR)
-                                .with(new OffscreenCleanComponent())
-                                .with(new HealthbarComponent())
-                                .view(healthbar)
-                                .build();
-        }
+    @Spawns("healthBar")
+    public Entity newHealthbar(SpawnData data) {
+        Rectangle healthbar = new Rectangle(200.0, 25.0, Color.RED);
+        return entityBuilderBase(data, EntityType.HEALTHBAR)
+                .with(new OffscreenCleanComponent())
+                .with(new HealthbarComponent())
+                .view(healthbar)
+                .build();
+    }
 
         /**
          * Summary :