Merge pull request #88 from Ben12345rocks/2.9.3

2.9.3

Author: BenCodez

AdvancedCore/Resources/Rewards/ExampleAdvanced.yml

@@ -176,7 +176,8 @@ Sound:
 Effect:
   Enabled: false
   Effect: 'EXPLOSION'
-  Data: 0
+  # Ususally speed
+  Data: 1
   Particles: 10
   Radius: 5
 

AdvancedCore/pom.xml

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

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

@@ -38,6 +38,7 @@
 import com.Ben12345rocks.AdvancedCore.ServerHandle.SpigotHandle;
 import com.Ben12345rocks.AdvancedCore.TimeChecker.TimeChecker;
 import com.Ben12345rocks.AdvancedCore.UserManager.UserManager;
+import com.Ben12345rocks.AdvancedCore.Util.Effects.FireworkHandler;
 import com.Ben12345rocks.AdvancedCore.Util.Javascript.JavascriptPlaceholderRequest;
 import com.Ben12345rocks.AdvancedCore.Util.Logger.Logger;
 import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils;
@@ -89,34 +90,17 @@ public static AdvancedCoreHook getInstance() {
 	private String buildTime = "";
 	private int maxMysqlSize = -1;
 	private boolean autoKillInvs = true;
-
-	public boolean isAutoKillInvs() {
-		return autoKillInvs;
-	}
-
-	public void setAutoKillInvs(boolean autoKillInvs) {
-		this.autoKillInvs = autoKillInvs;
-	}
-
-	public int getMaxMysqlSize() {
-		return maxMysqlSize;
-	}
-
-	public void setMaxMysqlSize(int maxMysqlSize) {
-		this.maxMysqlSize = maxMysqlSize;
-	}
+	private String prevPageTxt = "&aPrevious Page";
+	private String nextPageTxt = "&aNext Page";
 
 	private HashMap<String, Object> javascriptEngine = new HashMap<String, Object>();
 
 	/** The econ. */
 	private Economy econ = null;
 
 	private Permission perms;
-	private boolean alternateUUIDLookUp;
 
-	public void setAlternateUUIDLookUp(boolean alternateUUIDLookUp) {
-		this.alternateUUIDLookUp = alternateUUIDLookUp;
-	}
+	private boolean alternateUUIDLookUp;
 
 	private AdvancedCoreHook() {
 	}
@@ -268,13 +252,21 @@ public Logger getLogger() {
 		return logger;
 	}
 
+	public int getMaxMysqlSize() {
+		return maxMysqlSize;
+	}
+
 	/**
 	 * @return the mysql
 	 */
 	public MySQL getMysql() {
 		return mysql;
 	}
 
+	public String getNextPageTxt() {
+		return nextPageTxt;
+	}
+
 	public String getPermPrefix() {
 		return permPrefix;
 	}
@@ -287,6 +279,10 @@ public JavaPlugin getPlugin() {
 		return plugin;
 	}
 
+	public String getPrevPageTxt() {
+		return prevPageTxt;
+	}
+
 	/**
 	 * @return the resourceId
 	 */
@@ -326,6 +322,10 @@ public UserManager getUserManager() {
 		return UserManager.getInstance();
 	}
 
+	public ConcurrentHashMap<String, String> getUuids() {
+		return uuids;
+	}
+
 	/**
 	 * @return the version
 	 */
@@ -361,13 +361,21 @@ private YamlConfiguration getVersionFile() {
 		return null;
 	}
 
+	public boolean isAlternateUUIDLookUp() {
+		return alternateUUIDLookUp;
+	}
+
 	/**
 	 * @return the autoDownload
 	 */
 	public boolean isAutoDownload() {
 		return autoDownload;
 	}
 
+	public boolean isAutoKillInvs() {
+		return autoKillInvs;
+	}
+
 	public synchronized boolean isCheckOnWorldChange() {
 		return checkOnWorldChange;
 	}
@@ -478,6 +486,7 @@ public void loadEconomy() {
 
 	public void loadEvents() {
 		Bukkit.getPluginManager().registerEvents(new PlayerJoinEvent(plugin), plugin);
+		Bukkit.getPluginManager().registerEvents(FireworkHandler.getInstance(), plugin);
 		if (checkOnWorldChange) {
 			Bukkit.getPluginManager().registerEvents(new WorldChangeEvent(plugin), plugin);
 		}
@@ -493,6 +502,11 @@ private void loadHandle() {
 			debug("Detected using craftbukkit");
 			plugin.getLogger().info("Detected server running craftbukkit. It is recommended to use spigot instead");
 		}
+		if (Bukkit.getOnlineMode()) {
+			debug("Server in online mode");
+		} else {
+			debug("Server in offline mode");
+		}
 	}
 
 	/**
@@ -505,7 +519,6 @@ public void loadHook(JavaPlugin plugin) {
 		this.plugin = plugin;
 		loadUUIDs();
 		permPrefix = plugin.getName();
-		loadUserAPI(UserStorage.SQLITE);
 		checkPlaceHolderAPI();
 		loadHandle();
 		loadEconomy();
@@ -521,29 +534,6 @@ public void loadHook(JavaPlugin plugin) {
 		debug("Using AdvancedCore '" + getVersion() + "' built on '" + getTime() + "'");
 	}
 
-	public ConcurrentHashMap<String, String> getUuids() {
-		return uuids;
-	}
-
-	private void loadUUIDs() {
-		uuids = new ConcurrentHashMap<String, String>();
-		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
-
-			@Override
-			public void run() {
-				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
-					User user = UserManager.getInstance().getUser(new UUID(uuid));
-					String name = user.getData().getString("PlayerName");
-					if (uuids.containsKey(name)) {
-						debug("Duplicate uuid? " + uuid + " : " + name + " Other key: " + uuids.get(name));
-					}
-					uuids.put(name, uuid);
-				}
-				debug("Loaded uuids in the background");
-			}
-		});
-	}
-
 	/**
 	 * Load logger
 	 */
@@ -578,6 +568,25 @@ public void loadUserAPI(UserStorage storageType) {
 		}
 	}
 
+	private void loadUUIDs() {
+		uuids = new ConcurrentHashMap<String, String>();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+
+			@Override
+			public void run() {
+				for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+					User user = UserManager.getInstance().getUser(new UUID(uuid));
+					String name = user.getData().getString("PlayerName");
+					if (uuids.containsKey(name)) {
+						debug("Duplicate uuid? " + uuid + " : " + name + " Other key: " + uuids.get(name));
+					}
+					uuids.put(name, uuid);
+				}
+				debug("Loaded uuids in the background");
+			}
+		});
+	}
+
 	public void loadValueRequestInputCommands() {
 		try {
 			final Field bukkitCommandMap = Bukkit.getServer().getClass().getDeclaredField("commandMap");
@@ -623,6 +632,10 @@ public void run(Runnable run) {
 		com.Ben12345rocks.AdvancedCore.Thread.Thread.getInstance().run(run);
 	}
 
+	public void setAlternateUUIDLookUp(boolean alternateUUIDLookUp) {
+		this.alternateUUIDLookUp = alternateUUIDLookUp;
+	}
+
 	/**
 	 * @param autoDownload
 	 *            the autoDownload to set
@@ -631,6 +644,10 @@ public void setAutoDownload(boolean autoDownload) {
 		this.autoDownload = autoDownload;
 	}
 
+	public void setAutoKillInvs(boolean autoKillInvs) {
+		this.autoKillInvs = autoKillInvs;
+	}
+
 	public synchronized void setCheckOnWorldChange(boolean checkOnWorldChange) {
 		this.checkOnWorldChange = checkOnWorldChange;
 	}
@@ -691,6 +708,10 @@ public void setLogDebugToFile(boolean logDebugToFile) {
 		this.logDebugToFile = logDebugToFile;
 	}
 
+	public void setMaxMysqlSize(int maxMysqlSize) {
+		this.maxMysqlSize = maxMysqlSize;
+	}
+
 	/**
 	 * @param mysql
 	 *            the mysql to set
@@ -703,6 +724,10 @@ public void setMysql(MySQL mysql) {
 		this.mysql = mysql;
 	}
 
+	public void setNextPageTxt(String nextPageTxt) {
+		this.nextPageTxt = nextPageTxt;
+	}
+
 	public void setPermPrefix(String permPrefix) {
 		this.permPrefix = permPrefix;
 	}
@@ -715,6 +740,10 @@ public void setPreloadUsers(boolean preloadUsers) {
 		this.preloadUsers = preloadUsers;
 	}
 
+	public void setPrevPageTxt(String prevPageTxt) {
+		this.prevPageTxt = prevPageTxt;
+	}
+
 	/**
 	 * @param resourceId
 	 *            the resourceId to set
@@ -733,6 +762,7 @@ public void setSendScoreboards(boolean sendScoreboards) {
 
 	public void setStorageType(UserStorage storageType) {
 		this.storageType = storageType;
+		loadUserAPI(storageType);
 	}
 
 	/**
@@ -765,8 +795,4 @@ private boolean setupPermissions() {
 	public void update() {
 		TimeChecker.getInstance().update();
 	}
-
-	public boolean isAlternateUUIDLookUp() {
-		return alternateUUIDLookUp;
-	}
 }

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java

@@ -244,7 +244,7 @@ public void execute(CommandSender sender, String[] args) {
 			public void execute(CommandSender sender, String[] args) {
 
 				User user = UserManager.getInstance().getUser((Player) sender);
-				InputMethod method = InputMethod.valueOf(args[1]);
+				InputMethod method = InputMethod.getMethod(args[1]);
 				if (method == null) {
 					user.sendMessage("&cInvalid request method: " + args[1]);
 				} else {
@@ -270,7 +270,7 @@ public void execute(CommandSender sender, String[] args) {
 							@Override
 							public void onInput(Player player, String value) {
 								User user = UserManager.getInstance().getUser(player);
-								user.setUserInputMethod(InputMethod.valueOf(value));
+								user.setUserInputMethod(InputMethod.getMethod(value));
 
 							}
 						});

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/Executor/CommandAdvancedCore.java

@@ -40,8 +40,8 @@ private CommandAdvancedCore() {
 	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
 
 		/*
-		 * for (CommandHandler commandHandler : plugin.advancedCoreCommands) {
-		 * if (commandHandler.runCommand(sender, args)) { return true; } }
+		 * for (CommandHandler commandHandler : plugin.advancedCoreCommands) { if
+		 * (commandHandler.runCommand(sender, args)) { return true; } }
 		 */
 
 		// invalid command

AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/TabComplete/AdvancedCoreTabCompleter.java

@@ -34,24 +34,22 @@ public ArrayList<String> getTabCompleteOptions(CommandSender sender, String[] ar
 		/*
 		 * for (CommandHandler commandHandler : plugin.advancedCoreCommands) {
 		 *
-		 * if (sender.hasPermission(commandHandler.getPerm())) { String[]
-		 * cmdArgs = commandHandler.getArgs(); if (cmdArgs.length > argNum) {
-		 * boolean argsMatch = true; for (int i = 0; i < argNum; i++) { if
-		 * (args.length >= i) { if (!commandHandler.argsMatch(args[i], i)) {
-		 * argsMatch = false; } } }
+		 * if (sender.hasPermission(commandHandler.getPerm())) { String[] cmdArgs =
+		 * commandHandler.getArgs(); if (cmdArgs.length > argNum) { boolean argsMatch =
+		 * true; for (int i = 0; i < argNum; i++) { if (args.length >= i) { if
+		 * (!commandHandler.argsMatch(args[i], i)) { argsMatch = false; } } }
 		 *
-		 * if (argsMatch) { String[] cmdArgsList = cmdArgs[argNum].split("&");
-		 * for (String arg : cmdArgsList) { if
-		 * (arg.equalsIgnoreCase("(player)")) { for (Object playerOb :
-		 * Bukkit.getOnlinePlayers().toArray()) { Player player = (Player)
-		 * playerOb; if (!cmds.contains(player.getName())) {
-		 * cmds.add(player.getName()); } } } else if
-		 * (arg.equalsIgnoreCase("(boolean)")) { if (!cmds.contains("True")) {
-		 * cmds.add("True"); } if (!cmds.contains("False")) { cmds.add("False");
-		 * } } else if (arg.equalsIgnoreCase("(requestmethod)")) { for
-		 * (InputMethod method : InputMethod.values()) { if
-		 * (!cmds.contains(method.toString())) { cmds.add(method.toString()); }
-		 * } } else if (arg.equalsIgnoreCase("(number)")) {
+		 * if (argsMatch) { String[] cmdArgsList = cmdArgs[argNum].split("&"); for
+		 * (String arg : cmdArgsList) { if (arg.equalsIgnoreCase("(player)")) { for
+		 * (Object playerOb : Bukkit.getOnlinePlayers().toArray()) { Player player =
+		 * (Player) playerOb; if (!cmds.contains(player.getName())) {
+		 * cmds.add(player.getName()); } } } else if (arg.equalsIgnoreCase("(boolean)"))
+		 * { if (!cmds.contains("True")) { cmds.add("True"); } if
+		 * (!cmds.contains("False")) { cmds.add("False"); } } else if
+		 * (arg.equalsIgnoreCase("(requestmethod)")) { for (InputMethod method :
+		 * InputMethod.values()) { if (!cmds.contains(method.toString())) {
+		 * cmds.add(method.toString()); } } } else if (arg.equalsIgnoreCase("(number)"))
+		 * {
 		 *
 		 * } else if (!cmds.contains(arg)) { cmds.add(arg); } }
 		 *
@@ -79,8 +77,8 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String alia
 
 		/*
 		 * for (CommandHandler commandHandler : plugin.advancedCoreCommands) {
-		 * cmds.addAll(commandHandler.getTabCompleteOptions(sender, args,
-		 * args.length - 1)); }
+		 * cmds.addAll(commandHandler.getTabCompleteOptions(sender, args, args.length -
+		 * 1)); }
 		 */
 
 		for (String str : cmds) {

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

@@ -82,6 +82,11 @@ public int getPrevWeekDay() {
 	public void onFileCreation() {
 	}
 
+	public void setData(String path, Object value) {
+		getData().set(path, value);
+		saveData();
+	}
+
 	/**
 	 * Sets the plugin version.
 	 *
@@ -125,9 +130,4 @@ public void setPrevWeekDay(int week) {
 		getData().set("PrevWeek", week);
 		saveData();
 	}
-
-	public void setData(String path, Object value) {
-		getData().set(path, value);
-		saveData();
-	}
 }