Code refactor and package changes.

Author: SEM24

src/main/java/com/khomsi/game/entity/npc/object/NpcRock.java

@@ -4,8 +4,8 @@
 import com.khomsi.game.entity.Entity;
 import com.khomsi.game.objects.outside.DungeonDoorClosedObject;
 import com.khomsi.game.objects.outside.DungeonDoorOpenedObject;
-import com.khomsi.game.tilesinteractive.InteractiveTile;
-import com.khomsi.game.tilesinteractive.SwitchPress;
+import com.khomsi.game.tiles.interactive.InteractiveTile;
+import com.khomsi.game.tiles.interactive.SwitchPress;
 
 import java.awt.*;
 import java.util.Arrays;

src/main/java/com/khomsi/game/main/GameManager.java

@@ -13,12 +13,12 @@
 import com.khomsi.game.main.logic.EventHandler;
 import com.khomsi.game.main.tools.EntityComparator;
 import com.khomsi.game.main.tools.KeyHandler;
-import com.khomsi.game.main.tools.PlaceObjects;
 import com.khomsi.game.main.tools.Sound;
 import com.khomsi.game.main.tools.ui.UI;
+import com.khomsi.game.objects.PlaceObjects;
 import com.khomsi.game.tiles.Map;
 import com.khomsi.game.tiles.TileManager;
-import com.khomsi.game.tilesinteractive.InteractiveTile;
+import com.khomsi.game.tiles.interactive.InteractiveTile;
 
 import javax.swing.*;
 import java.awt.*;
