Village spawn yaw + Village warps

src/main/java/com/johnymuffin/jvillage/beta/JVUtility.java

@@ -14,6 +14,7 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
@@ -72,6 +73,23 @@ public static double round(double value, int places) {
         return bd.doubleValue();
     }
 
+    public static int closestYaw(double yaw){
+        if(yaw < 0) yaw = 360 + yaw;
+        Set<Integer> yaws = new HashSet<>(Arrays.asList(0, 90, 180, 270, 360));
+        int closest = -1;
+        double lowestDiff = Integer.MAX_VALUE;
+
+        for(Integer entry : yaws){
+            double diff = Math.abs(yaw - entry);
+            if(diff < lowestDiff){
+                closest = entry;
+                lowestDiff = diff;
+            }
+        }
+        if(closest == 360) return 0;
+        return closest;
+    }
+
     public static String formatVillageList(Village[] villages) {
         StringBuilder stringBuilder = new StringBuilder();
         for (int i = 0; i < villages.length; i++) {

src/main/java/com/johnymuffin/jvillage/beta/JVillage.java

@@ -16,6 +16,7 @@
 import com.johnymuffin.jvillage.beta.maps.JPlayerMap;
 import com.johnymuffin.jvillage.beta.maps.JVillageMap;
 import com.johnymuffin.jvillage.beta.models.VCords;
+import com.johnymuffin.jvillage.beta.models.VSpawnCords;
 import com.johnymuffin.jvillage.beta.models.Village;
 import com.johnymuffin.jvillage.beta.models.chunk.VChunk;
 import com.johnymuffin.jvillage.beta.models.chunk.VClaim;
@@ -584,13 +585,13 @@ public boolean townyImport() {
             }
 
             //Misc
-            VCords townSpawn = null;
+            VSpawnCords townSpawn = null;
             try {
-                townSpawn = new VCords(town.getSpawn().getBlockX(), town.getSpawn().getBlockY(), town.getSpawn().getBlockZ(), town.getSpawn().getWorld().getName());
+                townSpawn = new VSpawnCords(town.getSpawn().getBlockX(), town.getSpawn().getBlockY(), town.getSpawn().getBlockZ(), 0, town.getSpawn().getWorld().getName());
             } catch (Exception exception) {
                 log.warning("[" + pluginName + "] Could not find town spawn for town " + newTownName + ". World spawn will be used instead.");
                 logger(Level.WARNING, "Could not find town spawn for town " + newTownName + ". The town spawn will be set to the world spawn.");
-                townSpawn = new VCords(Bukkit.getWorlds().get(0).getSpawnLocation().getBlockX(), Bukkit.getWorlds().get(0).getSpawnLocation().getBlockY(), Bukkit.getWorlds().get(0).getSpawnLocation().getBlockZ(), Bukkit.getWorlds().get(0).getName());
+                townSpawn = new VSpawnCords(Bukkit.getWorlds().get(0).getSpawnLocation().getBlockX(), Bukkit.getWorlds().get(0).getSpawnLocation().getBlockY(), Bukkit.getWorlds().get(0).getSpawnLocation().getBlockZ(), 0, Bukkit.getWorlds().get(0).getName());
             }
 
             //First chunk from townSpawn
@@ -801,15 +802,15 @@ public boolean factionsImport() {
 
             //Faction Spawn
             Location factionSpawn = faction.getHome();
-            VCords villageSpawn = null;
+            VSpawnCords villageSpawn = null;
             VChunk spawnChunk = null;
             if(factionSpawn == null) {
                 log.warning("[" + pluginName + "] Faction " + newVillageName + " has no spawn. The world spawn will be used instead.");
                 spawnChunk = new VChunk(Bukkit.getWorlds().get(0).getSpawnLocation());
-                villageSpawn = new VCords(Bukkit.getWorlds().get(0).getSpawnLocation());
+                villageSpawn = new VSpawnCords(Bukkit.getWorlds().get(0).getSpawnLocation());
             } else {
                 spawnChunk = new VChunk(factionSpawn);
-                villageSpawn = new VCords(factionSpawn);
+                villageSpawn = new VSpawnCords(factionSpawn);
             }
 
 
@@ -902,7 +903,7 @@ public JPlayerData getPlayerData() {
         return this.playerData;
     }
 
-    public Village generateNewVillage(String townName, UUID owner, VChunk vChunk, VCords townSpawn) {
+    public Village generateNewVillage(String townName, UUID owner, VChunk vChunk, VSpawnCords townSpawn) {
         if (!villageNameAvailable(townName)) {
             return null;
         }

src/main/java/com/johnymuffin/jvillage/beta/commands/village/JCreateCommand.java

@@ -4,7 +4,7 @@
 import com.johnymuffin.beta.fundamentals.api.FundamentalsAPI;
 import com.johnymuffin.jvillage.beta.JVillage;
 import com.johnymuffin.jvillage.beta.commands.JVBaseCommand;
-import com.johnymuffin.jvillage.beta.models.VCords;
+import com.johnymuffin.jvillage.beta.models.VSpawnCords;
 import com.johnymuffin.jvillage.beta.models.Village;
 import com.johnymuffin.jvillage.beta.models.chunk.ChunkClaimSettings;
 import com.johnymuffin.jvillage.beta.models.chunk.VChunk;
@@ -127,7 +127,7 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
             }
         }
 
-        Village newVillage = new Village(plugin, villageName, UUID.randomUUID(), player.getUniqueId(), vChunk, new VCords(player.getLocation()));
+        Village newVillage = new Village(plugin, villageName, UUID.randomUUID(), player.getUniqueId(), vChunk, new VSpawnCords(player.getLocation()));
         plugin.getVillageMap().addVillageToMap(newVillage);
 
         //Metadata for first chunk

src/main/java/com/johnymuffin/jvillage/beta/commands/village/JSetSpawnCommand.java

@@ -2,7 +2,7 @@
 
 import com.johnymuffin.jvillage.beta.JVillage;
 import com.johnymuffin.jvillage.beta.commands.JVBaseCommand;
-import com.johnymuffin.jvillage.beta.models.VCords;
+import com.johnymuffin.jvillage.beta.models.VSpawnCords;
 import com.johnymuffin.jvillage.beta.models.Village;
 import com.johnymuffin.jvillage.beta.models.chunk.VChunk;
 import com.johnymuffin.jvillage.beta.player.VPlayer;
@@ -49,7 +49,7 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
             return true;
         }
 
-        VCords cords = new VCords(player.getLocation());
+        VSpawnCords cords = new VSpawnCords(player.getLocation());
         village.setTownSpawn(cords);
         village.broadcastToTown(player.getDisplayName() + " has set the spawn point to " + cords.toString());
         return true;

src/main/java/com/johnymuffin/jvillage/beta/models/VSpawnCords.java

@@ -0,0 +1,52 @@
+package com.johnymuffin.jvillage.beta.models;
+
+import com.johnymuffin.jvillage.beta.JVUtility;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.json.simple.JSONObject;
+
+public class VSpawnCords extends VCords{
+
+    private int yaw;
+
+    public VSpawnCords(int x, int y, int z, int yaw, String worldName){
+        super(x, y, z, worldName);
+        this.yaw = yaw;
+    }
+
+    public VSpawnCords(Location location){
+        this(location.getBlockX(), location.getBlockY(), location.getBlockZ(), JVUtility.closestYaw(location.getYaw()), location.getWorld().getName());
+    }
+
+    public VSpawnCords(JSONObject jsonObject){
+        super(Long.valueOf(String.valueOf(jsonObject.get("x"))).intValue(),
+                Long.valueOf(String.valueOf(jsonObject.get("y"))).intValue(),
+                Long.valueOf(String.valueOf(jsonObject.get("z"))).intValue(),
+                (String) jsonObject.get("world"));
+        if(jsonObject.get("yaw") == null){
+            yaw = 0;
+        }else{
+            yaw = Long.valueOf(String.valueOf(jsonObject.get("yaw"))).intValue();
+        }
+    }
+
+    @Override
+    public JSONObject getJsonObject(){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("x", super.getX());
+        jsonObject.put("y", super.getY());
+        jsonObject.put("z", super.getZ());
+        jsonObject.put("yaw", yaw);
+        jsonObject.put("world", super.getWorldName());
+        return jsonObject;
+    }
+
+    public int getYaw(){
+        return yaw;
+    }
+
+    @Override
+    public Location getLocation() {
+        return new Location(Bukkit.getWorld(super.getWorldName()), super.getX(), super.getY(), super.getZ(), yaw, 0);
+    }
+}

src/main/java/com/johnymuffin/jvillage/beta/models/Village.java

@@ -22,7 +22,7 @@ public class Village implements ClaimManager {
     private final ArrayList<UUID> members = new ArrayList<UUID>();
     private final ArrayList<UUID> assistants = new ArrayList<UUID>();
     private UUID owner;
-    private VCords townSpawn;
+    private VSpawnCords townSpawn;
 
     private boolean modified = false;
 
@@ -42,7 +42,7 @@ private void initializeFlags() {
         }
     }
 
-    public Village(JVillage plugin, String townName, UUID townUUID, UUID owner, VChunk vChunk, VCords townSpawn) {
+    public Village(JVillage plugin, String townName, UUID townUUID, UUID owner, VChunk vChunk, VSpawnCords townSpawn) {
         this.plugin = plugin;
         this.townName = townName;
         this.townUUID = townUUID;
@@ -60,7 +60,7 @@ public Village(JVillage plugin, UUID uuid, JSONObject object) {
         this.townName = String.valueOf(object.get("name"));
         this.townUUID = uuid; // Ignore UUID in JSON file and use the one from the file name
         this.owner = UUID.fromString(String.valueOf(object.get("owner")));
-        this.townSpawn = new VCords((JSONObject) object.get("townSpawn"));
+        this.townSpawn = new VSpawnCords((JSONObject) object.get("townSpawn"));
         JSONArray members = (JSONArray) object.get("members");
         for (Object member : members) {
             this.members.add(UUID.fromString(String.valueOf(member)));
@@ -372,11 +372,11 @@ public void setOwner(UUID uuid) {
 //        return claims;
 //    }
 
-    public VCords getTownSpawn() {
+    public VSpawnCords getTownSpawn() {
         return townSpawn;
     }
 
-    public void setTownSpawn(VCords cords) {
+    public void setTownSpawn(VSpawnCords cords) {
         modified = true; // Indicate that the village has been modified and needs to be saved
         townSpawn = cords;
     }