From e380354baded7e9455514d8b8aae9947129f4fe5 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Sun, 29 May 2016 16:34:21 -0500 Subject: [PATCH] Refactor CurrencyType --- .../mineplex/core/common/CurrencyType.java | 12 ++--- .../core/boosters/tips/BoosterTipManager.java | 10 +++++ .../core/boosters/tips/TipAddResult.java | 1 + .../fountain/GemFountainSalesPackage.java | 2 +- .../brawl/fountain/command/AddCommand.java | 3 +- .../gui/button/FountainAddButton.java | 9 +--- .../core/cosmetic/ui/CosmeticShop.java | 2 +- .../core/cosmetic/ui/button/MountButton.java | 2 +- .../core/cosmetic/ui/page/CostumePage.java | 2 +- .../core/cosmetic/ui/page/GadgetPage.java | 44 +++++++++---------- .../core/cosmetic/ui/page/MountPage.java | 28 ++++++------ .../core/cosmetic/ui/page/PetPage.java | 32 ++++++-------- .../core/cosmetic/ui/page/PetTagPage.java | 2 +- .../src/mineplex/core/donation/Donor.java | 14 +++--- .../repository/DonationRepository.java | 7 ++- .../core/gadget/gadgets/morph/MorphBunny.java | 3 +- .../gadget/gadgets/morph/MorphVillager.java | 4 +- .../src/mineplex/core/pet/Pet.java | 2 +- .../src/mineplex/core/pet/PetExtra.java | 2 +- .../reward/rewards/UnknownPackageReward.java | 3 +- .../elements/ScoreboardElementCoinCount.java | 2 +- .../elements/ScoreboardElementGemCount.java | 2 +- .../elements/ScoreboardElementGoldCount.java | 2 +- .../core/shop/item/SalesPackageBase.java | 4 +- .../core/shop/page/ConfirmationPage.java | 4 +- .../core/tournament/ui/TournamentShop.java | 2 +- .../core/treasure/gui/BuyChestButton.java | 2 +- .../src/mineplex/enjinTranslator/Enjin.java | 3 +- .../elements/ScoreboardElementPlayer.java | 2 +- .../game/clans/shop/energy/EnergyPackage.java | 2 +- .../clans/shop/energy/EnergyShopButton.java | 2 +- .../hub/modules/ValentinesManager.java | 2 +- .../game/classcombat/Skill/Skill.java | 2 +- .../classcombat/shop/ClassCombatShop.java | 4 +- .../game/classcombat/shop/page/SkillPage.java | 4 +- .../shop/salespackage/ItemSalesPackage.java | 2 +- .../shop/salespackage/SkillSalesPackage.java | 2 +- .../command/GemHunterCommand.java | 5 +-- .../salespackage/command/ItemCommand.java | 3 +- .../game/arcade/booster/BoosterPodium.java | 25 +++++------ .../game/arcade/command/TipCommand.java | 4 +- .../game/games/halloween/Halloween.java | 3 +- .../arcade/managers/GamePlayerManager.java | 4 +- .../nautilus/game/arcade/shop/ArcadeShop.java | 2 +- .../nautilus/game/arcade/shop/KitPackage.java | 2 +- 45 files changed, 129 insertions(+), 146 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/CurrencyType.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/CurrencyType.java index e54f9f28f..5508b6367 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/CurrencyType.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/CurrencyType.java @@ -4,10 +4,10 @@ import org.bukkit.Material; public enum CurrencyType { - Tokens("Tokens", Material.EMERALD), - Coins("Treasure Shards", Material.PRISMARINE_SHARD), - Gems("Gems", Material.EMERALD), - Gold("Gold", Material.GOLD_NUGGET); + TOKEN("Tokens", Material.EMERALD), + TREASURE_SHARD("Treasure Shards", Material.PRISMARINE_SHARD), + GEM("Gems", Material.EMERALD), + GOLD("Gold", Material.GOLD_NUGGET); private String _prefix; private Material _displayMaterial; @@ -18,12 +18,12 @@ public enum CurrencyType _displayMaterial = displayMaterial; } - public String Prefix() + public String getPrefix() { return _prefix; } - public Material GetDisplayMaterial() + public Material getDisplayMaterial() { return _displayMaterial; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java index f018da852..dabe0a048 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java @@ -5,6 +5,7 @@ import mineplex.core.account.CoreClientManager; import mineplex.core.boosters.Booster; import mineplex.core.common.util.Callback; import mineplex.core.donation.DonationManager; +import mineplex.core.recharge.Recharge; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; @@ -16,6 +17,9 @@ import java.sql.SQLException; */ public class BoosterTipManager extends MiniDbClientPlugin { + public static final int TIP_FOR_SPONSOR = 30; + public static final int TIP_FOR_TIPPER = 10; + private BoosterTipRepository _repository; private DonationManager _donationManager; @@ -29,6 +33,12 @@ public class BoosterTipManager extends MiniDbClientPlugin public void addTip(Player player, Booster booster, Callback callback) { + if (!Recharge.Instance.use(player, "Booster Tip", 1000 * 60 * 10, true, false)) + { + callback.run(TipAddResult.ON_COOLDOWN); + return; + } + int accountId = ClientManager.getAccountId(player); // Break out if client manager has a bad account id diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/TipAddResult.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/TipAddResult.java index d1654d997..e983e9be8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/TipAddResult.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/TipAddResult.java @@ -7,5 +7,6 @@ public enum TipAddResult { ALREADY_TIPPED_BOOSTER, INVALID_ACCOUNT_ID, + ON_COOLDOWN, SUCCESS } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java b/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java index fe739ce9d..062e5a381 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java @@ -14,7 +14,7 @@ public class GemFountainSalesPackage extends SalesPackageBase { super("Add " + gems + " Gems", Material.EMERALD, (byte) 0, new String[] {}, gems, 1); - CurrencyCostMap.put(CurrencyType.Gems, gems); + CurrencyCostMap.put(CurrencyType.GEM, gems); KnownPackage = false; OneTimePurchaseOnly = false; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/command/AddCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/command/AddCommand.java index 1b0b70843..9266d5e55 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/command/AddCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/command/AddCommand.java @@ -9,7 +9,6 @@ import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.server.util.TransactionResponse; import org.bukkit.entity.Player; -import org.omg.PortableInterceptor.SUCCESSFUL; /** * @author Shaun Bennett @@ -53,7 +52,7 @@ public class AddCommand extends CommandBase UtilPlayer.message(caller, F.main("Fountain", "There was an error processing your request!")); } } - }, caller, "GemFountain.Add", CurrencyType.Gems, amount, false); + }, caller, "GemFountain.Add", CurrencyType.GEM, amount, false); } catch (NumberFormatException ex) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/gui/button/FountainAddButton.java b/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/gui/button/FountainAddButton.java index b566d4d89..9460025c1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/gui/button/FountainAddButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/gui/button/FountainAddButton.java @@ -1,20 +1,13 @@ package mineplex.core.brawl.fountain.gui.button; -import mineplex.core.brawl.fountain.Fountain; import mineplex.core.brawl.fountain.FountainManager; import mineplex.core.brawl.fountain.GemFountainSalesPackage; import mineplex.core.brawl.fountain.gui.FountainPage; import mineplex.core.brawl.fountain.gui.FountainShop; import mineplex.core.common.CurrencyType; -import mineplex.core.common.jsonchat.ClickEvent; -import mineplex.core.common.jsonchat.JsonMessage; -import mineplex.core.common.util.C; -import mineplex.core.cosmetic.CosmeticManager; -import mineplex.core.cosmetic.ui.CosmeticShop; import mineplex.core.shop.item.IButton; import mineplex.core.shop.item.SalesPackageBase; import mineplex.core.shop.page.ConfirmationPage; -import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -44,6 +37,6 @@ public class FountainAddButton implements IButton _page.getPlugin().getGemFountain().increment(player, _gems); _page.refresh(); } - }, _page, _salesPackage, CurrencyType.Gems, player)); + }, _page, _salesPackage, CurrencyType.GEM, player)); } } 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 a1bd1a0db..64844f622 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java @@ -19,7 +19,7 @@ public class CosmeticShop extends ShopBase implements PluginMes { public CosmeticShop(CosmeticManager plugin, CoreClientManager clientManager, DonationManager donationManager, String name) { - super(plugin, clientManager, donationManager, name, CurrencyType.Gems, CurrencyType.Coins); + super(plugin, clientManager, donationManager, name, CurrencyType.GEM, CurrencyType.TREASURE_SHARD); plugin.getPlugin().getServer().getMessenger().registerIncomingPluginChannel(plugin.getPlugin(), "MC|ItemName", this); } 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 55d34af4b..d4d186eb8 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 @@ -32,6 +32,6 @@ public class MountButton implements IButton _page.getPlugin().getInventoryManager().addItemToInventory(null, player, _mount.GetName(), 1); _page.refresh(); } - }, _page, _mount, CurrencyType.Coins, player)); + }, _page, _mount, CurrencyType.TREASURE_SHARD, player)); } } 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 9c8ca1850..0d6f83dd7 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 @@ -38,7 +38,7 @@ public class CostumePage extends GadgetPage for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Costume)) { - if (gadget.GetCost(CurrencyType.Coins) == -1) + if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -1) continue; OutfitGadget outfitGadget = ((OutfitGadget) gadget); 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 db83190df..d63b2d545 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 @@ -46,7 +46,7 @@ public class GadgetPage extends ShopPageBase for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Item)) { - if (gadget.GetCost(CurrencyType.Coins) == -3) + if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -3) continue; addGadget(gadget, slot); @@ -101,59 +101,59 @@ public class GadgetPage extends ShopPageBase if (!gadget.ownsGadget(getPlayer())) { - if (gadget.GetCost(CurrencyType.Coins) == -1) + if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -1) { //Nothing } //Chest Unlocks - else if (gadget.GetCost(CurrencyType.Coins) == -2 || gadget.GetCost(CurrencyType.Coins) > 0) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -2 || gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Treasure Chests"); } - else if (gadget.GetCost(CurrencyType.Coins) == -3) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -3) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Winter Holiday Treasure"); } - else if (gadget.GetCost(CurrencyType.Coins) == -4) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -4) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Halloween Pumpkin Treasure"); } - else if (gadget.GetCost(CurrencyType.Coins) == -5) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -5) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Easter Holiday Treasure"); } - else if (gadget.GetCost(CurrencyType.Coins) == -6) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -6) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Valentines Gifts"); } - else if (gadget.GetCost(CurrencyType.Coins) == -7) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -7) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Purchased from shop.mineplex.com"); } //Rank Unlocks - else if (gadget.GetCost(CurrencyType.Coins) == -10) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -10) { itemLore.add(C.cBlack); itemLore.add(C.cAqua + "Unlocked with Ultra Rank"); } - else if (gadget.GetCost(CurrencyType.Coins) == -11) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -11) { itemLore.add(C.cBlack); itemLore.add(C.cPurple + "Unlocked with Hero Rank"); } - else if (gadget.GetCost(CurrencyType.Coins) == -12) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -12) { itemLore.add(C.cBlack); itemLore.add(C.cGreen + "Unlocked with Legend Rank"); } - else if (gadget.GetCost(CurrencyType.Coins) == -13) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -13) { itemLore.add(C.cBlack); itemLore.add(C.cRed + "Unlocked with Titan Rank"); @@ -230,20 +230,20 @@ public class GadgetPage extends ShopPageBase } else { - if (gadget.GetCost(CurrencyType.Coins) > 0) + if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); - itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + gadget.GetCost(CurrencyType.Coins) + " Treasure Shards"); + itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + gadget.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards"); } - if (gadget.GetCost(CurrencyType.Coins) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= gadget.GetCost(CurrencyType.Coins)) + if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= gadget.GetCost(CurrencyType.TREASURE_SHARD)) { itemLore.add(C.cBlack); itemLore.add(C.cGreen + "Click to Purchase"); addButton(slot, new ShopItem(Material.INK_SACK, (byte) 8, gadget.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false).hideInfo(), new GadgetButton(gadget, this)); } - else if (gadget.GetCost(CurrencyType.Coins) > 0) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); itemLore.add(C.cRed + "Not enough Treasure Shards."); @@ -279,20 +279,20 @@ public class GadgetPage extends ShopPageBase } else { - if (gadget.GetCost(CurrencyType.Coins) > 0) + if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); - itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + gadget.GetCost(CurrencyType.Coins) + " Treasure Shards"); + itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + gadget.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards"); } - if (gadget.GetCost(CurrencyType.Coins) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= gadget.GetCost(CurrencyType.Coins)) + if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= gadget.GetCost(CurrencyType.TREASURE_SHARD)) { itemLore.add(C.cBlack); itemLore.add(C.cGreen + "Click to Purchase"); addButton(slot, new ShopItem(Material.INK_SACK, (byte) 8, gadget.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false).hideInfo(), new GadgetButton(gadget, this)); } - else if (gadget.GetCost(CurrencyType.Coins) > 0) + else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); itemLore.add(C.cRed + "Not enough Treasure Shards."); @@ -313,7 +313,7 @@ public class GadgetPage extends ShopPageBase { ItemGadget itemGadget = (ItemGadget)gadget; - if (itemGadget.getAmmo().GetCost(CurrencyType.Coins) < 0) + if (itemGadget.getAmmo().GetCost(CurrencyType.TREASURE_SHARD) < 0) return; } @@ -329,7 +329,7 @@ public class GadgetPage extends ShopPageBase getPlugin().getInventoryManager().addItemToInventory(getPlayer(), gadget.GetName(), (gadget instanceof ItemGadget ? ((ItemGadget) gadget).getAmmo().getQuantity() : gadget.getQuantity())); refresh(); } - }, this, (gadget instanceof ItemGadget ? ((ItemGadget) gadget).getAmmo() : gadget), CurrencyType.Coins, getPlayer())); + }, this, (gadget instanceof ItemGadget ? ((ItemGadget) gadget).getAmmo() : gadget), CurrencyType.TREASURE_SHARD, getPlayer())); } public void activateGadget(Player player, Gadget gadget) 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 12475e8d9..aea19841c 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 @@ -62,53 +62,53 @@ public class MountPage extends ShopPageBase if (!getDonationManager().Get(getPlayer().getName()).OwnsUnknownPackage(mount.GetName())) { - if (mount.GetCost(CurrencyType.Coins) == -1) + if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -1) { //Nothing } //Chest Unlocks - else if (mount.GetCost(CurrencyType.Coins) == -2 || mount.GetCost(CurrencyType.Coins) > 0) + else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -2 || mount.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Treasure Chests"); } - else if (mount.GetCost(CurrencyType.Coins) == -3) + else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -3) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Winter Holiday Treasure"); } - else if (mount.GetCost(CurrencyType.Coins) == -4) + else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -4) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Halloween Pumpkin Treasure"); } - else if (mount.GetCost(CurrencyType.Coins) == -5) + else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -5) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Easter Holiday Treasure"); } - else if (mount.GetCost(CurrencyType.Coins) == -6) + else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -6) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Valentines Holiday Treasure"); } //Rank Unlocks - else if (mount.GetCost(CurrencyType.Coins) == -10) + else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -10) { itemLore.add(C.cBlack); itemLore.add(C.cAqua + "Unlocked with Ultra Rank"); } - else if (mount.GetCost(CurrencyType.Coins) == -11) + else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -11) { itemLore.add(C.cBlack); itemLore.add(C.cPurple + "Unlocked with Hero Rank"); } - else if (mount.GetCost(CurrencyType.Coins) == -12) + else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -12) { itemLore.add(C.cBlack); itemLore.add(C.cGreen + "Unlocked with Legend Rank"); } - else if (mount.GetCost(CurrencyType.Coins) == -13) + else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -13) { itemLore.add(C.cBlack); itemLore.add(C.cRed + "Unlocked with Titan Rank"); @@ -134,20 +134,20 @@ public class MountPage extends ShopPageBase } else { - if (mount.GetCost(CurrencyType.Coins) > 0) + if (mount.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); - itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + mount.GetCost(CurrencyType.Coins) + " Treasure Shards"); + itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + mount.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards"); } - if (mount.GetCost(CurrencyType.Coins) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= mount.GetCost(CurrencyType.Coins)) + if (mount.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= mount.GetCost(CurrencyType.TREASURE_SHARD)) { itemLore.add(C.cBlack); itemLore.add(C.cGreen + "Click to Purchase"); addButton(slot, new ShopItem(Material.INK_SACK, (byte) 7, mount.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false), new MountButton(mount, this)); } - else if (mount.GetCost(CurrencyType.Coins) > 0) + else if (mount.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); itemLore.add(C.cRed + "Not enough Treasure Shards."); 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 114b700ce..9a58bdca9 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 @@ -7,12 +7,10 @@ import java.util.List; import net.minecraft.server.v1_8_R3.Blocks; import net.minecraft.server.v1_8_R3.ChatMessage; import net.minecraft.server.v1_8_R3.EntityPlayer; -import net.minecraft.server.v1_8_R3.IChatBaseComponent; import net.minecraft.server.v1_8_R3.Items; import net.minecraft.server.v1_8_R3.PacketPlayOutOpenWindow; import net.minecraft.server.v1_8_R3.PacketPlayOutSetSlot; -import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.entity.EntityType; @@ -33,8 +31,6 @@ import mineplex.core.cosmetic.ui.button.RenamePetButton; import mineplex.core.donation.DonationManager; import mineplex.core.pet.Pet; import mineplex.core.pet.PetExtra; -import mineplex.core.pet.types.Elf; -import mineplex.core.pet.types.Pumpkin; import mineplex.core.shop.item.IButton; import mineplex.core.shop.item.ShopItem; import mineplex.core.shop.page.AnvilContainer; @@ -67,49 +63,49 @@ public class PetPage extends ShopPageBase //Chest Unlocks if (!getPlugin().getPetManager().Get(getPlayer()).GetPets().containsKey(pet.GetPetType())) { - if (pet.GetCost(CurrencyType.Coins) == -1) + if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -1) { //Nothing } - else if (pet.GetCost(CurrencyType.Coins) == -2 || pet.GetCost(CurrencyType.Coins) > 0) + else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -2 || pet.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Treasure Chests"); } - else if (pet.GetCost(CurrencyType.Coins) == -3) + else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -3) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Winter Holiday Treasure"); } - else if (pet.GetCost(CurrencyType.Coins) == -4) + else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -4) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Halloween Pumpkin Treasure"); } - else if (pet.GetCost(CurrencyType.Coins) == -5) + else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -5) { itemLore.add(C.cBlack); itemLore.add(C.cBlue + "Found in Easter Holiday Treasure"); } //Rank Unlocks - else if (pet.GetCost(CurrencyType.Coins) == -10) + else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -10) { itemLore.add(C.cBlack); itemLore.add(C.cAqua + "Unlocked with Ultra Rank"); } - else if (pet.GetCost(CurrencyType.Coins) == -11) + else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -11) { itemLore.add(C.cBlack); itemLore.add(C.cPurple + "Unlocked with Hero Rank"); } - else if (pet.GetCost(CurrencyType.Coins) == -12) + else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -12) { itemLore.add(C.cBlack); itemLore.add(C.cGreen + "Unlocked with Legend Rank"); } - else if (pet.GetCost(CurrencyType.Coins) == -13) + else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -13) { itemLore.add(C.cBlack); itemLore.add(C.cRed + "Unlocked with Titan Rank"); @@ -149,20 +145,20 @@ public class PetPage extends ShopPageBase //Not Owned else { - if (pet.GetCost(CurrencyType.Coins) > 0) + if (pet.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); - itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + pet.GetCost(CurrencyType.Coins) + " Treasure Shards"); + itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + pet.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards"); } - if (pet.GetCost(CurrencyType.Coins) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.Coins) >= pet.GetCost(CurrencyType.Coins)) + if (pet.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= pet.GetCost(CurrencyType.TREASURE_SHARD)) { itemLore.add(C.cBlack); itemLore.add(C.cGreen + "Click to Purchase"); addButton(slot, new ShopItem(Material.INK_SACK, (byte) 8, pet.GetPetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false), new PetButton(pet, this)); } - else if (pet.GetCost(CurrencyType.Coins) > 0) + else if (pet.GetCost(CurrencyType.TREASURE_SHARD) > 0) { itemLore.add(C.cBlack); itemLore.add(C.cRed + "Not enough Treasure Shards."); @@ -193,7 +189,7 @@ public class PetPage extends ShopPageBase } else if (getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType() != EntityType.WITHER) { - addButton(slot, new ShopItem(petExtra.GetMaterial(), (byte) 0, "Rename " + getPlugin().getPetManager().getActivePet(getPlayer().getName()).getCustomName() + " for " + C.cYellow + petExtra.GetCost(CurrencyType.Coins) + C.cGreen + " Shards", 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.TREASURE_SHARD) + C.cGreen + " Shards", itemLore.toArray(new String[itemLore.size()]), 1, false, false), new RenamePetButton(this)); } slot++; 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 9e222aeae..431ce81e5 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 @@ -130,7 +130,7 @@ public class PetTagPage extends ShopPageBase getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), getPlayer())); } - }, null, _petPurchase ? _pet : tag, CurrencyType.Coins, getPlayer())); + }, null, _petPurchase ? _pet : tag, CurrencyType.TREASURE_SHARD, getPlayer())); } public void SetTagName(String tagName) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/Donor.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/Donor.java index 267a582b8..692b9cdb5 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/donation/Donor.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/Donor.java @@ -69,15 +69,15 @@ public class Donor { switch (currencyType) { - case Gems: + case GEM: _gems -= cost; _update = true; break; - case Coins: + case TREASURE_SHARD: _coins -= cost; _update = true; break; - case Gold: + case GOLD: _gold -= cost; _update = true; break; @@ -90,13 +90,13 @@ public class Donor { switch (currencyType) { - case Gems: + case GEM: return _gems; - case Coins: + case TREASURE_SHARD: return _coins; - case Gold: + case GOLD: return _gold; - case Tokens: + case TOKEN: return 0; default: return 0; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java index 8b842f424..414e23118 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java @@ -11,7 +11,6 @@ import mineplex.core.common.CurrencyType; import mineplex.core.common.util.Callback; import mineplex.serverdata.database.DBPool; import mineplex.serverdata.database.DatabaseRunnable; -import mineplex.serverdata.database.RepositoryBase; import mineplex.serverdata.database.column.ColumnInt; import mineplex.core.donation.Donor; import mineplex.core.donation.repository.token.GemRewardToken; @@ -76,7 +75,7 @@ public class DonationRepository extends MinecraftRepository final UnknownPurchaseToken token = new UnknownPurchaseToken(); token.AccountName = name; token.SalesPackageName = packageName; - token.CoinPurchase = currencyType == CurrencyType.Coins; + token.CoinPurchase = currencyType == CurrencyType.TREASURE_SHARD; token.Cost = cost; token.Premium = false; @@ -86,12 +85,12 @@ public class DonationRepository extends MinecraftRepository { if (response == TransactionResponse.Success) { - if (currencyType == CurrencyType.Coins) + if (currencyType == CurrencyType.TREASURE_SHARD) { executeUpdate(UPDATE_ACCOUNT_COINS, new ColumnInt("coins", -cost), new ColumnInt("id", accountId)); //executeUpdate(INSERT_COIN_TRANSACTION, new ColumnInt("id", accountId), new ColumnVarChar("reason", 100, "Purchased " + packageName), new ColumnInt("coins", -cost)); } - else if (currencyType == CurrencyType.Gold) + else if (currencyType == CurrencyType.GOLD) { executeUpdate(UPDATE_ACCOUNT_GOLD, new ColumnInt("gold", -cost), new ColumnInt("id", accountId)); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java index 50d789985..215c7a4f1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java @@ -29,7 +29,6 @@ import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEvent; import mineplex.core.common.util.UtilFirework; -import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilText; import mineplex.core.common.util.UtilParticle.ParticleType; @@ -152,7 +151,7 @@ public class MorphBunny extends MorphGadget if (!UtilEvent.isAction(event, ActionType.L)) return; - if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.Coins) < 500) + if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.TREASURE_SHARD) < 500) { UtilPlayer.message(player, F.main("Gadget", "You do not have enough Shards.")); return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java index d2e9f9bad..2b42adfda 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java @@ -14,7 +14,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.player.*; import org.bukkit.inventory.ItemStack; -import org.bukkit.util.Vector; import mineplex.core.common.CurrencyType; import mineplex.core.common.util.C; @@ -26,7 +25,6 @@ import mineplex.core.common.util.UtilEvent; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilText; import mineplex.core.common.util.UtilEvent.ActionType; -import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.disguise.disguises.DisguiseVillager; import mineplex.core.projectile.IThrown; import mineplex.core.projectile.ProjectileUser; @@ -83,7 +81,7 @@ public class MorphVillager extends MorphGadget implements IThrown if (!UtilEvent.isAction(event, ActionType.L)) return; - if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.Gems) < 20) + if (Manager.getDonationManager().Get(player.getName()).GetBalance(CurrencyType.GEM) < 20) { UtilPlayer.message(player, F.main("Gadget", "You do not have enough Gems.")); return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/Pet.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/Pet.java index 4bc68c8dc..d96ce9525 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/Pet.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/Pet.java @@ -19,7 +19,7 @@ public class Pet extends SalesPackageBase _name = name; _petType = petType; - CurrencyCostMap.put(CurrencyType.Coins, cost); + CurrencyCostMap.put(CurrencyType.TREASURE_SHARD, cost); KnownPackage = false; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java index 8cc4d8bff..493d0eb27 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java @@ -18,7 +18,7 @@ public class PetExtra extends SalesPackageBase _name = name; _material = material; - CurrencyCostMap.put(CurrencyType.Coins, cost); + CurrencyCostMap.put(CurrencyType.TREASURE_SHARD, cost); KnownPackage = false; OneTimePurchaseOnly = false; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java index 01a28d57d..51a54d3ea 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java @@ -7,7 +7,6 @@ import mineplex.core.common.CurrencyType; import mineplex.core.donation.DonationManager; import mineplex.core.reward.Reward; import mineplex.core.reward.RewardData; -import mineplex.core.reward.RewardManager; import mineplex.core.reward.RewardRarity; import mineplex.core.reward.RewardType; @@ -35,7 +34,7 @@ public class UnknownPackageReward extends Reward @Override protected RewardData giveRewardCustom(Player player, RewardType type) { - _donationManager.PurchaseUnknownSalesPackage(null, player.getName(), _donationManager.getClientManager().Get(player).getAccountId(), _packageName, CurrencyType.Coins, 0, true); + _donationManager.PurchaseUnknownSalesPackage(null, player.getName(), _donationManager.getClientManager().Get(player).getAccountId(), _packageName, CurrencyType.TREASURE_SHARD, 0, true); return new RewardData(getRarity().getDarkColor() + _header, getRarity().getColor() + _name, _itemStack, getRarity()); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementCoinCount.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementCoinCount.java index 9d7281cd3..a11dd46fc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementCoinCount.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementCoinCount.java @@ -14,7 +14,7 @@ public class ScoreboardElementCoinCount implements ScoreboardElement public List getLines(ScoreboardManager manager, Player player, List out) { List output = new ArrayList(); - output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.Coins) + ""); + output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.TREASURE_SHARD) + ""); return output; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGemCount.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGemCount.java index e685ff6f1..c4566a6c3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGemCount.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGemCount.java @@ -14,7 +14,7 @@ public class ScoreboardElementGemCount implements ScoreboardElement public List getLines(ScoreboardManager manager, Player player, List out) { List output = new ArrayList(); - output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.Gems) + ""); + output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.GEM) + ""); return output; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGoldCount.java b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGoldCount.java index a95508b36..5f97e8798 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGoldCount.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/scoreboard/elements/ScoreboardElementGoldCount.java @@ -14,7 +14,7 @@ public class ScoreboardElementGoldCount implements ScoreboardElement public List getLines(ScoreboardManager manager, Player player, List out) { List output = new ArrayList(); - output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.Gold) + ""); + output.add(manager.getDonation().Get(player).GetBalance(CurrencyType.GOLD) + ""); return output; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java index bc42c6a50..8075278d1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java @@ -49,7 +49,7 @@ public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPack _displayMaterial = material; _displayData = displayData; - CurrencyCostMap.put(CurrencyType.Coins, coins); + CurrencyCostMap.put(CurrencyType.TREASURE_SHARD, coins); Quantity = quantity; } @@ -105,7 +105,7 @@ public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPack if (token.Gems > 0) { - CurrencyCostMap.put(CurrencyType.Gems, token.Gems); + CurrencyCostMap.put(CurrencyType.GEM, token.Gems); } } 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 c52c84e2b..50964a274 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java @@ -79,7 +79,7 @@ public class ConfirmationPage { public TournamentShop(TournamentManager plugin, CoreClientManager clientManager, DonationManager donationManager) { - super(plugin, clientManager, donationManager, "Tournaments", CurrencyType.Gems); + super(plugin, clientManager, donationManager, "Tournaments", CurrencyType.GEM); } @Override 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 b74ded372..81ad47721 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java @@ -52,6 +52,6 @@ public class BuyChestButton implements IButton _page.getPlugin(), _page.getShop(), _page.getClientManager(), _page.getDonationManager(), () -> { _inventoryManager.addItemToInventory(player, _chestName, 1); _page.refresh(); - }, _page, new ChestPackage(_chestName, _chestMat, _chestCost), CurrencyType.Coins, player)); + }, _page, new ChestPackage(_chestName, _chestMat, _chestCost), CurrencyType.TREASURE_SHARD, player)); } } diff --git a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java index f7c37033d..c19ccea17 100644 --- a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java +++ b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java @@ -25,7 +25,6 @@ import mineplex.core.common.util.UUIDFetcher; import mineplex.core.donation.DonationManager; import mineplex.core.gadget.gadgets.item.ItemGemBooster; import mineplex.core.inventory.InventoryManager; -import mineplex.core.punish.Punish; import mineplex.core.server.util.TransactionResponse; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -245,7 +244,7 @@ public class Enjin extends MiniPlugin implements CommandExecutor _purchaseManager.addAccountPurchaseToQueue(client.getAccountId(), packageName, amount, data == TransactionResponse.Success); } } - }, name, client.getAccountId(), amount == 1 ? packageName : packageName + " " + amount, CurrencyType.Gems, 0, false); + }, name, client.getAccountId(), amount == 1 ? packageName : packageName + " " + amount, CurrencyType.GEM, 0, false); return true; } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementPlayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementPlayer.java index e110c98eb..5b6cb24f4 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementPlayer.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/elements/ScoreboardElementPlayer.java @@ -26,7 +26,7 @@ public class ScoreboardElementPlayer implements ScoreboardElement public List getLines(ScoreboardManager manager, Player player, List out) { List output = new ArrayList(); - output.add(C.cYellow + "Gold " + C.cWhite + manager.getDonation().Get(player).GetBalance(CurrencyType.Gold) + ""); + output.add(C.cYellow + "Gold " + C.cWhite + manager.getDonation().Get(player).GetBalance(CurrencyType.GOLD) + ""); String regionString = C.xWilderness + "Wilderness"; output.add(" "); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPackage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPackage.java index 1cb0d90c2..dcbe58b56 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPackage.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/energy/EnergyPackage.java @@ -12,7 +12,7 @@ public class EnergyPackage extends SalesPackageBase public EnergyPackage(String name, int cost) { super(name, Material.REDSTONE, " ", ChatColor.RESET + "Clan Energy"); - CurrencyCostMap.put(CurrencyType.Gold, cost); + CurrencyCostMap.put(CurrencyType.GOLD, cost); KnownPackage = false; OneTimePurchaseOnly = false; } 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 fb2550d38..d84a9877a 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 @@ -57,7 +57,7 @@ public class EnergyShopButton implements IButton // Notify _energyManager.getClansManager().messageClan(_clanInfo, F.main("Energy", F.name(player.getName()) + " purchased " + F.elem(_energyToPurchase + " Energy") + " for the clan")); } - }, _page, new EnergyPackage(_energyToPurchase + " Energy", _cost), CurrencyType.Gold, player)); + }, _page, new EnergyPackage(_energyToPurchase + " Energy", _cost), CurrencyType.GOLD, player)); } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ValentinesManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ValentinesManager.java index 73bb8bd30..cce5c3625 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ValentinesManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/ValentinesManager.java @@ -128,6 +128,6 @@ public class ValentinesManager extends MiniPlugin UtilPlayer.message(player, F.main("Reward", "You recieved " + F.elem(_reward + " Mount") + " from " + F.elem(_prefix) + "!")); } } - }, player.getName(), _client.getAccountId(player), _reward, CurrencyType.Coins, 0, true); + }, player.getName(), _client.getAccountId(player), _reward, CurrencyType.TREASURE_SHARD, 0, true); } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java index c8985c538..8288495b2 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java @@ -180,7 +180,7 @@ public abstract class Skill implements ISkill, Listener { String newLine = ""; - //Check for Level Tokens + //Check for Level TOKEN for (String token : line.split(" ")) { if (token.length() <= 0) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassCombatShop.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassCombatShop.java index cab66ec23..211e1d6de 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassCombatShop.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassCombatShop.java @@ -34,14 +34,14 @@ public class ClassCombatShop extends ShopBase public ClassCombatShop(ClassShopManager plugin, CoreClientManager clientManager, DonationManager donationManager, boolean skillsOnly, String name) { - super(plugin, clientManager, donationManager, name, CurrencyType.Gems); + super(plugin, clientManager, donationManager, name, CurrencyType.GEM); _skillsOnly = skillsOnly; } public ClassCombatShop(ClassShopManager plugin, CoreClientManager clientManager, DonationManager donationManager, boolean skillsOnly, String name, IPvpClass iPvpClass, boolean hub) { - super(plugin, clientManager, donationManager, name, CurrencyType.Gems); + super(plugin, clientManager, donationManager, name, CurrencyType.GEM); _gameClass = iPvpClass; _takeAwayStuff = true; _skillsOnly = skillsOnly; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/SkillPage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/SkillPage.java index 176cfb332..31fa6c1c0 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/SkillPage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/SkillPage.java @@ -398,7 +398,7 @@ public class SkillPage extends ShopPageBase { buildPage(); } - }, this, new SkillSalesPackage(skill), CurrencyType.Gems, player)); + }, this, new SkillSalesPackage(skill), CurrencyType.GEM, player)); } private boolean isSkillLocked(ISkill skill) @@ -425,7 +425,7 @@ public class SkillPage extends ShopPageBase { buildPage(); } - }, this, new ItemSalesPackage(item), CurrencyType.Gems, player)); + }, this, new ItemSalesPackage(item), CurrencyType.GEM, player)); } public void SelectItem(Player player, Item item) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java index 625920e4b..0f2bd8f1a 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java @@ -14,7 +14,7 @@ public class ItemSalesPackage extends SalesPackageBase super("Champions " + item.GetName(), Material.BOOK, (byte)0, item.GetDesc(), item.GetGemCost()); Free = item.isFree(); KnownPackage = false; - CurrencyCostMap.put(CurrencyType.Gems, item.GetGemCost()); + CurrencyCostMap.put(CurrencyType.GEM, item.GetGemCost()); } @Override diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java index 436d82b17..c6c980711 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java @@ -14,7 +14,7 @@ public class SkillSalesPackage extends SalesPackageBase super("Champions " + skill.GetName(), Material.BOOK, (byte)0, skill.GetDesc(0), skill.GetGemCost()); Free = skill.IsFree(); KnownPackage = false; - CurrencyCostMap.put(CurrencyType.Gems, skill.GetGemCost()); + CurrencyCostMap.put(CurrencyType.GEM, skill.GetGemCost()); } @Override diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java index bd4760a6c..62258e3af 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java @@ -1,7 +1,5 @@ package mineplex.staffServer.salespackage.command; -import java.util.UUID; - import org.bukkit.entity.Player; import mineplex.core.account.CoreClient; @@ -9,7 +7,6 @@ import mineplex.core.command.CommandBase; import mineplex.core.common.CurrencyType; import mineplex.core.common.Rank; import mineplex.core.common.util.F; -import mineplex.core.common.util.UUIDFetcher; import mineplex.staffServer.salespackage.SalesPackageManager; public class GemHunterCommand extends CommandBase @@ -44,7 +41,7 @@ public class GemHunterCommand extends CommandBase if (client != null) { - Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, client.getAccountId(), "Gem Hunter Level " + amount, CurrencyType.Gems, 0, false); + Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, client.getAccountId(), "Gem Hunter Level " + amount, CurrencyType.GEM, 0, false); Plugin.getStatsManager().incrementStat(client.getAccountId(), "Global.GemsEarned", experience); caller.sendMessage(F.main(Plugin.getName(), "Added Level " + amount + " Gem Hunter to " + playerName + "'s account!")); } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/ItemCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/ItemCommand.java index 3fce1fd15..0e30045b5 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/ItemCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/ItemCommand.java @@ -10,7 +10,6 @@ import mineplex.core.common.CurrencyType; import mineplex.core.common.Rank; import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; -import mineplex.core.common.util.UUIDFetcher; import mineplex.core.common.util.UtilPlayer; import mineplex.core.server.util.TransactionResponse; import mineplex.staffServer.salespackage.SalesPackageManager; @@ -73,7 +72,7 @@ public class ItemCommand extends CommandBase } }, uuid, itemName, amount); } - }, playerName, client.getAccountId(), (amount == 1 ? itemName : itemName + " " + amount), CurrencyType.Gems, 0, false); + }, playerName, client.getAccountId(), (amount == 1 ? itemName : itemName + " " + amount), CurrencyType.GEM, 0, false); } else caller.sendMessage(F.main(Plugin.getName(), "Couldn't find " + playerName + "'s account!")); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/BoosterPodium.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/BoosterPodium.java index d168c4a9f..fd3b326b2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/BoosterPodium.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/BoosterPodium.java @@ -5,33 +5,23 @@ import mineplex.core.MiniPlugin; import mineplex.core.boosters.Booster; import mineplex.core.boosters.BoosterManager; import mineplex.core.boosters.event.BoosterEnableEvent; -import mineplex.core.common.util.C; -import mineplex.core.common.util.Callback; -import mineplex.core.common.util.ProfileLoader; -import mineplex.core.common.util.UtilSkull; +import mineplex.core.boosters.tips.BoosterTipManager; +import mineplex.core.boosters.tips.TipAddResult; +import mineplex.core.common.CurrencyType; +import mineplex.core.common.util.*; import mineplex.core.disguise.DisguiseManager; import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.hologram.HologramManager; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.block.Block; import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.entity.EntityInteractEvent; -import org.bukkit.event.entity.EntitySpawnEvent; import org.bukkit.event.player.PlayerInteractAtEntityEvent; -import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.java.JavaPlugin; -import java.util.List; -import java.util.Map; - /** * @author Shaun Bennett */ @@ -156,8 +146,13 @@ public class BoosterPodium extends MiniPlugin { if (event.getRightClicked().equals(_activeArmorStand)) { + _boosterManager.getTipManager().addTip(event.getPlayer(), _activeBooster, result -> { + if (result == TipAddResult.SUCCESS) + { + UtilPlayer.message(event.getPlayer(), F.main("Tip", "Thanks for your tip! You earned " + CurrencyType.TREASURE_SHARD.getPrefix() + BoosterTipManager.TIP_FOR_TIPPER + " Treasure Shards")); + } + }); event.setCancelled(true); - Bukkit.broadcastMessage("Interact"); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/TipCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/TipCommand.java index 011f64075..4bf2c26fe 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/TipCommand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/TipCommand.java @@ -33,7 +33,7 @@ public class TipCommand extends CommandBase } Donor donor = Plugin.GetDonation().Get(player); - if (donor.GetBalance(CurrencyType.Coins) < 3) + if (donor.GetBalance(CurrencyType.TREASURE_SHARD) < 3) { UtilPlayer.message(player, F.main("Game", "You do not have at least" + F.elem("three") + F.elem("Gem Boosters") + " to tip!")); return; @@ -48,7 +48,7 @@ public class TipCommand extends CommandBase UtilPlayer.message(other, F.main("Game", "You have received a " + F.elem("three shard") + " tip from " + F.elem(player.getName()) + " for boosting this game!")); } - donor.DeductCost(3, CurrencyType.Coins); + donor.DeductCost(3, CurrencyType.TREASURE_SHARD); UtilPlayer.message(player, F.main("Game", F.elem(booster) + " has received " + F.elem("three shards") + " from your tip. Thanks!")); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java index 4ccc70136..19d8cfa40 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java @@ -48,7 +48,6 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.entity.Fireball; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -437,7 +436,7 @@ public class Halloween extends SoloGame if (!player.isOnline()) continue; - Manager.GetDonation().PurchaseUnknownSalesPackage(null, player.getName(), Manager.GetClients().Get(player).getAccountId(), "Decrepit Warhorse", CurrencyType.Coins, 0, true); + Manager.GetDonation().PurchaseUnknownSalesPackage(null, player.getName(), Manager.GetClients().Get(player).getAccountId(), "Decrepit Warhorse", CurrencyType.TREASURE_SHARD, 0, true); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java index 2a3c5b75d..a18b55a08 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java @@ -348,7 +348,7 @@ public class GamePlayerManager implements Listener { Manager.GetGame().SetKit(player, kit, true); } - else if (kit.GetAvailability() == KitAvailability.Gem && donor.GetBalance(CurrencyType.Gems) >= kit.GetCost()) + else if (kit.GetAvailability() == KitAvailability.Gem && donor.GetBalance(CurrencyType.GEM) >= kit.GetCost()) { Manager.GetShop().openPageForPlayer(player, new ConfirmationPage( Manager, Manager.GetShop(), Manager.GetClients(), Manager.GetDonation(), new Runnable() @@ -361,7 +361,7 @@ public class GamePlayerManager implements Listener UtilPlayer.sendPacket(player, new PacketPlayOutEntityMetadata(entity.getEntityId(), ((CraftEntity) entity).getHandle().getDataWatcher(), true)); } } - }, null, new KitPackage(Manager.GetGame().GetType().GetKitGameName(), kit), CurrencyType.Gems, player)); + }, null, new KitPackage(Manager.GetGame().GetType().GetKitGameName(), kit), CurrencyType.GEM, player)); } else if (kit.GetAvailability() == KitAvailability.Achievement) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/ArcadeShop.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/ArcadeShop.java index 1922032cc..82919530d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/ArcadeShop.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/ArcadeShop.java @@ -13,7 +13,7 @@ public class ArcadeShop extends ShopBase { public ArcadeShop(ArcadeManager plugin, CoreClientManager clientManager, DonationManager donationManager) { - super(plugin, clientManager, donationManager, "Shop", CurrencyType.Gems); + super(plugin, clientManager, donationManager, "Shop", CurrencyType.GEM); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java index 03da0da69..b471f22ea 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java @@ -12,7 +12,7 @@ public class KitPackage extends SalesPackageBase { super(gameName + " " + kit.GetName(), kit.getDisplayMaterial(), kit.GetDesc()); KnownPackage = false; - CurrencyCostMap.put(CurrencyType.Gems, kit.GetCost()); + CurrencyCostMap.put(CurrencyType.GEM, kit.GetCost()); } @Override