switched from SuperObject to Entity for objects

src/de/miaurizius/jgame2d/entity/Entity.java

@@ -18,7 +18,7 @@ public class Entity {
     public int worldX, worldY;
     public int speed;
     public BufferedImage up1, up2, down1, down2, left1, left2, right1, right2;
-    public Direction direction;
+    public Direction direction = Direction.DOWN;
     public int spriteCounter = 0;
     public int spriteNum = 1;
     public Rectangle solidArea = new Rectangle(0, 0, 48, 48);
@@ -27,6 +27,9 @@ public class Entity {
     public int actionLock = 0;
     String[] dialogue = new String[20];
     int dialogueIndex = 0;
+    public BufferedImage image, image2, image3;
+    public String name;
+    public boolean collision = false;
 
     // CHARACTER STATUS
     public int maxLife;
@@ -98,7 +101,7 @@ public class Entity {
         };
     }
 
-    BufferedImage initEntitySprites(String name) {
+    public BufferedImage initEntitySprites(String name) {
         try {
             return Utility.scaleImage(ImageIO.read(new FileInputStream("assets/" + name + ".png")), panel.tileSize, panel.tileSize);
         } catch (IOException e) {

src/de/miaurizius/jgame2d/entity/objects/BootsObj.java

@@ -0,0 +1,14 @@
+package de.miaurizius.jgame2d.entity.objects;
+
+import de.miaurizius.jgame2d.core.GamePanel;
+import de.miaurizius.jgame2d.entity.Entity;
+
+public class BootsObj extends Entity {
+
+    public BootsObj(GamePanel panel) {
+        super(panel);
+        name = "boots";
+        down1 = initEntitySprites("objects/boots.png");
+    }
+
+}

src/de/miaurizius/jgame2d/entity/objects/ChestObj.java

@@ -0,0 +1,14 @@
+package de.miaurizius.jgame2d.entity.objects;
+
+import de.miaurizius.jgame2d.core.GamePanel;
+import de.miaurizius.jgame2d.entity.Entity;
+
+public class ChestObj extends Entity {
+
+    public ChestObj(GamePanel panel) {
+        super(panel);
+        name = "chest";
+        down1 = initEntitySprites("objects/chest");
+    }
+
+}

src/de/miaurizius/jgame2d/entity/objects/DoorObj.java

@@ -0,0 +1,15 @@
+package de.miaurizius.jgame2d.entity.objects;
+
+import de.miaurizius.jgame2d.core.GamePanel;
+import de.miaurizius.jgame2d.entity.Entity;
+
+public class DoorObj extends Entity {
+
+    public DoorObj(GamePanel panel) {
+        super(panel);
+        name = "door";
+        down1 = initEntitySprites("objects/door");
+        collision = true;
+    }
+
+}

src/de/miaurizius/jgame2d/entity/objects/HeartObj.java

@@ -0,0 +1,16 @@
+package de.miaurizius.jgame2d.entity.objects;
+
+import de.miaurizius.jgame2d.core.GamePanel;
+import de.miaurizius.jgame2d.entity.Entity;
+
+public class HeartObj extends Entity {
+
+    public HeartObj(GamePanel panel) {
+        super(panel);
+        name = "heart";
+        image = initEntitySprites("objects/heart_full");
+        image2 = initEntitySprites("objects/heart_half");
+        image3 = initEntitySprites("objects/heart_blank");
+    }
+
+}

src/de/miaurizius/jgame2d/entity/objects/KeyObj.java

@@ -0,0 +1,14 @@
+package de.miaurizius.jgame2d.entity.objects;
+
+import de.miaurizius.jgame2d.core.GamePanel;
+import de.miaurizius.jgame2d.entity.Entity;
+
+public class KeyObj extends Entity {
+
+    public KeyObj(GamePanel panel) {
+        super(panel);
+        name = "key";
+        down1 = initEntitySprites("objects/key");
+    }
+
+}

src/de/miaurizius/jgame2d/entity/objects/SuperObject.java

@@ -0,0 +1,30 @@
+package de.miaurizius.jgame2d.entity.objects;
+
+import de.miaurizius.jgame2d.core.GamePanel;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+@Deprecated
+public class SuperObject {
+
+    public BufferedImage image, image2, image3;
+    public String name;
+    public boolean collision = false;
+    public int worldX, worldY;
+    public Rectangle solidArea = new Rectangle(0, 0, 48, 48);
+    public int solidAreaDefaultX = 0;
+    public int solidAreaDefaultY = 0;
+
+    public void draw(Graphics2D graphics2D, GamePanel panel) {
+        int screenX = worldX - panel.player.worldX + panel.player.screenX;
+        int screenY = worldY - panel.player.worldY + panel.player.screenY;
+
+        if(worldX + panel.tileSize > panel.player.worldX - panel.player.screenX &&
+                worldX - panel.tileSize < panel.player.worldX + panel.player.screenX &&
+                worldY + panel.tileSize > panel.player.worldY - panel.player.screenY &&
+                worldY - panel.tileSize < panel.player.worldY + panel.player.screenY
+        ) graphics2D.drawImage(image, screenX, screenY, panel.tileSize, panel.tileSize, null);
+    }
+
+}