JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge problems

Browse Source
This commit is contained in:
LCastr0 2016-06-23 16:33:20 -03:00
parent 7749314e64
commit c1b7be6363
8 changed files with 63 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/CostumePage.java
View File

@ -38,11 +38,7 @@ public class CostumePage extends GadgetPage
for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Costume))
{
<<<<<<< HEAD
if (gadget.getCost(CurrencyType.Coins) == -1)
=======
if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -1)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -1)
continue;
OutfitGadget outfitGadget = ((OutfitGadget) gadget);

128
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
View File

@ -48,11 +48,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
for (Gadget gadget : getPlugin().getGadgetManager().getGadgets(GadgetType.Item))
{
<<<<<<< HEAD
if (gadget.getCost(CurrencyType.Coins) == -3)
=======
if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -3)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -3)
continue;
addGadget(gadget, slot);
@ -107,108 +103,64 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
if (!gadget.ownsGadget(getPlayer()))
{
<<<<<<< HEAD
if (gadget.getCost(CurrencyType.Coins) == -1)
=======
if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -1)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -1)
{
//Nothing
}
//Chest Unlocks
<<<<<<< HEAD
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)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
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");
}
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) == -3)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -3)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -3)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Winter Holiday Treasure");
}
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) == -4)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -4)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -4)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Halloween Pumpkin Treasure");
}
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) == -5)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -5)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -5)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Easter Holiday Treasure");
}
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) == -6)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -6)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -6)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Valentines Gifts");
}
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) == -7)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -7)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -7)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Purchased from shop.mineplex.com");
}
else if (gadget.getCost(CurrencyType.Coins) == -8)
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -8)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Freedom Chests");
}
//Rank Unlocks
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) == -10)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -10)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -10)
{
itemLore.add(C.cBlack);
itemLore.add(C.cAqua + "Unlocked with Ultra Rank");
}
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) == -11)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -11)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -11)
{
itemLore.add(C.cBlack);
itemLore.add(C.cPurple + "Unlocked with Hero Rank");
}
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) == -12)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -12)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -12)
{
itemLore.add(C.cBlack);
itemLore.add(C.cGreen + "Unlocked with Legend Rank");
}
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) == -13)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) == -13)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -13)
{
itemLore.add(C.cBlack);
itemLore.add(C.cRed + "Unlocked with Titan Rank");
@ -285,34 +237,26 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
}
else
{
<<<<<<< HEAD
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)
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.cWhiteB + "Cost: " + C.cAqua + gadget.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards");
itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + gadget.getCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards");
}
if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= gadget.GetCost(CurrencyType.TREASURE_SHARD))
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
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));
}
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) > 0)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) > 0)
{
itemLore.add(C.cBlack);
itemLore.add(C.cRed + "Not enough Treasure Shards.");
@ -345,7 +289,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
if (gadget.getGadgetType() == GadgetType.ArrowTrail || gadget.getGadgetType() == GadgetType.Death
|| gadget.getGadgetType() == GadgetType.Particle || gadget.getGadgetType() == GadgetType.DoubleJump)
{
if (gadget.getCost(CurrencyType.Coins) == -8)
if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -8)
{
gadgetItemStack = CountryFlag.Usa.getBanner();
BannerMeta bannerMeta = (BannerMeta) gadgetItemStack.getItemMeta();
@ -368,7 +312,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
if (gadget.getGadgetType() == GadgetType.ArrowTrail || gadget.getGadgetType() == GadgetType.Death
|| gadget.getGadgetType() == GadgetType.Particle || gadget.getGadgetType() == GadgetType.DoubleJump)
{
if (gadget.getCost(CurrencyType.Coins) == -8)
if (gadget.getCost(CurrencyType.TREASURE_SHARD) == -8)
{
gadgetItemStack = CountryFlag.Usa.getBanner();
BannerMeta bannerMeta = (BannerMeta) gadgetItemStack.getItemMeta();
@ -382,35 +326,21 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
}
}
else
{
<<<<<<< HEAD
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)
{
itemLore.add(C.cBlack);
itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + gadget.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards");
}
if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= gadget.GetCost(CurrencyType.TREASURE_SHARD))
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
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));
}
<<<<<<< HEAD
else if (gadget.getCost(CurrencyType.Coins) > 0)
=======
else if (gadget.GetCost(CurrencyType.TREASURE_SHARD) > 0)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (gadget.getCost(CurrencyType.TREASURE_SHARD) > 0)
{
itemLore.add(C.cBlack);
itemLore.add(C.cRed + "Not enough Treasure Shards.");
@ -431,11 +361,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
{
ItemGadget itemGadget = (ItemGadget)gadget;
<<<<<<< HEAD
if (itemGadget.getAmmo().getCost(CurrencyType.Coins) < 0)
=======
if (itemGadget.getAmmo().GetCost(CurrencyType.TREASURE_SHARD) < 0)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
if (itemGadget.getAmmo().getCost(CurrencyType.TREASURE_SHARD) < 0)
return;
}

12
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
View File

@ -67,7 +67,6 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
int tauntSlot = 49;//slots[11];
int winEffectSlot = 51;
int gameModifierSlot = 53;
int boosterSlot = 52;// TODO
EnumMap<GadgetType, Integer> ownedCount = new EnumMap<GadgetType, Integer>(GadgetType.class);
EnumMap<GadgetType, Integer> maxCount = new EnumMap<GadgetType, Integer>(GadgetType.class);
@ -196,17 +195,6 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
lore = getLore(ownedCount.get(type), maxCount.get(type), "Cosmetic effects which changes appearances of objects in game", "Visible in Games", enabled.get(type));
addButton(gameModifierSlot, new ShopItem(Material.TORCH, "Game Modifiers", lore, 1, false), new OpenGameModifiers(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(gameModifierSlot);
<<<<<<< HEAD
/*type = GadgetType.Balloon;
lore = getLore(ownedCount.get(type), maxCount.get(type), "Placeholder", "Placeholder", enabled.get(type));
addButton(balloonSlot, new ShopItem(Material.BANNER, "Balloons", lore, 1, false), new OpenBalloons(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(balloonSlot);*/
=======
// addButton(boosterSlot, new ShopItem(Material.EMERALD, "Game Boosters",
// new String[]{C.Bold + "", C.cDGreen + C.Italics + "Coming soon!"}, 1, false),
// (player, clickType) -> openBoosters(player));
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
}
private String[] getLore(int ownedCount, int maxCount, String info, String visibility, Gadget enabled)

84
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
View File

@ -62,98 +62,58 @@ public class MountPage extends ShopPageBase<CosmeticManager, CosmeticShop>
if (!getDonationManager().Get(getPlayer().getName()).OwnsUnknownPackage(mount.getName()))
{
<<<<<<< HEAD
if (mount.getCost(CurrencyType.Coins) == -1)
=======
if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -1)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
if (mount.getCost(CurrencyType.TREASURE_SHARD) == -1)
{
//Nothing
}
//Chest Unlocks
<<<<<<< HEAD
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)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
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");
}
<<<<<<< HEAD
else if (mount.getCost(CurrencyType.Coins) == -3)
=======
else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -3)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (mount.getCost(CurrencyType.TREASURE_SHARD) == -3)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Winter Holiday Treasure");
}
<<<<<<< HEAD
else if (mount.getCost(CurrencyType.Coins) == -4)
=======
else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -4)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (mount.getCost(CurrencyType.TREASURE_SHARD) == -4)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Halloween Pumpkin Treasure");
}
<<<<<<< HEAD
else if (mount.getCost(CurrencyType.Coins) == -5)
=======
else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -5)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (mount.getCost(CurrencyType.TREASURE_SHARD) == -5)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Easter Holiday Treasure");
}
<<<<<<< HEAD
else if (mount.getCost(CurrencyType.Coins) == -6)
=======
else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -6)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (mount.getCost(CurrencyType.TREASURE_SHARD) == -6)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Valentines Holiday Treasure");
}
else if (mount.getCost(CurrencyType.Coins) == -7)
else if (mount.getCost(CurrencyType.TREASURE_SHARD) == -7)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Freedom Chests");
}
//Rank Unlocks
<<<<<<< HEAD
else if (mount.getCost(CurrencyType.Coins) == -10)
=======
else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -10)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (mount.getCost(CurrencyType.TREASURE_SHARD) == -10)
{
itemLore.add(C.cBlack);
itemLore.add(C.cAqua + "Unlocked with Ultra Rank");
}
<<<<<<< HEAD
else if (mount.getCost(CurrencyType.Coins) == -11)
=======
else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -11)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (mount.getCost(CurrencyType.TREASURE_SHARD) == -11)
{
itemLore.add(C.cBlack);
itemLore.add(C.cPurple + "Unlocked with Hero Rank");
}
<<<<<<< HEAD
else if (mount.getCost(CurrencyType.Coins) == -12)
=======
else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -12)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (mount.getCost(CurrencyType.TREASURE_SHARD) == -12)
{
itemLore.add(C.cBlack);
itemLore.add(C.cGreen + "Unlocked with Legend Rank");
}
<<<<<<< HEAD
else if (mount.getCost(CurrencyType.Coins) == -13)
=======
else if (mount.GetCost(CurrencyType.TREASURE_SHARD) == -13)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (mount.getCost(CurrencyType.TREASURE_SHARD) == -13)
{
itemLore.add(C.cBlack);
itemLore.add(C.cRed + "Unlocked with Titan Rank");
@ -179,34 +139,20 @@ public class MountPage extends ShopPageBase<CosmeticManager, CosmeticShop>
}
else
{
<<<<<<< HEAD
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)
{
itemLore.add(C.cBlack);
itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + mount.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards");
}
if (mount.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= mount.GetCost(CurrencyType.TREASURE_SHARD))
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
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) 8, mount.getName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false), new MountButton(mount, this));
}
<<<<<<< HEAD
else if (mount.getCost(CurrencyType.Coins) > 0)
=======
else if (mount.GetCost(CurrencyType.TREASURE_SHARD) > 0)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (mount.getCost(CurrencyType.TREASURE_SHARD) > 0)
{
itemLore.add(C.cBlack);
itemLore.add(C.cRed + "Not enough Treasure Shards.");

84
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetPage.java
View File

@ -63,85 +63,49 @@ public class PetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
//Chest Unlocks
if (!getPlugin().getPetManager().Get(getPlayer()).GetPets().containsKey(pet.GetPetType()))
{
<<<<<<< HEAD
if (pet.getCost(CurrencyType.Coins) == -1)
=======
if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -1)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
if (pet.getCost(CurrencyType.TREASURE_SHARD) == -1)
{
//Nothing
}
<<<<<<< HEAD
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)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
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");
}
<<<<<<< HEAD
else if (pet.getCost(CurrencyType.Coins) == -3)
=======
else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -3)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (pet.getCost(CurrencyType.TREASURE_SHARD) == -3)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Winter Holiday Treasure");
}
<<<<<<< HEAD
else if (pet.getCost(CurrencyType.Coins) == -4)
=======
else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -4)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (pet.getCost(CurrencyType.TREASURE_SHARD) == -4)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Halloween Pumpkin Treasure");
}
<<<<<<< HEAD
else if (pet.getCost(CurrencyType.Coins) == -5)
=======
else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -5)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (pet.getCost(CurrencyType.TREASURE_SHARD) == -5)
{
itemLore.add(C.cBlack);
itemLore.add(C.cBlue + "Found in Easter Holiday Treasure");
}
//Rank Unlocks
<<<<<<< HEAD
else if (pet.getCost(CurrencyType.Coins) == -10)
=======
else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -10)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (pet.getCost(CurrencyType.TREASURE_SHARD) == -10)
{
itemLore.add(C.cBlack);
itemLore.add(C.cAqua + "Unlocked with Ultra Rank");
}
<<<<<<< HEAD
else if (pet.getCost(CurrencyType.Coins) == -11)
=======
else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -11)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (pet.getCost(CurrencyType.TREASURE_SHARD) == -11)
{
itemLore.add(C.cBlack);
itemLore.add(C.cPurple + "Unlocked with Hero Rank");
}
<<<<<<< HEAD
else if (pet.getCost(CurrencyType.Coins) == -12)
=======
else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -12)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (pet.getCost(CurrencyType.TREASURE_SHARD) == -12)
{
itemLore.add(C.cBlack);
itemLore.add(C.cGreen + "Unlocked with Legend Rank");
}
<<<<<<< HEAD
else if (pet.getCost(CurrencyType.Coins) == -13)
=======
else if (pet.GetCost(CurrencyType.TREASURE_SHARD) == -13)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (pet.getCost(CurrencyType.TREASURE_SHARD) == -13)
{
itemLore.add(C.cBlack);
itemLore.add(C.cRed + "Unlocked with Titan Rank");
@ -181,34 +145,20 @@ public class PetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
//Not Owned
else
{
<<<<<<< HEAD
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)
{
itemLore.add(C.cBlack);
itemLore.add(C.cWhiteB + "Cost: " + C.cAqua + pet.GetCost(CurrencyType.TREASURE_SHARD) + " Treasure Shards");
}
if (pet.GetCost(CurrencyType.TREASURE_SHARD) > 0 && getDonationManager().Get(getPlayer().getName()).GetBalance(CurrencyType.TREASURE_SHARD) >= pet.GetCost(CurrencyType.TREASURE_SHARD))
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
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));
}
<<<<<<< HEAD
else if (pet.getCost(CurrencyType.Coins) > 0)
=======
else if (pet.GetCost(CurrencyType.TREASURE_SHARD) > 0)
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
else if (pet.getCost(CurrencyType.TREASURE_SHARD) > 0)
{
itemLore.add(C.cBlack);
itemLore.add(C.cRed + "Not enough Treasure Shards.");
@ -244,11 +194,7 @@ public class PetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
|| getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType() != EntityType.VILLAGER
|| getPlugin().getPetManager().getActivePet(getPlayer().getName()).getType() != EntityType.ZOMBIE)
{
<<<<<<< HEAD
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));
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
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++;

