From 0461ec01db970f2095e59312c039e346ef42c6c9 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Thu, 28 Sep 2017 11:24:16 -0400 Subject: [PATCH 01/35] Make getting uuids case insensitive. --- .../Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java index 8c166162ac..fbc3b9b42a 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java @@ -1,5 +1,6 @@ package com.Ben12345rocks.AdvancedCore.Util.Misc; +import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.bukkit.Bukkit; @@ -136,6 +137,12 @@ public String getUUID(String playerName) { String uuid = uuids.get(playerName); if (uuid != null) { return uuid; + } else { + for (Entry entry : uuids.entrySet()) { + if (entry.getKey().equalsIgnoreCase(playerName)) { + return entry.getValue(); + } + } } } for (String uuid : UserManager.getInstance().getAllUUIDs()) { From fc93185dcb2fa832d23f36f3d25766778b368cb3 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Thu, 28 Sep 2017 11:42:13 -0400 Subject: [PATCH 02/35] Prevent firework damage, needs testing --- .../Util/Effects/FireworkHandler.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java index 47da17b58a..7c6c48443d 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java @@ -1,6 +1,7 @@ package com.Ben12345rocks.AdvancedCore.Util.Effects; import java.util.ArrayList; +import java.util.concurrent.ConcurrentLinkedQueue; import org.bukkit.Bukkit; import org.bukkit.DyeColor; @@ -9,6 +10,10 @@ import org.bukkit.Location; import org.bukkit.entity.EntityType; import org.bukkit.entity.Firework; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.inventory.meta.FireworkMeta; import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook; @@ -18,6 +23,8 @@ public class FireworkHandler { /** The instance. */ static FireworkHandler instance = new FireworkHandler(); + private ConcurrentLinkedQueue fireWorks = new ConcurrentLinkedQueue(); + /** * Gets the single instance of FireworkHandler. * @@ -96,9 +103,21 @@ public void run() { fwmeta.addEffects(builder.build()); fwmeta.setPower(power); fw.setFireworkMeta(fwmeta); + fireWorks.add(fw); // plugin.debug("Launched firework"); } }); } + + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) + public void onPlayerLogin(EntityDamageByEntityEvent event) { + if (event.getDamager() instanceof Firework && event.getEntity() instanceof Player) { + Firework fw = (Firework) event.getDamager(); + if (fireWorks.contains(fw)) { + event.setCancelled(true); + fireWorks.remove(fw); + } + } + } } From fc63b4b8e4a9325ac9564d3327e6d469a012ab86 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Thu, 28 Sep 2017 11:43:21 -0400 Subject: [PATCH 03/35] Bug fix --- .../src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java | 2 ++ .../AdvancedCore/Util/Effects/FireworkHandler.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java index 8247d7519c..436b17cc14 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java +++ b/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; @@ -478,6 +479,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); } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java index 7c6c48443d..28d9bc32ac 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java @@ -13,12 +13,13 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.inventory.meta.FireworkMeta; import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook; -public class FireworkHandler { +public class FireworkHandler implements Listener { /** The instance. */ static FireworkHandler instance = new FireworkHandler(); @@ -111,7 +112,7 @@ public void run() { } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) - public void onPlayerLogin(EntityDamageByEntityEvent event) { + public void onFireworkDamage(EntityDamageByEntityEvent event) { if (event.getDamager() instanceof Firework && event.getEntity() instanceof Player) { Firework fw = (Firework) event.getDamager(); if (fireWorks.contains(fw)) { From f9a5e348b4da2d73908d86628e4d3cb81ebb878c Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Thu, 28 Sep 2017 13:52:17 -0400 Subject: [PATCH 04/35] Added new options --- .../AdvancedCore/AdvancedCoreHook.java | 18 ++++++++++++++++++ .../Util/Inventory/BInventory.java | 13 +++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java index 436b17cc14..abce60fc9b 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java @@ -90,6 +90,24 @@ public static AdvancedCoreHook getInstance() { private String buildTime = ""; private int maxMysqlSize = -1; private boolean autoKillInvs = true; + private String prevPageTxt = "&aPrevious Page"; + private String nextPageTxt = "&aNext Page"; + + public String getPrevPageTxt() { + return prevPageTxt; + } + + public void setPrevPageTxt(String prevPageTxt) { + this.prevPageTxt = prevPageTxt; + } + + public String getNextPageTxt() { + return nextPageTxt; + } + + public void setNextPageTxt(String nextPageTxt) { + this.nextPageTxt = nextPageTxt; + } public boolean isAutoKillInvs() { return autoKillInvs; diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java index 38f594cdac..96b9a2a681 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java @@ -369,10 +369,11 @@ public void onInventoryClick(InventoryClickEvent event) { event.setCancelled(true); Player player = (Player) event.getWhoClicked(); - if (event.getClickedInventory() != null && !event.getClickedInventory().getType().equals(InventoryType.CHEST)) { + if (event.getClickedInventory() != null + && !event.getClickedInventory().getType().equals(InventoryType.CHEST)) { return; } - + if (!pages) { for (int buttonSlot : getButtons().keySet()) { BInventoryButton button = getButtons().get(buttonSlot); @@ -541,12 +542,12 @@ private void openInventory(Player player, int page) { inv.setItem((maxInvSize - 9) + b.getSlot(), b.getItem(player)); } if (prevItem == null) { - prevItem = new ItemBuilder(Material.STAINED_GLASS_PANE, 1, (short) 15).setName("&aPrevious Page") - .toItemStack(player); + prevItem = new ItemBuilder(Material.STAINED_GLASS_PANE, 1, (short) 15) + .setName(AdvancedCoreHook.getInstance().getPrevPageTxt()).toItemStack(player); } if (nextItem == null) { - nextItem = new ItemBuilder(Material.STAINED_GLASS_PANE, 1, (short) 15).setName("&aNext Page") - .toItemStack(player); + nextItem = new ItemBuilder(Material.STAINED_GLASS_PANE, 1, (short) 15) + .setName(AdvancedCoreHook.getInstance().getNextPageTxt()).toItemStack(player); } inv.setItem(maxInvSize - 9, prevItem); From aa1cdc193df9c62cc3b4b88483b5d8b69490dfee Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Thu, 28 Sep 2017 14:48:32 -0400 Subject: [PATCH 05/35] Bug fix --- .../Util/Effects/FireworkHandler.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java index 28d9bc32ac..41562600ea 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java @@ -15,6 +15,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.entity.FireworkExplodeEvent; import org.bukkit.inventory.meta.FireworkMeta; import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook; @@ -117,7 +118,22 @@ public void onFireworkDamage(EntityDamageByEntityEvent event) { Firework fw = (Firework) event.getDamager(); if (fireWorks.contains(fw)) { event.setCancelled(true); - fireWorks.remove(fw); + } + } + } + + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) + public void onFireworkDamage(FireworkExplodeEvent event) { + if (event.getEntity() instanceof Firework) { + Firework fw = (Firework) event.getEntity(); + if (fireWorks.contains(fw)) { + Bukkit.getScheduler().runTaskLaterAsynchronously(plugin.getPlugin(), new Runnable() { + + @Override + public void run() { + fireWorks.remove(fw); + } + }, 10l); } } } From 97b270ae9491edba7208680fcd327673367a38df Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Thu, 28 Sep 2017 20:16:27 -0400 Subject: [PATCH 06/35] Fix inventories on craftbukkit --- .../AdvancedCore/Util/Inventory/BInventory.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java index 96b9a2a681..588f84b6a3 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java @@ -24,6 +24,7 @@ import org.bukkit.inventory.ItemStack; import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook; +import com.Ben12345rocks.AdvancedCore.ServerHandle.SpigotHandle; import com.Ben12345rocks.AdvancedCore.Util.Item.ItemBuilder; import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils; import com.Ben12345rocks.AdvancedCore.Util.Misc.StringUtils; @@ -369,9 +370,13 @@ public void onInventoryClick(InventoryClickEvent event) { event.setCancelled(true); Player player = (Player) event.getWhoClicked(); - if (event.getClickedInventory() != null - && !event.getClickedInventory().getType().equals(InventoryType.CHEST)) { - return; + + if (AdvancedCoreHook.getInstance().getServerHandle() instanceof SpigotHandle) { + // spigot only method + if (event.getClickedInventory() != null + && !event.getClickedInventory().getType().equals(InventoryType.CHEST)) { + return; + } } if (!pages) { From 3d01ebe2292a1ae21923b490a2da1670ee9aa78d Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Thu, 28 Sep 2017 21:43:13 -0400 Subject: [PATCH 07/35] Performance improvement --- .../AdvancedCore/UserManager/UserManager.java | 6 ++---- .../Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java index 47707657cd..e38eab1d49 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java @@ -125,10 +125,8 @@ public String getProperName(String name) { public boolean userExist(UUID uuid) { if (uuid != null && uuid.getUUID() != null) { - for (String str : getAllUUIDs()) { - if (str.equals(uuid.getUUID())) { - return true; - } + if (getAllUUIDs().contains(uuid.getUUID())) { + return true; } } return false; diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java index fbc3b9b42a..967c1c4af2 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java @@ -128,7 +128,7 @@ public String getUUID(String playerName) { if (playerName == null) { return null; } - + OfflinePlayer p = Bukkit.getOfflinePlayer(playerName); if (plugin.isAlternateUUIDLookUp() || (!p.hasPlayedBefore() && !p.isOnline())) { @@ -138,7 +138,7 @@ public String getUUID(String playerName) { if (uuid != null) { return uuid; } else { - for (Entry entry : uuids.entrySet()) { + for (Entry entry : uuids.entrySet()) { if (entry.getKey().equalsIgnoreCase(playerName)) { return entry.getValue(); } @@ -158,13 +158,13 @@ public String getUUID(String playerName) { return p.getUniqueId().toString(); } - + @SuppressWarnings("deprecation") public boolean isValidUser(String name) { OfflinePlayer p = Bukkit.getOfflinePlayer(name); if (p.hasPlayedBefore() || p.isOnline()) { return true; - } + } return UserManager.getInstance().userExist(name); } From 1074e6c5df0c7192f0dcfbdb009b503c819b435d Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 29 Sep 2017 13:40:03 -0400 Subject: [PATCH 08/35] Modify debug messages --- .../AdvancedCore/Objects/UserData.java | 16 ++++++++-------- .../AdvancedCore/UserManager/UserManager.java | 3 +++ .../AdvancedCore/Util/Misc/PlayerUtils.java | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserData.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserData.java index d3725d8217..f3a8310906 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserData.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserData.java @@ -74,10 +74,10 @@ public int getInt(String key, int def) { } - if (AdvancedCoreHook.getInstance().isExtraDebug()) { - AdvancedCoreHook.getInstance() - .debug("Extra: Failed to get int from '" + key + "' for '" + user.getPlayerName() + "'"); - } + // AdvancedCoreHook.getInstance() + // .extraDebug("Failed to get int from '" + key + "' for '" + + // user.getPlayerName() + "'"); + return def; } @@ -149,10 +149,10 @@ public String getString(String key) { } } } - if (AdvancedCoreHook.getInstance().isExtraDebug()) { + /*if (AdvancedCoreHook.getInstance().isExtraDebug()) { AdvancedCoreHook.getInstance() .debug("Extra: Failed to get string from: '" + key + "' for '" + user.getPlayerName() + "'"); - } + }*/ return ""; } @@ -174,10 +174,10 @@ public void setInt(final String key, final int value) { AdvancedCoreHook.getInstance().debug("No key: " + key + " to " + value); return; } - if (AdvancedCoreHook.getInstance().isExtraDebug()) { + /*if (AdvancedCoreHook.getInstance().isExtraDebug()) { AdvancedCoreHook.getInstance() .debug("Extra: Setting " + key + " to '" + value + "' for '" + user.getPlayerName() + "'"); - } + }*/ if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.SQLITE)) { ArrayList columns = new ArrayList(); Column primary = new Column("uuid", user.getUUID(), DataType.STRING); diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java index e38eab1d49..59a2ed8d23 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java @@ -126,9 +126,12 @@ public String getProperName(String name) { public boolean userExist(UUID uuid) { if (uuid != null && uuid.getUUID() != null) { if (getAllUUIDs().contains(uuid.getUUID())) { + plugin.debug(uuid.getUUID() + " exists"); return true; } + plugin.debug(uuid.getUUID() + " not exist"); } + return false; } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java index 967c1c4af2..1a3ef5c4c8 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java @@ -163,6 +163,7 @@ public String getUUID(String playerName) { public boolean isValidUser(String name) { OfflinePlayer p = Bukkit.getOfflinePlayer(name); if (p.hasPlayedBefore() || p.isOnline()) { + plugin.debug(name + " has joined before"); return true; } return UserManager.getInstance().userExist(name); From 29525b89da74534631626ffbd83963b1579908e4 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 29 Sep 2017 14:48:09 -0400 Subject: [PATCH 09/35] Improvements --- .../AdvancedCore/UserManager/UserManager.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java index 59a2ed8d23..b110cf4d10 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java @@ -12,7 +12,6 @@ import com.Ben12345rocks.AdvancedCore.Objects.User; import com.Ben12345rocks.AdvancedCore.Objects.UserStorage; import com.Ben12345rocks.AdvancedCore.Util.Misc.ArrayUtils; -import com.Ben12345rocks.AdvancedCore.Util.Misc.PlayerUtils; import com.Ben12345rocks.AdvancedCore.sql.Column; /** @@ -126,16 +125,21 @@ public String getProperName(String name) { public boolean userExist(UUID uuid) { if (uuid != null && uuid.getUUID() != null) { if (getAllUUIDs().contains(uuid.getUUID())) { - plugin.debug(uuid.getUUID() + " exists"); + //plugin.debug(uuid.getUUID() + " exists"); return true; } - plugin.debug(uuid.getUUID() + " not exist"); + //plugin.debug(uuid.getUUID() + " not exist"); } return false; } public boolean userExist(String name) { - return userExist(new UUID(PlayerUtils.getInstance().getUUID(name))); + for (String uuid : getAllUUIDs()) { + if (getUser(new UUID(uuid)).getPlayerName().equalsIgnoreCase(name)) { + return true; + } + } + return false; } } From f1b5df12fe289403e64274f7af076c1135896610 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 29 Sep 2017 14:55:37 -0400 Subject: [PATCH 10/35] Improvements --- .../AdvancedCore/UserManager/UserManager.java | 8 +++++--- .../Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java index b110cf4d10..9cffc2212c 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java @@ -125,10 +125,10 @@ public String getProperName(String name) { public boolean userExist(UUID uuid) { if (uuid != null && uuid.getUUID() != null) { if (getAllUUIDs().contains(uuid.getUUID())) { - //plugin.debug(uuid.getUUID() + " exists"); + // plugin.debug(uuid.getUUID() + " exists"); return true; } - //plugin.debug(uuid.getUUID() + " not exist"); + // plugin.debug(uuid.getUUID() + " not exist"); } return false; @@ -136,7 +136,9 @@ public boolean userExist(UUID uuid) { public boolean userExist(String name) { for (String uuid : getAllUUIDs()) { - if (getUser(new UUID(uuid)).getPlayerName().equalsIgnoreCase(name)) { + User user = getUser(new UUID(uuid)); + if (user.getPlayerName().equalsIgnoreCase(name)) { + plugin.extraDebug("Found " + name + " in database"); return true; } } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java index 1a3ef5c4c8..bb49ed0cd0 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java @@ -163,7 +163,7 @@ public String getUUID(String playerName) { public boolean isValidUser(String name) { OfflinePlayer p = Bukkit.getOfflinePlayer(name); if (p.hasPlayedBefore() || p.isOnline()) { - plugin.debug(name + " has joined before"); + plugin.extraDebug(name + " has joined before"); return true; } return UserManager.getInstance().userExist(name); From bd948098c000ccb36538659c0be13cd3ab6521f4 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 29 Sep 2017 15:03:33 -0400 Subject: [PATCH 11/35] Improvements --- .../AdvancedCore/UserManager/UserManager.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java index 9cffc2212c..b860d4c0d0 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java @@ -135,10 +135,16 @@ public boolean userExist(UUID uuid) { } public boolean userExist(String name) { + for (String s : plugin.getUuids().keySet()) { + if (s.equalsIgnoreCase(name)) { + return true; + } + } + for (String uuid : getAllUUIDs()) { User user = getUser(new UUID(uuid)); if (user.getPlayerName().equalsIgnoreCase(name)) { - plugin.extraDebug("Found " + name + " in database"); + //plugin.extraDebug("Found " + name + " in database"); return true; } } From be8988f74f4f662ae63489e49600891bb5e2e166 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 29 Sep 2017 15:31:32 -0400 Subject: [PATCH 12/35] Improvements --- .../com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java index b860d4c0d0..d243fbbecc 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java @@ -144,7 +144,7 @@ public boolean userExist(String name) { for (String uuid : getAllUUIDs()) { User user = getUser(new UUID(uuid)); if (user.getPlayerName().equalsIgnoreCase(name)) { - //plugin.extraDebug("Found " + name + " in database"); + plugin.extraDebug("Found " + name + " in database"); return true; } } From 2413eb334399a27859347fd6d349863b05a76d01 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Sun, 1 Oct 2017 13:51:02 -0400 Subject: [PATCH 13/35] Bug fixes --- .../com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java index c3334359ec..477137c72e 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java @@ -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)); } }); From dbcb6904f06acc526bd7bdf36338b0e3adf8ccb9 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Sun, 1 Oct 2017 14:28:04 -0400 Subject: [PATCH 14/35] Bug fix --- .../com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java index 477137c72e..6b6a390cc6 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/CommandLoader.java +++ b/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 { From 53f650a82e91ebe18e8104c2aadf7945bfd008b0 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Sun, 1 Oct 2017 17:55:21 -0400 Subject: [PATCH 15/35] Experimental change --- .../com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java index cb425c138d..d3dba7ac4f 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java @@ -348,6 +348,9 @@ public boolean hasPerm(CommandSender sender) { if (sender.hasPermission(perm)) { hasPerm = true; } + if (sender.hasPermission("-" + perm)) { + return false; + } } } else { hasPerm = true; From e2a76c85530609b443a3c667ed6199979264466a Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Sun, 1 Oct 2017 18:52:38 -0400 Subject: [PATCH 16/35] Bug fix --- .../com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java index d3dba7ac4f..cb425c138d 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java @@ -348,9 +348,6 @@ public boolean hasPerm(CommandSender sender) { if (sender.hasPermission(perm)) { hasPerm = true; } - if (sender.hasPermission("-" + perm)) { - return false; - } } } else { hasPerm = true; From 1dc41cbad0f9ce803296cd2074a46a994c3dc71f Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Tue, 3 Oct 2017 16:40:47 -0400 Subject: [PATCH 17/35] Add debug to see if commands are executed --- .../AdvancedCore/Objects/User.java | 21 ++++++++++--------- .../AdvancedCore/Util/Misc/MiscUtils.java | 16 ++++++++------ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java index 53fafc9043..3a7ae45843 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java @@ -594,18 +594,18 @@ public void preformCommand(ArrayList commands, HashMap p if (commands != null && !commands.isEmpty()) { final ArrayList cmds = ArrayUtils.getInstance().replaceJavascript(getPlayer(), ArrayUtils.getInstance().replacePlaceHolder(commands, placeholders)); - Bukkit.getScheduler().runTask(plugin, new Runnable() { - @Override - public void run() { - Player player = getPlayer(); - if (player != null) { - for (String cmd : cmds) { - player.performCommand(cmd); - } + final Player player = getPlayer(); + for (final String cmd : cmds) { + AdvancedCoreHook.getInstance().debug("Executing player command for " + getPlayerName() + ": " + cmd); + Bukkit.getScheduler().runTask(plugin, new Runnable() { + + @Override + public void run() { + player.performCommand(cmd); } - } - }); + }); + } } } @@ -613,6 +613,7 @@ public void preformCommand(String command, HashMap placeholders) if (command != null && !command.isEmpty()) { final String cmd = StringUtils.getInstance().replaceJavascript(getPlayer(), StringUtils.getInstance().replacePlaceHolder(command, placeholders)); + AdvancedCoreHook.getInstance().debug("Executing player command for " + getPlayerName() + ": " + command); Bukkit.getScheduler().runTask(plugin, new Runnable() { @Override diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java index 4ed7ddd0d8..9a9d16ff51 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java @@ -79,6 +79,7 @@ public void executeConsoleCommands(final Player player, final ArrayList final ArrayList commands = ArrayUtils.getInstance().replaceJavascript(player, ArrayUtils.getInstance().replacePlaceHolder(cmds, placeholders)); for (final String cmd : commands) { + plugin.debug("Executing console command: " + cmd); Bukkit.getScheduler().runTask(plugin.getPlugin(), new Runnable() { @Override @@ -100,15 +101,16 @@ public void executeConsoleCommands(final String playerName, final ArrayList commands = ArrayUtils.getInstance().replaceJavascript( Bukkit.getOfflinePlayer(playerName), ArrayUtils.getInstance().replacePlaceHolder(cmds, placeholders)); - Bukkit.getScheduler().runTask(plugin.getPlugin(), new Runnable() { + for (final String cmd : commands) { + plugin.debug("Executing console command: " + cmd); + Bukkit.getScheduler().runTask(plugin.getPlugin(), new Runnable() { - @Override - public void run() { - for (String cmd : commands) { + @Override + public void run() { Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd); } - } - }); + }); + } } } @@ -116,6 +118,8 @@ public void executeConsoleCommands(Player player, String command, HashMap Date: Tue, 3 Oct 2017 16:41:13 -0400 Subject: [PATCH 18/35] Bug fix --- .../AdvancedCore/Objects/User.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java index 3a7ae45843..3220f1fde5 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java @@ -596,15 +596,18 @@ public void preformCommand(ArrayList commands, HashMap p ArrayUtils.getInstance().replacePlaceHolder(commands, placeholders)); final Player player = getPlayer(); - for (final String cmd : cmds) { - AdvancedCoreHook.getInstance().debug("Executing player command for " + getPlayerName() + ": " + cmd); - Bukkit.getScheduler().runTask(plugin, new Runnable() { - - @Override - public void run() { - player.performCommand(cmd); - } - }); + if (player != null) { + for (final String cmd : cmds) { + AdvancedCoreHook.getInstance() + .debug("Executing player command for " + getPlayerName() + ": " + cmd); + Bukkit.getScheduler().runTask(plugin, new Runnable() { + + @Override + public void run() { + player.performCommand(cmd); + } + }); + } } } } From ba33be2d8a5e12452dba6708ab28384692d62be1 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Tue, 3 Oct 2017 16:51:59 -0400 Subject: [PATCH 19/35] Improve skulls --- .../AdvancedCore/Objects/Reward.java | 4 +- .../AdvancedCore/Util/Item/ItemBuilder.java | 56 +++++++++++++++---- .../AdvancedCore/Util/Misc/MiscUtils.java | 8 ++- 3 files changed, 53 insertions(+), 15 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java index 885f31f5ec..f75890b0ba 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java @@ -656,7 +656,7 @@ public HashMap getItemsAndAmountsGiven() { } public ItemStack getItemStack(User user, String item) { - return new ItemBuilder(getConfig().getItemSection(item)).setSkullOwner(user.getPlayerName()) + return new ItemBuilder(getConfig().getItemSection(item)).setSkullOwner(user.getOfflinePlayer()) .toItemStack(user.getPlayer()); } @@ -1025,7 +1025,7 @@ public void giveReward(User user, boolean online, boolean giveOffline, boolean c public void giveReward(User user, boolean online, boolean giveOffline, boolean checkTimed, HashMap placeholders) { giveReward(user, online, giveOffline, checkTimed, false, placeholders); - } + } public void giveReward(User user, boolean online, boolean giveOffline, boolean checkTimed, boolean ignoreChance, HashMap placeholders) { diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java index 21ded16767..8ea6bb4ca5 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java @@ -11,6 +11,7 @@ import org.bukkit.Color; import org.bukkit.DyeColor; import org.bukkit.Material; +import org.bukkit.OfflinePlayer; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; @@ -36,7 +37,6 @@ public class ItemBuilder { private ItemStack is; private HashMap placeholders = new HashMap(); private int slot = -1; - private String skull = ""; /** * Create ItemBuilder from a ConfigurationSection @@ -322,11 +322,11 @@ public ArrayList getLore() { public String getName() { return is.getItemMeta().getDisplayName(); } - + public boolean hasCustomDisplayName() { return is.getItemMeta().hasDisplayName(); } - + public boolean hasCustomLore() { return is.getItemMeta().hasLore(); } @@ -334,8 +334,27 @@ public boolean hasCustomLore() { /** * @return the skull */ + @Deprecated public String getSkull() { - return skull; + try { + SkullMeta im = (SkullMeta) is.getItemMeta(); + if (im.hasOwner()) { + return im.getOwner(); + } + } catch (ClassCastException expected) { + } + return ""; + } + + public OfflinePlayer getSkullOwner() { + try { + SkullMeta im = (SkullMeta) is.getItemMeta(); + if (im.hasOwner()) { + return im.getOwningPlayer(); + } + } catch (ClassCastException expected) { + } + return null; } /** @@ -426,8 +445,8 @@ public ItemBuilder setDurability(short dur) { } /** - * Sets the dye color on an item. * Notice that this doesn't check for - * item type, sets the literal data of the dyecolor as durability. + * Sets the dye color on an item. * Notice that this doesn't check for item + * type, sets the literal data of the dyecolor as durability. * * @param color * The color to put. @@ -451,8 +470,8 @@ public ItemBuilder setInfinityDurability() { } /** - * Sets the armor color of a leather armor piece. Works only on leather - * armor pieces. + * Sets the armor color of a leather armor piece. Works only on leather armor + * pieces. * * @param color * The color to set it to. @@ -520,13 +539,22 @@ public ItemBuilder setPlaceholders(HashMap placeholders) { * The name of the skull's owner. * @return ItemBuilder */ - @SuppressWarnings("deprecation") + @Deprecated public ItemBuilder setSkullOwner(String owner) { try { SkullMeta im = (SkullMeta) is.getItemMeta(); im.setOwner(owner); is.setItemMeta(im); - skull = owner; + } catch (ClassCastException expected) { + } + return this; + } + + public ItemBuilder setSkullOwner(OfflinePlayer offlinePlayer) { + try { + SkullMeta im = (SkullMeta) is.getItemMeta(); + im.setOwningPlayer(offlinePlayer); + is.setItemMeta(im); } catch (ClassCastException expected) { } return this; @@ -556,6 +584,10 @@ public ItemStack toItemStack() { } public ItemStack toItemStack(Player player) { + return toItemStack((OfflinePlayer) player); + } + + public ItemStack toItemStack(OfflinePlayer player) { if (player != null) { if (!placeholders.isEmpty()) { setName(StringUtils.getInstance().replaceJavascript(player, @@ -563,8 +595,8 @@ public ItemStack toItemStack(Player player) { setLore(ArrayUtils.getInstance().replaceJavascript(player, ArrayUtils.getInstance().replacePlaceHolder(getLore(), placeholders))); } - if (!skull.equals("")) { - setSkullOwner(StringUtils.getInstance().replacePlaceHolder(skull, "player", player.getName())); + if (!getSkull().equals("")) { + setSkullOwner(StringUtils.getInstance().replacePlaceHolder(getSkull(), "player", player.getName())); } } else { return toItemStack(); diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java index 9a9d16ff51..c6b371e25d 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java @@ -15,6 +15,7 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; +import org.bukkit.OfflinePlayer; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -259,10 +260,15 @@ public int getYearFromMili(long time) { * the player name * @return the item stack */ - @SuppressWarnings("deprecation") + @Deprecated public ItemStack setSkullOwner(String playerName) { return new ItemBuilder(new ItemStack(Material.SKULL_ITEM, 1, (short) 3)).setSkullOwner(playerName) .toItemStack(); } + public ItemStack setSkullOwner(OfflinePlayer player) { + return new ItemBuilder(new ItemStack(Material.SKULL_ITEM, 1, (short) 3)).setSkullOwner(player) + .toItemStack(player); + } + } From 87aabfe7fa48df0a7a8ffe1ff86bbcaaabb66767 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Tue, 3 Oct 2017 16:54:04 -0400 Subject: [PATCH 20/35] Bug fix --- .../AdvancedCore/Util/Item/ItemBuilder.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java index 8ea6bb4ca5..98c4e19908 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java @@ -551,11 +551,13 @@ public ItemBuilder setSkullOwner(String owner) { } public ItemBuilder setSkullOwner(OfflinePlayer offlinePlayer) { - try { - SkullMeta im = (SkullMeta) is.getItemMeta(); - im.setOwningPlayer(offlinePlayer); - is.setItemMeta(im); - } catch (ClassCastException expected) { + if (offlinePlayer != null) { + try { + SkullMeta im = (SkullMeta) is.getItemMeta(); + im.setOwningPlayer(offlinePlayer); + is.setItemMeta(im); + } catch (ClassCastException expected) { + } } return this; } From a5228d1263fba70b9a38f2157cc56910cd2e331a Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Sat, 7 Oct 2017 16:51:59 -0400 Subject: [PATCH 21/35] Add a new method --- .../Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java index 757dde7dfe..c5657cf66a 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java @@ -3,6 +3,7 @@ import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.ZoneId; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -98,6 +99,12 @@ public void send(User... users) { send(user); } } + + public void send(ArrayList users) { + for (User user : users) { + send(user); + } + } public RewardBuilder setCheckTimed(boolean b) { checkTimed = b; From 3f1041552f9c2a868a1bf0a02b583c64a7074e07 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Sat, 7 Oct 2017 16:57:00 -0400 Subject: [PATCH 22/35] Add more methods --- .../AdvancedCore/Objects/RewardBuilder.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java index c5657cf66a..360ae3202f 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java @@ -7,7 +7,11 @@ import java.util.Date; import java.util.HashMap; +import org.bukkit.OfflinePlayer; import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.entity.Player; + +import com.Ben12345rocks.AdvancedCore.UserManager.UserManager; public class RewardBuilder { private FileConfiguration data; @@ -93,6 +97,14 @@ public void send(User user) { ignoreChance, placeholders); } } + + public void send(Player p) { + send(UserManager.getInstance().getUser(p)); + } + + public void send(OfflinePlayer p) { + send(UserManager.getInstance().getUser(p)); + } public void send(User... users) { for (User user : users) { From 099a43ccb83bf42284b453031f8dbee4d837142a Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Wed, 11 Oct 2017 08:47:06 -0400 Subject: [PATCH 23/35] Use particle api --- .../AdvancedCore/Objects/Reward.java | 2 +- .../AdvancedCore/Objects/User.java | 21 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java index f75890b0ba..9fd531e480 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java @@ -1460,7 +1460,7 @@ public void setForceOffline(boolean forceOffline) { */ public void playEffect(User user) { if (effectEnabled) { - user.playParticleEffect(effectEffect, effectData, effectParticles, effectRadius); + user.playParticle(effectEffect, effectData, effectParticles, effectRadius); } } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java index 3220f1fde5..55f563b784 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java @@ -14,6 +14,7 @@ import org.bukkit.Effect; import org.bukkit.Material; import org.bukkit.OfflinePlayer; +import org.bukkit.Particle; import org.bukkit.Sound; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; @@ -557,8 +558,8 @@ public void run() { * @param radius * the radius */ - public void playParticleEffect(String effectName, int data, int particles, int radius) { - Player player = Bukkit.getPlayer(java.util.UUID.fromString(uuid)); + public void playEffect(String effectName, int data, int particles, int radius) { + Player player = getPlayer(); if ((player != null) && (effectName != null)) { Effect effect = Effect.valueOf(effectName); for (int i = 0; i < particles; i++) { @@ -567,6 +568,22 @@ public void playParticleEffect(String effectName, int data, int particles, int r } } + + @Deprecated + public void playParticleEffect(String effectName, int data, int particles, int radius) { + playParticle(effectName, data, particles, radius); + } + + public void playParticle(String effectName, int data, int particles, int radius) { + Player player = getPlayer(); + if ((player != null) && (effectName != null)) { + Particle effect = Particle.valueOf(effectName); + for (int i = 0; i < particles; i++) { + player.getWorld().spawnParticle(effect, player.getLocation(), particles, radius, radius, radius, data); + } + + } + } /** * Play sound. From 69c5818af5154f0e58133d61b6820661f32c77dd Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Wed, 11 Oct 2017 08:50:49 -0400 Subject: [PATCH 24/35] Improvements, closes #87 --- AdvancedCore/Resources/Rewards/ExampleAdvanced.yml | 1 + .../com/Ben12345rocks/AdvancedCore/Objects/Reward.java | 5 ++++- .../AdvancedCore/Objects/RewardFileData.java | 4 ++++ .../src/com/Ben12345rocks/AdvancedCore/Objects/User.java | 9 +++++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/AdvancedCore/Resources/Rewards/ExampleAdvanced.yml b/AdvancedCore/Resources/Rewards/ExampleAdvanced.yml index 45c77e2948..16d22b3ff8 100644 --- a/AdvancedCore/Resources/Rewards/ExampleAdvanced.yml +++ b/AdvancedCore/Resources/Rewards/ExampleAdvanced.yml @@ -179,6 +179,7 @@ Effect: Data: 0 Particles: 10 Radius: 5 + Speed: 1 Firework: Enabled: false diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java index 9fd531e480..d003755ce9 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java @@ -228,6 +228,8 @@ public class Reward { /** The effect particles. */ private int effectParticles; + + private int effectSpeed; /** The effect radius. */ private int effectRadius; @@ -1405,6 +1407,7 @@ public void loadValues() { effectData = getConfig().getEffectData(); effectParticles = getConfig().getEffectParticles(); effectRadius = getConfig().getEffectRadius(); + effectSpeed = getConfig().getEffectSpeed(); priority = getConfig().getPriority(); @@ -1460,7 +1463,7 @@ public void setForceOffline(boolean forceOffline) { */ public void playEffect(User user) { if (effectEnabled) { - user.playParticle(effectEffect, effectData, effectParticles, effectRadius); + user.playParticle(effectEffect, effectData, effectParticles, effectRadius,effectSpeed); } } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java index cadc7360b7..8f7e9118ca 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java @@ -258,6 +258,10 @@ public int getEffectParticles() { return getData().getInt("Effect.Particles"); } + public int getEffectSpeed() { + return getData().getInt("Effect.Speed", 1); + } + /** * Gets the effect radius. * diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java index 55f563b784..e89555d4fa 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java @@ -568,18 +568,19 @@ public void playEffect(String effectName, int data, int particles, int radius) { } } - + @Deprecated public void playParticleEffect(String effectName, int data, int particles, int radius) { - playParticle(effectName, data, particles, radius); + playParticle(effectName, data, particles, radius, 1); } - public void playParticle(String effectName, int data, int particles, int radius) { + public void playParticle(String effectName, int data, int particles, int radius, int speed) { Player player = getPlayer(); if ((player != null) && (effectName != null)) { Particle effect = Particle.valueOf(effectName); for (int i = 0; i < particles; i++) { - player.getWorld().spawnParticle(effect, player.getLocation(), particles, radius, radius, radius, data); + player.getWorld().spawnParticle(effect, player.getLocation(), particles, radius, radius, radius, speed, + data); } } From 4612b09ebfd5e650ab05780bc76fa042cf42c7cb Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Wed, 11 Oct 2017 09:16:26 -0400 Subject: [PATCH 25/35] Improvements to api --- .../AdvancedCore/Util/Item/ItemBuilder.java | 32 ++++++++++++++----- .../AdvancedCore/Util/Misc/MiscUtils.java | 8 +++-- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java index 98c4e19908..4d9d44f967 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java @@ -310,25 +310,37 @@ private int getAmount() { } public ArrayList getLore() { - List lore = is.getItemMeta().getLore(); - ArrayList list = new ArrayList(); - if (lore != null) { - list.addAll(lore); + if (hasCustomLore()) { + List lore = is.getItemMeta().getLore(); + ArrayList list = new ArrayList(); + if (lore != null) { + list.addAll(lore); + } + return list; } - return list; + return new ArrayList(); } public String getName() { - return is.getItemMeta().getDisplayName(); + if (hasCustomDisplayName()) { + return is.getItemMeta().getDisplayName(); + } + return ""; } public boolean hasCustomDisplayName() { - return is.getItemMeta().hasDisplayName(); + if (hasItemMeta()) { + return is.getItemMeta().hasDisplayName(); + } + return false; } public boolean hasCustomLore() { - return is.getItemMeta().hasLore(); + if (hasItemMeta()) { + return is.getItemMeta().hasLore(); + } + return false; } /** @@ -562,6 +574,10 @@ public ItemBuilder setSkullOwner(OfflinePlayer offlinePlayer) { return this; } + public boolean hasItemMeta() { + return is.hasItemMeta(); + } + public ItemBuilder setSlot(int slot) { this.slot = slot; return this; diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java index c6b371e25d..23ffbe7cce 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java @@ -267,8 +267,12 @@ public ItemStack setSkullOwner(String playerName) { } public ItemStack setSkullOwner(OfflinePlayer player) { - return new ItemBuilder(new ItemStack(Material.SKULL_ITEM, 1, (short) 3)).setSkullOwner(player) - .toItemStack(player); + if ((player.hasPlayedBefore() || player.isOnline()) || Bukkit.getOnlineMode()) { + return new ItemBuilder(new ItemStack(Material.SKULL_ITEM, 1, (short) 3)).setSkullOwner(player) + .toItemStack(player); + } else { + return setSkullOwner(player.getName()); + } } } From e2676e6de77af02faa6759ef01ea3e79a321c113 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Wed, 11 Oct 2017 09:23:09 -0400 Subject: [PATCH 26/35] Add debug to see server online mode --- .../src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java index abce60fc9b..9ff0009bc1 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java @@ -513,6 +513,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"); + } } /** From 020942fedbf509d3cb9b5b385e6927ca05003170 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Wed, 11 Oct 2017 09:28:00 -0400 Subject: [PATCH 27/35] Minor change --- .../AdvancedCore/Util/Effects/FireworkHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java index 41562600ea..1c2e660e22 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java @@ -123,7 +123,7 @@ public void onFireworkDamage(EntityDamageByEntityEvent event) { } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) - public void onFireworkDamage(FireworkExplodeEvent event) { + public void onFireworkExplode(FireworkExplodeEvent event) { if (event.getEntity() instanceof Firework) { Firework fw = (Firework) event.getEntity(); if (fireWorks.contains(fw)) { From 8e4e423f386d9022137e3f58f5ff4fa8e6a421b1 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Wed, 11 Oct 2017 20:12:47 -0400 Subject: [PATCH 28/35] Code cleanup & bug fix --- .../AdvancedCore/AdvancedCoreHook.java | 127 +-- .../Executor/CommandAdvancedCore.java | 4 +- .../TabComplete/AdvancedCoreTabCompleter.java | 36 +- .../AdvancedCore/Data/ServerData.java | 10 +- .../Listeners/DateChangedEvent.java | 22 +- .../Listeners/PlayerJoinEvent.java | 2 +- .../AdvancedCore/Objects/CommandHandler.java | 60 +- .../AdvancedCore/Objects/Reward.java | 186 ++--- .../AdvancedCore/Objects/RewardBuilder.java | 38 +- .../AdvancedCore/Objects/RewardFileData.java | 58 +- .../AdvancedCore/Objects/RewardHandler.java | 26 +- .../AdvancedCore/Objects/User.java | 80 +- .../AdvancedCore/Objects/UserData.java | 18 +- .../AdvancedCore/Objects/UserStorage.java | 4 +- .../AdvancedCore/TimeChecker/TimeChecker.java | 36 +- .../AdvancedCore/TimeChecker/TimeType.java | 4 +- .../AdvancedCore/UserManager/UserManager.java | 40 +- .../AInventory1_7_R4Handler.java | 3 +- .../AInventoryReflectionHandler.java | 3 +- .../Util/Effects/FireworkHandler.java | 6 +- .../V1_10AndBelowTitleVersionHandle.java | 5 +- .../Util/Inventory/BInventory.java | 67 +- .../Util/Inventory/BInventoryButton.java | 2 +- .../AdvancedCore/Util/Item/ItemBuilder.java | 70 +- .../Util/Javascript/JavascriptEngine.java | 34 +- .../Util/Metrics/BStatsMetrics.java | 746 ++++++++++++------ .../AdvancedCore/Util/Misc/ArrayUtils.java | 44 +- .../Util/Misc/CompatibleCacheBuilder.java | 175 ++-- .../AdvancedCore/Util/Misc/MiscUtils.java | 54 +- .../AdvancedCore/Util/Misc/PlayerUtils.java | 20 +- .../AdvancedCore/Util/Misc/StringUtils.java | 32 +- .../Util/Prompt/PromptReturnString.java | 6 +- .../Requesters/NumberRequester.java | 5 +- .../Requesters/StringRequester.java | 5 +- .../ValueRequest/ValueRequestBuilder.java | 62 +- .../AdvancedCore/mysql/MySQL.java | 40 +- .../mysql/api/ConnectionManager.java | 10 +- .../mysql/api/queries/InsertQuery.java | 4 +- .../mysql/api/queries/UpdateQuery.java | 8 +- .../AdvancedCore/sql/DataType.java | 4 +- 40 files changed, 1187 insertions(+), 969 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java index 9ff0009bc1..d1c3d41dfc 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java @@ -93,49 +93,14 @@ public static AdvancedCoreHook getInstance() { private String prevPageTxt = "&aPrevious Page"; private String nextPageTxt = "&aNext Page"; - public String getPrevPageTxt() { - return prevPageTxt; - } - - public void setPrevPageTxt(String prevPageTxt) { - this.prevPageTxt = prevPageTxt; - } - - public String getNextPageTxt() { - return nextPageTxt; - } - - public void setNextPageTxt(String nextPageTxt) { - this.nextPageTxt = nextPageTxt; - } - - 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 HashMap javascriptEngine = new HashMap(); /** 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() { } @@ -287,6 +252,10 @@ public Logger getLogger() { return logger; } + public int getMaxMysqlSize() { + return maxMysqlSize; + } + /** * @return the mysql */ @@ -294,6 +263,10 @@ public MySQL getMysql() { return mysql; } + public String getNextPageTxt() { + return nextPageTxt; + } + public String getPermPrefix() { return permPrefix; } @@ -306,6 +279,10 @@ public JavaPlugin getPlugin() { return plugin; } + public String getPrevPageTxt() { + return prevPageTxt; + } + /** * @return the resourceId */ @@ -345,6 +322,10 @@ public UserManager getUserManager() { return UserManager.getInstance(); } + public ConcurrentHashMap getUuids() { + return uuids; + } + /** * @return the version */ @@ -380,6 +361,10 @@ private YamlConfiguration getVersionFile() { return null; } + public boolean isAlternateUUIDLookUp() { + return alternateUUIDLookUp; + } + /** * @return the autoDownload */ @@ -387,6 +372,10 @@ public boolean isAutoDownload() { return autoDownload; } + public boolean isAutoKillInvs() { + return autoKillInvs; + } + public synchronized boolean isCheckOnWorldChange() { return checkOnWorldChange; } @@ -546,29 +535,6 @@ public void loadHook(JavaPlugin plugin) { debug("Using AdvancedCore '" + getVersion() + "' built on '" + getTime() + "'"); } - public ConcurrentHashMap getUuids() { - return uuids; - } - - private void loadUUIDs() { - uuids = new ConcurrentHashMap(); - 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 */ @@ -603,6 +569,25 @@ public void loadUserAPI(UserStorage storageType) { } } + private void loadUUIDs() { + uuids = new ConcurrentHashMap(); + 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"); @@ -648,6 +633,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 @@ -656,6 +645,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; } @@ -716,6 +709,10 @@ public void setLogDebugToFile(boolean logDebugToFile) { this.logDebugToFile = logDebugToFile; } + public void setMaxMysqlSize(int maxMysqlSize) { + this.maxMysqlSize = maxMysqlSize; + } + /** * @param mysql * the mysql to set @@ -728,6 +725,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; } @@ -740,6 +741,10 @@ public void setPreloadUsers(boolean preloadUsers) { this.preloadUsers = preloadUsers; } + public void setPrevPageTxt(String prevPageTxt) { + this.prevPageTxt = prevPageTxt; + } + /** * @param resourceId * the resourceId to set @@ -790,8 +795,4 @@ private boolean setupPermissions() { public void update() { TimeChecker.getInstance().update(); } - - public boolean isAlternateUUIDLookUp() { - return alternateUUIDLookUp; - } } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/Executor/CommandAdvancedCore.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/Executor/CommandAdvancedCore.java index 78db81f7cf..ca2bccf6ab 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/Executor/CommandAdvancedCore.java +++ b/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 diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/TabComplete/AdvancedCoreTabCompleter.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/TabComplete/AdvancedCoreTabCompleter.java index 191ccc0def..17fa6a71da 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/TabComplete/AdvancedCoreTabCompleter.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Commands/TabComplete/AdvancedCoreTabCompleter.java @@ -34,24 +34,22 @@ public ArrayList 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 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) { diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Data/ServerData.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Data/ServerData.java index d35f320b2a..af179a81b4 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Data/ServerData.java +++ b/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(); - } } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/DateChangedEvent.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/DateChangedEvent.java index 2aa9e4d6d1..cdaed98561 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/DateChangedEvent.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/DateChangedEvent.java @@ -23,12 +23,22 @@ public static HandlerList getHandlerList() { return handlers; } + private TimeType timeType; + public DateChangedEvent(TimeType time) { super(true); this.timeType = time; } - private TimeType timeType; + /* + * (non-Javadoc) + * + * @see org.bukkit.event.Event#getHandlers() + */ + @Override + public HandlerList getHandlers() { + return handlers; + } /** * @return the timeType @@ -45,14 +55,4 @@ public void setTimeType(TimeType timeType) { this.timeType = timeType; } - /* - * (non-Javadoc) - * - * @see org.bukkit.event.Event#getHandlers() - */ - @Override - public HandlerList getHandlers() { - return handlers; - } - } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/PlayerJoinEvent.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/PlayerJoinEvent.java index b37879c3eb..50bddd5f29 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/PlayerJoinEvent.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/PlayerJoinEvent.java @@ -70,7 +70,7 @@ public void onPlayerQuit(PlayerQuitEvent event) { /* * final String uuid = event.getPlayer().getPlayer().getUniqueId().toString(); * Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() { - * + * * @Override public void run() { if (Bukkit.getPlayer(UUID.fromString(uuid)) == * null) { if * (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) { diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java index cb425c138d..d14d09a13b 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/CommandHandler.java @@ -132,36 +132,6 @@ public void addTabCompleteOption(String toReplace, String... options) { addTabCompleteOption(toReplace, ArrayUtils.getInstance().convert(options)); } - public void sendMessage(CommandSender sender, ArrayList 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 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. * @@ -355,6 +325,10 @@ public boolean hasPerm(CommandSender sender) { return hasPerm; } + public boolean isPlayer(CommandSender sender) { + return sender instanceof Player; + } + /** * Load tab complete. */ @@ -453,6 +427,32 @@ public void run() { return false; } + public void sendMessage(CommandSender sender, ArrayList 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, ArrayList 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 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)); + } + } + /** * Sets the help message. * diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java index d003755ce9..4164defa1b 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java @@ -228,7 +228,7 @@ public class Reward { /** The effect particles. */ private int effectParticles; - + private int effectSpeed; /** The effect radius. */ @@ -242,20 +242,6 @@ public class Reward { private boolean onlyOneLucky; - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @return the priority - */ - public ArrayList getPriority() { - return priority; - } - private File file; private boolean randomPickRandom; @@ -282,6 +268,13 @@ public Reward(String reward) { load(new File(plugin.getPlugin().getDataFolder(), "Rewards"), reward); } + public boolean canGiveReward(User user) { + if (hasPermission(user) && checkChance()) { + return true; + } + return false; + } + /** * Check chance. * @@ -339,23 +332,6 @@ public boolean checkRandomChance() { return MiscUtils.getInstance().checkChance(getRandomChance(), 100); } - public void givePriorityReward(User user, final HashMap placeholders) { - for (String str : getPriority()) { - Reward reward = RewardHandler.getInstance().getReward(str); - if (reward.canGiveReward(user)) { - new RewardBuilder(reward).withPlaceHolder(placeholders).ignoreChance(true).send(user); - return; - } - } - } - - public boolean canGiveReward(User user) { - if (hasPermission(user) && checkChance()) { - return true; - } - return false; - } - /** * Check timed. * @@ -678,6 +654,13 @@ public ArrayList getJavascripts() { return javascripts; } + /** + * @return the luckyRewards + */ + public HashMap getLuckyRewards() { + return luckyRewards; + } + /** * Gets the max exp. * @@ -739,6 +722,13 @@ public int getMoneyToGive() { } } + /** + * @return the name + */ + public String getName() { + return name; + } + /** * Gets the permission. * @@ -784,6 +774,13 @@ public HashMap getPotionsDuration() { return potionsDuration; } + /** + * @return the priority + */ + public ArrayList getPriority() { + return priority; + } + /** * Gets the random chance. * @@ -946,6 +943,32 @@ public void giveItems(User user, HashMap placeholders) { } } + public void giveLucky(User user, HashMap placeholders) { + HashMap map = new LinkedHashMap(); + for (Entry entry : luckyRewards.entrySet()) { + if (MiscUtils.getInstance().checkChance(1, entry.getKey())) { + // new RewardBuilder(getConfig().getData(), + // entry.getValue()).withPlaceHolder(placeholders).send(user); + map.put(entry.getValue(), entry.getKey()); + } + } + + map = ArrayUtils.getInstance().sortByValuesStr(map, false); + if (map.size() > 0) { + if (isOnlyOneLucky()) { + for (Entry entry : map.entrySet()) { + new RewardBuilder(getConfig().getData(), entry.getKey()).withPlaceHolder(placeholders).send(user); + return; + } + + } else { + for (Entry entry : map.entrySet()) { + new RewardBuilder(getConfig().getData(), entry.getKey()).withPlaceHolder(placeholders).send(user); + } + } + } + } + /** * Give money. * @@ -971,6 +994,16 @@ public void givePotions(User user) { } } + public void givePriorityReward(User user, final HashMap placeholders) { + for (String str : getPriority()) { + Reward reward = RewardHandler.getInstance().getReward(str); + if (reward.canGiveReward(user)) { + new RewardBuilder(reward).withPlaceHolder(placeholders).ignoreChance(true).send(user); + return; + } + } + } + /** * Give random. * @@ -1024,11 +1057,6 @@ public void giveReward(User user, boolean online, boolean giveOffline, boolean c giveReward(user, online, giveOffline, checkTimed, null); } - public void giveReward(User user, boolean online, boolean giveOffline, boolean checkTimed, - HashMap placeholders) { - giveReward(user, online, giveOffline, checkTimed, false, placeholders); - } - public void giveReward(User user, boolean online, boolean giveOffline, boolean checkTimed, boolean ignoreChance, HashMap placeholders) { @@ -1060,6 +1088,11 @@ public void giveReward(User user, boolean online, boolean giveOffline, boolean c giveRewardReward(user, online, ignoreChance, placeholders); } + public void giveReward(User user, boolean online, boolean giveOffline, boolean checkTimed, + HashMap placeholders) { + giveReward(user, online, giveOffline, checkTimed, false, placeholders); + } + public void giveRewardReward(User user, boolean online, boolean ignoreChance, HashMap placeholders) { plugin.debug("Attempting to give " + user.getPlayerName() + " reward " + name); @@ -1082,32 +1115,6 @@ public void giveRewardReward(User user, boolean online, boolean ignoreChance, } } - public void giveLucky(User user, HashMap placeholders) { - HashMap map = new LinkedHashMap(); - for (Entry entry : luckyRewards.entrySet()) { - if (MiscUtils.getInstance().checkChance(1, entry.getKey())) { - // new RewardBuilder(getConfig().getData(), - // entry.getValue()).withPlaceHolder(placeholders).send(user); - map.put(entry.getValue(), entry.getKey()); - } - } - - map = ArrayUtils.getInstance().sortByValuesStr(map, false); - if (map.size() > 0) { - if (isOnlyOneLucky()) { - for (Entry entry : map.entrySet()) { - new RewardBuilder(getConfig().getData(), entry.getKey()).withPlaceHolder(placeholders).send(user); - return; - } - - } else { - for (Entry entry : map.entrySet()) { - new RewardBuilder(getConfig().getData(), entry.getKey()).withPlaceHolder(placeholders).send(user); - } - } - } - } - /** * Give reward user. * @@ -1232,6 +1239,13 @@ public boolean isFireworkTrail() { return fireworkTrail; } + /** + * @return the forceOffline + */ + public boolean isForceOffline() { + return forceOffline; + } + /** * Checks if is javascript enabled. * @@ -1241,6 +1255,13 @@ public boolean isJavascriptEnabled() { return javascriptEnabled; } + /** + * @return the onlyOneLucky + */ + public boolean isOnlyOneLucky() { + return onlyOneLucky; + } + /** * @return the randomPickRandom */ @@ -1426,35 +1447,6 @@ public void loadValues() { onlyOneLucky = getConfig().getOnlyOneLucky(); } - /** - * @return the luckyRewards - */ - public HashMap getLuckyRewards() { - return luckyRewards; - } - - /** - * @return the onlyOneLucky - */ - public boolean isOnlyOneLucky() { - return onlyOneLucky; - } - - /** - * @return the forceOffline - */ - public boolean isForceOffline() { - return forceOffline; - } - - /** - * @param forceOffline - * the forceOffline to set - */ - public void setForceOffline(boolean forceOffline) { - this.forceOffline = forceOffline; - } - /** * Play effect. * @@ -1463,7 +1455,7 @@ public void setForceOffline(boolean forceOffline) { */ public void playEffect(User user) { if (effectEnabled) { - user.playParticle(effectEffect, effectData, effectParticles, effectRadius,effectSpeed); + user.playParticle(effectEffect, effectData, effectParticles, effectRadius, effectSpeed); } } @@ -1928,6 +1920,14 @@ public void setFireworkTypes(ArrayList fireworkTypes) { this.fireworkTypes = fireworkTypes; } + /** + * @param forceOffline + * the forceOffline to set + */ + public void setForceOffline(boolean forceOffline) { + this.forceOffline = forceOffline; + } + /** * Sets the items. * diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java index 360ae3202f..384fd550ea 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardBuilder.java @@ -69,6 +69,11 @@ public Reward getReward() { return reward; } + public RewardBuilder ignoreChance(boolean ignoreChance) { + this.ignoreChance = ignoreChance; + return this; + } + /** * @return the checkTimed */ @@ -87,6 +92,20 @@ public boolean isOnline() { return online; } + public void send(ArrayList users) { + for (User user : users) { + send(user); + } + } + + public void send(OfflinePlayer p) { + send(UserManager.getInstance().getUser(p)); + } + + public void send(Player p) { + send(UserManager.getInstance().getUser(p)); + } + @SuppressWarnings("deprecation") public void send(User user) { if (reward == null) { @@ -97,26 +116,12 @@ public void send(User user) { ignoreChance, placeholders); } } - - public void send(Player p) { - send(UserManager.getInstance().getUser(p)); - } - - public void send(OfflinePlayer p) { - send(UserManager.getInstance().getUser(p)); - } public void send(User... users) { for (User user : users) { send(user); } } - - public void send(ArrayList users) { - for (User user : users) { - send(user); - } - } public RewardBuilder setCheckTimed(boolean b) { checkTimed = b; @@ -156,9 +161,4 @@ public RewardBuilder withPrefix(String prefix) { return this; } - public RewardBuilder ignoreChance(boolean ignoreChance) { - this.ignoreChance = ignoreChance; - return this; - } - } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java index 8f7e9118ca..6a92a1ebe2 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java @@ -88,10 +88,6 @@ public int getBossBarDelay() { return getData().getInt("BossBar.Delay"); } - public boolean getForceOffline() { - return getData().getBoolean("ForceOffline"); - } - public boolean getBossBarEnabled() { return getData().getBoolean("BossBar.Enabled"); } @@ -185,11 +181,6 @@ public FileConfiguration getData() { return data; } - @SuppressWarnings("unchecked") - public ArrayList getPriority() { - return (ArrayList) getData().getList("Priority", new ArrayList()); - } - /** * Gets the delayed enabled. * @@ -258,10 +249,6 @@ public int getEffectParticles() { return getData().getInt("Effect.Particles"); } - public int getEffectSpeed() { - return getData().getInt("Effect.Speed", 1); - } - /** * Gets the effect radius. * @@ -271,6 +258,10 @@ public int getEffectRadius() { return getData().getInt("Effect.Radius"); } + public int getEffectSpeed() { + return getData().getInt("Effect.Speed", 1); + } + /** * Gets the exp. * @@ -300,22 +291,6 @@ public ArrayList getFireworkColorsFadeOut() { return (ArrayList) getData().getList("Firework.FadeOutColor", new ArrayList()); } - public Set getLuckyRewards() { - if (getData().getConfigurationSection("Lucky") != null) { - return getData().getConfigurationSection("Lucky").getKeys(false); - } else { - return new HashSet(); - } - } - - public boolean getOnlyOneLucky() { - return getData().getBoolean("OnlyOneLucky"); - } - - public String getLuckyRewardsPath(int num) { - return "Lucky." + num; - } - /** * Gets the firework enabled. * @@ -362,6 +337,10 @@ public ArrayList getFireworkTypes() { return (ArrayList) getData().getList("Firework.Types", new ArrayList()); } + public boolean getForceOffline() { + return getData().getBoolean("ForceOffline"); + } + /** * Gets the item amount. * @@ -549,6 +528,18 @@ public String getJavascriptTrueRewardsPath() { return "Javascript.TrueRewards"; } + public Set getLuckyRewards() { + if (getData().getConfigurationSection("Lucky") != null) { + return getData().getConfigurationSection("Lucky").getKeys(false); + } else { + return new HashSet(); + } + } + + public String getLuckyRewardsPath(int num) { + return "Lucky." + num; + } + /** * Gets the max exp. * @@ -612,6 +603,10 @@ public int getMoney() { return getData().getInt("Money"); } + public boolean getOnlyOneLucky() { + return getData().getBoolean("OnlyOneLucky"); + } + /** * Gets the permission. * @@ -656,6 +651,11 @@ public int getPotionsDuration(String potion) { return getData().getInt("Potions." + potion + ".Duration"); } + @SuppressWarnings("unchecked") + public ArrayList getPriority() { + return (ArrayList) getData().getList("Priority", new ArrayList()); + } + /** * Gets the random chance. * diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardHandler.java index 7d8c5c0ef3..f859d13943 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardHandler.java @@ -266,24 +266,24 @@ public void run() { @Deprecated public void giveReward(User user, Reward reward, boolean online, boolean giveOffline, boolean checkTimed, - HashMap placeholders) { + boolean ignoreChance, HashMap placeholders) { Bukkit.getScheduler().runTaskAsynchronously(plugin.getPlugin(), new Runnable() { @Override public void run() { - reward.giveReward(user, online, giveOffline, checkTimed, placeholders); + reward.giveReward(user, online, giveOffline, checkTimed, ignoreChance, placeholders); } }); } @Deprecated public void giveReward(User user, Reward reward, boolean online, boolean giveOffline, boolean checkTimed, - boolean ignoreChance, HashMap placeholders) { + HashMap placeholders) { Bukkit.getScheduler().runTaskAsynchronously(plugin.getPlugin(), new Runnable() { @Override public void run() { - reward.giveReward(user, online, giveOffline, checkTimed, ignoreChance, placeholders); + reward.giveReward(user, online, giveOffline, checkTimed, placeholders); } }); } @@ -338,17 +338,17 @@ public void giveReward(User user, String reward, boolean online, boolean giveOff @Deprecated public void giveReward(User user, String reward, boolean online, boolean giveOffline, boolean checkTimed, - HashMap placeholders) { + boolean ignoreChance, HashMap placeholders) { if (!reward.equals("")) { - giveReward(user, getReward(reward), online, giveOffline, checkTimed, placeholders); + giveReward(user, getReward(reward), online, giveOffline, checkTimed, ignoreChance, placeholders); } } @Deprecated public void giveReward(User user, String reward, boolean online, boolean giveOffline, boolean checkTimed, - boolean ignoreChance, HashMap placeholders) { + HashMap placeholders) { if (!reward.equals("")) { - giveReward(user, getReward(reward), online, giveOffline, checkTimed, ignoreChance, placeholders); + giveReward(user, getReward(reward), online, giveOffline, checkTimed, placeholders); } } @@ -365,11 +365,6 @@ public void giveReward(User user, String prefix, FileConfiguration data, String giveReward(user, prefix, data, path, online, giveOffline, null); } - public void giveReward(User user, String prefix, FileConfiguration data, String path, boolean online, - boolean giveOffline, boolean checkTimed, HashMap placeholders) { - giveReward(user, prefix, data, path, online, giveOffline, checkTimed, false, placeholders); - } - @SuppressWarnings("unchecked") public void giveReward(User user, String prefix, FileConfiguration data, String path, boolean online, boolean giveOffline, boolean checkTimed, boolean ignoreChance, HashMap placeholders) { @@ -399,6 +394,11 @@ public void giveReward(User user, String prefix, FileConfiguration data, String } } + public void giveReward(User user, String prefix, FileConfiguration data, String path, boolean online, + boolean giveOffline, boolean checkTimed, HashMap placeholders) { + giveReward(user, prefix, data, path, online, giveOffline, checkTimed, false, placeholders); + } + public void giveReward(User user, String prefix, FileConfiguration data, String path, boolean online, boolean giveOffline, HashMap placeholders) { giveReward(user, prefix, data, path, online, giveOffline, true, placeholders); diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java index e89555d4fa..3084bf7492 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java @@ -142,17 +142,6 @@ public User(Plugin plugin, UUID uuid, boolean loadName, boolean loadData) { } - public boolean isVanished() { - Player player = getPlayer(); - if (player != null) { - for (MetadataValue meta : player.getMetadata("vanished")) { - if (meta.asBoolean()) - return true; - } - } - return false; - } - /** * Adds the choice reward. * @@ -230,6 +219,20 @@ public void checkOfflineRewards() { } } + public void closeInv() { + Bukkit.getScheduler().runTask(plugin, new Runnable() { + + @Override + public void run() { + Player player = getPlayer(); + if (player != null) { + player.closeInventory(); + } + } + }); + + } + public ArrayList getChoiceRewards() { return getUserData().getStringList("ChoiceRewards"); } @@ -242,6 +245,13 @@ public String getInputMethod() { return getUserData().getString("InputMethod"); } + public OfflinePlayer getOfflinePlayer() { + if (uuid != null && !uuid.equals("")) { + return Bukkit.getOfflinePlayer(java.util.UUID.fromString(uuid)); + } + return null; + } + public ArrayList getOfflineRewards() { return getUserData().getStringList("OfflineRewards"); } @@ -255,13 +265,6 @@ public Player getPlayer() { return Bukkit.getPlayer(java.util.UUID.fromString(uuid)); } - public OfflinePlayer getOfflinePlayer() { - if (uuid != null && !uuid.equals("")) { - return Bukkit.getOfflinePlayer(java.util.UUID.fromString(uuid)); - } - return null; - } - /** * Gets the player name. * @@ -511,10 +514,12 @@ public boolean hasPermission(String perm) { return player.hasPermission(perm); } - public void closeInv() { - Player player = getPlayer(); - if (player != null) { - player.closeInventory(); + public boolean isBanned() { + OfflinePlayer p = getOfflinePlayer(); + if (p != null) { + return p.isBanned(); + } else { + return false; } } @@ -527,6 +532,18 @@ public boolean isOnline() { return PlayerUtils.getInstance().isPlayerOnline(getPlayerName()); } + public boolean isVanished() { + Player player = getPlayer(); + if (player != null) { + for (MetadataValue meta : player.getMetadata("vanished")) { + if (meta.asBoolean()) { + return true; + } + } + } + return false; + } + public void loadData() { data = new UserData(this); } @@ -569,11 +586,6 @@ public void playEffect(String effectName, int data, int particles, int radius) { } } - @Deprecated - public void playParticleEffect(String effectName, int data, int particles, int radius) { - playParticle(effectName, data, particles, radius, 1); - } - public void playParticle(String effectName, int data, int particles, int radius, int speed) { Player player = getPlayer(); if ((player != null) && (effectName != null)) { @@ -586,6 +598,11 @@ public void playParticle(String effectName, int data, int particles, int radius, } } + @Deprecated + public void playParticleEffect(String effectName, int data, int particles, int radius) { + playParticle(effectName, data, particles, radius, 1); + } + /** * Play sound. * @@ -751,15 +768,6 @@ public void sendMessage(ArrayList msg) { sendMessage(ArrayUtils.getInstance().convert(msg)); } - public boolean isBanned() { - OfflinePlayer p = getOfflinePlayer(); - if (p != null) { - return p.isBanned(); - } else { - return false; - } - } - /** * Send message. * diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserData.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserData.java index f3a8310906..a03a44b69f 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserData.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserData.java @@ -149,10 +149,11 @@ public String getString(String key) { } } } - /*if (AdvancedCoreHook.getInstance().isExtraDebug()) { - AdvancedCoreHook.getInstance() - .debug("Extra: Failed to get string from: '" + key + "' for '" + user.getPlayerName() + "'"); - }*/ + /* + * if (AdvancedCoreHook.getInstance().isExtraDebug()) { + * AdvancedCoreHook.getInstance() .debug("Extra: Failed to get string from: '" + + * key + "' for '" + user.getPlayerName() + "'"); } + */ return ""; } @@ -174,10 +175,11 @@ public void setInt(final String key, final int value) { AdvancedCoreHook.getInstance().debug("No key: " + key + " to " + value); return; } - /*if (AdvancedCoreHook.getInstance().isExtraDebug()) { - AdvancedCoreHook.getInstance() - .debug("Extra: Setting " + key + " to '" + value + "' for '" + user.getPlayerName() + "'"); - }*/ + /* + * if (AdvancedCoreHook.getInstance().isExtraDebug()) { + * AdvancedCoreHook.getInstance() .debug("Extra: Setting " + key + " to '" + + * value + "' for '" + user.getPlayerName() + "'"); } + */ if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.SQLITE)) { ArrayList columns = new ArrayList(); Column primary = new Column("uuid", user.getUUID(), DataType.STRING); diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserStorage.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserStorage.java index dc100fed2d..62b377a42b 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserStorage.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/UserStorage.java @@ -1,9 +1,7 @@ package com.Ben12345rocks.AdvancedCore.Objects; public enum UserStorage { - FLAT, - SQLITE, - MYSQL; + FLAT, SQLITE, MYSQL; public static UserStorage value(String str) { for (UserStorage s : values()) { diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java index 41180108c6..ce37bb279c 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java @@ -39,6 +39,23 @@ public static TimeChecker getInstance() { private TimeChecker() { } + public void forceChanged(TimeType time) { + DateChangedEvent dateChanged = new DateChangedEvent(time); + plugin.getPlugin().getServer().getPluginManager().callEvent(dateChanged); + + if (time.equals(TimeType.DAY)) { + DayChangeEvent dayChange = new DayChangeEvent(); + plugin.getPlugin().getServer().getPluginManager().callEvent(dayChange); + } else if (time.equals(TimeType.WEEK)) { + WeekChangeEvent weekChange = new WeekChangeEvent(); + plugin.getPlugin().getServer().getPluginManager().callEvent(weekChange); + } else if (time.equals(TimeType.MONTH)) { + MonthChangeEvent monthChange = new MonthChangeEvent(); + plugin.getPlugin().getServer().getPluginManager().callEvent(monthChange); + } + + } + /** * Checks for day changed. * @@ -121,24 +138,5 @@ public void update() { forceChanged(TimeType.MONTH); } - } - - public void forceChanged(TimeType time) { - DateChangedEvent dateChanged = new DateChangedEvent(time); - plugin.getPlugin().getServer().getPluginManager().callEvent(dateChanged); - - if (time.equals(TimeType.DAY)) { - DayChangeEvent dayChange = new DayChangeEvent(); - plugin.getPlugin().getServer().getPluginManager().callEvent(dayChange); - } else if (time.equals(TimeType.WEEK)) { - WeekChangeEvent weekChange = new WeekChangeEvent(); - plugin.getPlugin().getServer().getPluginManager().callEvent(weekChange); - } else if (time.equals(TimeType.MONTH)) { - MonthChangeEvent monthChange = new MonthChangeEvent(); - plugin.getPlugin().getServer().getPluginManager().callEvent(monthChange); - } - - - } } \ No newline at end of file diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeType.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeType.java index 86be54242c..0889a645c0 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeType.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeType.java @@ -1,9 +1,7 @@ package com.Ben12345rocks.AdvancedCore.TimeChecker; public enum TimeType { - MONTH, - WEEK, - DAY; + MONTH, WEEK, DAY; public static TimeType getTimeType(String str) { for (TimeType time : TimeType.values()) { diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java index d243fbbecc..3b0aa63b61 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/UserManager/UserManager.java @@ -67,6 +67,15 @@ public ArrayList getAllUUIDs() { return new ArrayList(); } + public String getProperName(String name) { + for (String s : plugin.getUuids().keySet()) { + if (s.equalsIgnoreCase(name)) { + return s; + } + } + return name; + } + /** * Gets the user. * @@ -113,13 +122,21 @@ public User getUser(UUID uuid) { return new User(plugin.getPlugin(), uuid); } - public String getProperName(String name) { + public boolean userExist(String name) { for (String s : plugin.getUuids().keySet()) { if (s.equalsIgnoreCase(name)) { - return s; + return true; } } - return name; + + for (String uuid : getAllUUIDs()) { + User user = getUser(new UUID(uuid)); + if (user.getPlayerName().equalsIgnoreCase(name)) { + plugin.extraDebug("Found " + name + " in database"); + return true; + } + } + return false; } public boolean userExist(UUID uuid) { @@ -133,21 +150,4 @@ public boolean userExist(UUID uuid) { return false; } - - public boolean userExist(String name) { - for (String s : plugin.getUuids().keySet()) { - if (s.equalsIgnoreCase(name)) { - return true; - } - } - - for (String uuid : getAllUUIDs()) { - User user = getUser(new UUID(uuid)); - if (user.getPlayerName().equalsIgnoreCase(name)) { - plugin.extraDebug("Found " + name + " in database"); - return true; - } - } - return false; - } } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/AnvilInventory/VersionHandler/AInventory1_7_R4Handler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/AnvilInventory/VersionHandler/AInventory1_7_R4Handler.java index d745c701ce..eec7ab1713 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/AnvilInventory/VersionHandler/AInventory1_7_R4Handler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/AnvilInventory/VersionHandler/AInventory1_7_R4Handler.java @@ -57,8 +57,7 @@ public void loadClasses() { * (non-Javadoc) * * @see com.Ben12345rocks.AdvancedCore.Util.AnvilInventory.VersionHandler. - * AInventoryVersionHandler#open(org.bukkit.entity.Player, - * java.util.HashMap) + * AInventoryVersionHandler#open(org.bukkit.entity.Player, java.util.HashMap) */ @Override public void open(Player player, HashMap items) { diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/AnvilInventory/VersionHandler/AInventoryReflectionHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/AnvilInventory/VersionHandler/AInventoryReflectionHandler.java index 0d92be1f13..faef55a349 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/AnvilInventory/VersionHandler/AInventoryReflectionHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/AnvilInventory/VersionHandler/AInventoryReflectionHandler.java @@ -81,8 +81,7 @@ public void loadClasses() { * (non-Javadoc) * * @see com.Ben12345rocks.AdvancedCore.Util.AnvilInventory.VersionHandler. - * AInventoryVersionHandler#open(org.bukkit.entity.Player, - * java.util.HashMap) + * AInventoryVersionHandler#open(org.bukkit.entity.Player, java.util.HashMap) */ @Override public void open(Player player, HashMap items) { diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java index 1c2e660e22..ad38b11ae7 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/FireworkHandler.java @@ -25,8 +25,6 @@ public class FireworkHandler implements Listener { /** The instance. */ static FireworkHandler instance = new FireworkHandler(); - private ConcurrentLinkedQueue fireWorks = new ConcurrentLinkedQueue(); - /** * Gets the single instance of FireworkHandler. * @@ -36,6 +34,8 @@ public static FireworkHandler getInstance() { return instance; } + private ConcurrentLinkedQueue fireWorks = new ConcurrentLinkedQueue(); + /** The plugin. */ AdvancedCoreHook plugin = AdvancedCoreHook.getInstance(); @@ -125,7 +125,7 @@ public void onFireworkDamage(EntityDamageByEntityEvent event) { @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onFireworkExplode(FireworkExplodeEvent event) { if (event.getEntity() instanceof Firework) { - Firework fw = (Firework) event.getEntity(); + Firework fw = event.getEntity(); if (fireWorks.contains(fw)) { Bukkit.getScheduler().runTaskLaterAsynchronously(plugin.getPlugin(), new Runnable() { diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/VersionHandler/V1_10AndBelowTitleVersionHandle.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/VersionHandler/V1_10AndBelowTitleVersionHandle.java index f36bfd72ce..d8b8d126a1 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/VersionHandler/V1_10AndBelowTitleVersionHandle.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Effects/VersionHandler/V1_10AndBelowTitleVersionHandle.java @@ -257,9 +257,8 @@ public void updateTimes(Player player, int fadeInTime, int stayTime, int fadeOut Object connection = getField(handle.getClass(), "playerConnection").get(handle); Object[] actions = packetActions.getEnumConstants(); Method sendPacket = getMethod(connection.getClass(), "sendPacket"); - Object packet = packetTitle - .getConstructor(new Class[] { packetActions, chatBaseComponent, Integer.TYPE, Integer.TYPE, - Integer.TYPE }) + Object packet = packetTitle.getConstructor( + new Class[] { packetActions, chatBaseComponent, Integer.TYPE, Integer.TYPE, Integer.TYPE }) .newInstance(new Object[] { actions[2], null, Integer.valueOf(fadeInTime * (ticks ? 1 : 20)), Integer.valueOf(stayTime * (ticks ? 1 : 20)), Integer.valueOf(fadeOutTime * (ticks ? 1 : 20)) }); diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java index 588f84b6a3..098b7eca4c 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventory.java @@ -34,9 +34,6 @@ */ public class BInventory implements Listener { - private ItemStack prevItem; - private ItemStack nextItem; - /** * The Class ClickEvent. */ @@ -193,6 +190,10 @@ public static void openInventory(Player player, BInventory inventory) { inventory.openInventory(player); } + private ItemStack prevItem; + + private ItemStack nextItem; + private ArrayList pageButtons = new ArrayList(); private int maxInvSize = 54; @@ -309,6 +310,13 @@ public int getMaxInvSize() { return maxInvSize; } + /** + * @return the nextItem + */ + public ItemStack getNextItem() { + return nextItem; + } + /** * Gets the next slot. * @@ -328,6 +336,13 @@ public ArrayList getPageButtons() { return pageButtons; } + /** + * @return the prevItem + */ + public ItemStack getPrevItem() { + return prevItem; + } + private int getProperSize(int size) { if (size < 9) { return 9; @@ -568,36 +583,6 @@ public void run() { }); } - /** - * @return the prevItem - */ - public ItemStack getPrevItem() { - return prevItem; - } - - /** - * @param prevItem - * the prevItem to set - */ - public void setPrevItem(ItemStack prevItem) { - this.prevItem = prevItem; - } - - /** - * @return the nextItem - */ - public ItemStack getNextItem() { - return nextItem; - } - - /** - * @param nextItem - * the nextItem to set - */ - public void setNextItem(ItemStack nextItem) { - this.nextItem = nextItem; - } - /** * Sets the inventory name. * @@ -630,6 +615,14 @@ public void setMeta(Player player, String str, Object ob) { PlayerUtils.getInstance().setPlayerMeta(player, str, ob); } + /** + * @param nextItem + * the nextItem to set + */ + public void setNextItem(ItemStack nextItem) { + this.nextItem = nextItem; + } + /** * @param pageButtons * the pageButtons to set @@ -646,4 +639,12 @@ public void setPages(boolean pages) { this.pages = pages; } + /** + * @param prevItem + * the prevItem to set + */ + public void setPrevItem(ItemStack prevItem) { + this.prevItem = prevItem; + } + } \ No newline at end of file diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventoryButton.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventoryButton.java index 7762e5fa13..923ba9a2ba 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventoryButton.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Inventory/BInventoryButton.java @@ -55,7 +55,7 @@ public ItemBuilder getBuilder() { * Gets the item. * * @return the item - * + * * @deprecated Use getItem(Player player) */ @Deprecated diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java index 4d9d44f967..0c158e3ba7 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java @@ -329,20 +329,6 @@ public String getName() { return ""; } - public boolean hasCustomDisplayName() { - if (hasItemMeta()) { - return is.getItemMeta().hasDisplayName(); - } - return false; - } - - public boolean hasCustomLore() { - if (hasItemMeta()) { - return is.getItemMeta().hasLore(); - } - return false; - } - /** * @return the skull */ @@ -376,6 +362,24 @@ public int getSlot() { return slot; } + public boolean hasCustomDisplayName() { + if (hasItemMeta()) { + return is.getItemMeta().hasDisplayName(); + } + return false; + } + + public boolean hasCustomLore() { + if (hasItemMeta()) { + return is.getItemMeta().hasLore(); + } + return false; + } + + public boolean hasItemMeta() { + return is.hasItemMeta(); + } + /** * Remove a certain enchant from the item. * @@ -544,6 +548,18 @@ public ItemBuilder setPlaceholders(HashMap placeholders) { return this; } + public ItemBuilder setSkullOwner(OfflinePlayer offlinePlayer) { + if (offlinePlayer != null) { + try { + SkullMeta im = (SkullMeta) is.getItemMeta(); + im.setOwningPlayer(offlinePlayer); + is.setItemMeta(im); + } catch (ClassCastException expected) { + } + } + return this; + } + /** * Set the skull owner for the item. Works on skulls only. * @@ -562,22 +578,6 @@ public ItemBuilder setSkullOwner(String owner) { return this; } - public ItemBuilder setSkullOwner(OfflinePlayer offlinePlayer) { - if (offlinePlayer != null) { - try { - SkullMeta im = (SkullMeta) is.getItemMeta(); - im.setOwningPlayer(offlinePlayer); - is.setItemMeta(im); - } catch (ClassCastException expected) { - } - } - return this; - } - - public boolean hasItemMeta() { - return is.hasItemMeta(); - } - public ItemBuilder setSlot(int slot) { this.slot = slot; return this; @@ -587,7 +587,7 @@ public ItemBuilder setSlot(int slot) { * Retrieves the itemstack from the ItemBuilder. * * @return The itemstack created/modified by the ItemBuilder instance. - * + * * @deprecated Use toItemStack(Player player) */ @Deprecated @@ -601,10 +601,6 @@ public ItemStack toItemStack() { return is; } - public ItemStack toItemStack(Player player) { - return toItemStack((OfflinePlayer) player); - } - public ItemStack toItemStack(OfflinePlayer player) { if (player != null) { if (!placeholders.isEmpty()) { @@ -621,4 +617,8 @@ public ItemStack toItemStack(OfflinePlayer player) { } return is; } + + public ItemStack toItemStack(Player player) { + return toItemStack((OfflinePlayer) player); + } } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Javascript/JavascriptEngine.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Javascript/JavascriptEngine.java index 828e37d5da..52891d4c7f 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Javascript/JavascriptEngine.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Javascript/JavascriptEngine.java @@ -28,6 +28,23 @@ public JavascriptEngine addPlayer(CommandSender player) { return this; } + public JavascriptEngine addPlayer(OfflinePlayer player) { + addToEngine("Player", player); + addToEngine("PlayerName", player.getName()); + addToEngine("PlayerUUID", player.getUniqueId().toString()); + addToEngine("AdvancedCoreUser", UserManager.getInstance().getUser(player)); + addToEngine("CommandSender", player); + + for (JavascriptPlaceholderRequest request : AdvancedCoreHook.getInstance().getJavascriptEngineRequests()) { + addToEngine(request.getStr(), request.getObject(player)); + } + + if (player.isOnline()) { + return addPlayer(player.getPlayer()); + } + return this; + } + public JavascriptEngine addPlayer(Player player) { addToEngine("Player", player); addToEngine("PlayerName", player.getName()); @@ -104,21 +121,4 @@ public String getStringValue(String expression) { } return ""; } - - public JavascriptEngine addPlayer(OfflinePlayer player) { - addToEngine("Player", player); - addToEngine("PlayerName", player.getName()); - addToEngine("PlayerUUID", player.getUniqueId().toString()); - addToEngine("AdvancedCoreUser", UserManager.getInstance().getUser(player)); - addToEngine("CommandSender", player); - - for (JavascriptPlaceholderRequest request : AdvancedCoreHook.getInstance().getJavascriptEngineRequests()) { - addToEngine(request.getStr(), request.getObject(player)); - } - - if (player.isOnline()) { - return addPlayer(player.getPlayer()); - } - return this; - } } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Metrics/BStatsMetrics.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Metrics/BStatsMetrics.java index df85c6666b..f7bd8d6542 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Metrics/BStatsMetrics.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Metrics/BStatsMetrics.java @@ -79,8 +79,8 @@ protected JSONObject getChartData() { * Gets the value of the chart. * * @param valueMap - * Just an empty map. The only reason it exists is to make - * your life easier. You don't have to create a map yourself! + * Just an empty map. The only reason it exists is to make your life + * easier. You don't have to create a map yourself! * @return The value of the chart. */ public abstract HashMap getValues(HashMap valueMap); @@ -132,8 +132,8 @@ protected JSONObject getChartData() { * Gets the values of the pie. * * @param valueMap - * Just an empty map. The only reason it exists is to make - * your life easier. You don't have to create a map yourself! + * Just an empty map. The only reason it exists is to make your life + * easier. You don't have to create a map yourself! * @return The values of the pie. */ public abstract HashMap getValues(HashMap valueMap); @@ -149,264 +149,486 @@ public enum Country { */ AUTO_DETECT("AUTO", "Auto Detected"), - ANDORRA("AD", "Andorra"), - UNITED_ARAB_EMIRATES("AE", "United Arab Emirates"), - AFGHANISTAN("AF", "Afghanistan"), - ANTIGUA_AND_BARBUDA("AG", "Antigua and Barbuda"), - ANGUILLA("AI", "Anguilla"), - ALBANIA("AL", "Albania"), - ARMENIA("AM", "Armenia"), - NETHERLANDS_ANTILLES("AN", "Netherlands Antilles"), - ANGOLA("AO", "Angola"), - ANTARCTICA("AQ", "Antarctica"), - ARGENTINA("AR", "Argentina"), - AMERICAN_SAMOA("AS", "American Samoa"), - AUSTRIA("AT", "Austria"), - AUSTRALIA("AU", "Australia"), - ARUBA("AW", "Aruba"), - ÅLAND_ISLANDS("AX", "Åland Islands"), - AZERBAIJAN("AZ", "Azerbaijan"), - BOSNIA_AND_HERZEGOVINA("BA", "Bosnia and Herzegovina"), - BARBADOS("BB", "Barbados"), - BANGLADESH("BD", "Bangladesh"), - BELGIUM("BE", "Belgium"), - BURKINA_FASO("BF", "Burkina Faso"), - BULGARIA("BG", "Bulgaria"), - BAHRAIN("BH", "Bahrain"), - BURUNDI("BI", "Burundi"), - BENIN("BJ", "Benin"), - SAINT_BARTHÉLEMY("BL", "Saint Barthélemy"), - BERMUDA("BM", "Bermuda"), - BRUNEI("BN", "Brunei"), - BOLIVIA("BO", "Bolivia"), - BONAIRE_SINT_EUSTATIUS_AND_SABA("BQ", "Bonaire, Sint Eustatius and Saba"), - BRAZIL("BR", "Brazil"), - BAHAMAS("BS", "Bahamas"), - BHUTAN("BT", "Bhutan"), - BOUVET_ISLAND("BV", "Bouvet Island"), - BOTSWANA("BW", "Botswana"), - BELARUS("BY", "Belarus"), - BELIZE("BZ", "Belize"), - CANADA("CA", "Canada"), - COCOS_ISLANDS("CC", "Cocos Islands"), - THE_DEMOCRATIC_REPUBLIC_OF_CONGO("CD", "The Democratic Republic Of Congo"), - CENTRAL_AFRICAN_REPUBLIC("CF", "Central African Republic"), - CONGO("CG", "Congo"), - SWITZERLAND("CH", "Switzerland"), - CÔTE_D_IVOIRE("CI", "Côte d'Ivoire"), - COOK_ISLANDS("CK", "Cook Islands"), - CHILE("CL", "Chile"), - CAMEROON("CM", "Cameroon"), - CHINA("CN", "China"), - COLOMBIA("CO", "Colombia"), - COSTA_RICA("CR", "Costa Rica"), - CUBA("CU", "Cuba"), - CAPE_VERDE("CV", "Cape Verde"), - CURAÇAO("CW", "Curaçao"), - CHRISTMAS_ISLAND("CX", "Christmas Island"), - CYPRUS("CY", "Cyprus"), - CZECH_REPUBLIC("CZ", "Czech Republic"), - GERMANY("DE", "Germany"), - DJIBOUTI("DJ", "Djibouti"), - DENMARK("DK", "Denmark"), - DOMINICA("DM", "Dominica"), - DOMINICAN_REPUBLIC("DO", "Dominican Republic"), - ALGERIA("DZ", "Algeria"), - ECUADOR("EC", "Ecuador"), - ESTONIA("EE", "Estonia"), - EGYPT("EG", "Egypt"), - WESTERN_SAHARA("EH", "Western Sahara"), - ERITREA("ER", "Eritrea"), - SPAIN("ES", "Spain"), - ETHIOPIA("ET", "Ethiopia"), - FINLAND("FI", "Finland"), - FIJI("FJ", "Fiji"), - FALKLAND_ISLANDS("FK", "Falkland Islands"), - MICRONESIA("FM", "Micronesia"), - FAROE_ISLANDS("FO", "Faroe Islands"), - FRANCE("FR", "France"), - GABON("GA", "Gabon"), - UNITED_KINGDOM("GB", "United Kingdom"), - GRENADA("GD", "Grenada"), - GEORGIA("GE", "Georgia"), - FRENCH_GUIANA("GF", "French Guiana"), - GUERNSEY("GG", "Guernsey"), - GHANA("GH", "Ghana"), - GIBRALTAR("GI", "Gibraltar"), - GREENLAND("GL", "Greenland"), - GAMBIA("GM", "Gambia"), - GUINEA("GN", "Guinea"), - GUADELOUPE("GP", "Guadeloupe"), - EQUATORIAL_GUINEA("GQ", "Equatorial Guinea"), - GREECE("GR", "Greece"), - SOUTH_GEORGIA_AND_THE_SOUTH_SANDWICH_ISLANDS("GS", "South Georgia And The South Sandwich Islands"), - GUATEMALA("GT", "Guatemala"), - GUAM("GU", "Guam"), - GUINEA_BISSAU("GW", "Guinea-Bissau"), - GUYANA("GY", "Guyana"), - HONG_KONG("HK", "Hong Kong"), - HEARD_ISLAND_AND_MCDONALD_ISLANDS("HM", "Heard Island And McDonald Islands"), - HONDURAS("HN", "Honduras"), - CROATIA("HR", "Croatia"), - HAITI("HT", "Haiti"), - HUNGARY("HU", "Hungary"), - INDONESIA("ID", "Indonesia"), - IRELAND("IE", "Ireland"), - ISRAEL("IL", "Israel"), - ISLE_OF_MAN("IM", "Isle Of Man"), - INDIA("IN", "India"), - BRITISH_INDIAN_OCEAN_TERRITORY("IO", "British Indian Ocean Territory"), - IRAQ("IQ", "Iraq"), - IRAN("IR", "Iran"), - ICELAND("IS", "Iceland"), - ITALY("IT", "Italy"), - JERSEY("JE", "Jersey"), - JAMAICA("JM", "Jamaica"), - JORDAN("JO", "Jordan"), - JAPAN("JP", "Japan"), - KENYA("KE", "Kenya"), - KYRGYZSTAN("KG", "Kyrgyzstan"), - CAMBODIA("KH", "Cambodia"), - KIRIBATI("KI", "Kiribati"), - COMOROS("KM", "Comoros"), - SAINT_KITTS_AND_NEVIS("KN", "Saint Kitts And Nevis"), - NORTH_KOREA("KP", "North Korea"), - SOUTH_KOREA("KR", "South Korea"), - KUWAIT("KW", "Kuwait"), - CAYMAN_ISLANDS("KY", "Cayman Islands"), - KAZAKHSTAN("KZ", "Kazakhstan"), - LAOS("LA", "Laos"), - LEBANON("LB", "Lebanon"), - SAINT_LUCIA("LC", "Saint Lucia"), - LIECHTENSTEIN("LI", "Liechtenstein"), - SRI_LANKA("LK", "Sri Lanka"), - LIBERIA("LR", "Liberia"), - LESOTHO("LS", "Lesotho"), - LITHUANIA("LT", "Lithuania"), - LUXEMBOURG("LU", "Luxembourg"), - LATVIA("LV", "Latvia"), - LIBYA("LY", "Libya"), - MOROCCO("MA", "Morocco"), - MONACO("MC", "Monaco"), - MOLDOVA("MD", "Moldova"), - MONTENEGRO("ME", "Montenegro"), - SAINT_MARTIN("MF", "Saint Martin"), - MADAGASCAR("MG", "Madagascar"), - MARSHALL_ISLANDS("MH", "Marshall Islands"), - MACEDONIA("MK", "Macedonia"), - MALI("ML", "Mali"), - MYANMAR("MM", "Myanmar"), - MONGOLIA("MN", "Mongolia"), - MACAO("MO", "Macao"), - NORTHERN_MARIANA_ISLANDS("MP", "Northern Mariana Islands"), - MARTINIQUE("MQ", "Martinique"), - MAURITANIA("MR", "Mauritania"), - MONTSERRAT("MS", "Montserrat"), - MALTA("MT", "Malta"), - MAURITIUS("MU", "Mauritius"), - MALDIVES("MV", "Maldives"), - MALAWI("MW", "Malawi"), - MEXICO("MX", "Mexico"), - MALAYSIA("MY", "Malaysia"), - MOZAMBIQUE("MZ", "Mozambique"), - NAMIBIA("NA", "Namibia"), - NEW_CALEDONIA("NC", "New Caledonia"), - NIGER("NE", "Niger"), - NORFOLK_ISLAND("NF", "Norfolk Island"), - NIGERIA("NG", "Nigeria"), - NICARAGUA("NI", "Nicaragua"), - NETHERLANDS("NL", "Netherlands"), - NORWAY("NO", "Norway"), - NEPAL("NP", "Nepal"), - NAURU("NR", "Nauru"), - NIUE("NU", "Niue"), - NEW_ZEALAND("NZ", "New Zealand"), - OMAN("OM", "Oman"), - PANAMA("PA", "Panama"), - PERU("PE", "Peru"), - FRENCH_POLYNESIA("PF", "French Polynesia"), - PAPUA_NEW_GUINEA("PG", "Papua New Guinea"), - PHILIPPINES("PH", "Philippines"), - PAKISTAN("PK", "Pakistan"), - POLAND("PL", "Poland"), - SAINT_PIERRE_AND_MIQUELON("PM", "Saint Pierre And Miquelon"), - PITCAIRN("PN", "Pitcairn"), - PUERTO_RICO("PR", "Puerto Rico"), - PALESTINE("PS", "Palestine"), - PORTUGAL("PT", "Portugal"), - PALAU("PW", "Palau"), - PARAGUAY("PY", "Paraguay"), - QATAR("QA", "Qatar"), - REUNION("RE", "Reunion"), - ROMANIA("RO", "Romania"), - SERBIA("RS", "Serbia"), - RUSSIA("RU", "Russia"), - RWANDA("RW", "Rwanda"), - SAUDI_ARABIA("SA", "Saudi Arabia"), - SOLOMON_ISLANDS("SB", "Solomon Islands"), - SEYCHELLES("SC", "Seychelles"), - SUDAN("SD", "Sudan"), - SWEDEN("SE", "Sweden"), - SINGAPORE("SG", "Singapore"), - SAINT_HELENA("SH", "Saint Helena"), - SLOVENIA("SI", "Slovenia"), - SVALBARD_AND_JAN_MAYEN("SJ", "Svalbard And Jan Mayen"), - SLOVAKIA("SK", "Slovakia"), - SIERRA_LEONE("SL", "Sierra Leone"), - SAN_MARINO("SM", "San Marino"), - SENEGAL("SN", "Senegal"), - SOMALIA("SO", "Somalia"), - SURINAME("SR", "Suriname"), - SOUTH_SUDAN("SS", "South Sudan"), - SAO_TOME_AND_PRINCIPE("ST", "Sao Tome And Principe"), - EL_SALVADOR("SV", "El Salvador"), - SINT_MAARTEN_DUTCH_PART("SX", "Sint Maarten (Dutch part)"), - SYRIA("SY", "Syria"), - SWAZILAND("SZ", "Swaziland"), - TURKS_AND_CAICOS_ISLANDS("TC", "Turks And Caicos Islands"), - CHAD("TD", "Chad"), - FRENCH_SOUTHERN_TERRITORIES("TF", "French Southern Territories"), - TOGO("TG", "Togo"), - THAILAND("TH", "Thailand"), - TAJIKISTAN("TJ", "Tajikistan"), - TOKELAU("TK", "Tokelau"), - TIMOR_LESTE("TL", "Timor-Leste"), - TURKMENISTAN("TM", "Turkmenistan"), - TUNISIA("TN", "Tunisia"), - TONGA("TO", "Tonga"), - TURKEY("TR", "Turkey"), - TRINIDAD_AND_TOBAGO("TT", "Trinidad and Tobago"), - TUVALU("TV", "Tuvalu"), - TAIWAN("TW", "Taiwan"), - TANZANIA("TZ", "Tanzania"), - UKRAINE("UA", "Ukraine"), - UGANDA("UG", "Uganda"), - UNITED_STATES_MINOR_OUTLYING_ISLANDS("UM", "United States Minor Outlying Islands"), - UNITED_STATES("US", "United States"), - URUGUAY("UY", "Uruguay"), - UZBEKISTAN("UZ", "Uzbekistan"), - VATICAN("VA", "Vatican"), - SAINT_VINCENT_AND_THE_GRENADINES("VC", "Saint Vincent And The Grenadines"), - VENEZUELA("VE", "Venezuela"), - BRITISH_VIRGIN_ISLANDS("VG", "British Virgin Islands"), - U_S__VIRGIN_ISLANDS("VI", "U.S. Virgin Islands"), - VIETNAM("VN", "Vietnam"), - VANUATU("VU", "Vanuatu"), - WALLIS_AND_FUTUNA("WF", "Wallis And Futuna"), - SAMOA("WS", "Samoa"), - YEMEN("YE", "Yemen"), - MAYOTTE("YT", "Mayotte"), - SOUTH_AFRICA("ZA", "South Africa"), - ZAMBIA("ZM", "Zambia"), - ZIMBABWE("ZW", "Zimbabwe"); + ANDORRA("AD", "Andorra"), UNITED_ARAB_EMIRATES("AE", "United Arab Emirates"), AFGHANISTAN("AF", + "Afghanistan"), ANTIGUA_AND_BARBUDA("AG", "Antigua and Barbuda"), ANGUILLA("AI", + "Anguilla"), ALBANIA("AL", "Albania"), ARMENIA("AM", "Armenia"), NETHERLANDS_ANTILLES("AN", + "Netherlands Antilles"), ANGOLA("AO", "Angola"), ANTARCTICA("AQ", + "Antarctica"), ARGENTINA("AR", "Argentina"), AMERICAN_SAMOA("AS", + "American Samoa"), AUSTRIA("AT", "Austria"), AUSTRALIA("AU", + "Australia"), ARUBA("AW", "Aruba"), ÅLAND_ISLANDS("AX", + "Åland Islands"), AZERBAIJAN("AZ", + "Azerbaijan"), BOSNIA_AND_HERZEGOVINA("BA", + "Bosnia and Herzegovina"), BARBADOS( + "BB", + "Barbados"), BANGLADESH("BD", + "Bangladesh"), BELGIUM( + "BE", + "Belgium"), BURKINA_FASO( + "BF", + "Burkina Faso"), BULGARIA( + "BG", + "Bulgaria"), BAHRAIN( + "BH", + "Bahrain"), BURUNDI( + "BI", + "Burundi"), BENIN( + "BJ", + "Benin"), SAINT_BARTHÉLEMY( + "BL", + "Saint Barthélemy"), BERMUDA( + "BM", + "Bermuda"), BRUNEI( + "BN", + "Brunei"), BOLIVIA( + "BO", + "Bolivia"), BONAIRE_SINT_EUSTATIUS_AND_SABA( + "BQ", + "Bonaire, Sint Eustatius and Saba"), BRAZIL( + "BR", + "Brazil"), BAHAMAS( + "BS", + "Bahamas"), BHUTAN( + "BT", + "Bhutan"), BOUVET_ISLAND( + "BV", + "Bouvet Island"), BOTSWANA( + "BW", + "Botswana"), BELARUS( + "BY", + "Belarus"), BELIZE( + "BZ", + "Belize"), CANADA( + "CA", + "Canada"), COCOS_ISLANDS( + "CC", + "Cocos Islands"), THE_DEMOCRATIC_REPUBLIC_OF_CONGO( + "CD", + "The Democratic Republic Of Congo"), CENTRAL_AFRICAN_REPUBLIC( + "CF", + "Central African Republic"), CONGO( + "CG", + "Congo"), SWITZERLAND( + "CH", + "Switzerland"), CÔTE_D_IVOIRE( + "CI", + "Côte d'Ivoire"), COOK_ISLANDS( + "CK", + "Cook Islands"), CHILE( + "CL", + "Chile"), CAMEROON( + "CM", + "Cameroon"), CHINA( + "CN", + "China"), COLOMBIA( + "CO", + "Colombia"), COSTA_RICA( + "CR", + "Costa Rica"), CUBA( + "CU", + "Cuba"), CAPE_VERDE( + "CV", + "Cape Verde"), CURAÇAO( + "CW", + "Curaçao"), CHRISTMAS_ISLAND( + "CX", + "Christmas Island"), CYPRUS( + "CY", + "Cyprus"), CZECH_REPUBLIC( + "CZ", + "Czech Republic"), GERMANY( + "DE", + "Germany"), DJIBOUTI( + "DJ", + "Djibouti"), DENMARK( + "DK", + "Denmark"), DOMINICA( + "DM", + "Dominica"), DOMINICAN_REPUBLIC( + "DO", + "Dominican Republic"), ALGERIA( + "DZ", + "Algeria"), ECUADOR( + "EC", + "Ecuador"), ESTONIA( + "EE", + "Estonia"), EGYPT( + "EG", + "Egypt"), WESTERN_SAHARA( + "EH", + "Western Sahara"), ERITREA( + "ER", + "Eritrea"), SPAIN( + "ES", + "Spain"), ETHIOPIA( + "ET", + "Ethiopia"), FINLAND( + "FI", + "Finland"), FIJI( + "FJ", + "Fiji"), FALKLAND_ISLANDS( + "FK", + "Falkland Islands"), MICRONESIA( + "FM", + "Micronesia"), FAROE_ISLANDS( + "FO", + "Faroe Islands"), FRANCE( + "FR", + "France"), GABON( + "GA", + "Gabon"), UNITED_KINGDOM( + "GB", + "United Kingdom"), GRENADA( + "GD", + "Grenada"), GEORGIA( + "GE", + "Georgia"), FRENCH_GUIANA( + "GF", + "French Guiana"), GUERNSEY( + "GG", + "Guernsey"), GHANA( + "GH", + "Ghana"), GIBRALTAR( + "GI", + "Gibraltar"), GREENLAND( + "GL", + "Greenland"), GAMBIA( + "GM", + "Gambia"), GUINEA( + "GN", + "Guinea"), GUADELOUPE( + "GP", + "Guadeloupe"), EQUATORIAL_GUINEA( + "GQ", + "Equatorial Guinea"), GREECE( + "GR", + "Greece"), SOUTH_GEORGIA_AND_THE_SOUTH_SANDWICH_ISLANDS( + "GS", + "South Georgia And The South Sandwich Islands"), GUATEMALA( + "GT", + "Guatemala"), GUAM( + "GU", + "Guam"), GUINEA_BISSAU( + "GW", + "Guinea-Bissau"), GUYANA( + "GY", + "Guyana"), HONG_KONG( + "HK", + "Hong Kong"), HEARD_ISLAND_AND_MCDONALD_ISLANDS( + "HM", + "Heard Island And McDonald Islands"), HONDURAS( + "HN", + "Honduras"), CROATIA( + "HR", + "Croatia"), HAITI( + "HT", + "Haiti"), HUNGARY( + "HU", + "Hungary"), INDONESIA( + "ID", + "Indonesia"), IRELAND( + "IE", + "Ireland"), ISRAEL( + "IL", + "Israel"), ISLE_OF_MAN( + "IM", + "Isle Of Man"), INDIA( + "IN", + "India"), BRITISH_INDIAN_OCEAN_TERRITORY( + "IO", + "British Indian Ocean Territory"), IRAQ( + "IQ", + "Iraq"), IRAN( + "IR", + "Iran"), ICELAND( + "IS", + "Iceland"), ITALY( + "IT", + "Italy"), JERSEY( + "JE", + "Jersey"), JAMAICA( + "JM", + "Jamaica"), JORDAN( + "JO", + "Jordan"), JAPAN( + "JP", + "Japan"), KENYA( + "KE", + "Kenya"), KYRGYZSTAN( + "KG", + "Kyrgyzstan"), CAMBODIA( + "KH", + "Cambodia"), KIRIBATI( + "KI", + "Kiribati"), COMOROS( + "KM", + "Comoros"), SAINT_KITTS_AND_NEVIS( + "KN", + "Saint Kitts And Nevis"), NORTH_KOREA( + "KP", + "North Korea"), SOUTH_KOREA( + "KR", + "South Korea"), KUWAIT( + "KW", + "Kuwait"), CAYMAN_ISLANDS( + "KY", + "Cayman Islands"), KAZAKHSTAN( + "KZ", + "Kazakhstan"), LAOS( + "LA", + "Laos"), LEBANON( + "LB", + "Lebanon"), SAINT_LUCIA( + "LC", + "Saint Lucia"), LIECHTENSTEIN( + "LI", + "Liechtenstein"), SRI_LANKA( + "LK", + "Sri Lanka"), LIBERIA( + "LR", + "Liberia"), LESOTHO( + "LS", + "Lesotho"), LITHUANIA( + "LT", + "Lithuania"), LUXEMBOURG( + "LU", + "Luxembourg"), LATVIA( + "LV", + "Latvia"), LIBYA( + "LY", + "Libya"), MOROCCO( + "MA", + "Morocco"), MONACO( + "MC", + "Monaco"), MOLDOVA( + "MD", + "Moldova"), MONTENEGRO( + "ME", + "Montenegro"), SAINT_MARTIN( + "MF", + "Saint Martin"), MADAGASCAR( + "MG", + "Madagascar"), MARSHALL_ISLANDS( + "MH", + "Marshall Islands"), MACEDONIA( + "MK", + "Macedonia"), MALI( + "ML", + "Mali"), MYANMAR( + "MM", + "Myanmar"), MONGOLIA( + "MN", + "Mongolia"), MACAO( + "MO", + "Macao"), NORTHERN_MARIANA_ISLANDS( + "MP", + "Northern Mariana Islands"), MARTINIQUE( + "MQ", + "Martinique"), MAURITANIA( + "MR", + "Mauritania"), MONTSERRAT( + "MS", + "Montserrat"), MALTA( + "MT", + "Malta"), MAURITIUS( + "MU", + "Mauritius"), MALDIVES( + "MV", + "Maldives"), MALAWI( + "MW", + "Malawi"), MEXICO( + "MX", + "Mexico"), MALAYSIA( + "MY", + "Malaysia"), MOZAMBIQUE( + "MZ", + "Mozambique"), NAMIBIA( + "NA", + "Namibia"), NEW_CALEDONIA( + "NC", + "New Caledonia"), NIGER( + "NE", + "Niger"), NORFOLK_ISLAND( + "NF", + "Norfolk Island"), NIGERIA( + "NG", + "Nigeria"), NICARAGUA( + "NI", + "Nicaragua"), NETHERLANDS( + "NL", + "Netherlands"), NORWAY( + "NO", + "Norway"), NEPAL( + "NP", + "Nepal"), NAURU( + "NR", + "Nauru"), NIUE( + "NU", + "Niue"), NEW_ZEALAND( + "NZ", + "New Zealand"), OMAN( + "OM", + "Oman"), PANAMA( + "PA", + "Panama"), PERU( + "PE", + "Peru"), FRENCH_POLYNESIA( + "PF", + "French Polynesia"), PAPUA_NEW_GUINEA( + "PG", + "Papua New Guinea"), PHILIPPINES( + "PH", + "Philippines"), PAKISTAN( + "PK", + "Pakistan"), POLAND( + "PL", + "Poland"), SAINT_PIERRE_AND_MIQUELON( + "PM", + "Saint Pierre And Miquelon"), PITCAIRN( + "PN", + "Pitcairn"), PUERTO_RICO( + "PR", + "Puerto Rico"), PALESTINE( + "PS", + "Palestine"), PORTUGAL( + "PT", + "Portugal"), PALAU( + "PW", + "Palau"), PARAGUAY( + "PY", + "Paraguay"), QATAR( + "QA", + "Qatar"), REUNION( + "RE", + "Reunion"), ROMANIA( + "RO", + "Romania"), SERBIA( + "RS", + "Serbia"), RUSSIA( + "RU", + "Russia"), RWANDA( + "RW", + "Rwanda"), SAUDI_ARABIA( + "SA", + "Saudi Arabia"), SOLOMON_ISLANDS( + "SB", + "Solomon Islands"), SEYCHELLES( + "SC", + "Seychelles"), SUDAN( + "SD", + "Sudan"), SWEDEN( + "SE", + "Sweden"), SINGAPORE( + "SG", + "Singapore"), SAINT_HELENA( + "SH", + "Saint Helena"), SLOVENIA( + "SI", + "Slovenia"), SVALBARD_AND_JAN_MAYEN( + "SJ", + "Svalbard And Jan Mayen"), SLOVAKIA( + "SK", + "Slovakia"), SIERRA_LEONE( + "SL", + "Sierra Leone"), SAN_MARINO( + "SM", + "San Marino"), SENEGAL( + "SN", + "Senegal"), SOMALIA( + "SO", + "Somalia"), SURINAME( + "SR", + "Suriname"), SOUTH_SUDAN( + "SS", + "South Sudan"), SAO_TOME_AND_PRINCIPE( + "ST", + "Sao Tome And Principe"), EL_SALVADOR( + "SV", + "El Salvador"), SINT_MAARTEN_DUTCH_PART( + "SX", + "Sint Maarten (Dutch part)"), SYRIA( + "SY", + "Syria"), SWAZILAND( + "SZ", + "Swaziland"), TURKS_AND_CAICOS_ISLANDS( + "TC", + "Turks And Caicos Islands"), CHAD( + "TD", + "Chad"), FRENCH_SOUTHERN_TERRITORIES( + "TF", + "French Southern Territories"), TOGO( + "TG", + "Togo"), THAILAND( + "TH", + "Thailand"), TAJIKISTAN( + "TJ", + "Tajikistan"), TOKELAU( + "TK", + "Tokelau"), TIMOR_LESTE( + "TL", + "Timor-Leste"), TURKMENISTAN( + "TM", + "Turkmenistan"), TUNISIA( + "TN", + "Tunisia"), TONGA( + "TO", + "Tonga"), TURKEY( + "TR", + "Turkey"), TRINIDAD_AND_TOBAGO( + "TT", + "Trinidad and Tobago"), TUVALU( + "TV", + "Tuvalu"), TAIWAN( + "TW", + "Taiwan"), TANZANIA( + "TZ", + "Tanzania"), UKRAINE( + "UA", + "Ukraine"), UGANDA( + "UG", + "Uganda"), UNITED_STATES_MINOR_OUTLYING_ISLANDS( + "UM", + "United States Minor Outlying Islands"), UNITED_STATES( + "US", + "United States"), URUGUAY( + "UY", + "Uruguay"), UZBEKISTAN( + "UZ", + "Uzbekistan"), VATICAN( + "VA", + "Vatican"), SAINT_VINCENT_AND_THE_GRENADINES( + "VC", + "Saint Vincent And The Grenadines"), VENEZUELA( + "VE", + "Venezuela"), BRITISH_VIRGIN_ISLANDS( + "VG", + "British Virgin Islands"), U_S__VIRGIN_ISLANDS( + "VI", + "U.S. Virgin Islands"), VIETNAM( + "VN", + "Vietnam"), VANUATU( + "VU", + "Vanuatu"), WALLIS_AND_FUTUNA( + "WF", + "Wallis And Futuna"), SAMOA( + "WS", + "Samoa"), YEMEN( + "YE", + "Yemen"), MAYOTTE( + "YT", + "Mayotte"), SOUTH_AFRICA( + "ZA", + "South Africa"), ZAMBIA( + "ZM", + "Zambia"), ZIMBABWE( + "ZW", + "Zimbabwe"); /** * Gets a country by it's iso tag. * * @param isoTag * The iso tag of the county. - * @return The country with the given iso tag or null if - * unknown. + * @return The country with the given iso tag or null if unknown. */ public static Country byIsoTag(String isoTag) { for (Country country : Country.values()) { @@ -422,8 +644,8 @@ public static Country byIsoTag(String isoTag) { * * @param locale * The locale. - * @return The country from the giben locale or null if - * unknown country or if the locale does not contain a country. + * @return The country from the giben locale or null if unknown + * country or if the locale does not contain a country. */ public static Country byLocale(Locale locale) { return byIsoTag(locale.getCountry()); @@ -549,8 +771,8 @@ protected JSONObject getChartData() { * Gets the values of the chart. * * @param valueMap - * Just an empty map. The only reason it exists is to make - * your life easier. You don't have to create a map yourself! + * Just an empty map. The only reason it exists is to make your life + * easier. You don't have to create a map yourself! * @return The values of the chart. */ public abstract HashMap getValues(HashMap valueMap); @@ -784,8 +1006,8 @@ public BStatsMetrics(Plugin plugin) { config.addDefault("logFailedRequests", false); // Inform the server owners about bStats - config.options() - .header("bStats collects some data for plugin authors like how many servers are using their plugins.\n" + config.options().header( + "bStats collects some data for plugin authors like how many servers are using their plugins.\n" + "To honor their work, you should not disable it.\n" + "This has nearly no effect on the server performance!\n" + "Check out https://bStats.org/ to learn more :)") diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/ArrayUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/ArrayUtils.java index ae111ffdce..6baeddddbd 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/ArrayUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/ArrayUtils.java @@ -104,11 +104,6 @@ public ArrayList comptoString(ArrayList comps) { return txt; } - public ArrayList sort(ArrayList list) { - Collections.sort(list, String.CASE_INSENSITIVE_ORDER); - return list; - } - /** * Sets the contains ignore case. * @@ -402,15 +397,15 @@ public ArrayList replaceJavascript(CommandSender sender, ArrayList replaceJavascript(Player player, ArrayList list) { + public ArrayList replaceJavascript(OfflinePlayer player, ArrayList list) { ArrayList msg = new ArrayList(); for (String str : list) { msg.add(StringUtils.getInstance().replaceJavascript(player, str)); } return msg; } - - public ArrayList replaceJavascript(OfflinePlayer player, ArrayList list) { + + public ArrayList replaceJavascript(Player player, ArrayList list) { ArrayList msg = new ArrayList(); for (String str : list) { msg.add(StringUtils.getInstance().replaceJavascript(player, str)); @@ -426,6 +421,11 @@ public ArrayList replacePlaceHolder(ArrayList list, HashMap sort(ArrayList list) { + Collections.sort(list, String.CASE_INSENSITIVE_ORDER); + return list; + } + /** * Sort by values. * @@ -460,15 +460,15 @@ public int compare(Entry o1, Entry o2) { return sortedMap; } - - public HashMap sortByValuesStr(HashMap unsortMap, final boolean order) { - List> list = new LinkedList>(unsortMap.entrySet()); + public HashMap sortByValuesLong(HashMap unsortMap, final boolean order) { + + List> list = new LinkedList>(unsortMap.entrySet()); // Sorting the list based on values - Collections.sort(list, new Comparator>() { + Collections.sort(list, new Comparator>() { @Override - public int compare(Entry o1, Entry o2) { + public int compare(Entry o1, Entry o2) { if (order) { return o1.getValue().compareTo(o2.getValue()); } else { @@ -479,22 +479,22 @@ public int compare(Entry o1, Entry o2) { }); // Maintaining insertion order with the help of LinkedList - HashMap sortedMap = new LinkedHashMap(); - for (Entry entry : list) { + HashMap sortedMap = new LinkedHashMap(); + for (Entry entry : list) { sortedMap.put(entry.getKey(), entry.getValue()); } return sortedMap; } - - public HashMap sortByValuesLong(HashMap unsortMap, final boolean order) { - List> list = new LinkedList>(unsortMap.entrySet()); + public HashMap sortByValuesStr(HashMap unsortMap, final boolean order) { + + List> list = new LinkedList>(unsortMap.entrySet()); // Sorting the list based on values - Collections.sort(list, new Comparator>() { + Collections.sort(list, new Comparator>() { @Override - public int compare(Entry o1, Entry o2) { + public int compare(Entry o1, Entry o2) { if (order) { return o1.getValue().compareTo(o2.getValue()); } else { @@ -505,8 +505,8 @@ public int compare(Entry o1, Entry o2) { }); // Maintaining insertion order with the help of LinkedList - HashMap sortedMap = new LinkedHashMap(); - for (Entry entry : list) { + HashMap sortedMap = new LinkedHashMap(); + for (Entry entry : list) { sortedMap.put(entry.getKey(), entry.getValue()); } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/CompatibleCacheBuilder.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/CompatibleCacheBuilder.java index 370e17e9a8..6e70d96433 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/CompatibleCacheBuilder.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/CompatibleCacheBuilder.java @@ -90,19 +90,18 @@ public ConcurrentMap build(CacheLoader * Note:The default may change in the future. If you care about this @@ -123,28 +122,28 @@ public CompatibleCacheBuilder concurrencyLevel(int concurrencyLevel) { } /** - * Specifies that each entry should be automatically removed from the cache - * once a fixed duration has elapsed after the entry's creation, or last - * access. Access time is reset by {@link com.google.common.cache.Cache#get + * Specifies that each entry should be automatically removed from the cache once + * a fixed duration has elapsed after the entry's creation, or last access. + * Access time is reset by {@link com.google.common.cache.Cache#get * Cache.get()}, but not by operations on the view returned by * {@link com.google.common.cache.Cache#asMap() Cache.asMap()}. * *

* When {@code duration} is zero, elements will be evicted immediately after * being loaded into the cache. This has the same effect as invoking - * {@link #maximumSize maximumSize}{@code (0)}. It can be useful in testing, - * or to disable caching temporarily without a code change. + * {@link #maximumSize maximumSize}{@code (0)}. It can be useful in testing, or + * to disable caching temporarily without a code change. * *

- * Expired entries may be counted by - * {@link com.google.common.cache.Cache#size Cache.size()}, but will never - * be visible to read or write operations. Expired entries are currently - * cleaned up during write operations, or during occasional read operations - * in the absense of writes; though this behavior may change in the future. + * Expired entries may be counted by {@link com.google.common.cache.Cache#size + * Cache.size()}, but will never be visible to read or write operations. Expired + * entries are currently cleaned up during write operations, or during + * occasional read operations in the absense of writes; though this behavior may + * change in the future. * * @param duration - * the length of time after an entry is last accessed that it - * should be automatically removed + * the length of time after an entry is last accessed that it should + * be automatically removed * @param unit * the unit that {@code duration} is expressed in * @return This for chaining @@ -163,22 +162,22 @@ public CompatibleCacheBuilder expireAfterAccess(long duration, TimeUnit un } /** - * Specifies that each entry should be automatically removed from the cache - * once a fixed duration has elapsed after the entry's creation, or the most - * recent replacement of its value. + * Specifies that each entry should be automatically removed from the cache once + * a fixed duration has elapsed after the entry's creation, or the most recent + * replacement of its value. * *

* When {@code duration} is zero, elements will be evicted immediately after * being loaded into the cache. This has the same effect as invoking - * {@link #maximumSize maximumSize}{@code (0)}. It can be useful in testing, - * or to disable caching temporarily without a code change. + * {@link #maximumSize maximumSize}{@code (0)}. It can be useful in testing, or + * to disable caching temporarily without a code change. * *

- * Expired entries may be counted by - * {@link com.google.common.cache.Cache#size Cache.size()}, but will never - * be visible to read or write operations. Expired entries are currently - * cleaned up during write operations, or during occasional read operations - * in the absense of writes; though this behavior may change in the future. + * Expired entries may be counted by {@link com.google.common.cache.Cache#size + * Cache.size()}, but will never be visible to read or write operations. Expired + * entries are currently cleaned up during write operations, or during + * occasional read operations in the absense of writes; though this behavior may + * change in the future. * * @param duration * the length of time after an entry is created that it should be @@ -201,12 +200,12 @@ public CompatibleCacheBuilder expireAfterWrite(long duration, TimeUnit uni } /** - * Sets the minimum total size for the internal hash tables. For example, if - * the initial capacity is {@code 60}, and the concurrency level is - * {@code 8}, then eight segments are created, each having a hash table of - * size eight. Providing a large enough estimate at construction time avoids - * the need for expensive resizing operations later, but setting this value - * unnecessarily high wastes memory. + * Sets the minimum total size for the internal hash tables. For example, if the + * initial capacity is {@code 60}, and the concurrency level is {@code 8}, then + * eight segments are created, each having a hash table of size eight. Providing + * a large enough estimate at construction time avoids the need for expensive + * resizing operations later, but setting this value unnecessarily high wastes + * memory. * * @param initialCapacity * - initial capacity @@ -223,15 +222,15 @@ public CompatibleCacheBuilder initialCapacity(int initialCapacity) { } /** - * Specifies the maximum number of entries the cache may contain. Note that - * the cache may evict an entry before this limit is exceeded. As the - * cache size grows close to the maximum, the cache evicts entries that are - * less likely to be used again. For example, the cache may evict an entry - * because it hasn't been used recently or very often. + * Specifies the maximum number of entries the cache may contain. Note that the + * cache may evict an entry before this limit is exceeded. As the cache + * size grows close to the maximum, the cache evicts entries that are less + * likely to be used again. For example, the cache may evict an entry because it + * hasn't been used recently or very often. * *

- * When {@code size} is zero, elements will be evicted immediately after - * being loaded into the cache. This has the same effect as invoking + * When {@code size} is zero, elements will be evicted immediately after being + * loaded into the cache. This has the same effect as invoking * {@link #expireAfterWrite expireAfterWrite}{@code (0, unit)} or * {@link #expireAfterAccess expireAfterAccess}{@code (0, * unit)}. It can be useful in testing, or to disable caching temporarily @@ -256,35 +255,34 @@ public CompatibleCacheBuilder maximumSize(int size) { /** * Specifies a listener instance, which all caches built using this - * {@code CacheBuilder} will notify each time an entry is removed from the - * cache by any means. + * {@code CacheBuilder} will notify each time an entry is removed from the cache + * by any means. * *

* Each cache built by this {@code CacheBuilder} after this method is called - * invokes the supplied listener after removing an element for any reason - * (see removal causes in {@link com.google.common.cache.RemovalCause - * RemovalCause}). It will invoke the listener during invocations of any of - * that cache's public methods (even read-only methods). + * invokes the supplied listener after removing an element for any reason (see + * removal causes in {@link com.google.common.cache.RemovalCause RemovalCause}). + * It will invoke the listener during invocations of any of that cache's public + * methods (even read-only methods). * *

* Important note: Instead of returning this as a * {@code CacheBuilder} instance, this method returns * {@code CacheBuilder}. From this point on, either the original - * reference or the returned reference may be used to complete configuration - * and build the cache, but only the "generic" one is type-safe. That is, it - * will properly prevent you from building caches whose key or value types - * are incompatible with the types accepted by the listener already - * provided; the {@code CacheBuilder} type cannot do this. For best results, - * simply use the standard method-chaining idiom, as illustrated in the - * documentation at top, configuring a {@code CacheBuilder} and building - * your {@link com.google.common.cache.Cache Cache} all in a single - * statement. + * reference or the returned reference may be used to complete configuration and + * build the cache, but only the "generic" one is type-safe. That is, it will + * properly prevent you from building caches whose key or value types are + * incompatible with the types accepted by the listener already provided; the + * {@code CacheBuilder} type cannot do this. For best results, simply use the + * standard method-chaining idiom, as illustrated in the documentation at top, + * configuring a {@code CacheBuilder} and building your + * {@link com.google.common.cache.Cache Cache} all in a single statement. * *

* Warning: if you ignore the above advice, and use this - * {@code CacheBuilder} to build a cache whose key or value type is - * incompatible with the listener, you will likely experience a - * {@link ClassCastException} at some undefined point in the future. + * {@code CacheBuilder} to build a cache whose key or value type is incompatible + * with the listener, you will likely experience a {@link ClassCastException} at + * some undefined point in the future. * * @param * Key type @@ -305,21 +303,20 @@ public CompatibleCacheBuilder removalListen } /** - * Specifies that each value (not key) stored in the cache should be wrapped - * in a {@link java.lang.ref.SoftReference SoftReference} (by default, - * strong references are used). Softly-referenced objects will be - * garbage-collected in a globally least-recently-used manner, in - * response to memory demand. + * Specifies that each value (not key) stored in the cache should be wrapped in + * a {@link java.lang.ref.SoftReference SoftReference} (by default, strong + * references are used). Softly-referenced objects will be garbage-collected in + * a globally least-recently-used manner, in response to memory demand. * *

* Warning: in most circumstances it is better to set a per-cache - * {@linkplain #maximumSize maximum size} instead of using soft references. - * You should only use this method if you are well familiar with the - * practical consequences of soft references. + * {@linkplain #maximumSize maximum size} instead of using soft references. You + * should only use this method if you are well familiar with the practical + * consequences of soft references. * *

- * Note: when this method is used, the resulting cache will use - * identity ({@code ==}) comparison to determine equality of values. + * Note: when this method is used, the resulting cache will use identity + * ({@code ==}) comparison to determine equality of values. * * @return This for chaining * @@ -336,8 +333,8 @@ public CompatibleCacheBuilder softValues() { * entries should be expired. By default, {@link System#nanoTime} is used. * *

- * The primary intent of this method is to facilitate testing of caches - * which have been configured with {@link #expireAfterWrite} or + * The primary intent of this method is to facilitate testing of caches which + * have been configured with {@link #expireAfterWrite} or * {@link #expireAfterAccess}. * * @param ticker @@ -353,9 +350,9 @@ public CompatibleCacheBuilder ticker(Ticker ticker) { } /** - * Specifies that each key (not value) stored in the cache should be wrapped - * in a {@link java.lang.ref.WeakReference WeakReference} (by default, - * strong references are used). + * Specifies that each key (not value) stored in the cache should be wrapped in + * a {@link java.lang.ref.WeakReference WeakReference} (by default, strong + * references are used). * *

* Warning: when this method is used, the resulting cache will use @@ -372,18 +369,18 @@ public CompatibleCacheBuilder weakKeys() { } /** - * Specifies that each value (not key) stored in the cache should be wrapped - * in a {@link java.lang.ref.WeakReference WeakReference} (by default, - * strong references are used). + * Specifies that each value (not key) stored in the cache should be wrapped in + * a {@link java.lang.ref.WeakReference WeakReference} (by default, strong + * references are used). * *

- * Weak values will be garbage collected once they are weakly reachable. - * This makes them a poor candidate for caching; consider - * {@link #softValues} instead. + * Weak values will be garbage collected once they are weakly reachable. This + * makes them a poor candidate for caching; consider {@link #softValues} + * instead. * *

- * Note: when this method is used, the resulting cache will use - * identity ({@code ==}) comparison to determine equality of values. + * Note: when this method is used, the resulting cache will use identity + * ({@code ==}) comparison to determine equality of values. * * @return This for chaining * diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java index 23ffbe7cce..68e8a11c1a 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java @@ -94,6 +94,24 @@ public void run() { } } + public void executeConsoleCommands(Player player, String command, HashMap placeholders) { + if (command != null && !command.isEmpty()) { + final String cmd = StringUtils.getInstance().replaceJavascript(player, + StringUtils.getInstance().replacePlaceHolder(command, placeholders)); + + plugin.debug("Executing console command: " + command); + Bukkit.getScheduler().runTask(plugin.getPlugin(), new Runnable() { + + @Override + public void run() { + Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd); + } + + }); + } + + } + @SuppressWarnings("deprecation") public void executeConsoleCommands(final String playerName, final ArrayList cmds, final HashMap placeholders) { @@ -115,24 +133,6 @@ public void run() { } } - public void executeConsoleCommands(Player player, String command, HashMap placeholders) { - if (command != null && !command.isEmpty()) { - final String cmd = StringUtils.getInstance().replaceJavascript(player, - StringUtils.getInstance().replacePlaceHolder(command, placeholders)); - - plugin.debug("Executing console command: " + command); - Bukkit.getScheduler().runTask(plugin.getPlugin(), new Runnable() { - - @Override - public void run() { - Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd); - } - - }); - } - - } - /** * Gets the connection. * @@ -253,6 +253,15 @@ public int getYearFromMili(long time) { return LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneId.systemDefault()).getYear(); } + public ItemStack setSkullOwner(OfflinePlayer player) { + if ((player.hasPlayedBefore() || player.isOnline()) || Bukkit.getOnlineMode()) { + return new ItemBuilder(new ItemStack(Material.SKULL_ITEM, 1, (short) 3)).setSkullOwner(player) + .toItemStack(player); + } else { + return setSkullOwner(player.getName()); + } + } + /** * Sets the skull owner. * @@ -266,13 +275,4 @@ public ItemStack setSkullOwner(String playerName) { .toItemStack(); } - public ItemStack setSkullOwner(OfflinePlayer player) { - if ((player.hasPlayedBefore() || player.isOnline()) || Bukkit.getOnlineMode()) { - return new ItemBuilder(new ItemStack(Material.SKULL_ITEM, 1, (short) 3)).setSkullOwner(player) - .toItemStack(player); - } else { - return setSkullOwner(player.getName()); - } - } - } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java index bb49ed0cd0..1e837cd0e7 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java @@ -159,16 +159,6 @@ public String getUUID(String playerName) { } - @SuppressWarnings("deprecation") - public boolean isValidUser(String name) { - OfflinePlayer p = Bukkit.getOfflinePlayer(name); - if (p.hasPlayedBefore() || p.isOnline()) { - plugin.extraDebug(name + " has joined before"); - return true; - } - return UserManager.getInstance().userExist(name); - } - /** * Checks for permission. * @@ -267,6 +257,16 @@ public boolean isPlayerOnline(String playerName) { return false; } + @SuppressWarnings("deprecation") + public boolean isValidUser(String name) { + OfflinePlayer p = Bukkit.getOfflinePlayer(name); + if (p.hasPlayedBefore() || p.isOnline()) { + plugin.extraDebug(name + " has joined before"); + return true; + } + return UserManager.getInstance().userExist(name); + } + /** * Sets the player meta. * diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/StringUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/StringUtils.java index ea1f5512b3..367364883e 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/StringUtils.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/StringUtils.java @@ -68,6 +68,17 @@ public boolean containsIgnorecase(String str1, String str2) { return str1.toLowerCase().contains(str2.toLowerCase()); } + public boolean isDouble(String st) { + try { + @SuppressWarnings("unused") + double num = Double.parseDouble(st); + return true; + + } catch (NumberFormatException ex) { + return false; + } + } + /** * Checks if is int. * @@ -85,17 +96,6 @@ public boolean isInt(String st) { return false; } } - - public boolean isDouble(String st) { - try { - @SuppressWarnings("unused") - double num = Double.parseDouble(st); - return true; - - } catch (NumberFormatException ex) { - return false; - } - } /** * Replace ignore case. @@ -123,16 +123,16 @@ public String replaceJavascript(CommandSender player, String text) { return replaceJavascript(text, engine); } - public String replaceJavascript(Player player, String text) { - JavascriptEngine engine = new JavascriptEngine().addPlayer(player); - return replaceJavascript(replacePlaceHolders(player, text), engine); - } - public String replaceJavascript(OfflinePlayer player, String text) { JavascriptEngine engine = new JavascriptEngine().addPlayer(player); return replaceJavascript(text, engine); } + public String replaceJavascript(Player player, String text) { + JavascriptEngine engine = new JavascriptEngine().addPlayer(player); + return replaceJavascript(replacePlaceHolders(player, text), engine); + } + public String replaceJavascript(String text) { return replaceJavascript(text, null); } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Prompt/PromptReturnString.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Prompt/PromptReturnString.java index e1006a1bd2..f1a821c708 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Prompt/PromptReturnString.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Prompt/PromptReturnString.java @@ -16,8 +16,7 @@ public abstract class PromptReturnString extends StringPrompt { /* * (non-Javadoc) * - * @see - * org.bukkit.conversations.Prompt#acceptInput(org.bukkit.conversations. + * @see org.bukkit.conversations.Prompt#acceptInput(org.bukkit.conversations. * ConversationContext, java.lang.String) */ @Override @@ -31,8 +30,7 @@ public Prompt acceptInput(ConversationContext context, String input) { /* * (non-Javadoc) * - * @see - * org.bukkit.conversations.Prompt#getPromptText(org.bukkit.conversations + * @see org.bukkit.conversations.Prompt#getPromptText(org.bukkit.conversations * .ConversationContext) */ @Override diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/Requesters/NumberRequester.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/Requesters/NumberRequester.java index 65706a603a..806e1f21d2 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/Requesters/NumberRequester.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/Requesters/NumberRequester.java @@ -61,8 +61,9 @@ public NumberRequester() { * @param listener * the listener */ - public void request(Player player, InputMethod method, String currentValue, LinkedHashMap options, - String promptText, boolean allowCustomOption, NumberListener listener) { + public void request(Player player, InputMethod method, String currentValue, + LinkedHashMap options, String promptText, boolean allowCustomOption, + NumberListener listener) { if ((options == null || options.size() == 0) && method.equals(InputMethod.INVENTORY) && allowCustomOption) { method = InputMethod.ANVIL; } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/Requesters/StringRequester.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/Requesters/StringRequester.java index 3d314473eb..a2d68e038c 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/Requesters/StringRequester.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/Requesters/StringRequester.java @@ -62,8 +62,9 @@ public StringRequester() { * @param listener * the listener */ - public void request(Player player, InputMethod method, String currentValue, LinkedHashMap options, - String promptText, boolean allowCustomOption, StringListener listener) { + public void request(Player player, InputMethod method, String currentValue, + LinkedHashMap options, String promptText, boolean allowCustomOption, + StringListener listener) { if ((options == null || options.size() == 0) && method.equals(InputMethod.INVENTORY) && allowCustomOption) { method = InputMethod.ANVIL; } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/ValueRequestBuilder.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/ValueRequestBuilder.java index a121d129c4..8d69ff8e96 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/ValueRequestBuilder.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/ValueRequest/ValueRequestBuilder.java @@ -28,23 +28,14 @@ public ValueRequestBuilder(BooleanListener listener) { booleanListener = listener; } - public ValueRequestBuilder(NumberListener listener, Number[] options) { - numberListener = listener; - numberOptions = options; - } - - public ValueRequestBuilder(StringListener listener, String[] options) { - stringListener = listener; - stringOptions = options; - } - - public ValueRequestBuilder(NumberListener listener, LinkedHashMap options) { - numberListener = listener; - numberItemOptions = options; - } + public ValueRequestBuilder(LinkedHashMap options, final Listener listener) { + stringListener = new StringListener() { - public ValueRequestBuilder(StringListener listener, LinkedHashMap options) { - stringListener = listener; + @Override + public void onInput(Player player, String value) { + listener.onInput(player, value); + } + }; stringItemOptions = options; } @@ -58,6 +49,17 @@ public void onInput(Player player, boolean value) { }; } + public ValueRequestBuilder(final Listener listener, LinkedHashMap options) { + numberListener = new NumberListener() { + + @Override + public void onInput(Player player, Number value) { + listener.onInput(player, value); + } + }; + numberItemOptions = options; + } + public ValueRequestBuilder(final Listener listener, Number[] options) { numberListener = new NumberListener() { @@ -80,28 +82,26 @@ public void onInput(Player player, String value) { stringOptions = options; } - public ValueRequestBuilder(final Listener listener, LinkedHashMap options) { - numberListener = new NumberListener() { - - @Override - public void onInput(Player player, Number value) { - listener.onInput(player, value); - } - }; + public ValueRequestBuilder(NumberListener listener, LinkedHashMap options) { + numberListener = listener; numberItemOptions = options; } - public ValueRequestBuilder(LinkedHashMap options, final Listener listener) { - stringListener = new StringListener() { + public ValueRequestBuilder(NumberListener listener, Number[] options) { + numberListener = listener; + numberOptions = options; + } - @Override - public void onInput(Player player, String value) { - listener.onInput(player, value); - } - }; + public ValueRequestBuilder(StringListener listener, LinkedHashMap options) { + stringListener = listener; stringItemOptions = options; } + public ValueRequestBuilder(StringListener listener, String[] options) { + stringListener = listener; + stringOptions = options; + } + public ValueRequestBuilder allowCustomOption(boolean allowCustomOption) { this.allowCustomOption = allowCustomOption; return this; diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/MySQL.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/MySQL.java index f5921465f1..eca43230af 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/MySQL.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/MySQL.java @@ -43,7 +43,7 @@ public ArrayList load(String key) { private String name; - private Set uuids = (Set) Collections.synchronizedSet(new HashSet()); + private Set uuids = Collections.synchronizedSet(new HashSet()); private boolean useBatchUpdates = true; @@ -250,6 +250,15 @@ public ArrayList getRowsQuery() { return result; } + public Set getUuids() { + if (uuids == null || uuids.size() == 0) { + uuids.clear(); + uuids.addAll(getUuidsQuery()); + return uuids; + } + return uuids; + } + public ArrayList getUuidsQuery() { ArrayList uuids = new ArrayList(); @@ -261,15 +270,6 @@ public ArrayList getUuidsQuery() { return uuids; } - public Set getUuids() { - if (uuids == null || uuids.size() == 0) { - uuids.clear(); - uuids.addAll(getUuidsQuery()); - return uuids; - } - return uuids; - } - public synchronized void insert(String index, String column, Object value, DataType dataType) { insertQuery(index, column, value, dataType); @@ -289,6 +289,10 @@ public synchronized void insertQuery(String index, String column, Object value, } } + public boolean isUseBatchUpdates() { + return useBatchUpdates; + } + public void loadData() { columns = getColumnsQueury(); @@ -300,10 +304,6 @@ public void loadData() { } } - public boolean isUseBatchUpdates() { - return useBatchUpdates; - } - public void loadPlayer(String uuid) { table.put(uuid, getExactQuery(new Column("uuid", uuid, DataType.STRING))); if (uuids.contains(uuid)) { @@ -311,6 +311,12 @@ public void loadPlayer(String uuid) { } } + public void loadPlayerIfNeeded(String uuid) { + if (!containsKey(uuid)) { + loadPlayer(uuid); + } + } + public void removePlayer(String uuid) { table.remove(uuid); } @@ -385,10 +391,4 @@ public synchronized void updateBatch() { } } - - public void loadPlayerIfNeeded(String uuid) { - if (!containsKey(uuid)) { - loadPlayer(uuid); - } - } } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/ConnectionManager.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/ConnectionManager.java index 2cf66d5d7b..6e0d022869 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/ConnectionManager.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/ConnectionManager.java @@ -17,7 +17,7 @@ public class ConnectionManager { private String database; private int connectionTimeout; private int maximumPoolsize; - //private int maxConnections; + // private int maxConnections; public ConnectionManager(String host, String port, String username, String password, String database) { this.host = host; @@ -27,7 +27,7 @@ public ConnectionManager(String host, String port, String username, String passw this.database = database; connectionTimeout = 20000; maximumPoolsize = 5; - //maxConnections = 1; + // maxConnections = 1; } @@ -44,7 +44,7 @@ public ConnectionManager(String host, String port, String username, String passw } else { maximumPoolsize = 5; } - //this.maxConnections = maxConnections; + // this.maxConnections = maxConnections; } public ConnectionManager(String host, String port, String username, String password, String database, @@ -56,7 +56,7 @@ public ConnectionManager(String host, String port, String username, String passw this.database = database; this.connectionTimeout = connectionTimeout; this.maximumPoolsize = maximumPoolsize; - //this.maxConnections = maxConnections; + // this.maxConnections = maxConnections; } public void close() { @@ -72,7 +72,7 @@ public Connection getConnection() { if (isClosed()) { AdvancedCoreHook.getInstance().debug("Connection closed... opening...."); open(); - } + } return dataSource.getConnection(); } catch (SQLException e) { e.printStackTrace(); diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/queries/InsertQuery.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/queries/InsertQuery.java index b7819ac394..1a0f1bb6c6 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/queries/InsertQuery.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/queries/InsertQuery.java @@ -85,8 +85,8 @@ public InsertQuery set(String column, String value) { } /** - * Set a column to insert to. Automatically sets the value to ? to be used - * with prepared statements. + * Set a column to insert to. Automatically sets the value to ? to be used with + * prepared statements. * * @param column * the column to insert to diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/queries/UpdateQuery.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/queries/UpdateQuery.java index c6b7f417c3..20faf55a1f 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/queries/UpdateQuery.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/queries/UpdateQuery.java @@ -60,11 +60,11 @@ public String build() { } /** - * Set the value of a column. Automatically sets the value to ? to be used - * with prepared statements. + * Set the value of a column. Automatically sets the value to ? to be used with + * prepared statements. *

- * MySQLAPIBukkit does not do any interpretation so you have to add - * apostrophes yourself. + * MySQLAPIBukkit does not do any interpretation so you have to add apostrophes + * yourself. * * @param column * the column to set the value for diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/sql/DataType.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/sql/DataType.java index 24a5a97239..52ef86a2bb 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/sql/DataType.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/sql/DataType.java @@ -2,8 +2,6 @@ public enum DataType { - STRING, - INTEGER, - FLOAT + STRING, INTEGER, FLOAT } From 72735a528094264e8cb287ae377abf468cd13141 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 13 Oct 2017 10:23:10 -0400 Subject: [PATCH 29/35] Add a fail safe to prevent failure to load hook in event a reward file isn't able to load --- .../AdvancedCore/Objects/RewardHandler.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardHandler.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardHandler.java index f859d13943..0bf32f7bef 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardHandler.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardHandler.java @@ -435,9 +435,13 @@ public void loadRewards() { for (String reward : getRewardNames(file)) { if (!reward.equals("")) { if (!rewardExist(reward)) { - rewards.add(new Reward(file, reward)); - if (AdvancedCoreHook.getInstance().isExtraDebug()) { - plugin.debug("Extra: Loaded Reward File: " + file.getAbsolutePath() + "/" + reward); + try { + rewards.add(new Reward(file, reward)); + plugin.extraDebug("Loaded Reward File: " + file.getAbsolutePath() + "/" + reward); + } catch (Exception e) { + plugin.getPlugin().getLogger() + .severe("Failed to load reward file " + reward + ".yml: " + e.getMessage()); + e.printStackTrace(); } } else { plugin.getPlugin().getLogger().warning("Detected that a reward file named " + reward From 9c7a74fd733de2da52acc1417a32c01ed5f16b9b Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 13 Oct 2017 10:34:06 -0400 Subject: [PATCH 30/35] Don't load sqlite unless needed --- .../src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java index d1c3d41dfc..77964a9d13 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java @@ -519,7 +519,6 @@ public void loadHook(JavaPlugin plugin) { this.plugin = plugin; loadUUIDs(); permPrefix = plugin.getName(); - loadUserAPI(UserStorage.SQLITE); checkPlaceHolderAPI(); loadHandle(); loadEconomy(); @@ -763,6 +762,7 @@ public void setSendScoreboards(boolean sendScoreboards) { public void setStorageType(UserStorage storageType) { this.storageType = storageType; + loadUserAPI(storageType); } /** From 79e1a86fa88197b8d8f385541e9fc699fedc4cb9 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 13 Oct 2017 11:05:49 -0400 Subject: [PATCH 31/35] Minor change --- .../Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java index ce37bb279c..26ab8d454d 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java @@ -40,9 +40,6 @@ private TimeChecker() { } public void forceChanged(TimeType time) { - DateChangedEvent dateChanged = new DateChangedEvent(time); - plugin.getPlugin().getServer().getPluginManager().callEvent(dateChanged); - if (time.equals(TimeType.DAY)) { DayChangeEvent dayChange = new DayChangeEvent(); plugin.getPlugin().getServer().getPluginManager().callEvent(dayChange); @@ -53,6 +50,9 @@ public void forceChanged(TimeType time) { MonthChangeEvent monthChange = new MonthChangeEvent(); plugin.getPlugin().getServer().getPluginManager().callEvent(monthChange); } + + DateChangedEvent dateChanged = new DateChangedEvent(time); + plugin.getPlugin().getServer().getPluginManager().callEvent(dateChanged); } From b05821b4d5cd11d5a66a83233fa3a0fce4963c66 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 13 Oct 2017 11:10:08 -0400 Subject: [PATCH 32/35] Add some more debug --- .../Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java index 26ab8d454d..9a4369c21a 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java @@ -40,6 +40,7 @@ private TimeChecker() { } public void forceChanged(TimeType time) { + plugin.debug("Executing time change events: " + time.toString()); if (time.equals(TimeType.DAY)) { DayChangeEvent dayChange = new DayChangeEvent(); plugin.getPlugin().getServer().getPluginManager().callEvent(dayChange); @@ -50,10 +51,11 @@ public void forceChanged(TimeType time) { MonthChangeEvent monthChange = new MonthChangeEvent(); plugin.getPlugin().getServer().getPluginManager().callEvent(monthChange); } - + DateChangedEvent dateChanged = new DateChangedEvent(time); plugin.getPlugin().getServer().getPluginManager().callEvent(dateChanged); + plugin.debug("Finished executing time change events: " + time.toString()); } /** From 9281ac232398df8e61f5dcebf808a7c909882fe2 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 13 Oct 2017 11:16:46 -0400 Subject: [PATCH 33/35] Bug fix --- .../src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java | 5 +---- .../Ben12345rocks/AdvancedCore/Objects/RewardFileData.java | 4 ---- .../src/com/Ben12345rocks/AdvancedCore/Objects/User.java | 7 +++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java index 4164defa1b..c15550cc47 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/Reward.java @@ -229,8 +229,6 @@ public class Reward { /** The effect particles. */ private int effectParticles; - private int effectSpeed; - /** The effect radius. */ private int effectRadius; @@ -1428,7 +1426,6 @@ public void loadValues() { effectData = getConfig().getEffectData(); effectParticles = getConfig().getEffectParticles(); effectRadius = getConfig().getEffectRadius(); - effectSpeed = getConfig().getEffectSpeed(); priority = getConfig().getPriority(); @@ -1455,7 +1452,7 @@ public void loadValues() { */ public void playEffect(User user) { if (effectEnabled) { - user.playParticle(effectEffect, effectData, effectParticles, effectRadius, effectSpeed); + user.playParticle(effectEffect, effectData, effectParticles, effectRadius); } } diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java index 6a92a1ebe2..fd30bd0a51 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java @@ -258,10 +258,6 @@ public int getEffectRadius() { return getData().getInt("Effect.Radius"); } - public int getEffectSpeed() { - return getData().getInt("Effect.Speed", 1); - } - /** * Gets the exp. * diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java index 3084bf7492..c40f24e0d9 100644 --- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java +++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java @@ -586,13 +586,12 @@ public void playEffect(String effectName, int data, int particles, int radius) { } } - public void playParticle(String effectName, int data, int particles, int radius, int speed) { + public void playParticle(String effectName, int data, int particles, int radius) { Player player = getPlayer(); if ((player != null) && (effectName != null)) { Particle effect = Particle.valueOf(effectName); for (int i = 0; i < particles; i++) { - player.getWorld().spawnParticle(effect, player.getLocation(), particles, radius, radius, radius, speed, - data); + player.getWorld().spawnParticle(effect, player.getLocation(), particles, radius, radius, radius, data); } } @@ -600,7 +599,7 @@ public void playParticle(String effectName, int data, int particles, int radius, @Deprecated public void playParticleEffect(String effectName, int data, int particles, int radius) { - playParticle(effectName, data, particles, radius, 1); + playParticle(effectName, data, particles, radius); } /** From b6efaade0a8c1cb4b505f83880e0e1b2d52cd459 Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 13 Oct 2017 11:20:21 -0400 Subject: [PATCH 34/35] Bug fix --- AdvancedCore/Resources/Rewards/ExampleAdvanced.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AdvancedCore/Resources/Rewards/ExampleAdvanced.yml b/AdvancedCore/Resources/Rewards/ExampleAdvanced.yml index 16d22b3ff8..cd6965b268 100644 --- a/AdvancedCore/Resources/Rewards/ExampleAdvanced.yml +++ b/AdvancedCore/Resources/Rewards/ExampleAdvanced.yml @@ -176,10 +176,10 @@ Sound: Effect: Enabled: false Effect: 'EXPLOSION' - Data: 0 + # Ususally speed + Data: 1 Particles: 10 Radius: 5 - Speed: 1 Firework: Enabled: false From 7bf1d67da10063bbb1b0de2b70db5c9bbede722e Mon Sep 17 00:00:00 2001 From: Ben12345rocks Date: Fri, 13 Oct 2017 19:56:35 -0400 Subject: [PATCH 35/35] Update version number --- AdvancedCore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdvancedCore/pom.xml b/AdvancedCore/pom.xml index 11c6abf877..8a5153556a 100644 --- a/AdvancedCore/pom.xml +++ b/AdvancedCore/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.Ben12345rocks AdvancedCore - 2.9.2 + 2.9.3 jar AdvancedCore