Refactor code

src/main/java/rpgkit/LDtkLoader.java

@@ -1,15 +1,15 @@
 package rpgkit;
 
-import rpgkit.entity.Entity;
-import rpgkit.entity.Player;
-import rpgkit.entity.item.Item;
+import rpgkit.drawable.entity.Entity;
+import rpgkit.drawable.entity.Player;
+import rpgkit.drawable.entity.item.Item;
 import rpgkit.ldtk.*;
 import rpgkit.ldtk.tile.Converter;
 import rpgkit.ldtk.tile.TileProperties;
-import rpgkit.managers.EntityManger;
-import rpgkit.managers.TileManager;
-import rpgkit.managers.TileSetManager;
-import rpgkit.utils.Direction;
+import rpgkit.manager.EntityManger;
+import rpgkit.manager.TileManager;
+import rpgkit.manager.TileSetManager;
+import rpgkit.util.Direction;
 
 import java.awt.*;
 import java.io.IOException;

src/main/java/rpgkit/Movement.java

@@ -1,13 +1,15 @@
 package rpgkit;
 
-import rpgkit.entity.Player;
-import rpgkit.managers.TileManager;
-import rpgkit.utils.Utils;
+import rpgkit.drawable.Drawable;
+import rpgkit.drawable.entity.Player;
+import rpgkit.input.KeyHandler;
+import rpgkit.manager.TileManager;
+import rpgkit.util.Utils;
 
 import java.awt.*;
 
 import static java.awt.event.KeyEvent.*;
