refactored code

Author: ashish2199

src/Bomberman/entity/Entity.java

@@ -13,4 +13,6 @@ public interface Entity {
     boolean isColliding(Entity b);
     void draw();
     void removeFromScene();
+    int getPositionX();
+    int getPositionY();
 }

src/Bomberman/entity/MovingEntity.java

@@ -5,7 +5,7 @@
  */
 package bomberman.entity;
 
-import bomberman.animations.Direction;
+import bomberman.constants.Direction;
 
 /**
  *

src/Bomberman/entity/player/Player.java

@@ -1,7 +1,7 @@
 package bomberman.entity.player;
 
 import bomberman.Renderer;
-import bomberman.animations.Direction;
+import bomberman.constants.Direction;
 import bomberman.animations.PlayerAnimations;
 import bomberman.animations.Sprite;
 import bomberman.constants.GlobalConstants;
@@ -43,7 +43,7 @@ private void init() {
         name = "Player";
         playerBoundary = new RectBoundedBox(positionX, positionY, GlobalConstants.PLAYER_WIDTH, GlobalConstants.PLAYER_HEIGHT);
 
-    	playerAnimations = new PlayerAnimations();
+    	playerAnimations = new PlayerAnimations(this);
 
         positionX = GlobalConstants.PLAYER_X;
         positionY = GlobalConstants.PLAYER_Y;
@@ -83,8 +83,7 @@ public boolean isColliding(Entity b) {
 
     @Override
     public void draw() {
-    	currentSprite.setPosition(positionX, positionY);
-        if (currentSprite != null) {
+    	if (currentSprite != null) {
             Renderer.playAnimation(currentSprite);
         }
     }
@@ -133,4 +132,14 @@ public void reduceHealth(int damage) {
     public void removeFromScene() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
+
+    @Override
+    public int getPositionX() {
+        return this.positionX;
+    }
+
+    @Override
+    public int getPositionY() {
+        return this.positionY;
+    }
 }

src/Bomberman/entity/staticobjects/Wall.java

@@ -14,6 +14,8 @@
  * @author kdost
  */
 public class Wall implements StaticEntity {
+    public int positionX = 0;
+    public int positionY = 0;
     private int height;
     private int width;
     private int health;
@@ -40,5 +42,15 @@ public void draw() {
     public void removeFromScene() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
+
+    @Override
+    public int getPositionX() {
+        return this.positionX;
+    }
+
+    @Override
+    public int getPositionY() {
+        return this.positionY;
+    }
 
 }

src/bomberman/entity/Entity.java

@@ -1,16 +1,18 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package bomberman.entity;
-
-/**
- *
- * @author Ashish
- */
-public interface Entity {
-    boolean isColliding(Entity b);
-    void draw();
-    void removeFromScene();
-}
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package bomberman.entity;
+
+/**
+ *
+ * @author Ashish
+ */
+public interface Entity {
+    boolean isColliding(Entity b);
+    void draw();
+    void removeFromScene();
+    int getPositionX();
+    int getPositionY();
+}

src/bomberman/entity/MovingEntity.java

@@ -1,19 +1,19 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package bomberman.entity;
-
-import bomberman.animations.Direction;
-
-/**
- *
- * @author kdost
- */
-public interface MovingEntity extends Entity {
-
-
-    public void move(int steps, Direction direction);
-
-}
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package bomberman.entity;
+
+import bomberman.constants.Direction;
+
+/**
+ *
+ * @author kdost
+ */
+public interface MovingEntity extends Entity {
+
+
+    public void move(int steps, Direction direction);
+
+}

src/bomberman/entity/player/Player.java

@@ -1,7 +1,7 @@
 package bomberman.entity.player;
 
 import bomberman.Renderer;
-import bomberman.animations.Direction;
+import bomberman.constants.Direction;
 import bomberman.animations.PlayerAnimations;
 import bomberman.animations.Sprite;
 import bomberman.constants.GlobalConstants;
@@ -43,7 +43,7 @@ private void init() {
         name = "Player";
         playerBoundary = new RectBoundedBox(positionX, positionY, GlobalConstants.PLAYER_WIDTH, GlobalConstants.PLAYER_HEIGHT);
 
-    	playerAnimations = new PlayerAnimations();
+    	playerAnimations = new PlayerAnimations(this);
 
         positionX = GlobalConstants.PLAYER_X;
         positionY = GlobalConstants.PLAYER_Y;
@@ -83,8 +83,7 @@ public boolean isColliding(Entity b) {
 
     @Override
     public void draw() {
-    	currentSprite.setPosition(positionX, positionY);
-        if (currentSprite != null) {
+    	if (currentSprite != null) {
             Renderer.playAnimation(currentSprite);
         }
     }
@@ -133,4 +132,14 @@ public void reduceHealth(int damage) {
     public void removeFromScene() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
+
+    @Override
+    public int getPositionX() {
+        return this.positionX;
+    }
+
+    @Override
+    public int getPositionY() {
+        return this.positionY;
+    }
 }

src/bomberman/entity/staticobjects/Wall.java

@@ -14,6 +14,8 @@
  * @author kdost
  */
 public class Wall implements StaticEntity {
+    public int positionX = 0;
+    public int positionY = 0;
     private int height;
     private int width;
     private int health;
@@ -40,5 +42,15 @@ public void draw() {
     public void removeFromScene() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
+
+    @Override
+    public int getPositionX() {
+        return this.positionX;
+    }
+
+    @Override
+    public int getPositionY() {
+        return this.positionY;
+    }
 
 }