diff --git a/Plugins/.idea/misc.xml b/Plugins/.idea/misc.xml
index 76fba6e9f..d5107f5ca 100644
--- a/Plugins/.idea/misc.xml
+++ b/Plugins/.idea/misc.xml
@@ -10,4 +10,7 @@
+
+
+
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
index 97488bc09..130995fde 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
@@ -428,7 +428,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler, NCPHook
_plugin.getServer().getPluginManager().callEvent(event);
final String finalEntityName = event.getCustomName();
- Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java b/Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
index a4a146700..3442af156 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
@@ -30,35 +30,35 @@ public abstract class MiniPlugin implements Listener
onEnable();
- RegisterEvents(this);
+ registerEvents(this);
}
- public PluginManager GetPluginManager()
+ public PluginManager getPluginManager()
{
return _plugin.getServer().getPluginManager();
}
- public BukkitScheduler GetScheduler()
+ public BukkitScheduler getScheduler()
{
return _plugin.getServer().getScheduler();
}
- public JavaPlugin GetPlugin()
+ public JavaPlugin getPlugin()
{
return _plugin;
}
- public void RegisterEvents(Listener listener)
+ public void registerEvents(Listener listener)
{
_plugin.getServer().getPluginManager().registerEvents(listener, _plugin);
}
- public void RegisterSelf()
+ public void registerSelf()
{
- RegisterEvents(this);
+ registerEvents(this);
}
- public void DeregisterSelf()
+ public void deregisterSelf()
{
HandlerList.unregisterAll(this);
}
@@ -67,23 +67,23 @@ public abstract class MiniPlugin implements Listener
{
long epoch = System.currentTimeMillis();
log("Initializing...");
- Enable();
- AddCommands();
+ enable();
+ addCommands();
log("Enabled in " + UtilTime.convertString(System.currentTimeMillis() - epoch, 1, TimeUnit.FIT) + ".");
}
public final void onDisable()
{
- Disable();
+ disable();
log("Disabled.");
}
- public void Enable() { }
+ public void enable() { }
- public void Disable() { }
+ public void disable() { }
- public void AddCommands() { }
+ public void addCommands() { }
public final String getName()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
index f78d23a2d..ec584c081 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
@@ -67,7 +67,7 @@ public class CoreClientManager extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new UpdateRank(this));
}
@@ -185,7 +185,7 @@ public class CoreClientManager extends MiniPlugin
{
final CoreClient client = Add(playerName);
- Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -209,7 +209,7 @@ public class CoreClientManager extends MiniPlugin
// JSON sql response
Bukkit.getServer().getPluginManager().callEvent(new ClientWebResponseEvent(response, uuid));
- Bukkit.getServer().getScheduler().runTask(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTask(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
index ca8e7b9b7..bef0baba7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
@@ -37,7 +37,7 @@ public class AchievementManager extends MiniPlugin
public AchievementManager(StatsManager statsManager, CoreClientManager clientManager, DonationManager donationManager)
{
- super("Achievement Manager", statsManager.GetPlugin());
+ super("Achievement Manager", statsManager.getPlugin());
_statsManager = statsManager;
_shop = new AchievementShop(this, _statsManager, clientManager, donationManager, "Achievement");
@@ -114,7 +114,7 @@ public class AchievementManager extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new StatsCommand(this));
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/AchievementShop.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/AchievementShop.java
index eb9bf2390..f9a78db07 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/AchievementShop.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/AchievementShop.java
@@ -24,32 +24,32 @@ public class AchievementShop extends ShopBase
}
@Override
- protected ShopPageBase> BuildPagesFor(Player player)
+ protected ShopPageBase> buildPagesFor(Player player)
{
return BuildPagesFor(player, player);
}
protected ShopPageBase> BuildPagesFor(Player player, Player target)
{
- return new AchievementMainPage(Plugin, _statsManager, this, ClientManager, DonationManager, target.getName() + "'s Stats", player, target);
+ return new AchievementMainPage(getPlugin(), _statsManager, this, getClientManager(), getDonationManager(), target.getName() + "'s Stats", player, target);
}
public boolean attemptShopOpen(Player player, Player target)
{
- if (!OpenedShop.contains(player.getName()))
+ if (!getOpenedShop().contains(player.getName()))
{
- if (!CanOpenShop(player))
+ if (!canOpenShop(player))
return false;
- OpenedShop.add(player.getName());
+ getOpenedShop().add(player.getName());
- OpenShopForPlayer(player);
- if (!PlayerPageMap.containsKey(player.getName()))
+ openShopForPlayer(player);
+ if (!getPlayerPageMap().containsKey(player.getName()))
{
- PlayerPageMap.put(player.getName(), BuildPagesFor(player, target));
+ getPlayerPageMap().put(player.getName(), BuildPagesFor(player, target));
}
- OpenPageForPlayer(player, GetOpeningPageForPlayer(player));
+ openPageForPlayer(player, getOpeningPageForPlayer(player));
return true;
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/button/ArcadeButton.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/button/ArcadeButton.java
index 823ca48e3..ada6e2984 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/button/ArcadeButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/button/ArcadeButton.java
@@ -34,7 +34,7 @@ public class ArcadeButton implements IButton
@Override
public void onClick(Player player, ClickType clickType)
{
- _shop.OpenPageForPlayer(player, new ArcadeMainPage(_achievementManager, _statsManager, _shop, _clientManager, _donationManager, "Arcade Games", player, _target));
+ _shop.openPageForPlayer(player, new ArcadeMainPage(_achievementManager, _statsManager, _shop, _clientManager, _donationManager, "Arcade Games", player, _target));
player.playSound(player.getLocation(), Sound.CLICK, 1, 1);
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/button/CategoryButton.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/button/CategoryButton.java
index bfe41f073..ab2d4370c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/button/CategoryButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/button/CategoryButton.java
@@ -40,7 +40,7 @@ public class CategoryButton implements IButton
@Override
public void onClick(Player player, ClickType clickType)
{
- _shop.OpenPageForPlayer(player, new AchievementPage(_achievementManager, _statsManager, _category, _shop, _clientManager, _donationManager, player, _target));
+ _shop.openPageForPlayer(player, new AchievementPage(_achievementManager, _statsManager, _category, _shop, _clientManager, _donationManager, player, _target));
player.playSound(player.getLocation(), Sound.CLICK, 1, 1);
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementMainPage.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementMainPage.java
index b383d168b..1ad16a15f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementMainPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementMainPage.java
@@ -36,11 +36,11 @@ public class AchievementMainPage extends ShopPageBase lore = new ArrayList();
lore.add(" ");
- category.addStats(ClientManager, _statsManager, lore, category == AchievementCategory.GLOBAL ? 5 : 2, Player, _target);
+ category.addStats(getClientManager(), _statsManager, lore, category == AchievementCategory.GLOBAL ? 5 : 2, getPlayer(), _target);
lore.add(" ");
addAchievements(category, lore, 9);
lore.add(" ");
@@ -75,17 +75,17 @@ public class AchievementMainPage extends ShopPageBase lore, int max)
@@ -100,7 +100,7 @@ public class AchievementMainPage extends ShopPageBase 1)
continue;
- AchievementData data = Plugin.get(_target, achievement);
+ AchievementData data = getPlugin().get(_target, achievement);
boolean finished = data.getLevel() >= achievement.getMaxLevel();
lore.add((finished ? C.cGreen : C.cRed) + achievement.getName());
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java
index b72200836..1ea6542c7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java
@@ -40,11 +40,11 @@ public class AchievementPage extends ShopPageBase achievements = getAchievements();
for (Achievement achievement : achievements)
{
- AchievementData data = Plugin.get(_target, achievement);
+ AchievementData data = getPlugin().get(_target, achievement);
boolean singleLevel = achievement.isSingleLevel();
boolean hasUnlocked = data.getLevel() >= achievement.getMaxLevel();
@@ -99,7 +99,7 @@ public class AchievementPage extends ShopPageBase lore = new ArrayList();
lore.add(" ");
- _category.addStats(ClientManager, _statsManager, lore, Player, _target);
+ _category.addStats(getClientManager(), _statsManager, lore, getPlayer(), _target);
ItemStack item = new ItemStack(material);
ItemMeta meta = item.getItemMeta();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/ArcadeMainPage.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/ArcadeMainPage.java
index c97c657ff..5ffbe3e88 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/ArcadeMainPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/ArcadeMainPage.java
@@ -30,7 +30,7 @@ public class ArcadeMainPage extends AchievementMainPage
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
int slot = 10;
@@ -39,11 +39,11 @@ public class ArcadeMainPage extends AchievementMainPage
if (category.getGameCategory() != AchievementCategory.GameCategory.ARCADE)
continue;
- CategoryButton button = new CategoryButton(Shop, Plugin, _statsManager, category, DonationManager, ClientManager, _target);
+ CategoryButton button = new CategoryButton(getShop(), getPlugin(), _statsManager, category, getDonationManager(), getClientManager(), _target);
ArrayList lore = new ArrayList();
lore.add(" ");
- category.addStats(ClientManager, _statsManager, lore, 2, Player, _target);
+ category.addStats(getClientManager(), _statsManager, lore, 2, getPlayer(), _target);
lore.add(" ");
addAchievements(category, lore, 9);
lore.add(" ");
@@ -53,7 +53,7 @@ public class ArcadeMainPage extends AchievementMainPage
slot++;
ShopItem shopItem = new ShopItem(category.getIcon(), category.getIconData(), C.Bold + category.getFriendlyName(), lore.toArray(new String[0]), 1, false, false);
- AddButton(slot, shopItem, button);
+ addButton(slot, shopItem, button);
slot += 2;
}
@@ -63,11 +63,11 @@ public class ArcadeMainPage extends AchievementMainPage
private void addBackButton()
{
- AddButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[] { }, 1, false), new IButton()
+ addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- Shop.OpenPageForPlayer(Player, new AchievementMainPage(Plugin, _statsManager, Shop, ClientManager, DonationManager, _target.getName() + "'s Stats", player, _target));
+ getShop().openPageForPlayer(getPlayer(), new AchievementMainPage(getPlugin(), _statsManager, getShop(), getClientManager(), getDonationManager(), _target.getName() + "'s Stats", player, _target));
player.playSound(player.getLocation(), Sound.CLICK, 1, 1);
}
});
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
index 30860aa16..ecb29e936 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
@@ -379,7 +379,7 @@ public class AntiHack extends MiniPlugin
//Record
ServerListPingEvent event = new ServerListPingEvent(null, Bukkit.getServer().getMotd(), Bukkit.getServer().getOnlinePlayers().size(), Bukkit.getServer().getMaxPlayers());
- GetPluginManager().callEvent(event);
+ getPluginManager().callEvent(event);
String motd = event.getMotd();
String game = "N/A";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Fly.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Fly.java
index 810a91df0..fd7b557af 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Fly.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Fly.java
@@ -27,7 +27,7 @@ public class Fly extends MiniPlugin implements Detector
public Fly (AntiHack host)
{
- super("Fly Detector", host.GetPlugin());
+ super("Fly Detector", host.getPlugin());
Host = host;
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Idle.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Idle.java
index 095553310..18889a4c6 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Idle.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Idle.java
@@ -25,7 +25,7 @@ public class Idle extends MiniPlugin implements Detector
public Idle (AntiHack host)
{
- super("Idle Detector", host.GetPlugin());
+ super("Idle Detector", host.getPlugin());
Host = host;
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Reach.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Reach.java
index ee3595ebb..390eebe4b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Reach.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Reach.java
@@ -29,7 +29,7 @@ public class Reach extends MiniPlugin implements Detector
public Reach (AntiHack host)
{
- super("Speed Detector", host.GetPlugin());
+ super("Speed Detector", host.getPlugin());
Host = host;
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Speed.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Speed.java
index 9777b50b5..9e57c33df 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Speed.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/types/Speed.java
@@ -26,7 +26,7 @@ public class Speed extends MiniPlugin implements Detector
public Speed (AntiHack host)
{
- super("Speed Detector", host.GetPlugin());
+ super("Speed Detector", host.getPlugin());
Host = host;
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java
index 6b2e87cce..fd45ee873 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java
@@ -36,7 +36,7 @@ public class BenefitManager extends MiniDbClientPlugin
@EventHandler(priority = EventPriority.LOWEST)
public void giveBenefit(final PlayerJoinEvent event)
{
- Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
index 1373a95e3..652a4fb6d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
@@ -78,7 +78,7 @@ public class Chat extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new SilenceCommand(this));
addCommand(new BroadcastCommand(this));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java
index 45ef30634..7d5b830fe 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java
@@ -98,7 +98,7 @@ public class CosmeticManager extends MiniPlugin
if (event.getItemDrop().getItemStack().getType() == Material.CHEST)
{
- Bukkit.getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
index 9f30adfc3..f3a5b3a82 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
@@ -24,13 +24,13 @@ public class CosmeticShop extends ShopBase implements PluginMes
{
super(plugin, clientManager, donationManager, name, CurrencyType.Gems, CurrencyType.Coins);
- plugin.GetPlugin().getServer().getMessenger().registerIncomingPluginChannel(plugin.GetPlugin(), "MC|ItemName", this);
+ plugin.getPlugin().getServer().getMessenger().registerIncomingPluginChannel(plugin.getPlugin(), "MC|ItemName", this);
}
@Override
- protected ShopPageBase> BuildPagesFor(Player player)
+ protected ShopPageBase> buildPagesFor(Player player)
{
- return new Menu(Plugin, this, ClientManager, DonationManager, player);
+ return new Menu(getPlugin(), this, getClientManager(), getDonationManager(), player);
}
@Override
@@ -39,13 +39,13 @@ public class CosmeticShop extends ShopBase implements PluginMes
if (!channel.equalsIgnoreCase("MC|ItemName"))
return;
- if (PlayerPageMap.containsKey(player.getName()) && PlayerPageMap.get(player.getName()) instanceof PetTagPage)
+ if (getPlayerPageMap().containsKey(player.getName()) && getPlayerPageMap().get(player.getName()) instanceof PetTagPage)
{
if (message != null && message.length >= 1)
{
String tagName = new String(message);
- ((PetTagPage)PlayerPageMap.get(player.getName())).SetTagName(tagName);
+ ((PetTagPage) getPlayerPageMap().get(player.getName())).SetTagName(tagName);
}
}
}
@@ -53,7 +53,7 @@ public class CosmeticShop extends ShopBase implements PluginMes
@EventHandler
public void itemGadgetEmptyAmmo(ItemGadgetOutOfAmmoEvent event)
{
- new GadgetPage(Plugin, this, ClientManager, DonationManager, "Gadgets", event.getPlayer()).purchaseGadget(event.getPlayer(), event.getGadget());
+ new GadgetPage(getPlugin(), this, getClientManager(), getDonationManager(), "Gadgets", event.getPlayer()).purchaseGadget(event.getPlayer(), event.getGadget());
}
@EventHandler
@@ -62,7 +62,7 @@ public class CosmeticShop extends ShopBase implements PluginMes
if (event.getType() != UpdateType.TICK)
return;
- for (ShopPageBase> shop : PlayerPageMap.values())
+ for (ShopPageBase> shop : getPlayerPageMap().values())
{
if (shop instanceof TreasurePage)
((TreasurePage) shop).update();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/ActivateMountButton.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/ActivateMountButton.java
index 89c87d3d4..ffa63ca11 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/ActivateMountButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/ActivateMountButton.java
@@ -22,8 +22,8 @@ public class ActivateMountButton implements IButton
@Override
public void onClick(Player player, ClickType clickType)
{
- _page.PlayAcceptSound(player);
+ _page.playAcceptSound(player);
_mount.Enable(player);
- _page.getShop().OpenPageForPlayer(player, new Menu(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), player));
+ _page.getShop().openPageForPlayer(player, new Menu(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), player));
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/ActivatePetButton.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/ActivatePetButton.java
index 447aa0a44..cc2012e0b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/ActivatePetButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/ActivatePetButton.java
@@ -22,8 +22,8 @@ public class ActivatePetButton implements IButton
@Override
public void onClick(Player player, ClickType clickType)
{
- _page.PlayAcceptSound(player);
+ _page.playAcceptSound(player);
_page.getPlugin().getPetManager().AddPetOwner(player, _pet.GetPetType(), player.getLocation());
- _page.getShop().OpenPageForPlayer(player, new Menu(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), player));
+ _page.getShop().openPageForPlayer(player, new Menu(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), player));
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/DeactivateMountButton.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/DeactivateMountButton.java
index 7b82d4d83..0a18d74f3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/DeactivateMountButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/DeactivateMountButton.java
@@ -20,8 +20,8 @@ public class DeactivateMountButton implements IButton
public void onClick(Player player, ClickType clickType)
{
- _page.PlayAcceptSound(player);
+ _page.playAcceptSound(player);
_mount.Disable(player);
- _page.Refresh();
+ _page.refresh();
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/DeactivatePetButton.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/DeactivatePetButton.java
index 4c18ff927..f05e36139 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/DeactivatePetButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/DeactivatePetButton.java
@@ -20,8 +20,8 @@ public class DeactivatePetButton implements IButton
public void onClick(Player player, ClickType clickType)
{
- _page.PlayAcceptSound(player);
+ _page.playAcceptSound(player);
_petManager.RemovePet(player, true);
- _page.Refresh();
+ _page.refresh();
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/MountButton.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/MountButton.java
index 2fe47bf19..57cad6fce 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/MountButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/MountButton.java
@@ -25,12 +25,12 @@ public class MountButton implements IButton
@Override
public void onClick(final Player player, ClickType clickType)
{
- _page.getShop().OpenPageForPlayer(player, new ConfirmationPage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), new Runnable()
+ _page.getShop().openPageForPlayer(player, new ConfirmationPage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), new Runnable()
{
public void run()
{
_page.getPlugin().getInventoryManager().addItemToInventory(null, player, "Mount", _mount.GetName(), 1);
- _page.Refresh();
+ _page.refresh();
}
}, _page, _mount, CurrencyType.Coins, player));
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenGadgets.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenGadgets.java
index 281f81474..79a62a52f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenGadgets.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenGadgets.java
@@ -19,6 +19,6 @@ public class OpenGadgets implements IButton
@Override
public void onClick(Player player, ClickType clickType)
{
- _page.getShop().OpenPageForPlayer(player, new GadgetPage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), "Gadgets", player));
+ _page.getShop().openPageForPlayer(player, new GadgetPage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), "Gadgets", player));
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenMorphs.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenMorphs.java
index ec42fcc25..8666c1bfb 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenMorphs.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenMorphs.java
@@ -18,6 +18,6 @@ public class OpenMorphs implements IButton
public void onClick(Player player, ClickType clickType)
{
- _page.getShop().OpenPageForPlayer(player, new MorphPage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), "Morphs", player));
+ _page.getShop().openPageForPlayer(player, new MorphPage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), "Morphs", player));
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenMounts.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenMounts.java
index 42fbb4756..d71c566a8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenMounts.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenMounts.java
@@ -18,6 +18,6 @@ public class OpenMounts implements IButton
public void onClick(Player player, ClickType clickType)
{
- _page.getShop().OpenPageForPlayer(player, new MountPage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), "Mounts", player));
+ _page.getShop().openPageForPlayer(player, new MountPage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), "Mounts", player));
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenParticles.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenParticles.java
index 74720e5e6..37e9cf1e1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenParticles.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenParticles.java
@@ -18,6 +18,6 @@ public class OpenParticles implements IButton
public void onClick(Player player, ClickType clickType)
{
- _page.getShop().OpenPageForPlayer(player, new ParticlePage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), "Particles", player));
+ _page.getShop().openPageForPlayer(player, new ParticlePage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), "Particles", player));
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenPets.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenPets.java
index 1dd4118a9..fdaaa0e19 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenPets.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/OpenPets.java
@@ -19,6 +19,6 @@ public class OpenPets implements IButton
@Override
public void onClick(Player player, ClickType clickType)
{
- _page.getShop().OpenPageForPlayer(player, new PetPage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), "Pets", player));
+ _page.getShop().openPageForPlayer(player, new PetPage(_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), "Pets", player));
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/RenamePetButton.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/RenamePetButton.java
index 06a55943c..82cad1f70 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/RenamePetButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/RenamePetButton.java
@@ -20,7 +20,7 @@ public class RenamePetButton implements IButton
@Override
public void onClick(Player player, ClickType clickType)
{
- _page.PlayAcceptSound(player);
+ _page.playAcceptSound(player);
Creature currentPet = _page.getPlugin().getPetManager().getActivePet(player.getName());
_page.renamePet(player, new Pet(currentPet.getCustomName(), currentPet.getType(), 1), false);
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/CostumePage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/CostumePage.java
index a7c356559..144131e81 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/CostumePage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/CostumePage.java
@@ -29,16 +29,16 @@ public class CostumePage extends GadgetPage
{
super(plugin, shop, clientManager, donationManager, name, player);
- BuildPage();
+ buildPage();
}
- protected void BuildPage()
+ protected void buildPage()
{
int slot;
List costumeClasses = new ArrayList();
- for (Gadget gadget : Plugin.getGadgetManager().getGadgets(GadgetType.Costume))
+ for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Costume))
{
OutfitGadget outfitGadget = ((OutfitGadget) gadget);
Class clazz = gadget.getClass();
@@ -59,16 +59,16 @@ public class CostumePage extends GadgetPage
addGadget(gadget, slot);
- if (gadget.IsActive(Player))
+ if (gadget.IsActive(getPlayer()))
addGlow(slot);
}
- AddButton(8, new ShopItem(Material.TNT, C.cRed + C.Bold + "Remove all Clothing", new String[] { }, 1, false), new IButton()
+ addButton(8, new ShopItem(Material.TNT, C.cRed + C.Bold + "Remove all Clothing", new String[]{}, 1, false), new IButton()
{
public void onClick(Player player, ClickType clickType)
{
boolean gadgetDisabled = false;
- for (Gadget gadget : Plugin.getGadgetManager().getGadgets(GadgetType.Costume))
+ for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Costume))
{
if (gadget.IsActive(player))
{
@@ -79,17 +79,17 @@ public class CostumePage extends GadgetPage
if (gadgetDisabled)
{
- BuildPage();
+ buildPage();
player.playSound(player.getEyeLocation(), Sound.SPLASH, 1, 1);
}
}
});
- AddButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[] { }, 1, false), new IButton()
+ addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, player));
+ getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
}
});
}
@@ -98,16 +98,16 @@ public class CostumePage extends GadgetPage
{
if (gadget instanceof ItemGadget)
{
- if (Plugin.getInventoryManager().Get(player).getItemCount(gadget.GetName()) <= 0)
+ if (getPlugin().getInventoryManager().Get(player).getItemCount(gadget.GetName()) <= 0)
{
purchaseGadget(player, gadget);
return;
}
}
- PlayAcceptSound(player);
+ playAcceptSound(player);
gadget.Enable(player);
- BuildPage();
+ buildPage();
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
index b319d3236..d54efdff3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
@@ -32,18 +32,18 @@ public class GadgetPage extends ShopPageBase
{
super(plugin, shop, clientManager, donationManager, name, player, 54);
- BuildPage();
+ buildPage();
}
- protected void BuildPage()
+ protected void buildPage()
{
int slot = 19;
- for (Gadget gadget : Plugin.getGadgetManager().getGadgets(GadgetType.Item))
+ for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Item))
{
addGadget(gadget, slot);
- if (Plugin.getInventoryManager().Get(Player).getItemCount(gadget.GetDisplayName()) > 0)
+ if (getPlugin().getInventoryManager().Get(getPlayer()).getItemCount(gadget.GetDisplayName()) > 0)
addGlow(slot);
slot++;
@@ -52,11 +52,11 @@ public class GadgetPage extends ShopPageBase
slot = 28;
}
- AddButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[] { }, 1, false), new IButton()
+ addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, player));
+ getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
}
});
}
@@ -88,24 +88,24 @@ public class GadgetPage extends ShopPageBase
itemLore.add(C.cGreen + "Right-Click To Purchase:");
itemLore.add(C.cWhite + ((ItemGadget)gadget).getAmmo().GetDisplayName() + " for " + C.cYellow + ((ItemGadget)gadget).getAmmo().GetCost(CurrencyType.Coins) + " Coins");
itemLore.add(C.cBlack);
- itemLore.add(C.cWhite + "Your Ammo : " + C.cGreen + Plugin.getInventoryManager().Get(Player).getItemCount(gadget.GetName()));
+ itemLore.add(C.cWhite + "Your Ammo : " + C.cGreen + getPlugin().getInventoryManager().Get(getPlayer()).getItemCount(gadget.GetName()));
}
- if (gadget.IsFree() || DonationManager.Get(Player.getName()).OwnsUnknownPackage(gadget.GetName()))
+ if (gadget.IsFree() || getDonationManager().Get(getPlayer().getName()).OwnsUnknownPackage(gadget.GetName()))
{
- if (gadget.GetActive().contains(Player))
+ if (gadget.GetActive().contains(getPlayer()))
{
- AddButton(slot, new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), "Deactivate " + gadget.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new DeactivateGadgetButton(gadget, this));
+ addButton(slot, new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), "Deactivate " + gadget.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new DeactivateGadgetButton(gadget, this));
}
else
{
- AddButton(slot, new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), "Activate " + gadget.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new ActivateGadgetButton(gadget, this));
+ addButton(slot, new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), "Activate " + gadget.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new ActivateGadgetButton(gadget, this));
}
}
else
{
- if (gadget.GetCost(CurrencyType.Coins) > 0 && DonationManager.Get(Player.getName()).GetBalance(CurrencyType.Coins) >= gadget.GetCost(CurrencyType.Coins))
- AddButton(slot, new ShopItem(Material.INK_SACK, (byte)8, (gadget.GetCost(CurrencyType.Coins) < 0 ? "" : "Purchase ") + gadget.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new GadgetButton(gadget, this));
+ if (gadget.GetCost(CurrencyType.Coins) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= gadget.GetCost(CurrencyType.Coins))
+ addButton(slot, new ShopItem(Material.INK_SACK, (byte) 8, (gadget.GetCost(CurrencyType.Coins) < 0 ? "" : "Purchase ") + gadget.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new GadgetButton(gadget, this));
else
setItem(slot, new ShopItem(Material.INK_SACK, (byte)8, (gadget.GetCost(CurrencyType.Coins) < 0 ? "" : "Purchase ") + gadget.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false));
}
@@ -113,31 +113,31 @@ public class GadgetPage extends ShopPageBase
public void purchaseGadget(final Player player, final Gadget gadget)
{
- Shop.OpenPageForPlayer(Player, new ConfirmationPage(Plugin, Shop, ClientManager, DonationManager, new Runnable()
+ getShop().openPageForPlayer(getPlayer(), new ConfirmationPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), new Runnable()
{
public void run()
{
- Plugin.getInventoryManager().addItemToInventory(Player, gadget.getGadgetType().name(), gadget.GetName(), (gadget instanceof ItemGadget ? ((ItemGadget)gadget).getAmmo().getQuantity() : gadget.getQuantity()));
- Refresh();
+ getPlugin().getInventoryManager().addItemToInventory(getPlayer(), gadget.getGadgetType().name(), gadget.GetName(), (gadget instanceof ItemGadget ? ((ItemGadget) gadget).getAmmo().getQuantity() : gadget.getQuantity()));
+ refresh();
}
- }, this, (gadget instanceof ItemGadget ? ((ItemGadget)gadget).getAmmo() : gadget), CurrencyType.Coins, Player));
+ }, this, (gadget instanceof ItemGadget ? ((ItemGadget) gadget).getAmmo() : gadget), CurrencyType.Coins, getPlayer()));
}
public void activateGadget(Player player, Gadget gadget)
{
if (gadget instanceof ItemGadget)
{
- if (Plugin.getInventoryManager().Get(player).getItemCount(gadget.GetName()) <= 0)
+ if (getPlugin().getInventoryManager().Get(player).getItemCount(gadget.GetName()) <= 0)
{
purchaseGadget(player, gadget);
return;
}
}
- PlayAcceptSound(player);
+ playAcceptSound(player);
gadget.Enable(player);
- Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, player));
+ getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
}
public void handleRightClick(Player player, Gadget gadget)
@@ -150,8 +150,8 @@ public class GadgetPage extends ShopPageBase
public void deactivateGadget(Player player, Gadget gadget)
{
- PlayAcceptSound(player);
+ playAcceptSound(player);
gadget.Disable(player);
- Refresh();
+ refresh();
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
index 0e7253a2c..4e779d687 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
@@ -35,114 +35,114 @@ public class Menu extends ShopPageBase
{
super(plugin, shop, clientManager, donationManager, "Inventory", player);
- BuildPage();
+ buildPage();
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
- AddItem(4, new ShopItem(175, DonationManager.Get(Player.getName()).getCoins() + " Coins", new String[]
+ addItem(4, new ShopItem(175, getDonationManager().Get(getPlayer().getName()).getCoins() + " Coins", new String[]
{
- " ",
- ChatColor.RESET + C.cYellow + "Purchase Coins",
- ChatColor.RESET + "www.mineplex.com/shop",
- " ",
- ChatColor.RESET + C.cAqua + "Ultra Rank",
- ChatColor.RESET + "Receives 7500 Coins per Month",
- " ",
- ChatColor.RESET + C.cPurple + "Hero Rank",
- ChatColor.RESET + "Receives 15000 Coins per Month",
+ " ",
+ ChatColor.RESET + C.cYellow + "Purchase Coins",
+ ChatColor.RESET + "www.mineplex.com/shop",
+ " ",
+ ChatColor.RESET + C.cAqua + "Ultra Rank",
+ ChatColor.RESET + "Receives 7500 Coins per Month",
+ " ",
+ ChatColor.RESET + C.cPurple + "Hero Rank",
+ ChatColor.RESET + "Receives 15000 Coins per Month",
}, 1, false));
- AddButton(18, new ShopItem(Material.NETHER_STAR, "Particle Effects", 1, false), new OpenParticles(this));
- AddButton(20, new ShopItem(Material.BOW, "Gadgets", 1, false), new OpenGadgets(this));
- AddButton(22, new ShopItem(Material.LEATHER, "Morphs", 1, false), new OpenMorphs(this));
- AddButton(24, new ShopItem(Material.IRON_BARDING, "Mounts", 1, false), new OpenMounts(this));
- AddButton(26, new ShopItem(Material.BONE, "Pets", 1, false), new OpenPets(this));
+ addButton(18, new ShopItem(Material.NETHER_STAR, "Particle Effects", 1, false), new OpenParticles(this));
+ addButton(20, new ShopItem(Material.BOW, "Gadgets", 1, false), new OpenGadgets(this));
+ addButton(22, new ShopItem(Material.LEATHER, "Morphs", 1, false), new OpenMorphs(this));
+ addButton(24, new ShopItem(Material.IRON_BARDING, "Mounts", 1, false), new OpenMounts(this));
+ addButton(26, new ShopItem(Material.BONE, "Pets", 1, false), new OpenPets(this));
//
- AddButton(48, new ShopItem(Material.GOLD_CHESTPLATE, "Costumes", 1, false), new OpenCostumes(this));
- AddButton(50, new ShopItem(Material.GREEN_RECORD, "Music", 1, false), new OpenMusic(this));
+ addButton(48, new ShopItem(Material.GOLD_CHESTPLATE, "Costumes", 1, false), new OpenCostumes(this));
+ addButton(50, new ShopItem(Material.GREEN_RECORD, "Music", 1, false), new OpenMusic(this));
- if (Plugin.getGadgetManager().getActive(Player, GadgetType.Particle) != null)
+ if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.Particle) != null)
{
- final Gadget gadget = Plugin.getGadgetManager().getActive(Player, GadgetType.Particle);
+ final Gadget gadget = getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.Particle);
- AddButton(18 + 9,
- new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), ChatColor.RESET + C.mItem + gadget.GetName(), new String[] {}, 1, false, false),
+ addButton(18 + 9,
+ new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), ChatColor.RESET + C.mItem + gadget.GetName(), new String[]{}, 1, false, false),
new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- PlayAcceptSound(player);
+ playAcceptSound(player);
gadget.Disable(player);
- Refresh();
+ refresh();
}
});
}
- if (Plugin.getGadgetManager().getActive(Player, GadgetType.Item) != null)
+ if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.Item) != null)
{
- final Gadget gadget = Plugin.getGadgetManager().getActive(Player, GadgetType.Item);
+ final Gadget gadget = getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.Item);
- AddButton(20 + 9,
- new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), ChatColor.RESET + C.mItem + gadget.GetName(), new String[] {}, 1, false, false),
+ addButton(20 + 9,
+ new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), ChatColor.RESET + C.mItem + gadget.GetName(), new String[]{}, 1, false, false),
new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- PlayAcceptSound(player);
+ playAcceptSound(player);
gadget.Disable(player);
- Refresh();
+ refresh();
}
});
}
- if (Plugin.getGadgetManager().getActive(Player, GadgetType.Morph) != null)
+ if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.Morph) != null)
{
- final Gadget gadget = Plugin.getGadgetManager().getActive(Player, GadgetType.Morph);
+ final Gadget gadget = getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.Morph);
- AddButton(22 + 9,
- new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), ChatColor.RESET + C.mItem + gadget.GetName(), new String[] {}, 1, false, false),
- new IButton()
- {
- public void onClick(Player player, ClickType clickType)
- {
- PlayAcceptSound(player);
- gadget.Disable(player);
- Refresh();
- }
- });
- }
-
- if (Plugin.getMountManager().getActive(Player) != null)
- {
- final Mount mount = Plugin.getMountManager().getActive(Player);
-
- AddButton(24 + 9,
- new ShopItem(mount.GetDisplayMaterial(), mount.GetDisplayData(), ChatColor.RESET + C.mItem + mount.GetName(), new String[] {}, 1, false, false),
+ addButton(22 + 9,
+ new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), ChatColor.RESET + C.mItem + gadget.GetName(), new String[]{}, 1, false, false),
new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- PlayAcceptSound(player);
- mount.Disable(player);
- Refresh();
+ playAcceptSound(player);
+ gadget.Disable(player);
+ refresh();
}
});
}
- if (Plugin.getPetManager().hasActivePet(Player.getName()))
+ if (getPlugin().getMountManager().getActive(getPlayer()) != null)
{
- Creature activePet = Plugin.getPetManager().getActivePet(Player.getName());
- String petName = activePet.getType() == EntityType.WITHER ? "Widder" : activePet.getCustomName();
- AddButton(26 + 9, new ShopItem(Material.MONSTER_EGG, (byte)Plugin.getPetManager().getActivePet(Player.getName()).getType().getTypeId(), ChatColor.RESET + C.mItem + petName, new String[] {}, 1, false, false),
+ final Mount mount = getPlugin().getMountManager().getActive(getPlayer());
+
+ addButton(24 + 9,
+ new ShopItem(mount.GetDisplayMaterial(), mount.GetDisplayData(), ChatColor.RESET + C.mItem + mount.GetName(), new String[]{}, 1, false, false),
new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- PlayAcceptSound(player);
- Plugin.getPetManager().RemovePet(player, true);
- Refresh();
+ playAcceptSound(player);
+ mount.Disable(player);
+ refresh();
+ }
+ });
+ }
+
+ if (getPlugin().getPetManager().hasActivePet(getPlayer().getName()))
+ {
+ Creature activePet = getPlugin().getPetManager().getActivePet(getPlayer().getName());
+ String petName = activePet.getType() == EntityType.WITHER ? "Widder" : activePet.getCustomName();
+ addButton(26 + 9, new ShopItem(Material.MONSTER_EGG, (byte) getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType().getTypeId(), ChatColor.RESET + C.mItem + petName, new String[]{}, 1, false, false),
+ new IButton()
+ {
+ public void onClick(Player player, ClickType clickType)
+ {
+ playAcceptSound(player);
+ getPlugin().getPetManager().RemovePet(player, true);
+ refresh();
}
});
}
@@ -150,23 +150,23 @@ public class Menu extends ShopPageBase
public void openCostumes(Player player)
{
- Shop.OpenPageForPlayer(player, new CostumePage(Plugin, Shop, ClientManager, DonationManager, "Costumes", player));
+ getShop().openPageForPlayer(player, new CostumePage(getPlugin(), getShop(), getClientManager(), getDonationManager(), "Costumes", player));
}
public void openMusic(Player player)
{
- Shop.OpenPageForPlayer(player, new MusicPage(Plugin, Shop, ClientManager, DonationManager, "Music", player));
+ getShop().openPageForPlayer(player, new MusicPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), "Music", player));
}
public void attemptPurchaseKey(Player player)
{
- Shop.OpenPageForPlayer(player, new ConfirmationPage(Plugin, Shop, ClientManager, DonationManager, new Runnable()
+ getShop().openPageForPlayer(player, new ConfirmationPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), new Runnable()
{
public void run()
{
- Plugin.getInventoryManager().addItemToInventory(Player, "Treasure", "Treasure Key", 1);
- Refresh();
+ getPlugin().getInventoryManager().addItemToInventory(getPlayer(), "Treasure", "Treasure Key", 1);
+ refresh();
}
- }, this, new TreasureKey(), CurrencyType.Coins, Player));
+ }, this, new TreasureKey(), CurrencyType.Coins, getPlayer()));
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MorphPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MorphPage.java
index d00fda4bb..508a58276 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MorphPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MorphPage.java
@@ -11,7 +11,6 @@ import mineplex.core.cosmetic.ui.CosmeticShop;
import mineplex.core.donation.DonationManager;
import mineplex.core.gadget.types.Gadget;
import mineplex.core.gadget.types.GadgetType;
-import mineplex.core.inventory.InventoryManager;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.shop.item.IButton;
@@ -23,15 +22,15 @@ public class MorphPage extends GadgetPage
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
int slot = 19;
- for (Gadget gadget : Plugin.getGadgetManager().getGadgets(GadgetType.Morph))
+ for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Morph))
{
addGadget(gadget, slot);
- if (Plugin.getGadgetManager().getActive(Player, GadgetType.Morph) == gadget)
+ if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.Morph) == gadget)
addGlow(slot);
slot++;
@@ -40,11 +39,11 @@ public class MorphPage extends GadgetPage
slot = 28;
}
- AddButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[] { }, 1, false), new IButton()
+ addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, player));
+ getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
}
});
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
index a74adbf35..3b24248d9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
@@ -18,7 +18,6 @@ import mineplex.core.cosmetic.ui.button.DeactivateMountButton;
import mineplex.core.cosmetic.ui.button.MountButton;
import mineplex.core.donation.DonationManager;
import mineplex.core.mount.Mount;
-import mineplex.core.shop.ShopBase;
import mineplex.core.shop.item.IButton;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.shop.page.ShopPageBase;
@@ -29,14 +28,14 @@ public class MountPage extends ShopPageBase
{
super(plugin, shop, clientManager, donationManager, name, player, 54);
- BuildPage();
+ buildPage();
}
- protected void BuildPage()
+ protected void buildPage()
{
int slot = 19;
- for (Mount mount : Plugin.getMountManager().getMounts())
+ for (Mount mount : getPlugin().getMountManager().getMounts())
{
addMount(mount, slot);
slot++;
@@ -58,30 +57,30 @@ public class MountPage extends ShopPageBase
itemLore.add(C.cBlack);
itemLore.addAll(Arrays.asList(mount.GetDescription()));
- if (DonationManager.Get(Player.getName()).OwnsUnknownPackage(mount.GetName()))
+ if (getDonationManager().Get(getPlayer().getName()).OwnsUnknownPackage(mount.GetName()))
{
- if (mount.GetActive().containsKey(Player))
+ if (mount.GetActive().containsKey(getPlayer()))
{
- AddButton(slot, new ShopItem(mount.GetDisplayMaterial(), mount.GetDisplayData(), "Deactivate " + mount.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new DeactivateMountButton(mount, this));
+ addButton(slot, new ShopItem(mount.GetDisplayMaterial(), mount.GetDisplayData(), "Deactivate " + mount.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new DeactivateMountButton(mount, this));
}
else
{
- AddButton(slot, new ShopItem(mount.GetDisplayMaterial(), mount.GetDisplayData(), "Activate " + mount.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new ActivateMountButton(mount, this));
+ addButton(slot, new ShopItem(mount.GetDisplayMaterial(), mount.GetDisplayData(), "Activate " + mount.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new ActivateMountButton(mount, this));
}
}
else
{
- if (mount.GetCost(CurrencyType.Coins) != -1 && DonationManager.Get(Player.getName()).GetBalance(CurrencyType.Coins) >= mount.GetCost(CurrencyType.Coins))
- AddButton(slot, new ShopItem(mount.GetDisplayMaterial(), mount.GetDisplayData(), (mount.GetCost(CurrencyType.Coins) < 0 ? "" : "Purchase ") + mount.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new MountButton(mount, this));
+ if (mount.GetCost(CurrencyType.Coins) != -1 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= mount.GetCost(CurrencyType.Coins))
+ addButton(slot, new ShopItem(mount.GetDisplayMaterial(), mount.GetDisplayData(), (mount.GetCost(CurrencyType.Coins) < 0 ? "" : "Purchase ") + mount.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new MountButton(mount, this));
else
setItem(slot, new ShopItem(mount.GetDisplayMaterial(), mount.GetDisplayData(), (mount.GetCost(CurrencyType.Coins) < 0 ? "" : "Purchase ") + mount.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false));
}
- AddButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[] { }, 1, false), new IButton()
+ addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, player));
+ getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
}
});
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MusicPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MusicPage.java
index 48c2a54ce..390d937ae 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MusicPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MusicPage.java
@@ -24,11 +24,11 @@ public class MusicPage extends GadgetPage
super(plugin, shop, clientManager, donationManager, name, player);
}
- protected void BuildPage()
+ protected void buildPage()
{
int slot = 19;
- for (Gadget gadget : Plugin.getGadgetManager().getGadgets(GadgetType.MusicDisc))
+ for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.MusicDisc))
{
addGadget(gadget, slot);
@@ -38,11 +38,11 @@ public class MusicPage extends GadgetPage
slot = 28;
}
- AddButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[] { }, 1, false), new IButton()
+ addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, player));
+ getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
}
});
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ParticlePage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ParticlePage.java
index 717f79839..97d39abbb 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ParticlePage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/ParticlePage.java
@@ -11,8 +11,6 @@ import mineplex.core.cosmetic.ui.CosmeticShop;
import mineplex.core.donation.DonationManager;
import mineplex.core.gadget.types.Gadget;
import mineplex.core.gadget.types.GadgetType;
-import mineplex.core.gadget.types.MorphGadget;
-import mineplex.core.inventory.InventoryManager;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.shop.item.IButton;
@@ -24,15 +22,15 @@ public class ParticlePage extends GadgetPage
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
int slot = 19;
- for (Gadget gadget : Plugin.getGadgetManager().getGadgets(GadgetType.Particle))
+ for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Particle))
{
addGadget(gadget, slot);
- if (Plugin.getGadgetManager().getActive(Player, GadgetType.Morph) == gadget)
+ if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.Morph) == gadget)
addGlow(slot);
slot++;
@@ -41,11 +39,11 @@ public class ParticlePage extends GadgetPage
slot = 28;
}
- AddButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[] { }, 1, false), new IButton()
+ addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, player));
+ getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
}
});
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java
index f3be8e50a..47d45cfa3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java
@@ -12,7 +12,6 @@ import net.minecraft.server.v1_7_R4.PacketPlayOutSetSlot;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
-import org.bukkit.entity.Creature;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
@@ -28,7 +27,6 @@ import mineplex.core.cosmetic.ui.button.DeactivatePetButton;
import mineplex.core.cosmetic.ui.button.PetButton;
import mineplex.core.cosmetic.ui.button.RenamePetButton;
import mineplex.core.donation.DonationManager;
-import mineplex.core.inventory.InventoryManager;
import mineplex.core.pet.Pet;
import mineplex.core.pet.PetExtra;
import mineplex.core.pet.types.Elf;
@@ -44,14 +42,14 @@ public class PetPage extends ShopPageBase
{
super(plugin, shop, clientManager, donationManager, name, player, 54);
- BuildPage();
+ buildPage();
}
- protected void BuildPage()
+ protected void buildPage()
{
int slot = 19;
- List pets = new ArrayList(Plugin.getPetManager().GetFactory().GetPets());
+ List pets = new ArrayList(getPlugin().getPetManager().GetFactory().GetPets());
Collections.sort(pets, new PetSorter());
@@ -82,27 +80,27 @@ public class PetPage extends ShopPageBase
}
//Owned
- if (DonationManager.Get(Player.getName()).OwnsUnknownPackage(pet.GetPetName()))
+ if (getDonationManager().Get(getPlayer().getName()).OwnsUnknownPackage(pet.GetPetName()))
{
- String petName = Plugin.getPetManager().Get(Player).GetPets().get(pet.GetPetType());
+ String petName = getPlugin().getPetManager().Get(getPlayer()).GetPets().get(pet.GetPetType());
if (petName == null)
{
petName = pet.GetName();
}
- if (Plugin.getPetManager().hasActivePet(Player.getName()) && Plugin.getPetManager().getActivePet(Player.getName()).getType() == pet.GetPetType())
+ if (getPlugin().getPetManager().hasActivePet(getPlayer().getName()) && getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType() == pet.GetPetType())
{
- AddButton(slot, new ShopItem(Material.MONSTER_EGG, (byte)pet.GetPetType().getTypeId(),
- "Deactivate " + pet.GetPetName() + " (" + C.cWhite + petName + C.cGreen + ")",
- itemLore.toArray(new String[itemLore.size()]), 1, false, false), new DeactivatePetButton(this, Plugin.getPetManager()));
+ addButton(slot, new ShopItem(Material.MONSTER_EGG, (byte) pet.GetPetType().getTypeId(),
+ "Deactivate " + pet.GetPetName() + " (" + C.cWhite + petName + C.cGreen + ")",
+ itemLore.toArray(new String[itemLore.size()]), 1, false, false), new DeactivatePetButton(this, getPlugin().getPetManager()));
addGlow(slot);
}
else
{
- AddButton(slot, new ShopItem(Material.MONSTER_EGG, (byte)pet.GetPetType().getTypeId(),
- "Activate " + pet.GetPetName() + " (" + C.cWhite + petName + C.cGreen + ")",
- itemLore.toArray(new String[itemLore.size()]), 1, false, false), new ActivatePetButton(pet, this));
+ addButton(slot, new ShopItem(Material.MONSTER_EGG, (byte) pet.GetPetType().getTypeId(),
+ "Activate " + pet.GetPetName() + " (" + C.cWhite + petName + C.cGreen + ")",
+ itemLore.toArray(new String[itemLore.size()]), 1, false, false), new ActivatePetButton(pet, this));
}
}
//Not Owned
@@ -117,8 +115,8 @@ public class PetPage extends ShopPageBase
if (pet.GetCost(CurrencyType.Coins) == -1)
setItem(slot, new ShopItem(Material.INK_SACK, (byte)8, pet.GetPetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false));
- else if (DonationManager.Get(Player.getName()).GetBalance(CurrencyType.Coins) >= pet.GetCost(CurrencyType.Coins))
- AddButton(slot, new ShopItem(Material.INK_SACK, (byte)8, "Purchase " + pet.GetPetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new PetButton(pet, this));
+ else if (getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= pet.GetCost(CurrencyType.Coins))
+ addButton(slot, new ShopItem(Material.INK_SACK, (byte) 8, "Purchase " + pet.GetPetName(), itemLore.toArray(new String[itemLore.size()]), 1, false, false), new PetButton(pet, this));
else
setItem(slot, new ShopItem(Material.INK_SACK, (byte)8, "Purchase " + pet.GetPetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false));
}
@@ -130,28 +128,28 @@ public class PetPage extends ShopPageBase
}
slot = 49;
- for (PetExtra petExtra : Plugin.getPetManager().GetFactory().GetPetExtras())
+ for (PetExtra petExtra : getPlugin().getPetManager().GetFactory().GetPetExtras())
{
List itemLore = new ArrayList();
- if (!Plugin.getPetManager().hasActivePet(Player.getName()))
+ if (!getPlugin().getPetManager().hasActivePet(getPlayer().getName()))
{
itemLore.add(C.cWhite + "You must have an active pet to use this!");
getInventory().setItem(slot, new ShopItem(petExtra.GetMaterial(), (byte)0, C.cRed + petExtra.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false).getHandle());
}
- else if (Plugin.getPetManager().getActivePet(Player.getName()).getType() != EntityType.WITHER)
+ else if (getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType() != EntityType.WITHER)
{
- AddButton(slot, new ShopItem(petExtra.GetMaterial(), (byte)0, "Rename " + Plugin.getPetManager().getActivePet(Player.getName()).getCustomName() + " for " + C.cYellow + petExtra.GetCost(CurrencyType.Coins) + C.cGreen + " Coins", itemLore.toArray(new String[itemLore.size()]), 1, false, false), new RenamePetButton(this));
+ addButton(slot, new ShopItem(petExtra.GetMaterial(), (byte) 0, "Rename " + getPlugin().getPetManager().getActivePet(getPlayer().getName()).getCustomName() + " for " + C.cYellow + petExtra.GetCost(CurrencyType.Coins) + C.cGreen + " Coins", itemLore.toArray(new String[itemLore.size()]), 1, false, false), new RenamePetButton(this));
}
slot++;
}
- AddButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[] { }, 1, false), new IButton()
+ addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
{
public void onClick(Player player, ClickType clickType)
{
- Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, player));
+ getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), player));
}
});
}
@@ -163,10 +161,10 @@ public class PetPage extends ShopPageBase
public void renamePet(Player player, Pet pet, boolean petPurchase)
{
- PlayAcceptSound(player);
+ playAcceptSound(player);
- PetTagPage petTagPage = new PetTagPage(Plugin, Shop, ClientManager, DonationManager, "Repairing", Player, pet, petPurchase);
- EntityPlayer entityPlayer = ((CraftPlayer)Player).getHandle();
+ PetTagPage petTagPage = new PetTagPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), "Repairing", getPlayer(), pet, petPurchase);
+ EntityPlayer entityPlayer = ((CraftPlayer) getPlayer()).getHandle();
int containerCounter = entityPlayer.nextContainerCounter();
entityPlayer.playerConnection.sendPacket(new PacketPlayOutOpenWindow(containerCounter, 8, "Repairing", 0, true));
entityPlayer.activeContainer = new AnvilContainer(entityPlayer.inventory, petTagPage.getInventory());
@@ -174,13 +172,13 @@ public class PetPage extends ShopPageBase
entityPlayer.activeContainer.addSlotListener(entityPlayer);
entityPlayer.playerConnection.sendPacket(new PacketPlayOutSetSlot(containerCounter, 0, new net.minecraft.server.v1_7_R4.ItemStack(Items.NAME_TAG)));
- Shop.SetCurrentPageForPlayer(Player, petTagPage);
+ getShop().setCurrentPageForPlayer(getPlayer(), petTagPage);
}
public void deactivatePet(Player player)
{
- PlayAcceptSound(player);
- Plugin.getPetManager().RemovePet(player, true);
- Refresh();
+ playAcceptSound(player);
+ getPlugin().getPetManager().RemovePet(player, true);
+ refresh();
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
index 2ad9efe9c..a9fd03414 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
@@ -10,7 +10,6 @@ import mineplex.core.cosmetic.ui.CosmeticShop;
import mineplex.core.cosmetic.ui.button.CloseButton;
import mineplex.core.cosmetic.ui.button.SelectTagButton;
import mineplex.core.donation.DonationManager;
-import mineplex.core.inventory.InventoryManager;
import mineplex.core.pet.Pet;
import mineplex.core.pet.PetExtra;
import mineplex.core.pet.repository.token.PetChangeToken;
@@ -37,27 +36,27 @@ public class PetTagPage extends ShopPageBase
_pet = pet;
_petPurchase = petPurchase;
- BuildPage();
+ buildPage();
- Player.setLevel(5);
+ getPlayer().setLevel(5);
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
inventory.setItem(0, new ItemStack(Items.NAME_TAG));
- ButtonMap.put(0, new CloseButton());
- ButtonMap.put(1, new CloseButton());
- ButtonMap.put(2, new SelectTagButton(this));
+ getButtonMap().put(0, new CloseButton());
+ getButtonMap().put(1, new CloseButton());
+ getButtonMap().put(2, new SelectTagButton(this));
}
@Override
- public void PlayerClosed()
+ public void playerClosed()
{
- super.PlayerClosed();
+ super.playerClosed();
- Player.setLevel(0);
+ getPlayer().setLevel(0);
}
public void SelectTag()
@@ -67,10 +66,10 @@ public class PetTagPage extends ShopPageBase
if (_tagName.length() > 16)
{
- UtilPlayer.message(Player, F.main(Plugin.getName(), ChatColor.RED + "Pet name cannot be longer than 16 characters."));
- PlayDenySound(Player);
+ UtilPlayer.message(getPlayer(), F.main(getPlugin().getName(), ChatColor.RED + "Pet name cannot be longer than 16 characters."));
+ playDenySound(getPlayer());
- Shop.OpenPageForPlayer(Player, new PetPage(Plugin, Shop, ClientManager, DonationManager, "Pets", Player));
+ getShop().openPageForPlayer(getPlayer(), new PetPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), "Pets", getPlayer()));
return;
}
@@ -78,35 +77,35 @@ public class PetTagPage extends ShopPageBase
_pet.setDisplayName(C.cGreen + "Purchase " + _tagName);
- Shop.OpenPageForPlayer(Player, new ConfirmationPage(Plugin, Shop, ClientManager, DonationManager, new Runnable()
+ getShop().openPageForPlayer(getPlayer(), new ConfirmationPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), new Runnable()
{
public void run()
{
PetChangeToken token = new PetChangeToken();
- token.Name = Player.getName();
+ token.Name = getPlayer().getName();
token.PetType = _pet.GetPetType().toString();
token.PetName = _tagName;
-
+
PetToken petToken = new PetToken();
petToken.PetType = token.PetType;
-
+
if (_petPurchase)
{
- Plugin.getPetManager().GetRepository().AddPet(token);
- Plugin.getPetManager().addPetOwnerToQueue(Player.getName(), _pet.GetPetType());
+ getPlugin().getPetManager().GetRepository().AddPet(token);
+ getPlugin().getPetManager().addPetOwnerToQueue(getPlayer().getName(), _pet.GetPetType());
}
else
{
- Plugin.getPetManager().GetRepository().UpdatePet(token);
- Plugin.getPetManager().addRenamePetToQueue(Player.getName(), token.PetName);
+ getPlugin().getPetManager().GetRepository().UpdatePet(token);
+ getPlugin().getPetManager().addRenamePetToQueue(getPlayer().getName(), token.PetName);
}
-
- Plugin.getPetManager().Get(Player).GetPets().put(_pet.GetPetType(), token.PetName);
- Plugin.getInventoryManager().addItemToInventory(null, Player, "Pet", _pet.GetPetType().toString(), 1);
- Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, Player));
+ getPlugin().getPetManager().Get(getPlayer()).GetPets().put(_pet.GetPetType(), token.PetName);
+
+ getPlugin().getInventoryManager().addItemToInventory(null, getPlayer(), "Pet", _pet.GetPetType().toString(), 1);
+ getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), getPlayer()));
}
- }, null, _petPurchase ? _pet : tag, CurrencyType.Coins, Player));
+ }, null, _petPurchase ? _pet : tag, CurrencyType.Coins, getPlayer()));
}
public void SetTagName(String tagName)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/TreasurePage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/TreasurePage.java
index 471516c74..dddf1d18f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/TreasurePage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/TreasurePage.java
@@ -64,9 +64,9 @@ public class TreasurePage extends ShopPageBase
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
- int treasureCount = Plugin.getInventoryManager().Get(Player).getItemCount("Treasure Chest");
+ int treasureCount = getPlugin().getInventoryManager().Get(getPlayer()).getItemCount("Treasure Chest");
_rotationColorOne = _ticks % 2 == 0 ? ((short) _random.nextInt(15)) : _rotationColorOne;
_rotationColorTwo = _ticks % 20 == 0 ? ((short) _random.nextInt(15)) : _rotationColorTwo;
@@ -96,11 +96,11 @@ public class TreasurePage extends ShopPageBase
if (_ticks == 0)
{
- Player.playSound(Player.getEyeLocation(), Sound.ANVIL_USE, 4, 1);
+ getPlayer().playSound(getPlayer().getEyeLocation(), Sound.ANVIL_USE, 4, 1);
}
else if (_ticks == 20)
{
- Player.playSound(Player.getEyeLocation(), Sound.CHEST_OPEN, 4, 1);
+ getPlayer().playSound(getPlayer().getEyeLocation(), Sound.CHEST_OPEN, 4, 1);
}
else if (_ticks >= 30 && _ticks <= 120 && _ticks % 20 == 0)
{
@@ -111,9 +111,9 @@ public class TreasurePage extends ShopPageBase
String[] lore = new String[] { ChatColor.RESET.toString() + ChatColor.WHITE + "Click to Open" };
- Player.playSound(Player.getEyeLocation(), Sound.NOTE_PLING, 4, 1);
+ getPlayer().playSound(getPlayer().getEyeLocation(), Sound.NOTE_PLING, 4, 1);
final int slot = _chestSlots.poll();
- AddButton(slot, new ShopItem(Material.CHEST, chestName, lore, 1, false), new IButton()
+ addButton(slot, new ShopItem(Material.CHEST, chestName, lore, 1, false), new IButton()
{
public void onClick(Player player, ClickType clickType)
{
@@ -127,7 +127,7 @@ public class TreasurePage extends ShopPageBase
}
else if (_ticks == 140)
{
- Player.playSound(Player.getEyeLocation(), Sound.LEVEL_UP, 4, 1F);
+ getPlayer().playSound(getPlayer().getEyeLocation(), Sound.LEVEL_UP, 4, 1F);
ItemStack is = new ItemStack(Material.BOOK);
ItemMeta meta = is.getItemMeta();
meta.setDisplayName(ChatColor.RESET.toString() + "Select a Chest");
@@ -169,7 +169,7 @@ public class TreasurePage extends ShopPageBase
public void update()
{
- BuildPage();
+ buildPage();
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/creature/Creature.java b/Plugins/Mineplex.Core/src/mineplex/core/creature/Creature.java
index 7cd2b0cfc..bb33f50b0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/creature/Creature.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/creature/Creature.java
@@ -41,7 +41,7 @@ public class Creature extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new MobCommand(this));
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/creature/command/KillCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/creature/command/KillCommand.java
index a4efed103..736aa9cee 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/creature/command/KillCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/creature/command/KillCommand.java
@@ -56,7 +56,7 @@ public class KillCommand extends CommandBase
}
CreatureKillEntitiesEvent event = new CreatureKillEntitiesEvent(killList);
- Plugin.GetPlugin().getServer().getPluginManager().callEvent(event);
+ Plugin.getPlugin().getServer().getPluginManager().callEvent(event);
for (Entity entity : event.GetEntities())
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
index 94859f263..6cb549963 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
@@ -235,7 +235,7 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
final List armorPackets = tempArmor;
- Bukkit.getServer().getScheduler().runTaskLater(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskLater(getPlugin(), new Runnable()
{
public void run()
{
@@ -297,7 +297,7 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
final List armorPackets = tempArmor;
- Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
@@ -597,7 +597,7 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
if (_goingUp.contains(movePacket.a) && movePacket.c != 0 && movePacket.c > 20)
{
- Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
@@ -649,7 +649,7 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler
if (_goingUp.contains(movePacket.a) && movePacket.c != 0 && movePacket.c > 20)
{
- Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
index 0d52f76f5..cff2bdd9c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
@@ -38,7 +38,7 @@ public class DonationManager extends MiniDbClientPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new GemCommand(this));
addCommand(new CoinCommand(this));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java
index 5aa465aa4..858e89198 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java
@@ -81,7 +81,7 @@ public class EloManager extends MiniDbClientPlugin
public void saveElo(final String uuid, final String gameType, final int elo)
{
- Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
index c94d01e80..fe6a0d892 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
@@ -62,7 +62,7 @@ public class FriendManager extends MiniDbClientPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new AddFriend(this));
addCommand(new DeleteFriend(this));
@@ -150,7 +150,7 @@ public class FriendManager extends MiniDbClientPlugin
final boolean updateFinal = update;
- Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -218,7 +218,7 @@ public class FriendManager extends MiniDbClientPlugin
public void removeFriend(final Player caller, final String name)
{
- Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/AddFriendPage.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/AddFriendPage.java
index 40aba2e09..c54875afc 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/AddFriendPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/AddFriendPage.java
@@ -74,7 +74,7 @@ public class AddFriendPage implements Listener
_friends = friends;
openInventory();
- friends.RegisterEvents(this);
+ friends.registerEvents(this);
}
@EventHandler
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java
index 137123955..a7e629744 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java
@@ -37,558 +37,560 @@ import mineplex.core.shop.item.IButton;
public class FriendsGUI implements Listener
{
- private NautHashMap _buttonMap = new NautHashMap();
- private FriendPage _currentPage = FriendPage.FRIENDS;
- private FriendPage _previousPage;
- private Player _player;
- private FriendManager _plugin;
- private Inventory _inventory;
- private int _page;
- private Comparator _friendCompare = new Comparator()
- {
-
- @Override
- public int compare(FriendStatus o1, FriendStatus o2)
- {
- if (o1.Online == o2.Online)
- {
- return o1.Name.compareToIgnoreCase(o2.Name);
- }
-
- if (o1.Online)
- {
- return -1;
- }
- return 1;
- }
- };
-
- public FriendsGUI(FriendManager plugin, Player player)
- {
- _plugin = plugin;
- _player = player;
-
- buildPage();
-
- _plugin.RegisterEvents(this);
-
- getFriendData().setGui(this);
- }
-
- private void AddButton(int slot, ItemStack item, IButton button)
- {
- _inventory.setItem(slot, item);
- _buttonMap.put(slot, button);
- }
-
- public void buildDeleteFriends()
- {
-
- ArrayList friends = new ArrayList();
-
- for (FriendStatus friend : getFriendData().getFriends())
- {
- if (friend.Status == FriendStatusType.Accepted)
- {
- friends.add(friend);
- }
- }
-
- Collections.sort(friends, _friendCompare);
-
- boolean pages = this.addPages(friends.size(), new Runnable()
- {
- public void run()
- {
- buildDeleteFriends();
- }
- });
-
- for (int i = 0; i < (pages ? 27 : 36); i++)
- {
- int friendSlot = (_page * 27) + i;
- int slot = i + 18;
-
- if (friendSlot >= friends.size())
- {
- ItemStack item = _inventory.getItem(slot);
-
- if (item == null || item.getType() == Material.AIR)
- {
- break;
- }
- else
- {
- _inventory.setItem(slot, new ItemStack(Material.AIR));
-
- continue;
- }
- }
-
- FriendStatus friend = friends.get(friendSlot);
-
- ItemBuilder builder = new ItemBuilder(Material.SKULL_ITEM, 1, (short) (friend.Online ? 3 : 0));
-
- builder.setTitle(C.cWhite + C.Bold + friend.Name);
- builder.setPlayerHead(friend.Name);
-
- builder.addLore(C.cGray + C.Bold + "Status: " + (friend.Online ? C.cDGreen + "Online" : C.cRed + "Offline"));
-
- if (friend.Online)
- {
- builder.addLore(C.cGray + C.Bold + "Server: " + C.cYellow + friend.ServerName);
- }
- else
- {
- builder.addLore(C.cGray + "Last seen " + UtilTime.MakeStr(friend.LastSeenOnline) + " ago");
- }
-
- builder.addLore("");
-
- builder.addLore(C.cGray + "Left click to delete from friends");
-
- final String name = friend.Name;
-
- AddButton(slot, builder.build(), new IButton()
- {
-
- @Override
- public void onClick(Player player, ClickType clickType)
- {
- if (clickType.isLeftClick())
- {
- CommandCenter.Instance.OnPlayerCommandPreprocess(new PlayerCommandPreprocessEvent(player, "/unfriend "
- + name));
- }
- }
- });
- }
- }
-
- private boolean addPages(int amount, final Runnable runnable)
- {
- if (amount > 36)
- {
- if (_page > 0)
- {
- AddButton(45, new ItemBuilder(Material.SIGN).setTitle("Previous Page").build(), new IButton()
- {
-
- @Override
- public void onClick(Player player, ClickType clickType)
- {
- Iterator itel = _buttonMap.keySet().iterator();
-
- while (itel.hasNext())
- {
- int slot = itel.next();
- if (slot > 8)
- {
- itel.remove();
- _inventory.setItem(slot, new ItemStack(Material.AIR));
- }
- }
-
- _page -= 1;
- runnable.run();
- }
- });
- }
-
- if (amount > (_page + 1) * 27)
- {
- AddButton(53, new ItemBuilder(Material.SIGN).setTitle("Next Page").build(), new IButton()
- {
-
- @Override
- public void onClick(Player player, ClickType clickType)
- {
- Iterator itel = _buttonMap.keySet().iterator();
-
- while (itel.hasNext())
- {
- int slot = itel.next();
- if (slot > 8)
- {
- itel.remove();
- _inventory.setItem(slot, new ItemStack(Material.AIR));
- }
- }
-
- _page += 1;
- runnable.run();
- }
- });
- }
-
- return true;
- }
- return false;
- }
-
- private void buildFriends()
- {
- ArrayList friends = new ArrayList();
-
- for (FriendStatus friend : getFriendData().getFriends())
- {
- if (friend.Status == FriendStatusType.Accepted)
- {
- friends.add(friend);
- }
- }
-
- Collections.sort(friends, _friendCompare);
- boolean pages = addPages(friends.size(), new Runnable()
- {
-
- @Override
- public void run()
- {
- buildFriends();
- }
- });
-
- for (int i = 0; i < (pages ? 27 : 36); i++)
- {
- int friendSlot = (_page * 27) + i;
- int slot = i + 18;
-
- if (friendSlot >= friends.size())
- {
- ItemStack item = _inventory.getItem(slot);
-
- if (item == null || item.getType() == Material.AIR)
- {
- break;
- }
- else
- {
- _inventory.setItem(slot, new ItemStack(Material.AIR));
-
- continue;
- }
- }
-
- FriendStatus friend = friends.get(friendSlot);
-
- ItemBuilder builder = new ItemBuilder(Material.SKULL_ITEM, 1, (short) (friend.Online ? 3 : 0));
-
- builder.setTitle(C.cWhite + C.Bold + friend.Name);
- builder.setPlayerHead(friend.Name);
-
- builder.addLore(C.cGray + C.Bold + "Status: " + (friend.Online ? C.cDGreen + "Online" : C.cRed + "Offline"));
-
- if (friend.Online)
- {
- builder.addLore(C.cGray + C.Bold + "Server: " + C.cYellow + friend.ServerName);
- }
- else
- {
- builder.addLore(C.cGray + "Last seen " + UtilTime.MakeStr(friend.LastSeenOnline) + " ago");
- }
-
- if (friend.Online)
- {
- builder.addLore("");
- builder.addLore(C.cGray + "Left click to teleport to their server");
-
- final String serverName = friend.ServerName;
-
- AddButton(slot, builder.build(), new IButton()
- {
-
- @Override
- public void onClick(Player player, ClickType clickType)
- {
- _plugin.getPortal().sendPlayerToServer(player, serverName);
- }
- });
- }
- else
- {
- _inventory.setItem(slot, builder.build());
- }
- }
- }
-
- public void updateGui()
- {
- if (_currentPage == FriendPage.FRIENDS)
- {
- buildFriends();
- }
- else if (_currentPage == FriendPage.FRIEND_REQUESTS)
- {
- buildRequests();
- }
- else if (_currentPage == FriendPage.DELETE_FRIENDS)
- {
- buildDeleteFriends();
- }
- }
-
- private void buildPage()
- {
-
- if (_currentPage != _previousPage)
- {
- _inventory = Bukkit.createInventory(null, 54, _currentPage.getName());
- }
- else
- {
- _inventory.setItem(53, new ItemStack(Material.AIR));
- _inventory.setItem(45, new ItemStack(Material.AIR));
- }
-
- _page = 0;
- _buttonMap.clear();
-
- ArrayList itemSlots = new ItemLayout("OXOXOXOXO").getItemSlots();
-
- for (int i = 0; i < FriendPage.values().length; i++)
- {
- final FriendPage page = FriendPage.values()[i];
-
- ItemStack icon = page == _currentPage ?
-
- new ItemBuilder(page.getIcon()).addEnchantment(UtilInv.getDullEnchantment(), 1).build()
-
- :
-
- page.getIcon();
-
- this.AddButton(itemSlots.get(i), icon, new IButton()
- {
-
- @Override
- public void onClick(Player player, ClickType clickType)
- {
- if (_currentPage != page || _page != 0)
- {
- _currentPage = page;
- buildPage();
- }
- }
-
- });
- }
-
- if (_currentPage == FriendPage.FRIENDS)
- {
- buildFriends();
- }
- else if (_currentPage == FriendPage.FRIEND_REQUESTS)
- {
- buildRequests();
- }
- else if (_currentPage == FriendPage.DELETE_FRIENDS)
- {
- buildDeleteFriends();
- }
- else if (_currentPage == FriendPage.SEND_REQUEST)
- {
- unregisterListener();
-
- new AddFriendPage(_plugin, _player);
-
- return;
- }
- else if (_currentPage == FriendPage.TOGGLE_DISPLAY)
- {
- _player.closeInventory();
-
- CommandCenter.Instance.OnPlayerCommandPreprocess(new PlayerCommandPreprocessEvent(_player, "/friendsdisplay"));
-
- return;
- }
-
- if (_previousPage != _currentPage)
- {
- _previousPage = _currentPage;
-
- EntityPlayer nmsPlayer = ((CraftPlayer) _player).getHandle();
- if (nmsPlayer.activeContainer != nmsPlayer.defaultContainer)
- {
- // Do this so that other inventories know their time is over.
- CraftEventFactory.handleInventoryCloseEvent(nmsPlayer);
- nmsPlayer.m();
- }
-
- _player.openInventory(_inventory);
- }
- }
-
- private void buildRequests()
- {
- ArrayList friends = new ArrayList();
-
- for (FriendStatus friend : getFriendData().getFriends())
- {
- if (friend.Status == FriendStatusType.Sent || friend.Status == FriendStatusType.Pending)
- {
- friends.add(friend);
- }
- }
-
- Collections.sort(friends, new Comparator()
- {
-
- @Override
- public int compare(FriendStatus o1, FriendStatus o2)
- {
- if (o1.Status == o2.Status)
- {
- return o1.Name.compareToIgnoreCase(o2.Name);
- }
-
- if (o1.Status == FriendStatusType.Sent)
- {
- return -1;
- }
-
- return 1;
- }
- });
-
- boolean pages = addPages(friends.size(), new Runnable()
- {
-
- @Override
- public void run()
- {
- buildRequests();
- }
- });
-
- for (int i = 0; i < (pages ? 27 : 36); i++)
- {
- int friendSlot = (_page * 27) + i;
- final int slot = i + 18;
-
- if (friendSlot >= friends.size())
- {
- ItemStack item = _inventory.getItem(slot);
-
- if (item == null || item.getType() == Material.AIR)
- {
- break;
- }
- else
- {
- _inventory.setItem(slot, new ItemStack(Material.AIR));
-
- continue;
- }
- }
-
- FriendStatus friend = friends.get(friendSlot);
-
- ItemBuilder builder;
-
- final boolean isSender = friend.Status == FriendStatusType.Sent;
-
- if (isSender)
- {
- builder = new ItemBuilder(Material.ENDER_PEARL);
-
- builder.setTitle(C.cGray + "Friend request to " + C.cWhite + C.Bold + friend.Name);
- }
- else
- {
- builder = new ItemBuilder(Material.PAPER);
-
- builder.setTitle(C.cGray + "Friend request from " + C.cWhite + C.Bold + friend.Name);
- }
-
- builder.addLore("");
-
- builder.addLore(C.cGray + (isSender ? "C" : "Left c") + "lick to " + (isSender ? "cancel" : "accept")
- + " friend request");
-
- if (!isSender)
- {
- builder.addLore(C.cGray + "Right click to refuse friend request");
- }
-
- final String name = friend.Name;
-
- AddButton(slot, builder.build(), new IButton()
- {
-
- @Override
- public void onClick(Player player, ClickType clickType)
- {
- if (isSender || clickType.isRightClick())
- {
- CommandCenter.Instance.OnPlayerCommandPreprocess(new PlayerCommandPreprocessEvent(player, "/unfriend "
- + name));
-
- _inventory.setItem(slot, new ItemStack(Material.AIR));
- _buttonMap.remove(slot);
- }
- else if (!isSender && clickType.isLeftClick())
- {
- CommandCenter.Instance.OnPlayerCommandPreprocess(new PlayerCommandPreprocessEvent(player, "/friend "
- + name));
-
- _inventory.setItem(slot, new ItemStack(Material.AIR));
- _buttonMap.remove(slot);
- }
- }
- });
- }
- }
-
- private FriendData getFriendData()
- {
- return _plugin.Get(_player);
- }
-
- @EventHandler
- public void OnInventoryClick(InventoryClickEvent event)
- {
- if (_inventory.getTitle().equals(event.getInventory().getTitle()) && event.getWhoClicked() == _player)
- {
- if (_buttonMap.containsKey(event.getRawSlot()))
- {
- if (event.getWhoClicked() instanceof Player)
- {
- IButton button = _buttonMap.get(event.getRawSlot());
-
- button.onClick(((Player) event.getWhoClicked()), event.getClick());
-
- _player.playSound(_player.getLocation(), Sound.NOTE_PLING, 1, 1.6f);
- }
- }
- else
- {
-
- _player.playSound(_player.getLocation(), Sound.ITEM_BREAK, 1, .6f);
- }
-
- event.setCancelled(true);
- }
- }
-
- @EventHandler
- public void OnInventoryClose(InventoryCloseEvent event)
- {
- if (_inventory.getTitle().equals(event.getInventory().getTitle()) && event.getPlayer() == _player)
- {
- unregisterListener();
- }
- }
-
- private void unregisterListener()
- {
- FriendData data = getFriendData();
-
- if (data != null && data.getGui() == this)
- {
- data.setGui(null);
- }
-
- HandlerList.unregisterAll(this);
- }
+ private NautHashMap _buttonMap = new NautHashMap();
+ private FriendPage _currentPage = FriendPage.FRIENDS;
+ private FriendPage _previousPage;
+ private Player _player;
+ private FriendManager _plugin;
+ private Inventory _inventory;
+ private int _page;
+ private Comparator _friendCompare = new Comparator()
+ {
+
+ @Override
+ public int compare(FriendStatus o1, FriendStatus o2)
+ {
+ if (o1.Online == o2.Online)
+ {
+ return o1.Name.compareToIgnoreCase(o2.Name);
+ }
+
+ if (o1.Online)
+ {
+ return -1;
+ }
+ return 1;
+ }
+ };
+
+ public FriendsGUI(FriendManager plugin, Player player)
+ {
+ _plugin = plugin;
+ _player = player;
+
+ buildPage();
+
+ _plugin.registerEvents(this);
+
+ getFriendData().setGui(this);
+ }
+
+ private void AddButton(int slot, ItemStack item, IButton button)
+ {
+ _inventory.setItem(slot, item);
+ _buttonMap.put(slot, button);
+ }
+
+ public void buildDeleteFriends()
+ {
+
+ ArrayList friends = new ArrayList();
+
+ for (FriendStatus friend : getFriendData().getFriends())
+ {
+ if (friend.Status == FriendStatusType.Accepted)
+ {
+ friends.add(friend);
+ }
+ }
+
+ Collections.sort(friends, _friendCompare);
+
+ boolean pages = this.addPages(friends.size(), new Runnable()
+ {
+ public void run()
+ {
+ buildDeleteFriends();
+ }
+ });
+
+ for (int i = 0; i < (pages ? 27 : 36); i++)
+ {
+ int friendSlot = (_page * 27) + i;
+ int slot = i + 18;
+
+ if (friendSlot >= friends.size())
+ {
+ ItemStack item = _inventory.getItem(slot);
+
+ if (item == null || item.getType() == Material.AIR)
+ {
+ break;
+ }
+ else
+ {
+ _inventory.setItem(slot, new ItemStack(Material.AIR));
+
+ continue;
+ }
+ }
+
+ FriendStatus friend = friends.get(friendSlot);
+
+ ItemBuilder builder = new ItemBuilder(Material.SKULL_ITEM, 1, (short) (friend.Online ? 3 : 0));
+
+ builder.setTitle(C.cWhite + C.Bold + friend.Name);
+ builder.setPlayerHead(friend.Name);
+
+ builder.addLore(C.cGray + C.Bold + "Status: " + (friend.Online ? C.cDGreen + "Online" : C.cRed + "Offline"));
+
+ if (friend.Online)
+ {
+ builder.addLore(C.cGray + C.Bold + "Server: " + C.cYellow + friend.ServerName);
+ }
+ else
+ {
+ builder.addLore(C.cGray + "Last seen " + UtilTime.MakeStr(friend.LastSeenOnline) + " ago");
+ }
+
+ builder.addLore("");
+
+ builder.addLore(C.cGray + "Left click to delete from friends");
+
+ final String name = friend.Name;
+
+ AddButton(slot, builder.build(), new IButton()
+ {
+
+ @Override
+ public void onClick(Player player, ClickType clickType)
+ {
+ if (clickType.isLeftClick())
+ {
+ CommandCenter.Instance.OnPlayerCommandPreprocess(new PlayerCommandPreprocessEvent(player, "/unfriend "
+ + name));
+ }
+ }
+ });
+ }
+ }
+
+ private boolean addPages(int amount, final Runnable runnable)
+ {
+ if (amount > 36)
+ {
+ if (_page > 0)
+ {
+ AddButton(45, new ItemBuilder(Material.SIGN).setTitle("Previous Page").build(), new IButton()
+ {
+
+ @Override
+ public void onClick(Player player, ClickType clickType)
+ {
+ Iterator itel = _buttonMap.keySet().iterator();
+
+ while (itel.hasNext())
+ {
+ int slot = itel.next();
+ if (slot > 8)
+ {
+ itel.remove();
+ _inventory.setItem(slot, new ItemStack(Material.AIR));
+ }
+ }
+
+ _page -= 1;
+ runnable.run();
+ }
+ });
+ }
+
+ if (amount > (_page + 1) * 27)
+ {
+ AddButton(53, new ItemBuilder(Material.SIGN).setTitle("Next Page").build(), new IButton()
+ {
+
+ @Override
+ public void onClick(Player player, ClickType clickType)
+ {
+ Iterator itel = _buttonMap.keySet().iterator();
+
+ while (itel.hasNext())
+ {
+ int slot = itel.next();
+ if (slot > 8)
+ {
+ itel.remove();
+ _inventory.setItem(slot, new ItemStack(Material.AIR));
+ }
+ }
+
+ _page += 1;
+ runnable.run();
+ }
+ });
+ }
+
+ return true;
+ }
+ return false;
+ }
+
+ private void buildFriends()
+ {
+ ArrayList friends = new ArrayList();
+
+ for (FriendStatus friend : getFriendData().getFriends())
+ {
+ if (friend.Status == FriendStatusType.Accepted)
+ {
+ friends.add(friend);
+ }
+ }
+
+ Collections.sort(friends, _friendCompare);
+ boolean pages = addPages(friends.size(), new Runnable()
+ {
+
+ @Override
+ public void run()
+ {
+ buildFriends();
+ }
+ });
+
+ for (int i = 0; i < (pages ? 27 : 36); i++)
+ {
+ int friendSlot = (_page * 27) + i;
+ int slot = i + 18;
+
+ if (friendSlot >= friends.size())
+ {
+ ItemStack item = _inventory.getItem(slot);
+
+ if (item == null || item.getType() == Material.AIR)
+ {
+ break;
+ }
+ else
+ {
+ _inventory.setItem(slot, new ItemStack(Material.AIR));
+
+ continue;
+ }
+ }
+
+ FriendStatus friend = friends.get(friendSlot);
+
+ ItemBuilder builder = new ItemBuilder(Material.SKULL_ITEM, 1, (short) (friend.Online ? 3 : 0));
+
+ builder.setTitle(C.cWhite + C.Bold + friend.Name);
+ builder.setPlayerHead(friend.Name);
+
+ builder.addLore(C.cGray + C.Bold + "Status: " + (friend.Online ? C.cDGreen + "Online" : C.cRed + "Offline"));
+
+ if (friend.Online)
+ {
+ builder.addLore(C.cGray + C.Bold + "Server: " + C.cYellow + friend.ServerName);
+ }
+ else
+ {
+ builder.addLore(C.cGray + "Last seen " + UtilTime.MakeStr(friend.LastSeenOnline) + " ago");
+ }
+
+ if (friend.Online)
+ {
+ builder.addLore("");
+ builder.addLore(C.cGray + "Left click to teleport to their server");
+
+ final String serverName = friend.ServerName;
+
+ AddButton(slot, builder.build(), new IButton()
+ {
+
+ @Override
+ public void onClick(Player player, ClickType clickType)
+ {
+ _plugin.getPortal().sendPlayerToServer(player, serverName);
+ }
+ });
+ }
+ else
+ {
+ _inventory.setItem(slot, builder.build());
+ }
+ }
+ }
+
+ public void updateGui()
+ {
+ if (_currentPage == FriendPage.FRIENDS)
+ {
+ buildFriends();
+ }
+ else if (_currentPage == FriendPage.FRIEND_REQUESTS)
+ {
+ buildRequests();
+ }
+ else if (_currentPage == FriendPage.DELETE_FRIENDS)
+ {
+ buildDeleteFriends();
+ }
+ }
+
+ private void buildPage()
+ {
+
+ if (_currentPage != _previousPage)
+ {
+ _inventory = Bukkit.createInventory(null, 54, _currentPage.getName());
+ }
+ else
+ {
+ _inventory.setItem(53, new ItemStack(Material.AIR));
+ _inventory.setItem(45, new ItemStack(Material.AIR));
+ }
+
+ _page = 0;
+ _buttonMap.clear();
+
+ ArrayList itemSlots = new ItemLayout("OXOXOXOXO").getItemSlots();
+
+ for (int i = 0; i < FriendPage.values().length; i++)
+ {
+ final FriendPage page = FriendPage.values()[i];
+
+ ItemStack icon = page == _currentPage ?
+
+ new ItemBuilder(page.getIcon()).addEnchantment(UtilInv.getDullEnchantment(), 1).build()
+
+ :
+
+ page.getIcon();
+
+ this.AddButton(itemSlots.get(i), icon, new IButton()
+ {
+
+ @Override
+ public void onClick(Player player, ClickType clickType)
+ {
+ if (_currentPage != page || _page != 0)
+ {
+ _currentPage = page;
+ buildPage();
+ }
+ }
+
+ });
+ }
+
+ if (_currentPage == FriendPage.FRIENDS)
+ {
+ buildFriends();
+ }
+ else if (_currentPage == FriendPage.FRIEND_REQUESTS)
+ {
+ buildRequests();
+ }
+ else if (_currentPage == FriendPage.DELETE_FRIENDS)
+ {
+ buildDeleteFriends();
+ }
+ else if (_currentPage == FriendPage.SEND_REQUEST)
+ {
+ unregisterListener();
+
+ new AddFriendPage(_plugin, _player);
+
+ return;
+ }
+ else if (_currentPage == FriendPage.TOGGLE_DISPLAY)
+ {
+ _player.closeInventory();
+
+ CommandCenter.Instance.OnPlayerCommandPreprocess(new PlayerCommandPreprocessEvent(_player, "/friendsdisplay"));
+
+ return;
+ }
+
+ if (_previousPage != _currentPage)
+ {
+ _previousPage = _currentPage;
+
+ EntityPlayer nmsPlayer = ((CraftPlayer) _player).getHandle();
+ if (nmsPlayer.activeContainer != nmsPlayer.defaultContainer)
+ {
+ // Do this so that other inventories know their time is over.
+ CraftEventFactory.handleInventoryCloseEvent(nmsPlayer);
+ nmsPlayer.m();
+ }
+
+ _player.openInventory(_inventory);
+ }
+ }
+
+ private void buildRequests()
+ {
+ ArrayList friends = new ArrayList();
+
+ for (FriendStatus friend : getFriendData().getFriends())
+ {
+ if (friend.Status == FriendStatusType.Sent || friend.Status == FriendStatusType.Pending)
+ {
+ friends.add(friend);
+ }
+ }
+
+ Collections.sort(friends, new Comparator()
+ {
+
+ @Override
+ public int compare(FriendStatus o1, FriendStatus o2)
+ {
+ if (o1.Status == o2.Status)
+ {
+ return o1.Name.compareToIgnoreCase(o2.Name);
+ }
+
+ if (o1.Status == FriendStatusType.Sent)
+ {
+ return -1;
+ }
+
+ return 1;
+ }
+ });
+
+ boolean pages = addPages(friends.size(), new Runnable()
+ {
+
+ @Override
+ public void run()
+ {
+ buildRequests();
+ }
+ });
+
+ for (int i = 0; i < (pages ? 27 : 36); i++)
+ {
+ int friendSlot = (_page * 27) + i;
+ final int slot = i + 18;
+
+ if (friendSlot >= friends.size())
+ {
+ ItemStack item = _inventory.getItem(slot);
+
+ if (item == null || item.getType() == Material.AIR)
+ {
+ break;
+ }
+ else
+ {
+ _inventory.setItem(slot, new ItemStack(Material.AIR));
+
+ continue;
+ }
+ }
+
+ FriendStatus friend = friends.get(friendSlot);
+
+ ItemBuilder builder;
+
+ final boolean isSender = friend.Status == FriendStatusType.Sent;
+
+ if (isSender)
+ {
+ builder = new ItemBuilder(Material.ENDER_PEARL);
+
+ builder.setTitle(C.cGray + "Friend request to " + C.cWhite + C.Bold + friend.Name);
+ }
+ else
+ {
+ builder = new ItemBuilder(Material.PAPER);
+
+ builder.setTitle(C.cGray + "Friend request from " + C.cWhite + C.Bold + friend.Name);
+ }
+
+ builder.addLore("");
+
+ builder.addLore(C.cGray + (isSender ? "C" : "Left c") + "lick to " + (isSender ? "cancel" : "accept")
+ + " friend request");
+
+ if (!isSender)
+ {
+ builder.addLore(C.cGray + "Right click to refuse friend request");
+ }
+
+ final String name = friend.Name;
+
+ AddButton(slot, builder.build(), new IButton()
+ {
+
+ @Override
+ public void onClick(Player player, ClickType clickType)
+ {
+ if (isSender || clickType.isRightClick())
+ {
+ _plugin.removeFriend(_player, name);
+// CommandCenter.Instance.OnPlayerCommandPreprocess(new PlayerCommandPreprocessEvent(player, "/unfriend "
+// + name));
+
+ _inventory.setItem(slot, new ItemStack(Material.AIR));
+ _buttonMap.remove(slot);
+ }
+ else if (!isSender && clickType.isLeftClick())
+ {
+ _plugin.addFriend(_player, name);
+// CommandCenter.Instance.OnPlayerCommandPreprocess(new PlayerCommandPreprocessEvent(player, "/friend "
+// + name));
+
+ _inventory.setItem(slot, new ItemStack(Material.AIR));
+ _buttonMap.remove(slot);
+ }
+ }
+ });
+ }
+ }
+
+ private FriendData getFriendData()
+ {
+ return _plugin.Get(_player);
+ }
+
+ @EventHandler
+ public void OnInventoryClick(InventoryClickEvent event)
+ {
+ if (_inventory.getTitle().equals(event.getInventory().getTitle()) && event.getWhoClicked() == _player)
+ {
+ if (_buttonMap.containsKey(event.getRawSlot()))
+ {
+ if (event.getWhoClicked() instanceof Player)
+ {
+ IButton button = _buttonMap.get(event.getRawSlot());
+
+ button.onClick(((Player) event.getWhoClicked()), event.getClick());
+
+ _player.playSound(_player.getLocation(), Sound.NOTE_PLING, 1, 1.6f);
+ }
+ }
+ else
+ {
+
+ _player.playSound(_player.getLocation(), Sound.ITEM_BREAK, 1, .6f);
+ }
+
+ event.setCancelled(true);
+ }
+ }
+
+ @EventHandler
+ public void OnInventoryClose(InventoryCloseEvent event)
+ {
+ if (_inventory.getTitle().equals(event.getInventory().getTitle()) && event.getPlayer() == _player)
+ {
+ unregisterListener();
+ }
+ }
+
+ private void unregisterListener()
+ {
+ FriendData data = getFriendData();
+
+ if (data != null && data.getGui() == this)
+ {
+ data.setGui(null);
+ }
+
+ HandlerList.unregisterAll(this);
+ }
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/BlockForm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/BlockForm.java
index a2328f7a0..6635ddbe3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/BlockForm.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/BlockForm.java
@@ -72,9 +72,9 @@ public class BlockForm
//Inform
String blockName = F.elem(ItemStackFactory.Instance.GetName(_mat, (byte)0, false));
if (!blockName.contains("Block"))
- UtilPlayer.message(_player, F.main("Game", C.cWhite + "You are now a " + F.elem(ItemStackFactory.Instance.GetName(_mat, (byte)0, false) + " Block") + "!"));
+ UtilPlayer.message(_player, F.main("Morph", "You are now a " + F.elem(ItemStackFactory.Instance.GetName(_mat, (byte)0, false) + " Block") + "!"));
else
- UtilPlayer.message(_player, F.main("Game", C.cWhite + "You are now a " + F.elem(ItemStackFactory.Instance.GetName(_mat, (byte)0, false)) + "!"));
+ UtilPlayer.message(_player, F.main("Morph", "You are now a " + F.elem(ItemStackFactory.Instance.GetName(_mat, (byte)0, false)) + "!"));
//Sound
_player.playSound(_player.getLocation(), Sound.ZOMBIE_UNFECT, 2f, 2f);
@@ -132,9 +132,9 @@ public class BlockForm
Bukkit.getServer().getPluginManager().callEvent(event);
//Not Able
- if (block.getType() != Material.AIR || !UtilBlock.solid(block.getRelative(BlockFace.DOWN)) || event.getBlocks().isEmpty())
+ if (block.getType() != Material.AIR || !UtilBlock.solid(block.getRelative(BlockFace.DOWN)) || event.getBlocks().isEmpty() || event.isCancelled())
{
- UtilPlayer.message(_player, F.main("Game", "You cannot become a Solid Block here."));
+ UtilPlayer.message(_player, F.main("Morph", "You cannot become a Solid Block here."));
_player.setExp(0f);
return;
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPumpkinKing.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPumpkinKing.java
index 9cfbbdfd8..da9dd87f5 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPumpkinKing.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPumpkinKing.java
@@ -1,7 +1,6 @@
package mineplex.core.gadget.gadgets;
import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.entity.Skeleton.SkeletonType;
@@ -44,7 +43,7 @@ public class MorphPumpkinKing extends MorphGadget
player.getInventory().setHelmet(new ItemStack(Material.JACK_O_LANTERN));
- Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Manager.GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java
index f79a958fa..adef371a1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java
@@ -38,7 +38,7 @@ public abstract class Gadget extends SalesPackageBase implements Listener
Manager = manager;
- Manager.GetPlugin().getServer().getPluginManager().registerEvents(this, Manager.GetPlugin());
+ Manager.getPlugin().getServer().getPluginManager().registerEvents(this, Manager.getPlugin());
}
public GadgetType getGadgetType()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java
index 9c2387dab..9ce8dfa8c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java
@@ -86,7 +86,7 @@ public abstract class ItemGadget extends Gadget
{
final Player player = event.getPlayer();
- Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.GetPlugin(), new Runnable()
+ Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java b/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
index 57448ad3e..482030f36 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
@@ -73,7 +73,7 @@ public class IgnoreManager extends MiniDbClientPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new Ignore(this));
addCommand(new Unignore(this));
@@ -136,7 +136,7 @@ public class IgnoreManager extends MiniDbClientPlugin
ignoreData.getIgnored().add(name);
}
- Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -175,7 +175,7 @@ public class IgnoreManager extends MiniDbClientPlugin
caller.sendMessage(F.main(getName(), "No longer ignoring " + ChatColor.GREEN + name + ChatColor.GRAY + "!"));
- Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java b/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java
index 8668343a8..577ed05f7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java
@@ -38,7 +38,7 @@ public class InventoryManager extends MiniDbClientPlugin
_repository = new InventoryRepository(plugin);
- Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskLaterAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -151,7 +151,7 @@ public class InventoryManager extends MiniDbClientPlugin
public void addItemToInventoryForOffline(final Callback callback, final String uuidString, final String category, final String item, final int count)
{
- Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -183,7 +183,7 @@ public class InventoryManager extends MiniDbClientPlugin
if (callback != null)
{
- Bukkit.getServer().getScheduler().runTask(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTask(getPlugin(), new Runnable()
{
public void run()
{
@@ -244,7 +244,7 @@ public class InventoryManager extends MiniDbClientPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new GiveItemCommand(this));
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java b/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java
index 83a4b4b28..592ff1d30 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java
@@ -12,8 +12,6 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilInv;
import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilTime;
-import net.minecraft.server.v1_7_R4.NBTTagByte;
-import net.minecraft.server.v1_7_R4.NBTTagCompound;
import org.bukkit.ChatColor;
import org.bukkit.Material;
@@ -70,7 +68,7 @@ public class ItemStackFactory extends MiniPlugin
public void AddStatListener(Listener listener)
{
_statListeners.add(listener);
- RegisterEvents(listener);
+ registerEvents(listener);
}
private void SetCustom()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/LeaderboardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/LeaderboardManager.java
index b2b12855b..73f893f1a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/LeaderboardManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/LeaderboardManager.java
@@ -65,7 +65,7 @@ public class LeaderboardManager extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new SetTournamentCommand(this));
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/map/Map.java b/Plugins/Mineplex.Core/src/mineplex/core/map/Map.java
index fd053dfb9..98ebc3d34 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/map/Map.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/map/Map.java
@@ -62,7 +62,7 @@ public class Map implements Listener
ex.printStackTrace();
}
- plugin.RegisterEvents(this);
+ plugin.registerEvents(this);
// Clear out the area to make room for the picture
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
index 9dc2646bb..ba41a8fc4 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
@@ -59,7 +59,7 @@ public class MessageManager extends MiniClientPlugin
_ignoreManager = ignoreManager;
_punish = punish;
_friendsManager = friendManager;
- _serverName = GetPlugin().getConfig().getString("serverstatus.name");
+ _serverName = getPlugin().getConfig().getString("serverstatus.name");
MessageHandler messageHandler = new MessageHandler(this);
@@ -71,7 +71,7 @@ public class MessageManager extends MiniClientPlugin
.registerCommandType("RedisMessageCallback", RedisMessageCallback.class, messageHandler);
}
- public void AddCommands()
+ public void addCommands()
{
addCommand(new MessageCommand(this));
addCommand(new ResendCommand(this));
@@ -242,7 +242,7 @@ public class MessageManager extends MiniClientPlugin
// Module Functions
@Override
- public void Enable()
+ public void enable()
{
_randomMessage = new LinkedList();
_randomMessage.clear();
@@ -522,7 +522,7 @@ public class MessageManager extends MiniClientPlugin
};
// This will activate in 2 seconds
- runnable.runTaskLater(GetPlugin(), 40);
+ runnable.runTaskLater(getPlugin(), 40);
// The key is the UUID its trading between servers
_messageTimeouts.put(uuid, runnable);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java
index 7387970a0..9c8c52d8d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java
@@ -7,8 +7,6 @@ import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Sound;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEnderDragon;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
import org.bukkit.entity.Chicken;
import org.bukkit.entity.EnderDragon;
import org.bukkit.entity.Entity;
@@ -55,7 +53,7 @@ public class DragonData
Chicken.setPassenger(Rider);
- Bukkit.getServer().getScheduler().runTaskLater(Host.Manager.GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskLater(Host.Manager.getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/Mount.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/Mount.java
index cdc1761c8..a326e9e42 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/Mount.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/Mount.java
@@ -14,7 +14,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
import mineplex.core.common.CurrencyType;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.gadget.event.GadgetActivateEvent;
import mineplex.core.mount.event.MountActivateEvent;
import mineplex.core.shop.item.SalesPackageBase;
@@ -31,7 +30,7 @@ public abstract class Mount extends SalesPackageBase implements Listener
Manager = manager;
- Manager.GetPlugin().getServer().getPluginManager().registerEvents(this, Manager.GetPlugin());
+ Manager.getPlugin().getServer().getPluginManager().registerEvents(this, Manager.getPlugin());
}
@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/movement/Movement.java b/Plugins/Mineplex.Core/src/mineplex/core/movement/Movement.java
index f2e39156a..867cb08ba 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/movement/Movement.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/movement/Movement.java
@@ -22,7 +22,7 @@ public class Movement extends MiniClientPlugin
{
if (event.getType() == UpdateType.TICK)
{
- for (Player cur : GetPlugin().getServer().getOnlinePlayers())
+ for (Player cur : getPlugin().getServer().getOnlinePlayers())
{
ClientMovement player = Get(cur);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
index cab2e8195..0c4d99a75 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
@@ -130,7 +130,7 @@ public class NpcManager extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new NpcCommand(this));
}
@@ -669,7 +669,7 @@ public class NpcManager extends MiniPlugin
public String getServerName()
{
- String serverName = GetPlugin().getClass().getSimpleName();
+ String serverName = getPlugin().getClass().getSimpleName();
if (Bukkit.getMotd() != null && Bukkit.getMotd().equalsIgnoreCase("test"))
serverName += "-Test";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/Party.java b/Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
index ecf47c906..e476b48c2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
@@ -59,8 +59,8 @@ public class Party
public Party(PartyManager manager)
{
_manager = manager;
- Region region = manager.GetPlugin().getConfig().getBoolean("serverstatus.us") ? Region.US : Region.EU;
- String groupName = manager.GetPlugin().getConfig().getString("serverstatus.group");
+ Region region = manager.getPlugin().getConfig().getBoolean("serverstatus.us") ? Region.US : Region.EU;
+ String groupName = manager.getPlugin().getConfig().getString("serverstatus.group");
ServerGroup serverGroup = ServerManager.getServerRepository(region).getServerGroup(groupName);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java
index 752a30f30..131c82022 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java
@@ -38,14 +38,14 @@ public class PartyManager extends MiniPlugin
_portal = portal;
_clientManager = clientManager;
_preferenceManager = preferenceManager;
- _serverName = GetPlugin().getConfig().getString("serverstatus.name");
+ _serverName = getPlugin().getConfig().getString("serverstatus.name");
ServerCommandManager.getInstance().registerCommandType("RedisPartyData", RedisPartyData.class,
new RedisPartyHandler(this));
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new PartyCommand(this));
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
index 73ba9f12f..ca7477137 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
@@ -97,7 +97,7 @@ public class PersonalServerManager extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new HostServerCommand(this));
}
@@ -106,10 +106,10 @@ public class PersonalServerManager extends MiniPlugin
{
try
{
- GetPlugin().getConfig().addDefault("serverstatus.us", true);
- GetPlugin().getConfig().set("serverstatus.us", GetPlugin().getConfig().getBoolean("serverstatus.us"));
+ getPlugin().getConfig().addDefault("serverstatus.us", true);
+ getPlugin().getConfig().set("serverstatus.us", getPlugin().getConfig().getBoolean("serverstatus.us"));
- GetPlugin().saveConfig();
+ getPlugin().saveConfig();
}
catch (Exception e)
{
@@ -119,12 +119,23 @@ public class PersonalServerManager extends MiniPlugin
public void hostServer(Player player, String serverName)
{
- createGroup(player, serverName, 12, 24, "Smash");
+ int ram = 1024;
+ int cpu = 1;
+
+ Rank rank = _clientManager.Get(player).GetRank();
+
+ if (rank.Has(Rank.SNR_MODERATOR) || rank == Rank.YOUTUBE)
+ {
+ ram = 2048;
+ cpu = 3;
+ }
+
+ createGroup(player, serverName, ram, cpu, 12, 24, "Smash");
}
- private void createGroup(final Player host, final String serverName, final int minPlayers, final int maxPlayers, final String games)
+ private void createGroup(final Player host, final String serverName, final int ram, final int cpu, final int minPlayers, final int maxPlayers, final String games)
{
- GetPlugin().getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -141,15 +152,15 @@ public class PersonalServerManager extends MiniPlugin
}
}
- final ServerGroup serverGroup = new ServerGroup(serverName, serverName, host.getName(), 1024, 1, 1, 0, UtilMath.random.nextInt(250) + 19999, true, "arcade.zip", "Arcade.jar", "plugins/Arcade/", minPlayers, maxPlayers,
+ final ServerGroup serverGroup = new ServerGroup(serverName, serverName, host.getName(), ram, cpu, 1, 0, UtilMath.random.nextInt(250) + 19999, true, "arcade.zip", "Arcade.jar", "plugins/Arcade/", minPlayers, maxPlayers,
true, false, false, games, "Player", true, false, true, false, true, true, false, false, false, false, true, true, true, false, false, "", _us ? Region.US : Region.EU);
- GetPlugin().getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
_repository.updateServerGroup(serverGroup);
- Bukkit.getScheduler().runTask(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTask(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
index 26f1e7b5a..37d5d933c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java
@@ -21,7 +21,7 @@ public class ServerCommand extends CommandBase
public void Execute(final Player player, final String[] args)
{
final Rank playerRank = CommandCenter.GetClientManager().Get(player).GetRank();
- final String serverName = Plugin.GetPlugin().getConfig().getString("serverstatus.name");
+ final String serverName = Plugin.getPlugin().getConfig().getString("serverstatus.name");
if (args == null || args.length == 0)
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
index e5af7622c..f04c3b637 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
@@ -7,6 +7,7 @@ import java.util.HashSet;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
+import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent;
@@ -52,7 +53,7 @@ public class Portal extends MiniPlugin
_region = plugin.getConfig().getBoolean("serverstatus.us") ? Region.US : Region.EU;
_repository = ServerManager.getServerRepository(_region);
- Bukkit.getMessenger().registerOutgoingPluginChannel(GetPlugin(), "BungeeCord");
+ Bukkit.getMessenger().registerOutgoingPluginChannel(getPlugin(), "BungeeCord");
// Register the server command type for future use
ServerCommandManager.getInstance().registerCommandType("TransferCommand", TransferCommand.class, new TransferHandler());
@@ -132,13 +133,13 @@ public class Portal extends MiniPlugin
if (callback == null)
return;
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
final boolean serverExists = ServerManager.getServerRepository(_region).serverExists(serverName);
- Bukkit.getScheduler().runTask(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTask(getPlugin(), new Runnable()
{
public void run()
{
@@ -149,11 +150,24 @@ public class Portal extends MiniPlugin
});
}
- public void AddCommands()
+ public void addCommands()
{
addCommand(new ServerCommand(this));
addCommand(new SendCommand(this));
}
+
+ public void sendToHub(Player player, String message)
+ {
+ if (message != null)
+ {
+ UtilPlayer.message(player, " ");
+ UtilPlayer.message(player, C.cGold + C.Bold + message);
+ UtilPlayer.message(player, " ");
+ }
+
+ player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f);
+ sendPlayerToServer(player, "Lobby");
+ }
private void sendPlayer(final Player player, String serverName)
{
@@ -181,10 +195,10 @@ public class Portal extends MiniPlugin
}
}
- player.sendPluginMessage(GetPlugin(), "BungeeCord", b.toByteArray());
+ player.sendPluginMessage(getPlugin(), "BungeeCord", b.toByteArray());
_connectingPlayers.add(player.getName());
- GetScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
index 9bbb15bca..5c95b395d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
@@ -48,9 +48,9 @@ public class PreferencesManager extends MiniDbClientPlugin
{
try
{
- GetPlugin().getConfig().addDefault("preferences.connectionurl", "jdbc:mysql://db.mineplex.com:3306/Account?autoReconnect=true&failOverReadOnly=false&maxReconnects=10");
- GetPlugin().getConfig().set("preferences.connectionurl", GetPlugin().getConfig().getString("preferences.connectionurl"));
- GetPlugin().saveConfig();
+ getPlugin().getConfig().addDefault("preferences.connectionurl", "jdbc:mysql://db.mineplex.com:3306/Account?autoReconnect=true&failOverReadOnly=false&maxReconnects=10");
+ getPlugin().getConfig().set("preferences.connectionurl", getPlugin().getConfig().getString("preferences.connectionurl"));
+ getPlugin().saveConfig();
}
catch (Exception e)
{
@@ -84,7 +84,7 @@ public class PreferencesManager extends MiniDbClientPlugin
_saveBuffer.clear();
- GetPlugin().getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
index e324fa5d3..ea6350b57 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
@@ -4,7 +4,6 @@ import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
-import org.bukkit.event.inventory.InventoryClickEvent;
import mineplex.core.account.CoreClientManager;
import mineplex.core.common.Rank;
@@ -44,7 +43,7 @@ public class PreferencesPage extends ShopPageBase
}
@Override
- protected ShopPageBase> BuildPagesFor(Player player)
+ protected ShopPageBase> buildPagesFor(Player player)
{
- return new PreferencesPage(Plugin, this, ClientManager, DonationManager, " " + ChatColor.UNDERLINE + "User Preferences", player);
+ return new PreferencesPage(getPlugin(), this, getClientManager(), getDonationManager(), " " + ChatColor.UNDERLINE + "User Preferences", player);
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
index 321d30896..ad0cf6594 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
@@ -53,7 +53,7 @@ public class Punish extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new PunishCommand(this));
}
@@ -154,7 +154,7 @@ public class Punish extends MiniPlugin
if (caller == null)
System.out.println(F.main(getName(), F.elem(caller == null ? "Mineplex Anti-Cheat" : caller.getName()) + " banned " + F.elem(playerName) + " because of " + F.elem(reason) + " for " + durationString + "."));
- Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/PunishmentHandler.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/PunishmentHandler.java
index 6cf878c34..8b245bd4c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/PunishmentHandler.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/PunishmentHandler.java
@@ -34,7 +34,7 @@ public class PunishmentHandler implements CommandCallback
{
if (ban)
{
- Bukkit.getServer().getScheduler().runTask(_punishManager.GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTask(_punishManager.getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
index f666c2d8c..528b66253 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
@@ -63,7 +63,7 @@ public class PunishPage extends CraftInventoryCustom implements Listener
BuildPage();
_player.openInventory(this);
- _plugin.RegisterEvents(this);
+ _plugin.registerEvents(this);
}
private void BuildPage()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java b/Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
index 63479b604..fb3f439c0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
@@ -51,7 +51,7 @@ public class ReportManager {
this.activeReports = new HashMap();
// TODO: Get JavaPlugin instance and locate ConnectionString from config?
- this.reportSqlRepository = new ReportRepository(ReportPlugin.getPlugin(), "CONNECTION STRING HERE");
+ this.reportSqlRepository = new ReportRepository(ReportPlugin.getPluginInstance(), "CONNECTION STRING HERE");
reportSqlRepository.initialize();
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java b/Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
index c37a34aff..b03857fc8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
@@ -11,7 +11,7 @@ public class ReportPlugin extends MiniPlugin
{
private static JavaPlugin instance;
- public static JavaPlugin getPlugin() { return instance; }
+ public static JavaPlugin getPluginInstance() { return instance; }
public ReportPlugin(JavaPlugin plugin, String serverName)
{
@@ -21,7 +21,7 @@ public class ReportPlugin extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new ReportCommand(this));
addCommand(new ReportHandleCommand(this));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
index 8ddf611c0..febfd0af3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
@@ -40,7 +40,7 @@ public class RewardManager
int legendValueMin, int legendValueMax,
boolean doubleGadgetValue)
{
- _plugin = donationManager.GetPlugin();
+ _plugin = donationManager.getPlugin();
_treasureMap = new HashMap>();
_random = new Random();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
index 3e9723dd1..c63e2c6b3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
@@ -36,42 +36,42 @@ public abstract class ShopBase implements Listene
private List _availableCurrencyTypes;
- protected PluginType Plugin;
- protected CoreClientManager ClientManager;
- protected DonationManager DonationManager;
- protected String Name;
- protected NautHashMap>> PlayerPageMap;
+ private PluginType _plugin;
+ private CoreClientManager _clientManager;
+ private DonationManager _donationManager;
+ private String _name;
+ private NautHashMap>> _playerPageMap;
- protected HashSet OpenedShop = new HashSet();
+ private HashSet _openedShop = new HashSet();
public ShopBase(PluginType plugin, CoreClientManager clientManager, DonationManager donationManager, String name, CurrencyType...currencyTypes)
{
- Plugin = plugin;
- ClientManager = clientManager;
- DonationManager = donationManager;
- Name = name;
+ _plugin = plugin;
+ _clientManager = clientManager;
+ _donationManager = donationManager;
+ _name = name;
- PlayerPageMap = new NautHashMap>>();
+ _playerPageMap = new NautHashMap>>();
_errorThrottling = new NautHashMap();
_purchaseBlock = new NautHashMap();
_availableCurrencyTypes = new ArrayList();
_availableCurrencyTypes.addAll(Arrays.asList(currencyTypes));
- Plugin.RegisterEvents(this);
+ _plugin.registerEvents(this);
}
- public List GetAvailableCurrencyTypes()
+ public List getAvailableCurrencyTypes()
{
return _availableCurrencyTypes;
}
@EventHandler(priority = EventPriority.LOWEST)
- public void OnPlayerDamageEntity(NpcDamageByEntityEvent event)
+ public void onPlayerDamageEntity(NpcDamageByEntityEvent event)
{
if (event.getDamager() instanceof Player)
{
- if (AttemptShopOpen((Player)event.getDamager(), event.getNpc()))
+ if (attemptShopOpen((Player) event.getDamager(), event.getNpc()))
{
event.setCancelled(true);
}
@@ -79,28 +79,28 @@ public abstract class ShopBase implements Listene
}
@EventHandler(priority = EventPriority.LOWEST)
- public void OnPlayerInteractEntity(NpcInteractEntityEvent event)
+ public void onPlayerInteractEntity(NpcInteractEntityEvent event)
{
- if (AttemptShopOpen(event.getPlayer(), (LivingEntity)event.getNpc()))
+ if (attemptShopOpen(event.getPlayer(), (LivingEntity) event.getNpc()))
event.setCancelled(true);
}
- private boolean AttemptShopOpen(Player player, LivingEntity entity)
+ private boolean attemptShopOpen(Player player, LivingEntity entity)
{
- if (!OpenedShop.contains(player.getName()) && entity.isCustomNameVisible() && entity.getCustomName() != null && ChatColor.stripColor(entity.getCustomName()).equalsIgnoreCase(ChatColor.stripColor(Name)))
+ if (!_openedShop.contains(player.getName()) && entity.isCustomNameVisible() && entity.getCustomName() != null && ChatColor.stripColor(entity.getCustomName()).equalsIgnoreCase(ChatColor.stripColor(_name)))
{
- if (!CanOpenShop(player))
+ if (!canOpenShop(player))
return false;
- OpenedShop.add(player.getName());
+ _openedShop.add(player.getName());
- OpenShopForPlayer(player);
- if (!PlayerPageMap.containsKey(player.getName()))
+ openShopForPlayer(player);
+ if (!_playerPageMap.containsKey(player.getName()))
{
- PlayerPageMap.put(player.getName(), BuildPagesFor(player));
+ _playerPageMap.put(player.getName(), buildPagesFor(player));
}
- OpenPageForPlayer(player, GetOpeningPageForPlayer(player));
+ openPageForPlayer(player, getOpeningPageForPlayer(player));
return true;
}
@@ -110,20 +110,20 @@ public abstract class ShopBase implements Listene
public boolean attemptShopOpen(Player player)
{
- if (!OpenedShop.contains(player.getName()))
+ if (!_openedShop.contains(player.getName()))
{
- if (!CanOpenShop(player))
+ if (!canOpenShop(player))
return false;
- OpenedShop.add(player.getName());
+ _openedShop.add(player.getName());
- OpenShopForPlayer(player);
- if (!PlayerPageMap.containsKey(player.getName()))
+ openShopForPlayer(player);
+ if (!_playerPageMap.containsKey(player.getName()))
{
- PlayerPageMap.put(player.getName(), BuildPagesFor(player));
+ _playerPageMap.put(player.getName(), buildPagesFor(player));
}
- OpenPageForPlayer(player, GetOpeningPageForPlayer(player));
+ openPageForPlayer(player, getOpeningPageForPlayer(player));
return true;
}
@@ -131,34 +131,34 @@ public abstract class ShopBase implements Listene
return false;
}
- protected ShopPageBase> GetOpeningPageForPlayer(Player player)
+ protected ShopPageBase> getOpeningPageForPlayer(Player player)
{
- return PlayerPageMap.get(player.getName());
+ return _playerPageMap.get(player.getName());
}
@EventHandler
- public void OnInventoryClick(InventoryClickEvent event)
+ public void onInventoryClick(InventoryClickEvent event)
{
- if (PlayerPageMap.containsKey(event.getWhoClicked().getName()) && PlayerPageMap.get(event.getWhoClicked().getName()).getName().equalsIgnoreCase(event.getInventory().getName()))
+ if (_playerPageMap.containsKey(event.getWhoClicked().getName()) && _playerPageMap.get(event.getWhoClicked().getName()).getName().equalsIgnoreCase(event.getInventory().getName()))
{
- PlayerPageMap.get(event.getWhoClicked().getName()).PlayerClicked(event);
+ _playerPageMap.get(event.getWhoClicked().getName()).playerClicked(event);
event.setCancelled(true);
}
}
@EventHandler
- public void OnInventoryClose(InventoryCloseEvent event)
+ public void onInventoryClose(InventoryCloseEvent event)
{
- if (PlayerPageMap.containsKey(event.getPlayer().getName()) && PlayerPageMap.get(event.getPlayer().getName()).getTitle() != null && PlayerPageMap.get(event.getPlayer().getName()).getTitle().equalsIgnoreCase(event.getInventory().getTitle()))
+ if (_playerPageMap.containsKey(event.getPlayer().getName()) && _playerPageMap.get(event.getPlayer().getName()).getTitle() != null && _playerPageMap.get(event.getPlayer().getName()).getTitle().equalsIgnoreCase(event.getInventory().getTitle()))
{
- PlayerPageMap.get(event.getPlayer().getName()).PlayerClosed();
- PlayerPageMap.get(event.getPlayer().getName()).Dispose();
+ _playerPageMap.get(event.getPlayer().getName()).playerClosed();
+ _playerPageMap.get(event.getPlayer().getName()).dispose();
- PlayerPageMap.remove(event.getPlayer().getName());
+ _playerPageMap.remove(event.getPlayer().getName());
- CloseShopForPlayer((Player)event.getPlayer());
+ closeShopForPlayer((Player) event.getPlayer());
- OpenedShop.remove(event.getPlayer().getName());
+ _openedShop.remove(event.getPlayer().getName());
}
}
@@ -168,53 +168,53 @@ public abstract class ShopBase implements Listene
if (!event.isCancelled())
return;
- if (PlayerPageMap.containsKey(event.getPlayer().getName()) && PlayerPageMap.get(event.getPlayer().getName()).getTitle() != null && PlayerPageMap.get(event.getPlayer().getName()).getTitle().equalsIgnoreCase(event.getInventory().getTitle()))
+ if (_playerPageMap.containsKey(event.getPlayer().getName()) && _playerPageMap.get(event.getPlayer().getName()).getTitle() != null && _playerPageMap.get(event.getPlayer().getName()).getTitle().equalsIgnoreCase(event.getInventory().getTitle()))
{
- PlayerPageMap.get(event.getPlayer().getName()).PlayerClosed();
- PlayerPageMap.get(event.getPlayer().getName()).Dispose();
+ _playerPageMap.get(event.getPlayer().getName()).playerClosed();
+ _playerPageMap.get(event.getPlayer().getName()).dispose();
- PlayerPageMap.remove(event.getPlayer().getName());
+ _playerPageMap.remove(event.getPlayer().getName());
- CloseShopForPlayer((Player)event.getPlayer());
+ closeShopForPlayer((Player) event.getPlayer());
- OpenedShop.remove(event.getPlayer().getName());
+ _openedShop.remove(event.getPlayer().getName());
}
}
- protected boolean CanOpenShop(Player player)
+ protected boolean canOpenShop(Player player)
{
return true;
}
- protected void OpenShopForPlayer(Player player) { }
+ protected void openShopForPlayer(Player player) { }
- protected void CloseShopForPlayer(Player player) { }
+ protected void closeShopForPlayer(Player player) { }
@EventHandler
- public void OnPlayerQuit(PlayerQuitEvent event)
+ public void onPlayerQuit(PlayerQuitEvent event)
{
- if (PlayerPageMap.containsKey(event.getPlayer().getName()))
+ if (_playerPageMap.containsKey(event.getPlayer().getName()))
{
- PlayerPageMap.get(event.getPlayer().getName()).PlayerClosed();
- PlayerPageMap.get(event.getPlayer().getName()).Dispose();
+ _playerPageMap.get(event.getPlayer().getName()).playerClosed();
+ _playerPageMap.get(event.getPlayer().getName()).dispose();
event.getPlayer().closeInventory();
- CloseShopForPlayer(event.getPlayer());
+ closeShopForPlayer(event.getPlayer());
- PlayerPageMap.remove(event.getPlayer().getName());
+ _playerPageMap.remove(event.getPlayer().getName());
- OpenedShop.remove(event.getPlayer().getName());
+ _openedShop.remove(event.getPlayer().getName());
}
}
- public void OpenPageForPlayer(Player player, ShopPageBase> page)
+ public void openPageForPlayer(Player player, ShopPageBase> page)
{
- if (PlayerPageMap.containsKey(player.getName()))
+ if (_playerPageMap.containsKey(player.getName()))
{
- PlayerPageMap.get(player.getName()).PlayerClosed();
+ _playerPageMap.get(player.getName()).playerClosed();
}
- SetCurrentPageForPlayer(player, page);
+ setCurrentPageForPlayer(player, page);
EntityPlayer nmsPlayer = ((CraftPlayer) player).getHandle();
if (nmsPlayer.activeContainer != nmsPlayer.defaultContainer)
@@ -226,12 +226,12 @@ public abstract class ShopBase implements Listene
player.openInventory(page);
}
- public void SetCurrentPageForPlayer(Player player, ShopPageBase> page)
+ public void setCurrentPageForPlayer(Player player, ShopPageBase> page)
{
- PlayerPageMap.put(player.getName(), page);
+ _playerPageMap.put(player.getName(), page);
}
- public void AddPlayerProcessError(Player player)
+ public void addPlayerProcessError(Player player)
{
if (_errorThrottling.containsKey(player.getName()) && (System.currentTimeMillis() - _errorThrottling.get(player.getName()) <= 5000))
_purchaseBlock.put(player.getName(), System.currentTimeMillis());
@@ -239,20 +239,50 @@ public abstract class ShopBase implements Listene
_errorThrottling.put(player.getName(), System.currentTimeMillis());
}
- public boolean CanPlayerAttemptPurchase(Player player)
+ public boolean canPlayerAttemptPurchase(Player player)
{
return !_purchaseBlock.containsKey(player.getName()) || (System.currentTimeMillis() - _purchaseBlock.get(player.getName()) > 10000);
}
- public NautHashMap>> GetPageMap()
+ public NautHashMap>> getPageMap()
{
- return PlayerPageMap;
+ return _playerPageMap;
}
- protected abstract ShopPageBase> BuildPagesFor(Player player);
+ protected abstract ShopPageBase> buildPagesFor(Player player);
public boolean isPlayerInShop(Player player)
{
- return PlayerPageMap.containsKey(player.getName());
+ return _playerPageMap.containsKey(player.getName());
+ }
+
+ protected PluginType getPlugin()
+ {
+ return _plugin;
+ }
+
+ protected CoreClientManager getClientManager()
+ {
+ return _clientManager;
+ }
+
+ protected DonationManager getDonationManager()
+ {
+ return _donationManager;
+ }
+
+ protected String getName()
+ {
+ return _name;
+ }
+
+ protected NautHashMap>> getPlayerPageMap()
+ {
+ return _playerPageMap;
+ }
+
+ protected HashSet getOpenedShop()
+ {
+ return _openedShop;
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java
index bfbee0264..fe2dfa558 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java
@@ -1,12 +1,12 @@
package mineplex.core.shop.page;
import mineplex.core.MiniPlugin;
+import mineplex.core.donation.DonationManager;
import mineplex.core.server.util.TransactionResponse;
import mineplex.core.shop.ShopBase;
import mineplex.core.shop.item.IButton;
import mineplex.core.shop.item.SalesPackageBase;
import mineplex.core.shop.item.ShopItem;
-import mineplex.core.shop.page.ShopPageBase;
import mineplex.core.account.CoreClientManager;
import mineplex.core.common.CurrencyType;
import mineplex.core.common.util.C;
@@ -20,7 +20,6 @@ import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
-import org.bukkit.event.inventory.InventoryClickEvent;
public class ConfirmationPage> extends ShopPageBase implements Runnable
{
@@ -33,29 +32,29 @@ public class ConfirmationPage returnPage, SalesPackageBase salesItem, CurrencyType currencyType, Player player)
+ public ConfirmationPage(PluginType plugin, ShopType shop, CoreClientManager clientManager, DonationManager donationManager, Runnable runnable, ShopPageBase returnPage, SalesPackageBase salesItem, CurrencyType currencyType, Player player)
{
super(plugin, shop, clientManager, donationManager, " Confirmation", player);
_runnable = runnable;
_returnPage = returnPage;
_salesItem = salesItem;
- SelectedCurrency = currencyType;
+ setCurrencyType(currencyType);
_progressItem = new ShopItem(Material.LAPIS_BLOCK, (byte)11, ChatColor.BLUE + "Processing", null, 1, false, true);
_okSquareSlotStart = 27;
- if (Shop.CanPlayerAttemptPurchase(player))
+ if (getShop().canPlayerAttemptPurchase(player))
{
- BuildPage();
+ buildPage();
}
else
{
- BuildErrorPage(new String[] { ChatColor.RED + "You have attempted too many invalid transactions.", ChatColor.RED + "Please wait 10 seconds before retrying." });
- _taskId = plugin.GetScheduler().scheduleSyncRepeatingTask(plugin.GetPlugin(), this, 2L, 2L);
+ buildErrorPage(new String[]{ChatColor.RED + "You have attempted too many invalid transactions.", ChatColor.RED + "Please wait 10 seconds before retrying."});
+ _taskId = plugin.getScheduler().scheduleSyncRepeatingTask(plugin.getPlugin(), this, 2L, 2L);
}
}
- protected void BuildPage()
+ protected void buildPage()
{
this.getInventory().setItem(22, new ShopItem(_salesItem.GetDisplayMaterial(), (byte)0, _salesItem.GetDisplayName(), _salesItem.GetDescription(), 1, false, true).getHandle());
@@ -64,7 +63,7 @@ public class ConfirmationPage ()
+ getDonationManager().PurchaseKnownSalesPackage(new Callback()
{
public void run(TransactionResponse response)
{
- ShowResultsPage(response);
+ showResultsPage(response);
}
- }, Player.getName(), Player.getUniqueId(), _salesItem.GetCost(SelectedCurrency), _salesItem.GetSalesPackageId());
+ }, getPlayer().getName(), getPlayer().getUniqueId(), _salesItem.GetCost(getCurrencyType()), _salesItem.GetSalesPackageId());
}
else
{
- DonationManager.PurchaseUnknownSalesPackage(new Callback ()
+ getDonationManager().PurchaseUnknownSalesPackage(new Callback()
{
public void run(TransactionResponse response)
{
- ShowResultsPage(response);
+ showResultsPage(response);
}
- }, Player.getName(), Player.getUniqueId(), _salesItem.GetName(), SelectedCurrency == CurrencyType.Coins, _salesItem.GetCost(SelectedCurrency), _salesItem.OneTimePurchase());
+ }, getPlayer().getName(), getPlayer().getUniqueId(), _salesItem.GetName(), getCurrencyType() == CurrencyType.Coins, _salesItem.GetCost(getCurrencyType()), _salesItem.OneTimePurchase());
}
- _taskId = Plugin.GetScheduler().scheduleSyncRepeatingTask(Plugin.GetPlugin(), this, 2L, 2L);
+ _taskId = getPlugin().getScheduler().scheduleSyncRepeatingTask(getPlugin().getPlugin(), this, 2L, 2L);
}
- private void ShowResultsPage(TransactionResponse response)
+ private void showResultsPage(TransactionResponse response)
{
_processing = false;
switch (response)
{
case Failed:
- BuildErrorPage(ChatColor.RED + "There was an error processing your request.");
- Shop.AddPlayerProcessError(Player);
+ buildErrorPage(ChatColor.RED + "There was an error processing your request.");
+ getShop().addPlayerProcessError(getPlayer());
break;
case AlreadyOwns:
- BuildErrorPage(ChatColor.RED + "You already own this package.");
- Shop.AddPlayerProcessError(Player);
+ buildErrorPage(ChatColor.RED + "You already own this package.");
+ getShop().addPlayerProcessError(getPlayer());
break;
case InsufficientFunds:
- BuildErrorPage(ChatColor.RED + "Your account has insufficient funds.");
- Shop.AddPlayerProcessError(Player);
+ buildErrorPage(ChatColor.RED + "Your account has insufficient funds.");
+ getShop().addPlayerProcessError(getPlayer());
break;
case Success:
- _salesItem.Sold(Player, SelectedCurrency);
+ _salesItem.Sold(getPlayer(), getCurrencyType());
- BuildSuccessPage("Your purchase was successful.");
+ buildSuccessPage("Your purchase was successful.");
if (_runnable != null)
_runnable.run();
@@ -188,55 +187,55 @@ public class ConfirmationPage> extends CraftInventoryCustom implements Listener
{
- protected PluginType Plugin;
- protected CoreClientManager ClientManager;
- protected DonationManager DonationManager;
- protected ShopType Shop;
- protected Player Player;
- protected CoreClient Client;
- protected CurrencyType SelectedCurrency;
- protected NautHashMap ButtonMap;
- protected boolean ShowCurrency = false;
+ private PluginType _plugin;
+ private CoreClientManager _clientManager;
+ private DonationManager _donationManager;
+ private ShopType _shop;
+ private Player _player;
+ private CoreClient _client;
+ private CurrencyType _currencyType;
+ private NautHashMap _buttonMap;
+ private boolean _showCurrency = false;
- protected int CurrencySlot = 4;
+ private int _currencySlot = 4;
public ShopPageBase(PluginType plugin, ShopType shop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player)
{
@@ -42,44 +42,44 @@ public abstract class ShopPageBase();
+ _plugin = plugin;
+ _clientManager = clientManager;
+ _donationManager = donationManager;
+ _shop = shop;
+ _player = player;
+ _buttonMap = new NautHashMap();
- Client = ClientManager.Get(player);
+ _client = _clientManager.Get(player);
- if (shop.GetAvailableCurrencyTypes().size() > 0)
+ if (shop.getAvailableCurrencyTypes().size() > 0)
{
- SelectedCurrency = shop.GetAvailableCurrencyTypes().get(0);
+ _currencyType = shop.getAvailableCurrencyTypes().get(0);
}
}
- protected void ChangeCurrency(Player player)
+ protected void changeCurrency(Player player)
{
- PlayAcceptSound(player);
+ playAcceptSound(player);
- int currentIndex = Shop.GetAvailableCurrencyTypes().indexOf(SelectedCurrency);
+ int currentIndex = _shop.getAvailableCurrencyTypes().indexOf(_currencyType);
- if (currentIndex + 1 < Shop.GetAvailableCurrencyTypes().size())
+ if (currentIndex + 1 < _shop.getAvailableCurrencyTypes().size())
{
- SelectedCurrency = Shop.GetAvailableCurrencyTypes().get(currentIndex + 1);
+ _currencyType = _shop.getAvailableCurrencyTypes().get(currentIndex + 1);
}
else
{
- SelectedCurrency = Shop.GetAvailableCurrencyTypes().get(0);
+ _currencyType = _shop.getAvailableCurrencyTypes().get(0);
}
}
- protected abstract void BuildPage();
+ protected abstract void buildPage();
- protected void AddItem(int slot, ItemStack item)
+ protected void addItem(int slot, ItemStack item)
{
if (slot > inventory.getSize() - 1)
{
- Player.getInventory().setItem(getPlayerSlot(slot), item);
+ _player.getInventory().setItem(getPlayerSlot(slot), item);
}
else
{
@@ -87,14 +87,14 @@ public abstract class ShopPageBase inventory.getSize() - 1)
{
- ((CraftPlayer) Player).getHandle().inventory.setItem(getPlayerSlot(slot), nmsStack);
+ ((CraftPlayer) _player).getHandle().inventory.setItem(getPlayerSlot(slot), nmsStack);
}
else
{
@@ -107,18 +107,18 @@ public abstract class ShopPageBase= (inventory.getSize() + 27) ? slot - (inventory.getSize() + 27) : slot - (inventory.getSize() - 9);
}
- protected void AddButton(int slot, ItemStack item, IButton button)
+ protected void addButton(int slot, ItemStack item, IButton button)
{
- AddItem(slot, item);
+ addItem(slot, item);
- ButtonMap.put(slot, button);
+ _buttonMap.put(slot, button);
}
- protected void AddButtonFakeCount(int slot, ItemStack item, IButton button, int fakeItemCount)
+ protected void addButtonFakeCount(int slot, ItemStack item, IButton button, int fakeItemCount)
{
- AddItemFakeCount(slot, item, fakeItemCount);
+ addItemFakeCount(slot, item, fakeItemCount);
- ButtonMap.put(slot, button);
+ _buttonMap.put(slot, button);
}
protected void addGlow(int slot)
@@ -126,74 +126,74 @@ public abstract class ShopPageBase getButtonMap()
+ {
+ return _buttonMap;
+ }
+
+ protected boolean shouldShowCurrency()
+ {
+ return _showCurrency;
+ }
+
+ protected int getCurrencySlot()
+ {
+ return _currencySlot;
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStats.java b/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStats.java
index d676cbc24..f2ea158bf 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStats.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStats.java
@@ -38,7 +38,7 @@ public class SimpleStats extends MiniPlugin
if (updateEvent.getType() != UpdateType.SLOW)
return;
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -55,7 +55,7 @@ public class SimpleStats extends MiniPlugin
final String statNameFinal = statName;
final String statValueFinal = statValue;
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -71,7 +71,7 @@ public class SimpleStats extends MiniPlugin
{
final String statNameFinal = statName;
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/spawn/Spawn.java b/Plugins/Mineplex.Core/src/mineplex/core/spawn/Spawn.java
index b99f8b65b..ca1de6576 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/spawn/Spawn.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/spawn/Spawn.java
@@ -36,7 +36,7 @@ public class Spawn extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new SpawnCommand(this));
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java
index 59062a61d..ef9689f3e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java
@@ -61,7 +61,7 @@ public class StatsManager extends MiniDbClientPlugin
// Verify stat is in our local cache, if not add it remotely.
if (!_stats.containsKey(statName))
{
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -187,7 +187,7 @@ public class StatsManager extends MiniDbClientPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new TimeCommand(this));
addCommand(new GiveStatCommand(this));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
index dcc12bf24..321f7f14a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
@@ -4,7 +4,6 @@ import java.sql.SQLException;
import org.bukkit.entity.Player;
-import mineplex.core.achievement.AchievementManager;
import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.core.common.util.F;
@@ -36,7 +35,7 @@ public class TimeCommand extends CommandBase
if (target == null)
{
- Plugin.GetPlugin().getServer().getScheduler().runTaskAsynchronously(Plugin.GetPlugin(), new Runnable()
+ Plugin.getPlugin().getServer().getScheduler().runTaskAsynchronously(Plugin.getPlugin(), new Runnable()
{
@Override
public void run()
@@ -45,7 +44,7 @@ public class TimeCommand extends CommandBase
{
final PlayerStats stats = Plugin.getOfflinePlayerStats(args[0]);
- Plugin.GetPlugin().getServer().getScheduler().runTask(Plugin.GetPlugin(), new Runnable()
+ Plugin.getPlugin().getServer().getScheduler().runTask(Plugin.getPlugin(), new Runnable()
{
@Override
public void run()
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java
index 60001ddbe..f466d2c37 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java
@@ -10,8 +10,6 @@ import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.MiniPlugin;
import mineplex.core.account.CoreClientManager;
-import mineplex.core.common.GenericRunnable;
-import mineplex.core.common.ProcessRunner;
import mineplex.core.common.util.Callback;
import mineplex.core.monitor.LagMeter;
import mineplex.core.updater.UpdateType;
@@ -69,25 +67,25 @@ public class ServerStatusManager extends MiniPlugin
{
try
{
- GetPlugin().getConfig().addDefault("serverstatus.connectionurl", "db.mineplex.com:3306");
- GetPlugin().getConfig().set("serverstatus.connectionurl", GetPlugin().getConfig().getString("serverstatus.connectionurl"));
+ getPlugin().getConfig().addDefault("serverstatus.connectionurl", "db.mineplex.com:3306");
+ getPlugin().getConfig().set("serverstatus.connectionurl", getPlugin().getConfig().getString("serverstatus.connectionurl"));
- GetPlugin().getConfig().addDefault("serverstatus.username", "root");
- GetPlugin().getConfig().set("serverstatus.username", GetPlugin().getConfig().getString("serverstatus.username"));
+ getPlugin().getConfig().addDefault("serverstatus.username", "root");
+ getPlugin().getConfig().set("serverstatus.username", getPlugin().getConfig().getString("serverstatus.username"));
- GetPlugin().getConfig().addDefault("serverstatus.password", "tAbechAk3wR7tuTh");
- GetPlugin().getConfig().set("serverstatus.password", GetPlugin().getConfig().getString("serverstatus.password"));
+ getPlugin().getConfig().addDefault("serverstatus.password", "tAbechAk3wR7tuTh");
+ getPlugin().getConfig().set("serverstatus.password", getPlugin().getConfig().getString("serverstatus.password"));
- GetPlugin().getConfig().addDefault("serverstatus.us", true);
- GetPlugin().getConfig().set("serverstatus.us", GetPlugin().getConfig().getBoolean("serverstatus.us"));
+ getPlugin().getConfig().addDefault("serverstatus.us", true);
+ getPlugin().getConfig().set("serverstatus.us", getPlugin().getConfig().getBoolean("serverstatus.us"));
- GetPlugin().getConfig().addDefault("serverstatus.name", "TEST-1");
- GetPlugin().getConfig().set("serverstatus.name", GetPlugin().getConfig().getString("serverstatus.name"));
+ getPlugin().getConfig().addDefault("serverstatus.name", "TEST-1");
+ getPlugin().getConfig().set("serverstatus.name", getPlugin().getConfig().getString("serverstatus.name"));
- GetPlugin().getConfig().addDefault("serverstatus.group", "Testing");
- GetPlugin().getConfig().set("serverstatus.group", GetPlugin().getConfig().getString("serverstatus.group"));
+ getPlugin().getConfig().addDefault("serverstatus.group", "Testing");
+ getPlugin().getConfig().set("serverstatus.group", getPlugin().getConfig().getString("serverstatus.group"));
- GetPlugin().saveConfig();
+ getPlugin().saveConfig();
}
catch (Exception e)
{
@@ -100,7 +98,7 @@ public class ServerStatusManager extends MiniPlugin
if (!_enabled)
return;
- GetPlugin().getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -131,7 +129,7 @@ public class ServerStatusManager extends MiniPlugin
private void saveServerStatus()
{
final MinecraftServer serverSnapshot = generateServerSnapshot();
- GetPlugin().getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -167,8 +165,8 @@ public class ServerStatusManager extends MiniPlugin
*/
private MinecraftServer generateServerSnapshot()
{
- ServerListPingEvent event = new ServerListPingEvent(null, GetPlugin().getServer().getMotd(), GetPlugin().getServer().getOnlinePlayers().size(), GetPlugin().getServer().getMaxPlayers());
- GetPluginManager().callEvent(event);
+ ServerListPingEvent event = new ServerListPingEvent(null, getPlugin().getServer().getMotd(), getPlugin().getServer().getOnlinePlayers().size(), getPlugin().getServer().getMaxPlayers());
+ getPluginManager().callEvent(event);
String motd = _enabled ? event.getMotd() : "Restarting";
int playerCount = _clientManager.getPlayerCountIncludingConnecting();
@@ -194,7 +192,7 @@ public class ServerStatusManager extends MiniPlugin
if (!_enabled)
return;
- GetPlugin().getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java b/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java
index adc441846..67dd351f0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/teleport/Teleport.java
@@ -44,7 +44,7 @@ public class Teleport extends MiniPlugin
{
super("Teleport", plugin);
- _serverName = GetPlugin().getConfig().getString("serverstatus.name");
+ _serverName = getPlugin().getConfig().getString("serverstatus.name");
RedisLocateHandler locateHandler = new RedisLocateHandler(this);
@@ -53,7 +53,7 @@ public class Teleport extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new TeleportCommand(this));
addCommand(new LocateCommand(this));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/teleport/redis/RedisLocateHandler.java b/Plugins/Mineplex.Core/src/mineplex/core/teleport/redis/RedisLocateHandler.java
index cadcd5b1c..29d14069d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/teleport/redis/RedisLocateHandler.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/teleport/redis/RedisLocateHandler.java
@@ -14,7 +14,7 @@ public class RedisLocateHandler implements CommandCallback
public RedisLocateHandler(Teleport plugin)
{
_plugin = plugin;
- _serverName = _plugin.GetPlugin().getConfig().getString("serverstatus.name");
+ _serverName = _plugin.getPlugin().getConfig().getString("serverstatus.name");
}
@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
index e93f556da..3f5b9d4ef 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
@@ -124,12 +124,29 @@ public class Treasure
}
Block block = _player.getTargetBlock(null, 3);
- if (block.getType() == Material.CHEST)
+ if (block.getType() == _treasureType.getMaterial())
{
ChestData data = getChestData(block);
- if (data != null && !data.isOpened())
+ if (!isFinished() && data != null && !data.isOpened())
{
- UtilParticle.PlayParticle(UtilParticle.ParticleType.ENCHANTMENT_TABLE, block.getLocation().add(0.5, 0.5, 0.5), 0F, 0F, 0F, 1, 4);
+ UtilParticle.ParticleType type = getTreasureType().getStyle().getHoverParticle();
+
+ if (_treasureType == TreasureType.OLD)
+ {
+ UtilParticle.PlayParticle(type, block.getLocation().add(0.5, 0.5, 0.5), 0F, 0F, 0F, 1, 4);
+ }
+ else if (_treasureType == TreasureType.ANCIENT)
+ {
+ double yDif = 0.2 + 0.6 * Math.sin(Math.PI * (_tickCount / 10.0));
+ double xDif = 0.7 * Math.sin(Math.PI * (_tickCount / 5.0));
+ double zDif = 0.7 * Math.cos(Math.PI * (_tickCount / 5.0));
+ float red = 0.1F + (float)( 0.4 * (1 + Math.cos(Math.PI * (_tickCount / 20.0))));
+ UtilParticle.PlayParticle(type, block.getLocation().add(0.5 + xDif, 0.5 + yDif, 0.5 + zDif), red, 0.2F, 0.2F, 1F, 0);
+ }
+ else
+ {
+ UtilParticle.PlayParticle(type, block.getLocation().add(0.5, 0.5, 0.5), 0.5F, 0.5F, 0.5F, 0.2F, 0);
+ }
}
}
@@ -303,6 +320,9 @@ public class Treasure
public void resetBlockInfo(BlockInfo blockInfo)
{
+ if (blockInfo == null)
+ return;
+
Block block = blockInfo.getBlock();
if (block.getType().equals(Material.CHEST))
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
index 518e1adf0..2c48445e3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
@@ -112,7 +112,7 @@ public class TreasureManager extends MiniPlugin
}
@Override
- public void Disable()
+ public void disable()
{
for (TreasureLocation treasureLocation : _treasureLocations)
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java
index f6f91a858..8875cac4a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java
@@ -9,30 +9,35 @@ public enum TreasureStyle
OLD(
ParticleType.EXPLODE,
ParticleType.EXPLODE,
+ ParticleType.ENCHANTMENT_TABLE,
Sound.FIZZ,
Sound.HORSE_ARMOR),
ANCIENT(
ParticleType.FLAME,
ParticleType.LAVA,
+ ParticleType.MOB_SPELL,
Sound.LAVA_POP,
Sound.EXPLODE),
MYTHICAL(
ParticleType.HAPPY_VILLAGER,
ParticleType.LARGE_EXPLODE,
+ ParticleType.INSTANT_SPELL,
Sound.PORTAL_TRAVEL,
Sound.ANVIL_LAND);
private ParticleType _secondaryParticle;
private ParticleType _chestSpawnParticle;
+ private ParticleType _hoverParticle;
private Sound _sound;
private Sound _chestSpawnSound;
- TreasureStyle(ParticleType secondaryParticle, ParticleType chestSpawnParticle, Sound sound, Sound chestSpawnSound)
+ TreasureStyle(ParticleType secondaryParticle, ParticleType chestSpawnParticle, ParticleType hoverParticle, Sound sound, Sound chestSpawnSound)
{
_secondaryParticle = secondaryParticle;
_chestSpawnParticle = chestSpawnParticle;
+ _hoverParticle = hoverParticle;
_sound = sound;
_chestSpawnSound = chestSpawnSound;
}
@@ -47,6 +52,11 @@ public enum TreasureStyle
return _chestSpawnParticle;
}
+ public ParticleType getHoverParticle()
+ {
+ return _hoverParticle;
+ }
+
public Sound getSound()
{
return _sound;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java
index f71cefe74..1e932656f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java
@@ -4,9 +4,7 @@ import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
-import mineplex.core.account.CoreClientManager;
import mineplex.core.common.CurrencyType;
-import mineplex.core.donation.DonationManager;
import mineplex.core.inventory.InventoryManager;
import mineplex.core.shop.item.IButton;
import mineplex.core.shop.page.ConfirmationPage;
@@ -38,13 +36,13 @@ public class BuyChestButton implements IButton
@Override
public void onClick(final Player player, ClickType clickType)
{
- _page.getShop().OpenPageForPlayer(player, new ConfirmationPage(
+ _page.getShop().openPageForPlayer(player, new ConfirmationPage(
_page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), new Runnable()
{
public void run()
{
_inventoryManager.addItemToInventory(player, "Item", _chestName, 1);
- _page.Refresh();
+ _page.refresh();
}
}, _page, new ChestPackage(_chestName, _chestMat, _chestCost), CurrencyType.Coins, player));
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java
index d55024764..f1426accf 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java
@@ -8,17 +8,12 @@ import org.bukkit.Material;
import org.bukkit.entity.Player;
import mineplex.core.account.CoreClientManager;
-import mineplex.core.common.CurrencyType;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
-import mineplex.core.cosmetic.CosmeticManager;
-import mineplex.core.cosmetic.ui.CosmeticShop;
import mineplex.core.donation.DonationManager;
import mineplex.core.inventory.InventoryManager;
import mineplex.core.shop.item.ShopItem;
-import mineplex.core.shop.page.ConfirmationPage;
import mineplex.core.shop.page.ShopPageBase;
-import mineplex.core.treasure.TreasureKey;
import mineplex.core.treasure.TreasureLocation;
import mineplex.core.treasure.TreasureManager;
import mineplex.core.treasure.TreasureType;
@@ -35,15 +30,15 @@ public class TreasurePage extends ShopPageBase
_treasureLocation = treasureLocation;
_inventoryManager = inventoryManager;
- BuildPage();
+ buildPage();
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
- int basicCount = _inventoryManager.Get(Player).getItemCount(TreasureType.OLD.getItemName());
- int heroicCount = _inventoryManager.Get(Player).getItemCount(TreasureType.ANCIENT.getItemName());
- int legendaryCount = _inventoryManager.Get(Player).getItemCount(TreasureType.MYTHICAL.getItemName());
+ int basicCount = _inventoryManager.Get(getPlayer()).getItemCount(TreasureType.OLD.getItemName());
+ int heroicCount = _inventoryManager.Get(getPlayer()).getItemCount(TreasureType.ANCIENT.getItemName());
+ int legendaryCount = _inventoryManager.Get(getPlayer()).getItemCount(TreasureType.MYTHICAL.getItemName());
List basicLore = new ArrayList();
basicLore.add(" ");
@@ -106,13 +101,13 @@ public class TreasurePage extends ShopPageBase
ShopItem heroic = new ShopItem(Material.TRAPPED_CHEST, C.cGold + C.Bold + "Ancient Chest", heroicLore.toArray(new String[0]), 0, false, false);
ShopItem legendary = new ShopItem(Material.ENDER_CHEST, C.cRed + C.Bold + "Mythical Chest", legendaryLore.toArray(new String[0]), 0, false, false);
- if (basicCount > 0) AddButton(2, basic, new OpenTreasureButton(Player, _treasureLocation, TreasureType.OLD));
- else AddButton(2, basic, new BuyChestButton(Player, _inventoryManager, this, "Old Chest", Material.CHEST, 1000));
+ if (basicCount > 0) addButton(2, basic, new OpenTreasureButton(getPlayer(), _treasureLocation, TreasureType.OLD));
+ else addButton(2, basic, new BuyChestButton(getPlayer(), _inventoryManager, this, "Old Chest", Material.CHEST, 1000));
- if (heroicCount > 0) AddButton(4, heroic, new OpenTreasureButton(Player, _treasureLocation, TreasureType.ANCIENT));
- else AddButton(4, heroic, new BuyChestButton(Player, _inventoryManager, this, "Ancient Chest", Material.CHEST, 5000));
+ if (heroicCount > 0) addButton(4, heroic, new OpenTreasureButton(getPlayer(), _treasureLocation, TreasureType.ANCIENT));
+ else addButton(4, heroic, new BuyChestButton(getPlayer(), _inventoryManager, this, "Ancient Chest", Material.CHEST, 5000));
- if (legendaryCount > 0) AddButton(6, legendary, new OpenTreasureButton(Player, _treasureLocation, TreasureType.MYTHICAL));
- else AddButton(6, legendary, new BuyChestButton(Player, _inventoryManager, this, "Mythical Chest", Material.ENDER_CHEST, 10000));
+ if (legendaryCount > 0) addButton(6, legendary, new OpenTreasureButton(getPlayer(), _treasureLocation, TreasureType.MYTHICAL));
+ else addButton(6, legendary, new BuyChestButton(getPlayer(), _inventoryManager, this, "Mythical Chest", Material.ENDER_CHEST, 10000));
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasureShop.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasureShop.java
index 644b94497..ac345e064 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasureShop.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasureShop.java
@@ -23,8 +23,8 @@ public class TreasureShop extends ShopBase
}
@Override
- protected ShopPageBase> BuildPagesFor(Player player)
+ protected ShopPageBase> buildPagesFor(Player player)
{
- return new TreasurePage(Plugin, this, _treasureLocation, ClientManager, DonationManager, _inventoryManager, player);
+ return new TreasurePage(getPlugin(), this, _treasureLocation, getClientManager(), getDonationManager(), _inventoryManager, player);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java b/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java
index 8fbb12ba5..5e325cf7d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java
@@ -53,7 +53,7 @@ public class FileUpdater extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new RestartServerCommand(this));
}
@@ -69,7 +69,7 @@ public class FileUpdater extends MiniPlugin
RestartServerEvent restartEvent = new RestartServerEvent();
- GetPluginManager().callEvent(restartEvent);
+ getPluginManager().callEvent(restartEvent);
if (!restartEvent.isCancelled())
{
@@ -78,7 +78,7 @@ public class FileUpdater extends MiniPlugin
player.sendMessage(F.main("Updater", C.cGold + _serverName + C.cGray + " is restarting for an update."));
}
- GetPlugin().getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
@@ -86,11 +86,11 @@ public class FileUpdater extends MiniPlugin
}
}, 60L);
- GetPlugin().getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
- GetPlugin().getServer().shutdown();
+ getPlugin().getServer().shutdown();
}
}, 100L);
}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java
index 943012c00..301683c26 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java
@@ -206,7 +206,7 @@ public class ClansAdmin
{
public void run(final Boolean nameExists)
{
- Bukkit.getServer().getScheduler().runTask(Clans.GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTask(Clans.getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
index c05809249..a0303b953 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
@@ -1,7 +1,6 @@
package mineplex.game.clans.clans;
import java.sql.Timestamp;
-import java.util.Date;
import org.bukkit.Chunk;
import org.bukkit.Location;
@@ -23,7 +22,7 @@ public class ClansDataAccessLayer
public ClansDataAccessLayer(ClansManager clans)
{
_manager = clans;
- _repository = new ClanRepository(clans.GetPlugin(), clans.getServerName());
+ _repository = new ClanRepository(clans.getPlugin(), clans.getServerName());
}
public void delete(ClanInfo clan)
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
index 717fb383b..6b1f8d233 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
@@ -152,7 +152,7 @@ public class ClansGame extends MiniPlugin
final Block block = event.getBlock();
- UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(Clans.GetPlugin(), new Runnable()
+ UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(Clans.getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
index dd85820e3..61753ea16 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
@@ -159,7 +159,7 @@ public class ClansManager extends MiniClientPlugin implements IRelat
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new ClansCommand(this));
addCommand(new ClansChatCommand(this));
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
index 4ad9a983b..bc5ee1494 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
@@ -1099,7 +1099,7 @@ public class ClansCommand extends CommandBase
}
/*
- CoreClient client = Plugin.getClientManager().Get(caller);
+ CoreClient client = _plugin.getClientManager().Get(caller);
for (Player cur : clan.GetHome().getWorld().getPlayers())
if (client.Clan().GetRelation(cur.getName()) == ClanRelation.NEUTRAL)
if (clan.GetClaimSet().contains(UtilWorld.chunkToStr(cur.getLocation().getChunk())))
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlock.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlock.java
index 69e7c5d89..aa98cb5d2 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlock.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldBlock.java
@@ -67,7 +67,7 @@ public class FieldBlock extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new FieldBlockCommand(this));
}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldMonster.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldMonster.java
index 3e141a874..5da66cd1a 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldMonster.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldMonster.java
@@ -45,7 +45,7 @@ public class FieldMonster extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new FieldMonsterCommand(this));
}
@@ -94,7 +94,7 @@ public class FieldMonster extends MiniPlugin
private void Add(FieldMonsterBase pit, boolean repo)
{
- UtilServer.getServer().getPluginManager().registerEvents(pit, GetPlugin());
+ UtilServer.getServer().getPluginManager().registerEvents(pit, getPlugin());
_pits.add(pit);
if (repo)
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOre.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOre.java
index 75a386404..8f07206e3 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOre.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOre.java
@@ -56,7 +56,7 @@ public class FieldOre extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new FieldOreCommand(this));
}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpShopButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpShopButton.java
index 66c92daa4..cb2b186df 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpShopButton.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/PvpShopButton.java
@@ -45,7 +45,7 @@ public class PvpShopButton> imple
{
if (cost > balance)
{
- Page.PlayDenySound(player);
+ Page.playDenySound(player);
UtilPlayer.message(player, F.main(Page.getPlugin().getName(), "You do not have enough funds to purchase " + deliveryAmount + " " + Item.GetName() + "."));
return;
}
@@ -57,7 +57,7 @@ public class PvpShopButton> imple
{
if (result)
{
- Page.PlayAcceptSound(player);
+ Page.playAcceptSound(player);
ShopItem item = Item.clone();
item.setAmount(deliveryAmount);
@@ -65,7 +65,7 @@ public class PvpShopButton> imple
}
else
{
- Page.PlayDenySound(player);
+ Page.playDenySound(player);
UtilPlayer.message(player, F.main(Page.getPlugin().getName(), "An error occurred processing your purchase."));
}
}
@@ -79,7 +79,7 @@ public class PvpShopButton> imple
if (InventoryUtil.first((CraftInventory)player.getInventory(), 36, dumbItem, true) == -1)
{
- Page.PlayDenySound(player);
+ Page.playDenySound(player);
UtilPlayer.message(player, F.main(Page.getPlugin().getName(), "You do not have " + deliveryAmount + " " + Item.GetName() + " in your inventory."));
return;
}
@@ -100,12 +100,12 @@ public class PvpShopButton> imple
{
if (result)
{
- Page.PlayAcceptSound(player);
+ Page.playAcceptSound(player);
System.out.println("Credited " + player.getName() + " with " + creditAmount + " gold.");
}
else
{
- Page.PlayDenySound(player);
+ Page.playDenySound(player);
UtilPlayer.message(player, F.main(Page.getPlugin().getName(), "An error occurred processing your return."));
}
}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingPage.java
index 88832e197..7f94c6835 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingPage.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingPage.java
@@ -15,11 +15,11 @@ public class BuildingPage extends ShopPageBase
{
super(plugin, shop, clientManager, donationManager, "Building Supplies", player);
- BuildPage();
+ buildPage();
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
addPvpItem(1, new PvpItem(Material.STONE, (byte)0, 1, "Stone", 25, 64));
addPvpItem(2, new PvpItem(Material.WOOD, (byte)0, 1, "Wood", 15, 64));
@@ -29,6 +29,6 @@ public class BuildingPage extends ShopPageBase
public void addPvpItem(int slot, PvpItem item)
{
- AddButton(slot, item, new PvpShopButton(this, item));
+ addButton(slot, item, new PvpShopButton(this, item));
}
}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingShop.java
index 7cd4061ff..f39503c57 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingShop.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/building/BuildingShop.java
@@ -20,9 +20,9 @@ public class BuildingShop extends ShopBase
}
@Override
- protected ShopPageBase> BuildPagesFor(Player player)
+ protected ShopPageBase> buildPagesFor(Player player)
{
- return new BuildingPage(Plugin, this, ClientManager, DonationManager, player);
+ return new BuildingPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
}
@EventHandler
@@ -30,7 +30,7 @@ public class BuildingShop extends ShopBase
{
if (event.getMessage().startsWith("/gold"))
{
- UtilPlayer.message(event.getPlayer(), F.main("Gold", "Your Balance is " + C.cYellow + DonationManager.Get(event.getPlayer().getName()).getGold() + "g"));
+ UtilPlayer.message(event.getPlayer(), F.main("Gold", "Your Balance is " + C.cYellow + getDonationManager().Get(event.getPlayer().getName()).getGold() + "g"));
event.setCancelled(true);
}
}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPage.java
index ee4400ea8..70e2ff348 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPage.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPage.java
@@ -22,13 +22,13 @@ public class EnergyPage extends ShopPageBase
public EnergyPage(ClansManager plugin, EnergyShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
{
super(plugin, shop, clientManager, donationManager, "Energy Shop", player, 9);
- _clanInfo = Plugin.getClan(Player);
+ _clanInfo = getPlugin().getClan(getPlayer());
- BuildPage();
+ buildPage();
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
if (_clanInfo == null)
{
@@ -58,14 +58,14 @@ public class EnergyPage extends ShopPageBase
int energyCost = getEnergyPerHour();
int goldCost = getGoldPerHour();
- EnergyShopButton button = new EnergyShopButton(Player, Plugin, this, _clanInfo, true, getDonationManager());
+ EnergyShopButton button = new EnergyShopButton(getPlayer(), getPlugin(), this, _clanInfo, true, getDonationManager());
String title = "Purchase Energy";
String currentEnergy = ChatColor.RESET + F.value("Clan Energy", "" + _clanInfo.getEnergy());
String energyString = ChatColor.RESET + F.value("Energy drain/hour", "" + energyCost);
String playerGoldString = ChatColor.RESET + F.value("Your Gold", playerGold + "g");
String purchaseString = ChatColor.RESET + C.cWhite + "Click to buy 1 hour of energy for " + C.cYellow + goldCost + "g";
ShopItem shopItem = new ShopItem(Material.LAVA_BUCKET, title, new String[] {" ", currentEnergy, energyString, " ", playerGoldString, purchaseString}, 0, false, false);
- AddButton(4, shopItem, button);
+ addButton(4, shopItem, button);
}
private void buildNotEnoughGold(ClanInfo _clanInfo)
@@ -74,7 +74,7 @@ public class EnergyPage extends ShopPageBase
int energyCost = getEnergyPerHour();
int goldCost = getGoldPerHour();
- EnergyShopButton button = new EnergyShopButton(Player, Plugin, this, _clanInfo, true, getDonationManager());
+ EnergyShopButton button = new EnergyShopButton(getPlayer(), getPlugin(), this, _clanInfo, true, getDonationManager());
String title = ChatColor.RED + C.Bold + "Missing Gold!";
String currentEnergy = ChatColor.RESET + F.value("Clan Energy", "" + _clanInfo.getEnergy());
String energyString = ChatColor.RESET + F.value("Energy drain/hour", "" + energyCost);
@@ -82,7 +82,7 @@ public class EnergyPage extends ShopPageBase
String purchaseString = ChatColor.RESET + C.cWhite + "You don't have enough gold";
String goldString = ChatColor.RESET + C.cWhite + "You need " + C.cYellow + goldCost + C.cWhite + " gold to purchase energy";
ShopItem shopItem = new ShopItem(Material.GOLD_INGOT, title, new String[] {" ", currentEnergy, energyString, " ", playerGoldString, purchaseString, goldString}, 0, false, false);
- AddButton(4, shopItem, button);
+ addButton(4, shopItem, button);
}
private void buildNoClan()
@@ -98,7 +98,7 @@ public class EnergyPage extends ShopPageBase
String currentEnergy = ChatColor.RESET + F.value("Clan Energy", "" + energy);
String[] lore = new String[] {" ", currentEnergy, ChatColor.RESET + "Your clan is at the energy cap"};
ShopItem shopItem = new ShopItem(Material.BUCKET, title, lore, 0, false, false);
- AddItem(4, shopItem);
+ addItem(4, shopItem);
}
protected boolean hasEnoughGold()
@@ -108,7 +108,7 @@ public class EnergyPage extends ShopPageBase
protected int getGoldPerHour()
{
- return Plugin.convertEnergyToGold(getEnergyPerHour());
+ return getPlugin().convertEnergyToGold(getEnergyPerHour());
}
protected int getEnergyPerHour()
@@ -118,7 +118,7 @@ public class EnergyPage extends ShopPageBase
protected int getPlayerGold()
{
- return getDonationManager().Get(Player).getGold();
+ return getDonationManager().Get(getPlayer()).getGold();
}
public void showLoading()
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShop.java
index cd7214b35..4a8a5df1b 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShop.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShop.java
@@ -17,8 +17,8 @@ public class EnergyShop extends ShopBase
}
@Override
- protected ShopPageBase> BuildPagesFor(Player player)
+ protected ShopPageBase> buildPagesFor(Player player)
{
- return new EnergyPage(Plugin, this, ClientManager, DonationManager, player);
+ return new EnergyPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
}
}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShopButton.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShopButton.java
index b956e5b82..c0d416d3b 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShopButton.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyShopButton.java
@@ -48,7 +48,7 @@ public class EnergyShopButton implements IButton
{
player.playSound(player.getEyeLocation(), Sound.ANVIL_USE, 1, 1);
_clanInfo.adjustEnergy(energy);
- _page.Refresh();
+ _page.refresh();
}
}, "Energy Purchase", player.getName(), player.getUniqueId(), -goldCost, true);
}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpPage.java
index 6ec15aadc..d71a34a11 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpPage.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpPage.java
@@ -15,11 +15,11 @@ public class PvpPage extends ShopPageBase
{
super(plugin, shop, clientManager, donationManager, "Pvp Gear", player);
- BuildPage();
+ buildPage();
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
addPvpItem(9, new PvpItem(Material.GOLD_HELMET, (byte)0, 1, "Mage Helmet", 200, 4));
addPvpItem(18, new PvpItem(Material.GOLD_CHESTPLATE, (byte)0, 1, "Mage Chestplate", 200, 4));
@@ -64,6 +64,6 @@ public class PvpPage extends ShopPageBase
public void addPvpItem(int slot, PvpItem item)
{
- AddButton(slot, item, new PvpShopButton(this, item));
+ addButton(slot, item, new PvpShopButton(this, item));
}
}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpShop.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpShop.java
index ff1f31437..3bbd382b0 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpShop.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/PvpShop.java
@@ -15,8 +15,8 @@ public class PvpShop extends ShopBase
}
@Override
- protected ShopPageBase> BuildPagesFor(Player player)
+ protected ShopPageBase> buildPagesFor(Player player)
{
- return new PvpPage(Plugin, this, ClientManager, DonationManager, player);
+ return new PvpPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
}
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
index ff27f0f1d..bd0712857 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
@@ -76,7 +76,6 @@ import mineplex.core.pet.PetManager;
import mineplex.core.portal.Portal;
import mineplex.core.preferences.PreferencesManager;
import mineplex.core.projectile.ProjectileManager;
-import mineplex.core.recharge.Recharge;
import mineplex.core.stats.StatsManager;
import mineplex.core.task.TaskManager;
import mineplex.core.treasure.TreasureManager;
@@ -200,7 +199,7 @@ public class HubManager extends MiniClientPlugin
_ruleBook = ItemStackFactory.Instance.CreateStack(Material.WRITTEN_BOOK, (byte)0, 1, ChatColor.GREEN + "Rule Book", new String[] { });
BookMeta meta = (BookMeta)_ruleBook.getItemMeta();
- _serverName = GetPlugin().getConfig().getString("serverstatus.name");
+ _serverName = getPlugin().getConfig().getString("serverstatus.name");
_serverName = _serverName.substring(0, Math.min(16, _serverName.length()));
meta.addPage("§m-------------------§r\n"
@@ -336,7 +335,7 @@ public class HubManager extends MiniClientPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new GadgetToggle(this));
addCommand(new NewsCommand(this));
@@ -477,7 +476,7 @@ public class HubManager extends MiniClientPlugin
{
if (!client.GetRank().Has(Rank.ULTRA))
{
- Bukkit.getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AdminMountManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AdminMountManager.java
index 1917dbb95..90806d135 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AdminMountManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AdminMountManager.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import mineplex.core.MiniPlugin;
-import mineplex.core.common.Rank;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.hub.HubManager;
@@ -19,7 +18,6 @@ import org.bukkit.entity.Horse.Variant;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemStack;
@@ -31,13 +29,13 @@ public class AdminMountManager extends MiniPlugin
public AdminMountManager(HubManager manager)
{
- super("Mount Manager", manager.GetPlugin());
+ super("Mount Manager", manager.getPlugin());
Manager = manager;
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new HorseSpawn(this));
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ForcefieldManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ForcefieldManager.java
index 72e54cd6d..0683060e9 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ForcefieldManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ForcefieldManager.java
@@ -29,7 +29,7 @@ public class ForcefieldManager extends MiniPlugin
public ForcefieldManager(HubManager manager)
{
- super("Forcefield", manager.GetPlugin());
+ super("Forcefield", manager.getPlugin());
Manager = manager;
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/HubScoreboardManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/HubScoreboardManager.java
index 7740c8204..7aa6aa8e0 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/HubScoreboardManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/HubScoreboardManager.java
@@ -19,9 +19,9 @@ public class HubScoreboardManager extends MiniPlugin
public HubScoreboardManager(HubManager manager, CoreClientManager clientManager, DonationManager donationManager)
{
- super("Hub Scoreboard Manager", manager.GetPlugin());
+ super("Hub Scoreboard Manager", manager.getPlugin());
- _scoreboardManager = new ScoreboardManager(manager.GetPlugin(), clientManager, donationManager);
+ _scoreboardManager = new ScoreboardManager(manager.getPlugin(), clientManager, donationManager);
init();
}
@@ -29,7 +29,7 @@ public class HubScoreboardManager extends MiniPlugin
private String getServerName()
{
if (_serverName == null)
- _serverName = GetPlugin().getConfig().getString("serverstatus.name");
+ _serverName = getPlugin().getConfig().getString("serverstatus.name");
return _serverName;
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java
index 8c4ed5adb..4222e31de 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/JumpManager.java
@@ -6,19 +6,15 @@ import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerToggleFlightEvent;
-import org.bukkit.util.Vector;
import mineplex.core.MiniPlugin;
-import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt;
-import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.disguise.disguises.DisguiseBase;
import mineplex.core.disguise.disguises.DisguiseBat;
import mineplex.core.disguise.disguises.DisguiseChicken;
-import mineplex.core.disguise.disguises.DisguiseCreeper;
import mineplex.core.disguise.disguises.DisguiseEnderman;
import mineplex.core.disguise.disguises.DisguiseWither;
import mineplex.core.updater.UpdateType;
@@ -31,7 +27,7 @@ public class JumpManager extends MiniPlugin
public JumpManager(HubManager manager)
{
- super("Double Jump", manager.GetPlugin());
+ super("Double Jump", manager.getPlugin());
Manager = manager;
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
index 0bac5ed4c..a2e3f6919 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
@@ -45,11 +45,11 @@ public class NewsManager extends MiniPlugin
public NewsManager(HubManager manager)
{
- super("News Manager", manager.GetPlugin());
+ super("News Manager", manager.getPlugin());
Manager = manager;
- _repository.initialize(manager.GetPlugin().getConfig().getBoolean("serverstatus.us"));
+ _repository.initialize(manager.getPlugin().getConfig().getBoolean("serverstatus.us"));
_news = new String[]
{
@@ -92,13 +92,13 @@ public class NewsManager extends MiniPlugin
if (callback == null)
return;
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
final HashMap newsEntries = _repository.retrieveNewsEntries();
- Bukkit.getScheduler().runTask(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTask(getPlugin(), new Runnable()
{
public void run()
{
@@ -114,13 +114,13 @@ public class NewsManager extends MiniPlugin
if (callback == null)
return;
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
final Boolean success = _repository.setNewsEntry(newsEntry, newsPosition);
- Bukkit.getScheduler().runTask(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTask(getPlugin(), new Runnable()
{
public void run()
{
@@ -136,13 +136,13 @@ public class NewsManager extends MiniPlugin
if (callback == null)
return;
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
final Boolean success = _repository.addNewsEntry(newsEntry);
- Bukkit.getScheduler().runTask(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTask(getPlugin(), new Runnable()
{
public void run()
{
@@ -158,13 +158,13 @@ public class NewsManager extends MiniPlugin
if (callback == null)
return;
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
final Boolean success = _repository.deleteNewsEntry(newsPosition);
- Bukkit.getScheduler().runTask(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTask(getPlugin(), new Runnable()
{
public void run()
{
@@ -180,13 +180,13 @@ public class NewsManager extends MiniPlugin
if (callback == null)
return;
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
final Integer position = _repository.retrieveMaxNewsPosition();
- Bukkit.getScheduler().runTask(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTask(getPlugin(), new Runnable()
{
public void run()
{
@@ -293,7 +293,7 @@ public class NewsManager extends MiniPlugin
{
final int count = i;
- UtilServer.getServer().getScheduler().runTaskLater(Manager.GetPlugin(), new Runnable()
+ UtilServer.getServer().getScheduler().runTaskLater(Manager.getPlugin(), new Runnable()
{
@Override
public void run()
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
index 9308e8340..49d3d603e 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
@@ -21,7 +21,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerVelocityEvent;
import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
import mineplex.core.MiniPlugin;
@@ -48,7 +47,6 @@ import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.hub.HubManager;
import mineplex.hub.modules.parkour.ParkourData;
-import mineplex.hub.modules.parkour.ParkourSnake;
public class ParkourManager extends MiniPlugin
{
@@ -69,7 +67,7 @@ public class ParkourManager extends MiniPlugin
public ParkourManager(HubManager manager, DonationManager donation, TaskManager task)
{
- super("Parkour", manager.GetPlugin());
+ super("Parkour", manager.getPlugin());
Manager = manager;
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
index cc3385aba..0259a4cd3 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
@@ -44,11 +44,11 @@ public class StackerManager extends MiniPlugin implements IThrown
public StackerManager(HubManager manager)
{
- super("Stacker", manager.GetPlugin());
+ super("Stacker", manager.getPlugin());
Manager = manager;
- _projectileManager = new ProjectileManager(manager.GetPlugin());
+ _projectileManager = new ProjectileManager(manager.getPlugin());
}
@EventHandler
@@ -184,7 +184,7 @@ public class StackerManager extends MiniPlugin implements IThrown
_tempStackShift.add(throweeStack);
- GetPlugin().getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable()
+ getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java
index 2ae729452..870943f65 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java
@@ -3,14 +3,11 @@ package mineplex.hub.modules;
import mineplex.core.MiniPlugin;
import mineplex.core.common.util.UtilBlockText;
import mineplex.core.common.util.UtilBlockText.TextAlign;
-import mineplex.core.updater.UpdateType;
-import mineplex.core.updater.event.UpdateEvent;
import mineplex.hub.HubManager;
import mineplex.hub.HubType;
import org.bukkit.Location;
import org.bukkit.block.BlockFace;
-import org.bukkit.event.EventHandler;
public class TextManager extends MiniPlugin
{
@@ -33,7 +30,7 @@ public class TextManager extends MiniPlugin
public TextManager(HubManager manager)
{
- super("Text Creator", manager.GetPlugin());
+ super("Text Creator", manager.getPlugin());
Manager = manager;
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TournamentInviter.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TournamentInviter.java
index f1dcc5178..badb32df2 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TournamentInviter.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TournamentInviter.java
@@ -82,7 +82,7 @@ public class TournamentInviter extends MiniPlugin
public TournamentInviter(HubManager manager)
{
- super("Map Manager", manager.GetPlugin());
+ super("Map Manager", manager.getPlugin());
}
@EventHandler
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/UHCManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/UHCManager.java
index b4ae6106c..f548a0b62 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/UHCManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/UHCManager.java
@@ -8,7 +8,6 @@ import mineplex.core.MiniPlugin;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilTime;
import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
@@ -27,7 +26,7 @@ public class UHCManager extends MiniPlugin
public UHCManager(HubManager manager)
{
- super("UHC Manager", manager.GetPlugin());
+ super("UHC Manager", manager.getPlugin());
Manager = manager;
}
@@ -38,7 +37,7 @@ public class UHCManager extends MiniPlugin
if (event.getType() != UpdateType.SEC)
return;
- Bukkit.getScheduler().runTaskAsynchronously(Manager.GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(Manager.getPlugin(), new Runnable()
{
@Override
public void run()
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/VisibilityManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/VisibilityManager.java
index 90f3dabc0..dd0502113 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/VisibilityManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/VisibilityManager.java
@@ -7,7 +7,6 @@ import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
-import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerQuitEvent;
@@ -32,7 +31,7 @@ public class VisibilityManager extends MiniPlugin
public VisibilityManager(HubManager manager)
{
- super("Visibility Manager", manager.GetPlugin());
+ super("Visibility Manager", manager.getPlugin());
Manager = manager;
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
index 9b34cd245..c2782cbff 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
@@ -5,16 +5,10 @@ import java.util.Iterator;
import mineplex.core.MiniPlugin;
import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilBlock;
-import mineplex.core.common.util.UtilEnt;
-import mineplex.core.common.util.UtilEvent;
-import mineplex.core.common.util.UtilGear;
import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilServer;
-import mineplex.core.common.util.UtilTime;
import mineplex.core.common.util.UtilWorld;
-import mineplex.core.common.util.UtilEvent.ActionType;
import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
@@ -33,10 +27,8 @@ import org.bukkit.entity.Chicken;
import org.bukkit.entity.Cow;
import org.bukkit.entity.Creature;
import org.bukkit.entity.Entity;
-import org.bukkit.entity.FallingBlock;
import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Minecart;
import org.bukkit.entity.Pig;
import org.bukkit.entity.Player;
import org.bukkit.entity.Skeleton;
@@ -52,11 +44,8 @@ import org.bukkit.event.block.LeavesDecayEvent;
import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntityTargetEvent;
-import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerPickupItemEvent;
-import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
public class WorldManager extends MiniPlugin
{
@@ -69,7 +58,7 @@ public class WorldManager extends MiniPlugin
public WorldManager(HubManager manager)
{
- super("World Manager", manager.GetPlugin());
+ super("World Manager", manager.getPlugin());
Manager = manager;
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/notification/NotificationManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/notification/NotificationManager.java
index d2dd03364..69c863958 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/notification/NotificationManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/notification/NotificationManager.java
@@ -89,7 +89,7 @@ public class NotificationManager extends MiniPlugin
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new NotificationCommand(this));
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/notification/gui/NotificationShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/notification/gui/NotificationShop.java
index 20a7a1745..018b26bdc 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/notification/gui/NotificationShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/notification/gui/NotificationShop.java
@@ -6,7 +6,6 @@ import mineplex.core.account.CoreClientManager;
import mineplex.core.donation.DonationManager;
import mineplex.core.shop.ShopBase;
import mineplex.core.shop.page.ShopPageBase;
-import mineplex.hub.mail.MailManager;
import mineplex.hub.notification.NotificationManager;
import mineplex.hub.notification.gui.page.NotificationPage;
@@ -18,8 +17,8 @@ public class NotificationShop extends ShopBase
}
@Override
- protected ShopPageBase> BuildPagesFor(Player player)
+ protected ShopPageBase> buildPagesFor(Player player)
{
- return new NotificationPage(Plugin, this, ClientManager, DonationManager, player);
+ return new NotificationPage(getPlugin(), this, getClientManager(), getDonationManager(), player);
}
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/notification/gui/page/NotificationPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/notification/gui/page/NotificationPage.java
index 02d9e918e..9c2b12347 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/notification/gui/page/NotificationPage.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/notification/gui/page/NotificationPage.java
@@ -1,20 +1,13 @@
package mineplex.hub.notification.gui.page;
-import java.util.ArrayList;
import java.util.List;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
import org.bukkit.entity.Player;
import mineplex.core.account.CoreClientManager;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilTime;
import mineplex.core.donation.DonationManager;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.shop.page.ShopPageBase;
-import mineplex.hub.mail.MailManager;
-import mineplex.hub.mail.MailMessage;
import mineplex.hub.notification.NotificationManager;
import mineplex.hub.notification.api.Notification;
import mineplex.hub.notification.gui.NotificationShop;
@@ -26,13 +19,13 @@ public class NotificationPage extends ShopPageBase notifications = Plugin.getNotifications(Player);
+ List notifications = getPlugin().getNotifications(getPlayer());
for (int i = 0; i < notifications.size(); i++)
{
@@ -40,7 +33,7 @@ public class NotificationPage extends ShopPageBase
}
@Override
- public void AddCommands()
+ public void addCommands()
{
addCommand(new PollCommand(this));
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/poll/command/PollCommand.java b/Plugins/Mineplex.Hub/src/mineplex/hub/poll/command/PollCommand.java
index bd75a6a06..fe5997c79 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/poll/command/PollCommand.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/poll/command/PollCommand.java
@@ -80,13 +80,13 @@ public class PollCommand extends CommandBase
}
UtilPlayer.message(caller, "Fetching Poll Stats....");
- Bukkit.getScheduler().runTaskAsynchronously(Plugin.GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(Plugin.getPlugin(), new Runnable()
{
@Override
public void run()
{
final PollStats stats = Plugin.getPollStats(pollId);
- Bukkit.getScheduler().runTask(Plugin.GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTask(Plugin.getPlugin(), new Runnable()
{
@Override
public void run()
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/queue/QueueManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/queue/QueueManager.java
index 0a7ebb32d..e1f06c6ef 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/queue/QueueManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/queue/QueueManager.java
@@ -48,8 +48,8 @@ public class QueueManager extends MiniPlugin
{
try
{
- GetPlugin().getConfig().addDefault("queue.us", true);
- GetPlugin().getConfig().set("queue.us", GetPlugin().getConfig().getBoolean("queue.us"));
+ getPlugin().getConfig().addDefault("queue.us", true);
+ getPlugin().getConfig().set("queue.us", getPlugin().getConfig().getBoolean("queue.us"));
}
catch (Exception e)
{
@@ -108,7 +108,7 @@ public class QueueManager extends MiniPlugin
final int elo = eloCumulative / players.length;
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -139,7 +139,7 @@ public class QueueManager extends MiniPlugin
if (matchStatus != null)
{
- Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -166,7 +166,7 @@ public class QueueManager extends MiniPlugin
}
}
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
@@ -223,7 +223,7 @@ public class QueueManager extends MiniPlugin
public void respondToInvite(final Player player, final boolean accepted)
{
- Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/queue/ui/QueuePage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/queue/ui/QueuePage.java
index e6b3db74c..b8794d407 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/queue/ui/QueuePage.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/queue/ui/QueuePage.java
@@ -17,7 +17,6 @@ import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
-import org.bukkit.event.inventory.InventoryClickEvent;
public class QueuePage extends ShopPageBase
{
@@ -28,17 +27,17 @@ public class QueuePage extends ShopPageBase
{
super(plugin, shop, clientManager, donationManager, name, player, 54);
- BuildPage();
+ buildPage();
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
clear();
- if (Plugin.isQueued(Player))
+ if (getPlugin().isQueued(getPlayer()))
{
- PlayerMatchStatus matchStatus = Plugin.getQueuedPlayerStatus(Player);
+ PlayerMatchStatus matchStatus = getPlugin().getQueuedPlayerStatus(getPlayer());
if (matchStatus.AssignedMatch != -1)
{
@@ -110,7 +109,7 @@ public class QueuePage extends ShopPageBase
}
};
- AddButton(22, new ShopItem(Material.BOOK, "Play", new String[] { "Click me to enter play queue." }, 1, false), queueButton);
+ addButton(22, new ShopItem(Material.BOOK, "Play", new String[]{"Click me to enter play queue."}, 1, false), queueButton);
}
}
@@ -118,7 +117,7 @@ public class QueuePage extends ShopPageBase
{
if (_closeOnNextUpdate)
{
- Player.closeInventory();
+ getPlayer().closeInventory();
System.out.println(this.getClass().getName() + " 138");
return;
}
@@ -126,12 +125,12 @@ public class QueuePage extends ShopPageBase
_circleIndex++;
_circleIndex %= 3;
- BuildPage();
+ buildPage();
}
private void queuePlayer(String gameType, Player player)
{
- Party party = Plugin.getPartyManager().GetParty(player);
+ Party party = getPlugin().getPartyManager().GetParty(player);
if (party != null)
{
@@ -149,27 +148,27 @@ public class QueuePage extends ShopPageBase
players.add(partyPlayer);
}
- Plugin.queuePlayer(gameType, players.toArray(new Player[] {}));
+ getPlugin().queuePlayer(gameType, players.toArray(new Player[]{}));
}
}
else
{
- Plugin.queuePlayer(gameType, player);
+ getPlugin().queuePlayer(gameType, player);
}
- BuildPage();
+ buildPage();
}
protected void OkClicked(Player player)
{
- Plugin.respondToInvite(player, true);
+ getPlugin().respondToInvite(player, true);
- BuildPage();
+ buildPage();
}
protected void CancelClicked(Player player)
{
- Plugin.respondToInvite(player, false);
+ getPlugin().respondToInvite(player, false);
player.closeInventory();
System.out.println(this.getClass().getName() + " 191");
@@ -177,21 +176,21 @@ public class QueuePage extends ShopPageBase
private void buildSquareAt(int slot, ShopItem item, IButton button)
{
- AddButton(slot, item, button);
- AddButton(slot + 1, item, button);
- AddButton(slot + 2, item, button);
+ addButton(slot, item, button);
+ addButton(slot + 1, item, button);
+ addButton(slot + 2, item, button);
slot += 9;
- AddButton(slot, item, button);
- AddButton(slot + 1, item, button);
- AddButton(slot + 2, item, button);
+ addButton(slot, item, button);
+ addButton(slot + 1, item, button);
+ addButton(slot + 2, item, button);
slot += 9;
- AddButton(slot, item, button);
- AddButton(slot + 1, item, button);
- AddButton(slot + 2, item, button);
+ addButton(slot, item, button);
+ addButton(slot + 1, item, button);
+ addButton(slot + 2, item, button);
}
private void drawCircle()
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/queue/ui/QueueShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/queue/ui/QueueShop.java
index ab458968b..33b2c6bbd 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/queue/ui/QueueShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/queue/ui/QueueShop.java
@@ -25,15 +25,15 @@ public class QueueShop extends ShopBase
}
@Override
- protected ShopPageBase> BuildPagesFor(Player player)
+ protected ShopPageBase> buildPagesFor(Player player)
{
- return new QueuePage(Plugin, this, ClientManager, DonationManager, " " + ChatColor.UNDERLINE + "Queuer 9001", player);
+ return new QueuePage(getPlugin(), this, getClientManager(), getDonationManager(), " " + ChatColor.UNDERLINE + "Queuer 9001", player);
}
@Override
- protected boolean CanOpenShop(Player player)
+ protected boolean canOpenShop(Player player)
{
- Party party = Plugin.getPartyManager().GetParty(player);
+ Party party = getPlugin().getPartyManager().GetParty(player);
if (party != null && !player.getName().equalsIgnoreCase(party.GetLeader()))
{
@@ -52,7 +52,7 @@ public class QueueShop extends ShopBase
if (event.getType() != UpdateType.FASTER)
return;
- for (Iterator>> iterator = PlayerPageMap.values().iterator(); iterator.hasNext();)
+ for (Iterator>> iterator = getPlayerPageMap().values().iterator(); iterator.hasNext();)
{
ShopPageBase> page = iterator.next();
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
index 59fe446b9..5b7aa65f4 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
@@ -219,7 +219,7 @@ public class ServerManager extends MiniPlugin
{
player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 5f, 1f);
- Bukkit.getScheduler().runTaskLater(GetPlugin(), new Runnable()
+ Bukkit.getScheduler().runTaskLater(getPlugin(), new Runnable()
{
public void run()
{
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java
index 89a46bcf5..f47ee6a16 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyMenu.java
@@ -29,13 +29,13 @@ public class LobbyMenu extends ShopPageBase implements
_serverGroup = serverGroup;
- BuildPage();
+ buildPage();
}
@Override
- protected void BuildPage()
+ protected void buildPage()
{
- List serverList = new ArrayList(Plugin.GetServerList(_serverGroup));
+ List serverList = new ArrayList(getPlugin().GetServerList(_serverGroup));
try
{
@@ -59,7 +59,7 @@ public class LobbyMenu extends ShopPageBase implements
if (slot >= 54)
break;
- if (serverInfo.Name.equalsIgnoreCase(Plugin.getStatusManager().getCurrentServerName()))
+ if (serverInfo.Name.equalsIgnoreCase(getPlugin().getStatusManager().getCurrentServerName()))
status = Material.EMERALD_BLOCK;
lore.add(ChatColor.RESET + "");
@@ -68,7 +68,7 @@ public class LobbyMenu extends ShopPageBase implements
if (serverInfo.CurrentPlayers >= serverInfo.MaxPlayers)
{
- if (!Client.GetRank().Has(Rank.ULTRA))
+ if (!getClient().GetRank().Has(Rank.ULTRA))
lore.add(openFull);
else
lore.add(openFullUltra);
@@ -77,30 +77,30 @@ public class LobbyMenu extends ShopPageBase implements
lore.add(ChatColor.RESET + C.Line + "Click to join!");
if (status != Material.EMERALD_BLOCK)
- AddButton(slot, new ShopItem(status, ChatColor.UNDERLINE + "" + ChatColor.BOLD + "" + ChatColor.WHITE + "Server " + serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1), lore.toArray(new String[lore.size()]), Integer.parseInt(serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1)), false), new JoinServerButton(this, serverInfo));
+ addButton(slot, new ShopItem(status, ChatColor.UNDERLINE + "" + ChatColor.BOLD + "" + ChatColor.WHITE + "Server " + serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1), lore.toArray(new String[lore.size()]), Integer.parseInt(serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1)), false), new JoinServerButton(this, serverInfo));
else
- AddItem(slot, new ShopItem(status, ChatColor.UNDERLINE + "" + ChatColor.BOLD + "" + ChatColor.WHITE + "Server " + serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1), lore.toArray(new String[lore.size()]), Integer.parseInt(serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1)), false));
+ addItem(slot, new ShopItem(status, ChatColor.UNDERLINE + "" + ChatColor.BOLD + "" + ChatColor.WHITE + "Server " + serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1), lore.toArray(new String[lore.size()]), Integer.parseInt(serverInfo.Name.substring(serverInfo.Name.indexOf('-') + 1)), false));
}
}
public void Update()
{
clear();
- ButtonMap.clear();
- BuildPage();
+ getButtonMap().clear();
+ buildPage();
}
@Override
public void SelectServer(org.bukkit.entity.Player player, ServerInfo serverInfo)
{
- int slots = Plugin.GetRequiredSlots(player, serverInfo.ServerType);
+ int slots = getPlugin().GetRequiredSlots(player, serverInfo.ServerType);
if (serverInfo.MaxPlayers - serverInfo.CurrentPlayers < slots)
{
- PlayDenySound(player);
+ playDenySound(player);
return;
}
- Plugin.SelectServer(player, serverInfo);
+ getPlugin().SelectServer(player, serverInfo);
}
}
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java
index a63359960..8cd3347df 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/LobbyShop.java
@@ -18,14 +18,14 @@ public class LobbyShop extends ShopBase
}
@Override
- protected ShopPageBase> BuildPagesFor(Player player)
+ protected ShopPageBase> buildPagesFor(Player player)
{
- return new LobbyMenu(Plugin, this, ClientManager, DonationManager, " " + ChatColor.UNDERLINE + "Lobby Selector", player, "Lobby");
+ return new LobbyMenu(getPlugin(), this, getClientManager(), getDonationManager(), " " + ChatColor.UNDERLINE + "Lobby Selector", player, "Lobby");
}
public void UpdatePages()
{
- for (ShopPageBase> page : PlayerPageMap.values())
+ for (ShopPageBase> page : getPlayerPageMap().values())
{
if (page instanceof LobbyMenu)
{
diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/QuickShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/QuickShop.java
index 4ffe41f10..2e0d59b45 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/QuickShop.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/QuickShop.java
@@ -16,14 +16,14 @@ public class QuickShop extends ShopBase
}
@Override
- protected ShopPageBase