-import static rpgkit.utils.Direction.*;
+import static rpgkit.util.Direction.*;
 
 public class Movement {
     public static void computeMovements(KeyHandler keyHandler, double delta) {

src/main/java/rpgkit/RPGKit.java

@@ -1,11 +1,15 @@
 package rpgkit;
 
-import rpgkit.entity.Player;
+import rpgkit.drawable.entity.Player;
+import rpgkit.drawable.ui.UI;
+import rpgkit.input.KeyHandler;
 import rpgkit.ldtk.Converter;
 import rpgkit.ldtk.LDtk;
-import rpgkit.managers.LayerManager;
-import rpgkit.ui.UI;
-import rpgkit.utils.Utils;
+import rpgkit.loader.InteractableLoader;
+import rpgkit.loader.ItemLoader;
+import rpgkit.loader.ItemToUIConverter;
+import rpgkit.manager.LayerManager;
+import rpgkit.util.Utils;
 
 import javax.swing.*;
 import java.awt.*;

src/main/java/rpgkit/Tile.java

@@ -1,9 +1,10 @@
 package rpgkit;
 
+import rpgkit.drawable.Drawable;
 import rpgkit.ldtk.Level;
 import rpgkit.ldtk.TileInstance;
 import rpgkit.ldtk.tile.TileProperties;
-import rpgkit.utils.Utils;
+import rpgkit.util.Utils;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;

src/main/java/rpgkit/TileSet.java

@@ -2,7 +2,7 @@
 
 import rpgkit.ldtk.TileCustomMetadata;
 import rpgkit.ldtk.TilesetDefinition;
-import rpgkit.utils.Utils;
+import rpgkit.util.Utils;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;

src/main/java/rpgkit/Drawable.java → src/main/java/rpgkit/drawable/Drawable.java

@@ -1,4 +1,4 @@
-package rpgkit;
+package rpgkit.drawable;
 
 import java.awt.*;
 

src/main/java/rpgkit/entity/Entity.java → src/main/java/rpgkit/drawable/entity/Entity.java

@@ -1,11 +1,11 @@
-package rpgkit.entity;
+package rpgkit.drawable.entity;
 
 import rpgkit.Camera;
-import rpgkit.Drawable;
 import rpgkit.RPGKit;
 import rpgkit.TileSet;
-import rpgkit.managers.EntityManger;
-import rpgkit.utils.Direction;
+import rpgkit.drawable.Drawable;
+import rpgkit.manager.EntityManger;
+import rpgkit.util.Direction;
 
 import java.awt.*;
 

src/main/java/rpgkit/entity/Player.java → src/main/java/rpgkit/drawable/entity/Player.java

@@ -1,8 +1,8 @@
-package rpgkit.entity;
+package rpgkit.drawable.entity;
 
-import rpgkit.KeyHandler;
-import rpgkit.managers.EntityManger;
-import rpgkit.utils.Utils;
+import rpgkit.input.KeyHandler;
+import rpgkit.manager.EntityManger;
+import rpgkit.util.Utils;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;

src/main/java/rpgkit/entity/item/Item.java → src/main/java/rpgkit/drawable/entity/item/Item.java

@@ -1,11 +1,11 @@
-package rpgkit.entity.item;
+package rpgkit.drawable.entity.item;
 
 import rpgkit.Sound;
 import rpgkit.TileSet;
-import rpgkit.entity.Entity;
+import rpgkit.drawable.entity.Entity;
 import rpgkit.ldtk.TilesetRectangle;
-import rpgkit.managers.EntityManger;
-import rpgkit.utils.Utils;
+import rpgkit.manager.EntityManger;
+import rpgkit.util.Utils;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;

src/main/java/rpgkit/ui/UI.java → src/main/java/rpgkit/drawable/ui/UI.java

@@ -1,8 +1,8 @@
-package rpgkit.ui;
+package rpgkit.drawable.ui;
 
-import rpgkit.Drawable;
 import rpgkit.RPGKit;
-import rpgkit.ui.item.Item;
+import rpgkit.drawable.Drawable;
+import rpgkit.drawable.ui.item.Item;
 
 import java.awt.*;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -43,7 +43,7 @@ public void update(double delta) {
 
     }
 
-    public void addItem(rpgkit.entity.item.Item itemEntity) {
+    public void addItem(rpgkit.drawable.entity.item.Item itemEntity) {
         Item item = null;
         item = rpgKit.itemToUIConverter.convertToUIItem(itemEntity, 1);
 

src/main/java/rpgkit/ui/item/Item.java → src/main/java/rpgkit/drawable/ui/item/Item.java

@@ -1,8 +1,8 @@
-package rpgkit.ui.item;
+package rpgkit.drawable.ui.item;
 
-import rpgkit.Drawable;
 import rpgkit.RPGKit;
-import rpgkit.utils.Utils;
+import rpgkit.drawable.Drawable;
+import rpgkit.util.Utils;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -13,7 +13,7 @@ public abstract class Item implements Drawable {
     private BufferedImage image;
     public int count;
 
-    public Item(rpgkit.entity.item.Item item, int count) {
+    public Item(rpgkit.drawable.entity.item.Item item, int count) {
         this.RPGKit = rpgkit.RPGKit.getInstance();
         this.image = item.tileSet.getFrame((int) (item.rectangle.getX() / item.tileSet.tileSize),
                                            (int) (item.rectangle.getY() / item.tileSet.tileSize));

src/main/java/rpgkit/KeyHandler.java → src/main/java/rpgkit/input/KeyHandler.java

@@ -1,4 +1,4 @@
-package rpgkit;
+package rpgkit.input;
 
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;

src/main/java/rpgkit/InteractableLoader.java → src/main/java/rpgkit/loader/InteractableLoader.java

@@ -1,5 +1,6 @@
-package rpgkit;
+package rpgkit.loader;
 
+import rpgkit.TileSet;
 import rpgkit.interactable.Interactable;
 import rpgkit.ldtk.Level;
 import rpgkit.ldtk.TileInstance;

src/main/java/rpgkit/ItemLoader.java → src/main/java/rpgkit/loader/ItemLoader.java

@@ -1,8 +1,8 @@
-package rpgkit;
+package rpgkit.loader;
 
-import rpgkit.entity.item.Item;
+import rpgkit.drawable.entity.item.Item;
 import rpgkit.ldtk.EntityInstance;
-import rpgkit.managers.EntityManger;
+import rpgkit.manager.EntityManger;
 
 import java.util.List;
 

src/main/java/rpgkit/loader/ItemToUIConverter.java

@@ -0,0 +1,7 @@
+package rpgkit.loader;
+
+import rpgkit.drawable.ui.item.Item;
+
+public interface ItemToUIConverter {
+    Item convertToUIItem(rpgkit.drawable.entity.item.Item item, int count);
+}

src/main/java/rpgkit/managers/EntityManger.java → src/main/java/rpgkit/manager/EntityManger.java

@@ -1,6 +1,6 @@
-package rpgkit.managers;
+package rpgkit.manager;
 
-import rpgkit.entity.Entity;
+import rpgkit.drawable.entity.Entity;
 
 import java.awt.*;
 import java.util.concurrent.CopyOnWriteArrayList;

src/main/java/rpgkit/managers/LayerManager.java → src/main/java/rpgkit/manager/LayerManager.java

@@ -1,6 +1,6 @@
-package rpgkit.managers;
+package rpgkit.manager;
 
-import rpgkit.Drawable;
+import rpgkit.drawable.Drawable;
 
 import java.awt.*;
 import java.util.ArrayList;

src/main/java/rpgkit/manager/Manager.java

@@ -0,0 +1,6 @@
+package rpgkit.manager;
+
+import rpgkit.drawable.Drawable;
+
+public abstract class Manager implements Drawable {
+}

src/main/java/rpgkit/managers/TileManager.java → src/main/java/rpgkit/manager/TileManager.java

@@ -1,4 +1,4 @@
-package rpgkit.managers;
+package rpgkit.manager;
 
 import rpgkit.Tile;
 

src/main/java/rpgkit/managers/TileSetManager.java → src/main/java/rpgkit/manager/TileSetManager.java

@@ -1,4 +1,4 @@
-package rpgkit.managers;
+package rpgkit.manager;
 
 import rpgkit.TileSet;
 

src/main/java/rpgkit/utils/Direction.java → src/main/java/rpgkit/util/Direction.java

@@ -1,4 +1,4 @@
-package rpgkit.utils;
+package rpgkit.util;
 
 /**
  * An enumeration of four cardinal directions: UP, DOWN, LEFT, and RIGHT.

src/main/java/rpgkit/utils/GameUtils.java → src/main/java/rpgkit/util/GameUtils.java

@@ -1,4 +1,4 @@
-package rpgkit.utils;
+package rpgkit.util;
 
 import rpgkit.RPGKit;
 

src/main/java/rpgkit/utils/ImageUtils.java → src/main/java/rpgkit/util/ImageUtils.java

@@ -1,4 +1,4 @@
-package rpgkit.utils;
+package rpgkit.util;
 
 import java.awt.geom.AffineTransform;
 import java.awt.image.AffineTransformOp;

src/main/java/rpgkit/utils/PathUtils.java → src/main/java/rpgkit/util/PathUtils.java

@@ -1,4 +1,4 @@
-package rpgkit.utils;
+package rpgkit.util;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

src/main/java/rpgkit/utils/StringUtils.java → src/main/java/rpgkit/util/StringUtils.java

@@ -1,4 +1,4 @@
-package rpgkit.utils;
+package rpgkit.util;
 
 import java.io.IOException;
 import java.io.InputStream;

src/main/java/rpgkit/utils/Utils.java → src/main/java/rpgkit/util/Utils.java

@@ -1,4 +1,4 @@
-package rpgkit.utils;
+package rpgkit.util;
 
 /**
  * Static utility objects for common problems.

src/test/java/main/Main.java

@@ -3,7 +3,7 @@
 import main.interactable.Farm;
 import rpgkit.RPGKit;
 import rpgkit.Sound;
-import rpgkit.managers.TileSetManager;
+import rpgkit.manager.TileSetManager;
 
 import javax.swing.*;
 import java.util.List;