@@ -221,10 +221,6 @@ public void update() {
                 if (npc != null)
                     npc.update();
 
-            for (Entity animated : animatedTiles[currentMap])
-                if (animated != null)
-                    animated.update();
-
             //Mob loop
             for (int i = 0; i < mobs[1].length; i++) {
                 if (mobs[currentMap][i] != null) {
@@ -256,6 +252,10 @@ public void update() {
                     tile.update();
                 }
             }
+            for (Entity animated : animatedTiles[currentMap])
+                if (animated != null)
+                    animated.update();
+
             enManagement.update();
         }
         if (gameState == PAUSE_STATE) {
@@ -281,14 +281,11 @@ else if (gameState == MAP_STATE) {
         else {
             //Draw Tiles
             tileManager.draw(g2d);
-            for (Entity element : interactTile[currentMap]) {
-                if (element != null)
-                    element.draw(g2d);
-            }
+            drawObjectsOnScreen(interactTile);
+            drawObjectsOnScreen(animatedTiles);
             entities.add(player);
             //Add and render npc, obj, mobs, projectiles to draw list
             drawMethodArray(npcList);
-            drawMethodArray(animatedTiles);
             drawMethodArray(object);
             drawMethodArray(mobs);
             //Interactive tiles
@@ -316,6 +313,13 @@ else if (gameState == MAP_STATE) {
         debugFunction(g2d, drawStart);
     }
 
+    private void drawObjectsOnScreen(Entity[][] animatedTiles) {
+        for (Entity element : animatedTiles[currentMap]) {
+            if (element != null)
+                element.draw(g2d);
+        }
+    }
+
     private void drawMethodList(List<Entity> list) {
         for (Entity object : list) {
             if (object != null)

…khomsi/game/main/tools/PlaceObjects.java …om/khomsi/game/objects/PlaceObjects.javasrc/main/java/com/khomsi/game/main/tools/PlaceObjects.java renamed to src/main/java/com/khomsi/game/objects/PlaceObjects.java src/main/java/com/khomsi/game/main/tools/PlaceObjects.java renamed to src/main/java/com/khomsi/game/objects/PlaceObjects.java

@@ -1,4 +1,4 @@
-package com.khomsi.game.main.tools;
+package com.khomsi.game.objects;
 
 import com.khomsi.game.data.GameProgress;
 import com.khomsi.game.entity.mobs.*;
@@ -15,11 +15,11 @@
 import com.khomsi.game.objects.light.LanternObject;
 import com.khomsi.game.objects.outside.*;
 import com.khomsi.game.objects.spells.PotionObject;
-import com.khomsi.game.tilesinteractive.Bush;
-import com.khomsi.game.tilesinteractive.DestructibleWall;
-import com.khomsi.game.tilesinteractive.SwitchPress;
-import com.khomsi.game.tilesanimated.water.WaterBubbles;
-import com.khomsi.game.tilesanimated.water.WaterHurricane;
+import com.khomsi.game.tiles.interactive.Bush;
+import com.khomsi.game.tiles.interactive.DestructibleWall;
+import com.khomsi.game.tiles.interactive.SwitchPress;
+import com.khomsi.game.tiles.animated.water.WaterBubbles;
+import com.khomsi.game.tiles.animated.water.WaterHurricane;
 
 public class PlaceObjects {
     GameManager gameManager;

…msi/game/tilesanimated/AnimatedTile.java …si/game/tiles/animated/AnimatedTile.javasrc/main/java/com/khomsi/game/tilesanimated/AnimatedTile.java renamed to src/main/java/com/khomsi/game/tiles/animated/AnimatedTile.java src/main/java/com/khomsi/game/tilesanimated/AnimatedTile.java renamed to src/main/java/com/khomsi/game/tiles/animated/AnimatedTile.java

@@ -1,4 +1,4 @@
-package com.khomsi.game.tilesanimated;
+package com.khomsi.game.tiles.animated;
 
 import com.khomsi.game.entity.Entity;
 import com.khomsi.game.main.GameManager;
@@ -9,8 +9,6 @@ public class AnimatedTile extends Entity {
     public AnimatedTile(GameManager gameManager) {
         super(gameManager);
         this.gameManager = gameManager;
-        direction = "down";
-        speed = 0;
     }
 
     @Override

…me/tilesanimated/water/WaterBubbles.java …e/tiles/animated/water/WaterBubbles.javasrc/main/java/com/khomsi/game/tilesanimated/water/WaterBubbles.java renamed to src/main/java/com/khomsi/game/tiles/animated/water/WaterBubbles.java src/main/java/com/khomsi/game/tilesanimated/water/WaterBubbles.java renamed to src/main/java/com/khomsi/game/tiles/animated/water/WaterBubbles.java

@@ -1,7 +1,7 @@
-package com.khomsi.game.tilesanimated.water;
+package com.khomsi.game.tiles.animated.water;
 
 import com.khomsi.game.main.GameManager;
-import com.khomsi.game.tilesanimated.AnimatedTile;
+import com.khomsi.game.tiles.animated.AnimatedTile;
 
 public class WaterBubbles extends AnimatedTile {
     public WaterBubbles(GameManager gameManager) {

…/tilesanimated/water/WaterHurricane.java …tiles/animated/water/WaterHurricane.javasrc/main/java/com/khomsi/game/tilesanimated/water/WaterHurricane.java renamed to src/main/java/com/khomsi/game/tiles/animated/water/WaterHurricane.java src/main/java/com/khomsi/game/tilesanimated/water/WaterHurricane.java renamed to src/main/java/com/khomsi/game/tiles/animated/water/WaterHurricane.java

@@ -1,7 +1,7 @@
-package com.khomsi.game.tilesanimated.water;
+package com.khomsi.game.tiles.animated.water;
 
 import com.khomsi.game.main.GameManager;
-import com.khomsi.game.tilesanimated.AnimatedTile;
+import com.khomsi.game.tiles.animated.AnimatedTile;
 
 public class WaterHurricane extends AnimatedTile {
     public WaterHurricane(GameManager gameManager) {

…m/khomsi/game/tilesinteractive/Bush.java …/khomsi/game/tiles/interactive/Bush.javasrc/main/java/com/khomsi/game/tilesinteractive/Bush.java renamed to src/main/java/com/khomsi/game/tiles/interactive/Bush.java src/main/java/com/khomsi/game/tilesinteractive/Bush.java renamed to src/main/java/com/khomsi/game/tiles/interactive/Bush.java

@@ -1,4 +1,4 @@
-package com.khomsi.game.tilesinteractive;
+package com.khomsi.game.tiles.interactive;
 
 import com.khomsi.game.main.GameManager;
 import com.khomsi.game.entity.Entity;

…e/tilesinteractive/DestructibleWall.java …/tiles/interactive/DestructibleWall.javasrc/main/java/com/khomsi/game/tilesinteractive/DestructibleWall.java renamed to src/main/java/com/khomsi/game/tiles/interactive/DestructibleWall.java src/main/java/com/khomsi/game/tilesinteractive/DestructibleWall.java renamed to src/main/java/com/khomsi/game/tiles/interactive/DestructibleWall.java

@@ -1,4 +1,4 @@
-package com.khomsi.game.tilesinteractive;
+package com.khomsi.game.tiles.interactive;
 
 import com.khomsi.game.main.GameManager;
 import com.khomsi.game.objects.interact.CoinBObject;

…homsi/game/tilesinteractive/DryTree.java …omsi/game/tiles/interactive/DryTree.javasrc/main/java/com/khomsi/game/tilesinteractive/DryTree.java renamed to src/main/java/com/khomsi/game/tiles/interactive/DryTree.java src/main/java/com/khomsi/game/tilesinteractive/DryTree.java renamed to src/main/java/com/khomsi/game/tiles/interactive/DryTree.java

@@ -1,4 +1,4 @@
-package com.khomsi.game.tilesinteractive;
+package com.khomsi.game.tiles.interactive;
 
 import com.khomsi.game.entity.Entity;
 import com.khomsi.game.main.GameManager;

…me/tilesinteractive/InteractiveTile.java …e/tiles/interactive/InteractiveTile.javasrc/main/java/com/khomsi/game/tilesinteractive/InteractiveTile.java renamed to src/main/java/com/khomsi/game/tiles/interactive/InteractiveTile.java src/main/java/com/khomsi/game/tilesinteractive/InteractiveTile.java renamed to src/main/java/com/khomsi/game/tiles/interactive/InteractiveTile.java

@@ -1,4 +1,4 @@
-package com.khomsi.game.tilesinteractive;
+package com.khomsi.game.tiles.interactive;
 
 import com.khomsi.game.main.GameManager;
 import com.khomsi.game.entity.Entity;