Feature/areaRepo

src/main/java/xyz/devosmium/games/textadventureengine/App.java

@@ -3,7 +3,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 import xyz.devosmium.games.textadventureengine.menus.MainMenu;
 
 /**
@@ -12,6 +11,7 @@
  */
 public class App {
   private static Logger logger = LoggerFactory.getLogger(App.class);
+  private static AreaCollection areas;
 
 
   public static void main(String[] args) {

src/main/java/xyz/devosmium/games/textadventureengine/Game.java

@@ -2,6 +2,7 @@
 
 import xyz.devosmium.games.textadventureengine.commands.EngineCommandManager;
 import xyz.devosmium.games.textadventureengine.exceptions.DeathException;
+import xyz.devosmium.games.textadventureengine.locations.World;
 import xyz.devosmium.games.textadventureengine.menus.MainMenu;
 import xyz.devosmium.games.textadventureengine.mobiles.Player;
 import xyz.devosmium.games.textadventureengine.util.MessageQueue;

src/main/java/xyz/devosmium/games/textadventureengine/locations/Area.java

@@ -4,38 +4,25 @@
 
 public class Area {
 
-    private String name;
-
-    private ArrayList<Location> locations;
-
-    public Area(String name) {
-        this.name = name;
-        locations = new ArrayList<Location>();
+    private String areaName;
+    private int areaID;
+    private ArrayList<Location> areaLocations;
+
+    public Area(String areaName, int areaID) {
+        this.areaName = areaName;
+        this.areaID = areaID;
+        areaLocations = new ArrayList<Location>();
     }
 
-    public void registerLocation(Location location) {
-        locations.add(location);
+    public int getAreaID() {
+        return areaID;
     }
 
-    public ArrayList<Location> getLocationList() {
-        return locations;
+    public String getAreaName() {
+        return areaName;
     }
 
-    /**
-     * Searchs the registered locations by name
-     * @param name The name of the location (short string)
-     * @return Location if it's been registered, or null
-     */
-    public Location getLocationByName(String name) {
-        for (Location loc : locations) {
-            if (loc.getShort().equals(name)) {
-                return loc;
-            } else {
-                continue;
-            }
-        }
-        return null;
+    public void registerLocation(Location location) {
+        areaLocations.add(location);
     }
-
-
 }