Various minor changes for 1.14

Author: Maxopoly

src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkCoord.java

@@ -8,7 +8,7 @@
 
 import org.bukkit.World;
 
-public class ChunkCoord {
+public class ChunkCoord implements Comparable<ChunkCoord>{
 
 	/**
 	 * When was this chunk last loaded in Minecraft as UNIX timestamp
@@ -37,10 +37,10 @@ public class ChunkCoord {
 	 */
 	private int z;
 
-	private int worldID;
+	private short worldID;
 	private World world;
 
-	ChunkCoord(int x, int z, int worldID, World world) {
+	ChunkCoord(int x, int z, short worldID, World world) {
 		this.x = x;
 		this.z = z;
 		this.worldID = worldID;
@@ -135,7 +135,7 @@ ChunkMeta<?> getMeta(int pluginID) {
 	/**
 	 * @return Internal ID of the world this chunk is in
 	 */
-	public int getWorldID() {
+	public short getWorldID() {
 		return worldID;
 	}
 
@@ -189,4 +189,17 @@ void minecraftChunkLoaded() {
 	void minecraftChunkUnloaded() {
 		this.lastUnloadingTime = System.currentTimeMillis();
 	}
+
+	@Override
+	public int compareTo(ChunkCoord o) {
+		int worldComp = Short.compare(this.worldID, o.getWorldID());
+		if (worldComp != 0) {
+			return worldComp;
+		}
+		int xComp = Integer.compare(this.x, o.getX());
+		if (xComp != 0) {
+			return worldComp;
+		}
+		return Integer.compare(this.z, o.getZ());
+	}
 }

src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkDAO.java

@@ -55,7 +55,7 @@ public int getOrCreatePluginID(JavaPlugin plugin) {
 		}
 	}
 
-	int getOrCreateWorldID(World world) {
+	short getOrCreateWorldID(World world) {
 		try (Connection insertConn = db.getConnection();
 				PreparedStatement insertWorld = insertConn
 						.prepareStatement("select id from cmc_worlds where uuid = ?;")) {

src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/GlobalChunkMetaManager.java

@@ -13,7 +13,7 @@
 
 public class GlobalChunkMetaManager {
 
-	private Map<UUID, Integer> uuidToInternalID;
+	private Map<UUID, Short> uuidToInternalID;
 	private Map<UUID, WorldChunkMetaManager> worldToManager;
 	private ChunkDAO chunkDao;
 
@@ -115,7 +115,7 @@ boolean registerWorld(World world) {
 		if (uuidToInternalID.containsKey(world.getUID())) {
 			return true;
 		}
-		int id = chunkDao.getOrCreateWorldID(world);
+		short id = chunkDao.getOrCreateWorldID(world);
 		if (id == -1) {
 			// very bad
 			return false;

src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/WorldChunkMetaManager.java

@@ -31,7 +31,7 @@ public class WorldChunkMetaManager {
 	private static final long UNLOAD_DELAY = 5L * 60L * 1000L;
 	private static final long UNLOAD_CHECK_INTERVAL = 5L * 60L * 1000L;
 
-	private final int worldID;
+	private final short worldID;
 	private final Map<ChunkCoord, ChunkCoord> metas;
 	/**
 	 * A synchronized TreeSet holding all chunk metadata belonging to unloaded
@@ -45,7 +45,7 @@ public class WorldChunkMetaManager {
 	private Queue<ChunkCoord> chunkLoadingQueue;
 	private World world;
 
-	public WorldChunkMetaManager(World world, int worldID) {
+	public WorldChunkMetaManager(World world, short worldID) {
 		this.worldID = worldID;
 		this.world = world;
 		this.metas = new HashMap<>();

src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java

@@ -67,6 +67,8 @@ public void put(int x, int y, int z, TableBasedDataObject blockData, boolean isN
 	public void remove(TableBasedDataObject blockData) {
 		super.remove(blockData);
 		blockData.setCacheState(CacheState.DELETED);
+		//this may look weird, but is what happens if the data was NEW previously, never written to the
+		//db and doesn't need to be deleted from there either
 		if (blockData.getCacheState() != CacheState.NORMAL) {
 			modifiedEntries.add((D) blockData);
 		}

src/main/java/vg/civcraft/mc/civmodcore/util/BukkitComparators.java

@@ -0,0 +1,31 @@
+package vg.civcraft.mc.civmodcore.util;
+
+import java.util.Comparator;
+
+import org.bukkit.Location;
+
+public class BukkitComparators {
+	
+	private BukkitComparators() {
+		
+	}
+	
+	public static Comparator<Location> getLocation() {
+		return (l1, l2) -> {
+			int worldComp = l1.getWorld().getUID().compareTo(l2.getWorld().getUID());
+			if (worldComp != 0) {
+				return worldComp;
+			}
+			int xComp = Double.compare(l1.getX(), l2.getX());
+			if (xComp != 0) {
+				return xComp;
+			}
+			int zComp = Double.compare(l1.getZ(), l2.getZ());
+			if (zComp != 0) {
+				return zComp;
+			}
+			return Double.compare(l1.getY(), l2.getY());
+		}; 
+	}
+
+}

src/main/java/vg/civcraft/mc/civmodcore/util/ConfigParsing.java

@@ -198,8 +198,7 @@ public static ItemMap parseItemMapDirectly(ConfigurationSection current) {
 	}
 
 	public static long parseTime(String arg, TimeUnit unit) {
-		long inTicks = parseTime(arg);
-		long millis = inTicks * 50;
+		long millis = parseTime(arg);
 		return unit.convert(millis, TimeUnit.MILLISECONDS);
 	}
 
@@ -217,7 +216,7 @@ public static long parseTime(String arg, TimeUnit unit) {
 	 * different values, but the values are not allowed to be separated by anything
 	 *
 	 * @param input Parsed string containing the time format
-	 * @return How many ticks the given time value is
+	 * @return How many milliseconds the given time value is
 	 */
 	public static long parseTime(String input) {
 		input = input.replace(" ", "").replace(",", "").toLowerCase();
@@ -228,9 +227,9 @@ public static long parseTime(String input) {
 		} catch (NumberFormatException e) {
 		}
 		while (!input.equals("")) {
-			String typeSuffix = getSuffix(input, a -> Character.isLetter(a));
+			String typeSuffix = getSuffix(input, Character::isLetter);
 			input = input.substring(0, input.length() - typeSuffix.length());
-			String numberSuffix = getSuffix(input, a -> Character.isDigit(a));
+			String numberSuffix = getSuffix(input, Character::isDigit);
 			input = input.substring(0, input.length() - numberSuffix.length());
 			long duration;
 			if (numberSuffix.length() == 0) {
@@ -275,6 +274,11 @@ public static long parseTime(String input) {
 			case "months":
 				result += TimeUnit.DAYS.toMillis(duration * 30);
 				break;
+			case "y":
+			case "year":
+			case "years":
+				result += TimeUnit.DAYS.toMillis(duration * 365);
+				break;
 			case "never":
 			case "inf":
 			case "infinite":