Merge pull request #72 from Ben12345rocks/2.8.1

2.8.1

Author: BenCodez

AdvancedCore/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>AdvancedCore</artifactId>
-	<version>2.8</version>
+	<version>2.8.1</version>
 	<packaging>jar</packaging>
 	<name>AdvancedCore</name>
 	<properties>

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java

@@ -555,6 +555,7 @@ public void reload() {
 		}
 		getTimer().purge();
 		RewardHandler.getInstance().checkDelayedTimedRewards();
+
 	}
 
 	/**
@@ -707,12 +708,6 @@ private boolean setupPermissions() {
 	 * Update.
 	 */
 	public void update() {
-		Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable() {
-
-			@Override
-			public void run() {
-				TimeChecker.getInstance().update();
-			}
-		});
+		TimeChecker.getInstance().update();
 	}
 }

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Data/ServerData.java

@@ -125,4 +125,9 @@ public void setPrevWeekDay(int week) {
 		getData().set("PrevWeek", week);
 		saveData();
 	}
+
+	public void setData(String path, Object value) {
+		getData().set(path, value);
+		saveData();
+	}
 }

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java

@@ -14,6 +14,7 @@
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeType;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserManager;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
 import com.Ben12345rocks.AdvancedCore.Util.ValueRequest.InputMethod;
@@ -131,6 +132,36 @@ public void addTabCompleteOption(String toReplace, String... options) {
 		addTabCompleteOption(toReplace, ArrayUtils.getInstance().convert(options));
 	}
 
+	public void sendMessage(CommandSender sender, ArrayList<String> msg) {
+		sender.sendMessage(ArrayUtils.getInstance().convert(ArrayUtils.getInstance().colorize(msg)));
+	}
+
+	public void sendMessage(CommandSender sender, String msg) {
+		sender.sendMessage(StringUtils.getInstance().colorize(msg));
+	}
+
+	public void sendMessageJson(CommandSender sender, TextComponent comp) {
+		if (isPlayer(sender)) {
+			Player player = (Player) sender;
+			UserManager.getInstance().getUser(player).sendJson(comp);
+		} else {
+			sender.sendMessage(StringUtils.getInstance().compToString(comp));
+		}
+	}
+
+	public void sendMessageJson(CommandSender sender, ArrayList<TextComponent> comp) {
+		if (isPlayer(sender)) {
+			Player player = (Player) sender;
+			UserManager.getInstance().getUser(player).sendJson(comp);
+		} else {
+			sender.sendMessage(ArrayUtils.getInstance().convert(ArrayUtils.getInstance().comptoString(comp)));
+		}
+	}
+
+	public boolean isPlayer(CommandSender sender) {
+		return sender instanceof Player;
+	}
+
 	/**
 	 * Args match.
 	 *
@@ -357,8 +388,7 @@ public void loadTabComplete() {
 			userStorage.add(storage.toString());
 		}
 		addTabCompleteOption("(UserStorage)", userStorage);
-		
-		
+
 		ArrayList<String> times = new ArrayList<String>();
 		for (TimeType ty : TimeType.values()) {
 			times.add(ty.toString());

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java

@@ -561,7 +561,7 @@ public int getEffectRadius() {
 	}
 
 	/**
-	 * Gets the exp.
+	 * Gets the .
 	 *
 	 * @return the exp
 	 */
@@ -581,12 +581,7 @@ public int getExpToGive() {
 		if ((maxAmount == 0) && (minAmount == 0)) {
 			return amount;
 		} else {
-			int num = (int) (Math.random() * maxAmount);
-			num++;
-			if (num < minAmount) {
-				num = minAmount;
-			}
-			return num;
+			return ThreadLocalRandom.current().nextInt(minAmount, maxAmount);
 		}
 	}
 
@@ -733,12 +728,7 @@ public int getMoneyToGive() {
 		if ((maxAmount == 0) && (minAmount == 0)) {
 			return amount;
 		} else {
-			int num = (int) (Math.random() * maxAmount);
-			num++;
-			if (num < minAmount) {
-				num = minAmount;
-			}
-			return num;
+			return ThreadLocalRandom.current().nextInt(minAmount, maxAmount);
 		}
 	}
 
@@ -994,7 +984,6 @@ public void giveRandom(User user, boolean online, HashMap<String, String> placeh
 						String reward = rewards.get(ThreadLocalRandom.current().nextInt(rewards.size()));
 						if (!reward.equals("")) {
 							RewardHandler.getInstance().giveReward(user, reward, online, true, true, placeholders);
-
 						}
 					}
 				}

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java

@@ -702,6 +702,15 @@ public void sendMessage(ArrayList<String> msg) {
 		sendMessage(ArrayUtils.getInstance().convert(msg));
 	}
 
+	public boolean isBanned() {
+		OfflinePlayer p = getOfflinePlayer();
+		if (p != null) {
+			return p.isBanned();
+		} else {
+			return false;
+		}
+	}
+
 	/**
 	 * Send message.
 	 *

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java

@@ -475,6 +475,7 @@ public void openInventory(Player player) {
 				ItemStack item = pair.getValue().getItem(player);
 				inv.setItem(pair.getKey(), item);
 			}
+			
 			Bukkit.getScheduler().runTask(AdvancedCoreHook.getInstance().getPlugin(), new Runnable() {
 
 				@Override

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/ArrayUtils.java

@@ -451,4 +451,30 @@ public int compare(Entry<User, Integer> o1, Entry<User, Integer> o2) {
 
 		return sortedMap;
 	}
+	
+	public HashMap<User, Long> sortByValuesLong(HashMap<User, Long> unsortMap, final boolean order) {
+
+		List<Entry<User, Long>> list = new LinkedList<Entry<User, Long>>(unsortMap.entrySet());
+
+		// Sorting the list based on values
+		Collections.sort(list, new Comparator<Entry<User, Long>>() {
+			@Override
+			public int compare(Entry<User, Long> o1, Entry<User, Long> o2) {
+				if (order) {
+					return o1.getValue().compareTo(o2.getValue());
+				} else {
+					return o2.getValue().compareTo(o1.getValue());
+
+				}
+			}
+		});
+
+		// Maintaining insertion order with the help of LinkedList
+		HashMap<User, Long> sortedMap = new LinkedHashMap<User, Long>();
+		for (Entry<User, Long> entry : list) {
+			sortedMap.put(entry.getKey(), entry.getValue());
+		}
+
+		return sortedMap;
+	}
 }

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java

@@ -8,8 +8,10 @@
 import org.bukkit.plugin.Plugin;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.Objects.UUID;
 import com.Ben12345rocks.AdvancedCore.Objects.User;
 import com.Ben12345rocks.AdvancedCore.Thread.Thread;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserManager;
 
 public class PlayerUtils {
 	/** The instance. */
@@ -65,6 +67,10 @@ public synchronized String getPlayerName(String uuid) {
 		}
 
 		if (name.equals("")) {
+			name = UserManager.getInstance().getUser(new UUID(uuid)).getData().getString("PlayerName");
+			if (!name.equals("")) {
+				return name;
+			}
 			name = "Error getting name";
 		}
 		return name;

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/MySQL.java

@@ -53,7 +53,7 @@ public MySQL(String tableName, String hostName, int port, String database, Strin
 			e.printStackTrace();
 		}
 		String sql = "CREATE TABLE IF NOT EXISTS " + getName() + " (";
-		sql += "uuid VARCHAR(255),";
+		sql += "uuid VARCHAR(191),";
 		sql += "PRIMARY KEY ( uuid )";
 		sql += ");";
 		Query query;