8
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java
View File

@ -78,12 +78,8 @@ public class ConfirmationPage<PluginType extends MiniPlugin, ShopType extends Sh
buildSquareAt(_okSquareSlotStart, new ShopItem(Material.EMERALD_BLOCK, (byte) 0, ChatColor.GREEN + "OK", null, 1, false, true), okClicked);
buildSquareAt(_okSquareSlotStart + 6, new ShopItem(Material.REDSTONE_BLOCK, (byte) 0, ChatColor.RED + "CANCEL", null, 1, false, true), cancelClicked);
<<<<<<< HEAD
this.getInventory().setItem(4, new ShopItem(getCurrencyType().GetDisplayMaterial(), (byte)0, getCurrencyType().Prefix(), new String[] { C.cGray + _salesItem.getCost(getCurrencyType()) + " " + getCurrencyType().Prefix() + " will be", C.cGray + "deducted from your account balance." }, 1, false, true).getHandle());
=======
this.getInventory().setItem(4, new ShopItem(getCurrencyType().getDisplayMaterial(), (byte)0, getCurrencyType().getPrefix(), new String[] { C.cGray + _salesItem.GetCost(getCurrencyType()) + " " + getCurrencyType().getPrefix() + " will be", C.cGray + "deducted from your account balance." }, 1, false, true).getHandle());
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
this.getInventory().setItem(4, new ShopItem(getCurrencyType().getDisplayMaterial(), (byte)0, getCurrencyType().getPrefix(), new String[] { C.cGray + _salesItem.getCost(getCurrencyType()) + " " + getCurrencyType().getPrefix() + " will be", C.cGray + "deducted from your account balance." }, 1, false, true).getHandle());
}
protected void okClicked(Player player)

