diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java index 12fa009d3..a80aa4503 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java @@ -811,7 +811,7 @@ public class ServerManager extends MiniPlugin public ServerNpcShop getBetaShop() { - return _serverNpcShopMap.get("Beta Games"); + return _serverNpcShopMap.get("Beta Monster Maze"); } public ServerNpcShop getUHCShop() diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java index 4e61341f8..3a062a401 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java @@ -48,7 +48,7 @@ public class ServerGameMenu extends ShopPageBase public ServerGameMenu(ServerManager plugin, QuickShop quickShop, CoreClientManager clientManager, DonationManager donationManager, String name, Player player) { - super(plugin, quickShop, clientManager, donationManager, name, player, 47); + super(plugin, quickShop, clientManager, donationManager, name, player, 45); createSuperSmashCycle(); createMinigameCycle(); @@ -59,9 +59,21 @@ public class ServerGameMenu extends ShopPageBase @Override protected void buildPage() { - addButton(13, new ItemBuilder(Material.IRON_SWORD).setTitle(C.cYellowB + "Gladiators" + C.cGray + " Bracketted Deathmatch").addLore(new String[] + addButton(3, new ItemBuilder(Material.NAME_TAG).setTitle(C.cYellowB + "Type Wars " + C.cGray + "Team Deathmatch").addLore(new String[] { - (_extraValue ? C.cAquaB : C.cWhiteB) + "FEATURED GAME " + C.cGray + "Arcade", + (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW GAME", + C.Reset + "", + C.Reset + "Attack your enemies with", + C.Reset + "waves of mobs. Defend your giant", + C.Reset + "by typing the name of an enemy mob", + C.Reset + "to kill it.", + C.Reset + "", + C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("TW") + C.Reset + " other players!", + }).setHideInfo(true).build(), new SelectTWButton(this)); + + addButton(5, new ItemBuilder(Material.IRON_SWORD).setTitle(C.cYellowB + "Gladiators" + C.cGray + " Bracketted Deathmatch").addLore(new String[] + { + (_extraValue ? C.cAquaB : C.cWhiteB) + "FEATURED ARCADE GAME", C.Reset + "", C.Reset + "A 1v1 tournament.", C.Reset + "Kill your enemy and then", @@ -70,7 +82,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("GLD") + C.Reset + " other players!" }).setHideInfo(true).build(), new SelectFEATButton(this, "Gladiators")); - addButton(18, new ItemBuilder(Material.IRON_PICKAXE).setTitle(C.cYellowB + "The Bridges " + C.cGray + "4 Team Survival").addLore(new String[] + addButton(9, new ItemBuilder(Material.IRON_PICKAXE).setTitle(C.cYellowB + "The Bridges " + C.cGray + "4 Team Survival").addLore(new String[] { C.Reset + "", C.Reset + "4 Teams get 10 minutes to prepare.", @@ -81,7 +93,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("BR") + C.Reset + " other players!" }).setHideInfo(true).build(), new SelectBRButton(this)); - addButton(19, new ItemBuilder(Material.DIAMOND_SWORD).setTitle(C.cYellowB + "Survival Games " + C.cGray + "Solo/Team Survival").addLore(new String[] + addButton(11, new ItemBuilder(Material.DIAMOND_SWORD).setTitle(C.cYellowB + "Survival Games " + C.cGray + "Solo/Team Survival").addLore(new String[] { C.Reset + "", C.Reset + "Search for chests to find loot and ", @@ -91,7 +103,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + C.cGreen + (getPlugin().getGroupTagPlayerCount("HG") + getPlugin().getGroupTagPlayerCount("SG2")) + C.Reset + " other players!" }).setHideInfo(true).build(), new SelectSGButton(this)); - addButton(20, new ItemBuilder(Material.FEATHER).setTitle(C.cYellowB + "Skywars " + C.cGray + "Solo/Team Survival").addLore(new String[] + addButton(13, new ItemBuilder(Material.FEATHER).setTitle(C.cYellowB + "Skywars " + C.cGray + "Solo/Team Survival").addLore(new String[] { C.Reset + "", C.Reset + "16 contenders fight to rule the skies!", @@ -103,7 +115,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + C.cGreen + (getPlugin().getGroupTagPlayerCount("SKY") + getPlugin().getGroupTagPlayerCount("SKY2")) + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectSKYButton(this)); - addButton(21, new ItemBuilder(Material.GOLDEN_APPLE).setTitle(C.cYellowB + "UHC " + C.cGray + "Ultra Hardcore Mode").addLore(new String[] + addButton(15, new ItemBuilder(Material.GOLDEN_APPLE).setTitle(C.cYellowB + "UHC " + C.cGray + "Ultra Hardcore Mode").addLore(new String[] { C.Reset + "", C.Reset + "Extremely hard team-based survival ", @@ -113,47 +125,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("UHC") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectUHCButton(this)); - addButton(23, new ItemBuilder(Material.TNT).setTitle(C.cYellowB + "MineStrike " + C.cGray + "Team Survival").addLore(new String[] - { - C.Reset + "", - C.Reset + "One team must defend two bomb sites from", - C.Reset + "the other team, who are trying to plant a bomb", - C.Reset + "and blow them up!", - C.Reset + "", - C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("MS") + C.Reset + " other players!", - }).setHideInfo(true).build(), new SelectMSButton(this)); - - addButton(24, new ItemBuilder(Material.BANNER).setColor(Color.RED).setTitle(C.cYellowB + "Capture the Flag " + C.cGray + "Team Game").addLore(new String[] - { - C.Reset + "", - C.Reset + "One team must steal the other", - C.Reset + "team's flag. Capture it", - C.Reset + "three times to win.", - C.Reset + "", - C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("CTF") + C.Reset + " other players!", - }).setHideInfo(true).build(), new SelectCTFButton(this)); - - addButton(25, new ItemBuilder(Material.BEACON).setTitle(C.cYellowB + "Dominate " + C.cGray + "Team Game").addLore(new String[] - { - C.Reset + "", - C.Reset + "Customize one of five exciting champions", - C.Reset + "and battle with the opposing team for the", - C.Reset + "control points on the map.", - C.Reset + "", - C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("DOM") + C.Reset + " other players!", - }).setHideInfo(true).build(), new SelectDOMButton(this)); - - addButton(26, new ItemBuilder(Material.GOLD_SWORD).setTitle(C.cYellowB + "Team Deathmatch " + C.cGray + "Team Game").addLore(new String[] - { - C.Reset + "", - C.Reset + "Customize one of five exciting champions", - C.Reset + "and battle with the opposing team to the", - C.Reset + "last man standing.", - C.Reset + "", - C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("TDM") + C.Reset + " other players!", - }).setHideInfo(true).build(), new SelectTDMButton(this)); - - addButton(27, new ItemBuilder(Material.BLAZE_ROD).setTitle(C.cYellowB + "Wizards " + C.cGray + "Last Man Standing").addLore(new String[] + addButton(17, new ItemBuilder(Material.BLAZE_ROD).setTitle(C.cYellowB + "Wizards " + C.cGray + "Last Man Standing").addLore(new String[] { C.Reset + "", C.Reset + "Wield powerful spells to fight", @@ -163,7 +135,37 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("WIZ") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectWIZButton(this)); - addButton(28, new ItemBuilder(Material.DIAMOND_CHESTPLATE).setTitle(C.cYellowB + "Castle Siege " + C.cGray + "Team Game").addLore(new String[] + addButton(18, new ItemBuilder(Material.BANNER).setColor(Color.RED).setTitle(C.cYellowB + "Capture the Flag " + C.cGray + "Team Game").addLore(new String[] + { + C.Reset + "", + C.Reset + "One team must steal the other", + C.Reset + "team's flag. Capture it", + C.Reset + "three times to win.", + C.Reset + "", + C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("CTF") + C.Reset + " other players!", + }).setHideInfo(true).build(), new SelectCTFButton(this)); + + addButton(20, new ItemBuilder(Material.BEACON).setTitle(C.cYellowB + "Dominate " + C.cGray + "Team Game").addLore(new String[] + { + C.Reset + "", + C.Reset + "Customize one of five exciting champions", + C.Reset + "and battle with the opposing team for the", + C.Reset + "control points on the map.", + C.Reset + "", + C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("DOM") + C.Reset + " other players!", + }).setHideInfo(true).build(), new SelectDOMButton(this)); + + addButton(22, new ItemBuilder(Material.GOLD_SWORD).setTitle(C.cYellowB + "Team Deathmatch " + C.cGray + "Team Game").addLore(new String[] + { + C.Reset + "", + C.Reset + "Customize one of five exciting champions", + C.Reset + "and battle with the opposing team to the", + C.Reset + "last man standing.", + C.Reset + "", + C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("TDM") + C.Reset + " other players!", + }).setHideInfo(true).build(), new SelectTDMButton(this)); + + addButton(24, new ItemBuilder(Material.DIAMOND_CHESTPLATE).setTitle(C.cYellowB + "Castle Siege " + C.cGray + "Team Game").addLore(new String[] { C.Reset + "", C.Reset + "Defenders must protect King Sparklez", @@ -173,7 +175,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("CS") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectCSButton(this)); - addButton(29, new ItemBuilder(Material.GRASS).setTitle(C.cYellowB + "Block Hunt " + C.cGray + "Cat and Mouse").addLore(new String[] + addButton(26, new ItemBuilder(Material.GRASS).setTitle(C.cYellowB + "Block Hunt " + C.cGray + "Cat and Mouse").addLore(new String[] { C.Reset + "", C.Reset + "Hide as blocks/animals, upgrade your ", @@ -183,33 +185,18 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("BH") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectBHButton(this)); - addButton(30, _superSmashCycle.get(_ssmIndex), new SelectSSMButton(this)); - - addButton(32, _minigameCycle.get(_minigameIndex), new SelectMINButton(this)); - - addButton(33, new ItemBuilder(Material.WOOD).setTitle(C.cYellowB + "Master Builders " + C.cGray + "Creative Build").setLore(new String[] - { + addButton(27, new ItemBuilder(Material.TNT).setTitle(C.cYellowB + "MineStrike " + C.cGray + "Team Survival").addLore(new String[] + { C.Reset + "", - C.Reset + "Players are given a Build Theme and ", - C.Reset + "must use blocks, monsters and more", - C.Reset + "to create a masterpiece!", + C.Reset + "One team must defend two bomb sites from", + C.Reset + "the other team, who are trying to plant a bomb", + C.Reset + "and blow them up!", C.Reset + "", - C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("BLD") + C.Reset + " other players!", - }).setHideInfo(true).build(), new SelectBLDButton(this)); + C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("MS") + C.Reset + " other players!", + }).setHideInfo(true).build(), new SelectMSButton(this)); - addButton(34, new ItemBuilder(Material.NAME_TAG).setTitle(C.cYellowB + "Type Wars " + C.cGray + "Team Deathmatch").addLore(new String[] - { - C.Reset + "", - C.Reset + "Attack your enemies with", - C.Reset + "waves of mobs. Defend your giant", - C.Reset + "by typing the name of an enemy mob", - C.Reset + "to kill it.", - C.Reset + "", - C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("TW") + C.Reset + " other players!", - }).setHideInfo(true).build(), new SelectTWButton(this)); - - addButton(35, new ItemBuilder(Material.BOOK_AND_QUILL).setTitle(C.cYellowB + "Draw My Thing " + C.cGray + "Pictionary").addLore(new String[] - { + addButton(29, new ItemBuilder(Material.BOOK_AND_QUILL).setTitle(C.cYellowB + "Draw My Thing " + C.cGray + "Pictionary").addLore(new String[] + { C.Reset + "", C.Reset + "Players take turns at drawing a random", C.Reset + "word. Whoever guesses it within the time", @@ -218,7 +205,21 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("DMT") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectDMTButton(this)); - addButton(46, new ItemBuilder(Material.SNOW_BALL).setTitle(C.cYellowB + "Snow Fight " + C.cGray + "Team Survival").addLore(new String[] + addButton(31, _superSmashCycle.get(_ssmIndex), new SelectSSMButton(this)); + + addButton(33, _minigameCycle.get(_minigameIndex), new SelectMINButton(this)); + + addButton(35, new ItemBuilder(Material.WOOD).setTitle(C.cYellowB + "Master Builders " + C.cGray + "Creative Build").setLore(new String[] + { + C.Reset + "", + C.Reset + "Players are given a Build Theme and ", + C.Reset + "must use blocks, monsters and more", + C.Reset + "to create a masterpiece!", + C.Reset + "", + C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("BLD") + C.Reset + " other players!", + }).setHideInfo(true).build(), new SelectBLDButton(this)); + + addButton(37, new ItemBuilder(Material.SNOW_BALL).setTitle(C.cYellowB + "Snow Fight " + C.cGray + "Team Survival").addLore(new String[] { (_extraValue ? C.cAquaB : C.cWhiteB) + "LIMITED TIME", C.Reset + "", @@ -229,7 +230,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("SF") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectFEATButton(this, "Snow Fight")); - addButton(48, new ItemBuilder(Material.SKULL_ITEM, 1, (byte) 3).setTitle(C.cYellowB + "Player Servers " + C.cGray + "Player Hosted Games").addLore(new String[] + addButton(39, new ItemBuilder(Material.SKULL_ITEM, 1, (byte) 3).setTitle(C.cYellowB + "Player Servers " + C.cGray + "Player Hosted Games").addLore(new String[] { C.Reset + "", C.Reset + "Join your friends in their own ", @@ -237,7 +238,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "the games you want, when you want.", }).setHideInfo(true).build(), new SelectPLAYERButton(this)); - addButton(49, new ItemBuilder(Material.IRON_DOOR).setTitle(C.cYellowB + "Mineplex Clans " + C.cGray + "Champions Teams").addLore(new String[] + addButton(40, new ItemBuilder(Material.IRON_DOOR).setTitle(C.cYellowB + "Mineplex Clans " + C.cGray + "Champions Teams").addLore(new String[] { (_extraValue ? C.cAquaB : C.cWhiteB) + "ALPHA RELEASE", C.Reset + "", @@ -248,7 +249,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("Clans") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectCLANSButton(this)); - addButton(50, new ItemBuilder(Material.BREWING_STAND_ITEM).setTitle(C.cYellowB + "Monster Maze " + C.cGray + "Snow Sprint").addLore(new String[] + addButton(41, new ItemBuilder(Material.BREWING_STAND_ITEM).setTitle(C.cYellowB + "Monster Maze " + C.cGray + "Snow Sprint").addLore(new String[] { (_extraValue ? C.cAquaB : C.cWhiteB) + "BETA GAME", C.Reset + "", @@ -259,7 +260,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("BETA") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectBETAButton(this)); - addButton(52, new ItemBuilder(Material.BOOKSHELF).setTitle(C.cYellowB + "Christmas Chaos " + C.cGray + "Help Save Christmas").addLore(new String[] + addButton(43, new ItemBuilder(Material.BOOKSHELF).setTitle(C.cYellowB + "Christmas Chaos " + C.cGray + "Help Save Christmas").addLore(new String[] { (_extraValue ? C.cAquaB : C.cWhiteB) + "LIMITED TIME", C.Reset + "",