Merge pull request #33 from Arctic-Gaming-LLC/pentlock1-patch-1

Pentlock1 patch 1

Author: pentlock1

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.pentlock</groupId>
     <artifactId>ThunderDataEngine</artifactId>
-    <version>0.2.5</version>
+    <version>0.2.6</version>
     <packaging>jar</packaging>
 
     <name>ThunderDataEngine</name>

src/main/java/net/pentlock/thunderdataengine/profiles/House.java

@@ -7,8 +7,6 @@
 import java.util.UUID;
 
 public class House {
-    @Setter @Getter
-    private UUID UUID; // UUID of house group
     @Setter @Getter
     private String name; // name of house
     @Setter @Getter
@@ -26,16 +24,14 @@ public class House {
      * <h3>House Objects</h3>
      * This is the constructor for a House type - not an individual house
      *
-     * @param uuid the Unique ID for the housing instance
      * @param name the Name of the House
      * @param cost How much the house costs to purchase
      * @param doorLocation The exact location of the door
      * @param arrivalLocation Where players should spawn in the house
      * @param instances Stores the locations and UUIDs of all instances of this house type
      * @param instanceLocation Stores a map of player UUIDs and House Locations
      */
-    public House(UUID uuid, String name, double cost, String[] doorLocation, String[] arrivalLocation, Map<UUID, String[]> instances, Map<UUID, String[]> instanceLocation) {
-        this.UUID = uuid;
+    public House(String name, double cost, String[] doorLocation, String[] arrivalLocation, Map<UUID, String[]> instances, Map<UUID, String[]> instanceLocation) {
         this.name = name;
         this.cost = cost;
         this.doorLocation = doorLocation;

src/main/java/net/pentlock/thunderdataengine/utilities/ArrayUtil.java

@@ -82,6 +82,32 @@ public static Double[] addToArray(Double[] oldArray, double value) {
         return newArray;
     }
 
+    /**
+     * <h3>Array Util</h3>
+     * A handy tool to update arrays!
+     * UUID Edition
+     *
+     * @param oldArray The current array that is being updated
+     * @param value The values that an array is adding to
+     * @return Array of object type
+     */
+    public static UUID[] addToArray(UUID[] oldArray, UUID value) {
+
+        UUID[] newArray = new UUID[oldArray.length + 1];
+
+        for (int i = 0; i < oldArray.length + 1;) {
+
+            if (i < oldArray.length) {
+                newArray[i] = oldArray[i];
+            } else {
+                newArray[i] = value;
+            }
+            i++;
+        }
+
+        return newArray;
+    }
+
     /**
      * <h3>Array Util</h3>
      * A handy tool to update arrays!
@@ -181,30 +207,4 @@ public static UUID[] removeFromArray(UUID[] oldArray, UUID value) {
 
         return newArray;
     }
-
-    /**
-     * <h3>Array Util</h3>
-     * A handy tool to update arrays!
-     * UUID Edition
-     *
-     * @param oldArray The current array that is being updated
-     * @param value The values that an array is adding to
-     * @return Array of object type
-     */
-    public static UUID[] addToArray(UUID[] oldArray, UUID value) {
-
-        UUID[] newArray = new UUID[oldArray.length + 1];
-
-        for (int i = 0; i < oldArray.length + 1;) {
-
-            if (i < oldArray.length) {
-                newArray[i] = oldArray[i];
-            } else {
-                newArray[i] = value;
-            }
-            i++;
-        }
-
-        return newArray;
-    }
 }

src/main/java/net/pentlock/thunderdataengine/utilities/HouseUtil.java

@@ -12,11 +12,10 @@
 
 public class HouseUtil {
 
-    public static final Map<UUID, House> HOUSES = new HashMap<>();
+    public static final Map<String, House> HOUSES = new HashMap<>();
 
     /**
      *
-     * @param uuid UUID of house
      * @param name Name of house
      * @param cost cost of house
      * @param doorLocation exact location of door to be clicked
@@ -26,15 +25,15 @@ public class HouseUtil {
      * @return this is the house object after it has been created
      */
 
-    public static House createHouse(UUID uuid, String name, double cost, String[] doorLocation, String[] arrivalLocation,
+    public static House createHouse(String name, double cost, String[] doorLocation, String[] arrivalLocation,
                                     Map<UUID, String[]> instances, Map<UUID, String[]> instanceLocation) {
 
-        House house = new House(uuid, name, cost, doorLocation, arrivalLocation, instances, instanceLocation);
+        House house = new House(name.toLowerCase(), cost, doorLocation, arrivalLocation, instances, instanceLocation);
 
-        HOUSES.put(uuid, house);
+        HOUSES.put(name, house);
 
         try {
-            saveHouse(uuid);
+            saveHouse(name);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -44,35 +43,34 @@ public static House createHouse(UUID uuid, String name, double cost, String[] do
 
     /**
      *
-     * @param uuid UUID of house
+     * @param name Name of house
      */
-    public static void deleteHouse(UUID uuid) {
-        HOUSES.remove(uuid);
-        File file = new File(ThunderDataEngine.getPlugin().getDataFolder().getAbsolutePath() + "/HouseData/" + uuid + ".json");
+    public static void deleteHouse(String name) {
+        HOUSES.remove(name);
+        File file = new File(ThunderDataEngine.getPlugin().getDataFolder().getAbsolutePath() + "/HouseData/" + name + ".json");
         if (file.exists()) {
             file.delete();
         }
     }
 
     /**
      *
-     * @param uuid UUID of house
+     * @param name Name of house
      * @return the house object to be found
      */
-    public static House findHouse(UUID uuid) {
-        return HOUSES.get(uuid);
+    public static House findHouse(String name) {
+        return HOUSES.get(name);
     }
 
     /**
      *
-     * @param uuid UUID of house
+     * @param name Name of house
      * @param newHouse House object to pass in
      * @return the house the has been updated
      */
-    public static House updateHouse(UUID uuid, House newHouse) {
-        House house = HOUSES.get(uuid);
+    public static House updateHouse(String name, House newHouse) {
+        House house = HOUSES.get(name);
 
-        house.setUUID(newHouse.getUUID());
         house.setName(newHouse.getName());
         house.setCost(newHouse.getCost());
         house.setDoorLocation(newHouse.getDoorLocation());
@@ -85,19 +83,19 @@ public static House updateHouse(UUID uuid, House newHouse) {
 
     /**
      *
-     * @param uuid UUID of house
+     * @param name Name of house
      * @throws IOException an exception?
      */
-    public static void saveHouse(UUID uuid) throws IOException {
+    public static void saveHouse(String name) throws IOException {
 
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
-        File file = new File(ThunderDataEngine.getPlugin().getDataFolder().getAbsolutePath() + "/HouseData/" + uuid + ".json");
+        File file = new File(ThunderDataEngine.getPlugin().getDataFolder().getAbsolutePath() + "/HouseData/" + name + ".json");
         if (!file.exists()) {
             file.getParentFile().mkdir();
         }
 
         file.createNewFile();
-        House house = HOUSES.get(uuid);
+        House house = HOUSES.get(name);
         if (house != null) {
             Writer writer = new FileWriter(file, false);
             gson.toJson(house, writer);
@@ -108,31 +106,31 @@ public static void saveHouse(UUID uuid) throws IOException {
 
     /**
      *
-     * @param uuid UUID of house
+     * @param name Name of house
      * @throws FileNotFoundException an exception?
      */
-    public static void loadHouse(UUID uuid) throws FileNotFoundException {
+    public static void loadHouse(String name) throws FileNotFoundException {
         Gson gson = new Gson();
-        File file = new File(ThunderDataEngine.getPlugin().getDataFolder().getAbsolutePath() + "/HouseData/" + uuid + ".json");
+        File file = new File(ThunderDataEngine.getPlugin().getDataFolder().getAbsolutePath() + "/HouseData/" + name + ".json");
 
         if (file.exists()) {
             Reader reader = new FileReader(file);
             House house = gson.fromJson(reader, House.class);
-            HOUSES.put(uuid, house);
+            HOUSES.put(name, house);
         }
     }
 
     /**
      *
-     * @param uuid
+     * @param name Name of house
      */
-    public static void unLoadHouse(UUID uuid) {
+    public static void unLoadHouse(String name) {
         try {
-            saveHouse(uuid);
+            saveHouse(name);
         } catch (IOException e) {
             e.printStackTrace();
         }
-        HOUSES.remove(uuid);
+        HOUSES.remove(name);
     }
 }