8
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -228,14 +228,10 @@ public class HubManager extends MiniClientPlugin<HubClient>
FacebookManager facebookManager = new FacebookManager(plugin, clientManager, donationManager, inventoryManager);
_bonusManager = new BonusManager(plugin, clientManager, serverStatusManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, _gadgetManager);
<<<<<<< HEAD
_treasureManager = new TreasureManager(_plugin, clientManager, serverStatusManager, donationManager, _inventoryManager, petManager, _gadgetManager, _blockRestore, hologramManager, statsManager, _bonusManager.getRewardManager());
new CosmeticManager(_plugin, clientManager, donationManager, _inventoryManager, _gadgetManager, _mountManager, petManager, _treasureManager);
=======
_treasureManager = new TreasureManager(_plugin, clientManager, serverStatusManager, donationManager, _inventoryManager, petManager, _blockRestore, hologramManager, statsManager, _bonusManager.getRewardManager());
new CosmeticManager(_plugin, clientManager, donationManager, _inventoryManager, _gadgetManager, _mountManager, petManager, _treasureManager, boosterManager);
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
new SoccerManager(this, _gadgetManager);
new KothManager(this, _gadgetManager);

12
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWolfPet.java
View File

@ -293,11 +293,6 @@ public class PerkWolfPet extends Perk
}
@EventHandler
<<<<<<< HEAD
public void playerDeath(PlayerDeathEvent event)
{
ArrayList<Wolf> wolves = _petMap.remove(event.getEntity());
=======
public void modTeleport(PlayerCommandPreprocessEvent event)
{
if (!Manager.GetGame().IsLive())
@ -305,7 +300,6 @@ public class PerkWolfPet extends Perk
if (!event.getMessage().toLowerCase().startsWith("/tp") && !event.getMessage().toLowerCase().startsWith("/teleport"))
return;
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
if (!Manager.GetClients().hasRank(event.getPlayer(), Rank.MODERATOR)
|| Manager.GetClients().hasRank(event.getPlayer(), Rank.DEVELOPER))
@ -326,16 +320,12 @@ public class PerkWolfPet extends Perk
@EventHandler
public void playerQuit(PlayerQuitEvent event)
{
<<<<<<< HEAD
ArrayList<Wolf> wolves = _petMap.remove(event.getPlayer());
=======
despawnWolf(event.getPlayer());
}
private void despawnWolf(Player player)
{
ArrayList<Wolf> wolves = _wolfMap.remove(player);
>>>>>>> 0160efb5ab1d9b903d517f6339e286eb6727d7d3
ArrayList<Wolf> wolves = _petMap.remove(player);
if (wolves == null)
return;