From bc80b2137216af45cc024821386a10bb02d0ca27 Mon Sep 17 00:00:00 2001 From: cnr Date: Thu, 13 Apr 2017 20:44:33 -0600 Subject: [PATCH] Update skyfall in the game selector --- .../mineplex/hub/server/ServerManager.java | 2 +- .../hub/server/ui/ServerGameMenu.java | 31 +++++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java index 97e5c11a0..a305c124b 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java @@ -747,7 +747,7 @@ public class ServerManager extends MiniPlugin implements BrawlShopProvider public ServerNpcShop getBetaShop() { - return _serverNpcShopMap.get("Skyfall BETA"); + return _serverNpcShopMap.get("Skyfall"); } 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 33c41236a..7c8b65b8b 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java @@ -3,20 +3,40 @@ package mineplex.hub.server.ui; import java.util.ArrayList; import java.util.List; -import mineplex.core.boosters.Booster; -import mineplex.core.shop.item.IButton; import org.bukkit.ChatColor; import org.bukkit.Color; import org.bukkit.Material; import org.bukkit.entity.Player; import mineplex.core.account.CoreClientManager; +import mineplex.core.boosters.Booster; import mineplex.core.common.util.C; import mineplex.core.donation.DonationManager; import mineplex.core.itemstack.ItemBuilder; +import mineplex.core.shop.item.IButton; import mineplex.core.shop.page.ShopPageBase; import mineplex.hub.server.ServerManager; -import mineplex.hub.server.ui.button.*; +import mineplex.hub.server.ui.button.SelectBETAButton; +import mineplex.hub.server.ui.button.SelectBHButton; +import mineplex.hub.server.ui.button.SelectBLDButton; +import mineplex.hub.server.ui.button.SelectBRButton; +import mineplex.hub.server.ui.button.SelectBawkButton; +import mineplex.hub.server.ui.button.SelectCLANSButton; +import mineplex.hub.server.ui.button.SelectCSButton; +import mineplex.hub.server.ui.button.SelectCTFButton; +import mineplex.hub.server.ui.button.SelectDMTButton; +import mineplex.hub.server.ui.button.SelectDOMButton; +import mineplex.hub.server.ui.button.SelectFEATButton; +import mineplex.hub.server.ui.button.SelectMINButton; +import mineplex.hub.server.ui.button.SelectMSButton; +import mineplex.hub.server.ui.button.SelectPLAYERButton; +import mineplex.hub.server.ui.button.SelectSBButton; +import mineplex.hub.server.ui.button.SelectSGButton; +import mineplex.hub.server.ui.button.SelectSKYButton; +import mineplex.hub.server.ui.button.SelectSSMButton; +import mineplex.hub.server.ui.button.SelectTDMButton; +import mineplex.hub.server.ui.button.SelectUHCButton; +import mineplex.hub.server.ui.button.SelectWIZButton; public class ServerGameMenu extends ShopPageBase { @@ -197,15 +217,14 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "and raid others!", }, "Clans", null, new SelectCLANSButton(this)); - add(41, Material.BREWING_STAND_ITEM, C.cYellowB + "Skyfall " + C.cGray + "Elytra Game", new String[] + add(41, Material.DIAMOND_BOOTS, C.cYellowB + "Skyfall " + C.cGray + "Elytra Game", new String[] { - (_extraValue ? C.cAquaB : C.cWhiteB) + "BETA GAME", C.Reset + "", C.Reset + "1.9 Game, 1.8 PVP", C.Reset + "Fly through sky islands,", C.Reset + "collect gear and defeat", C.Reset + "all enemies.", - }, "BETA", "Beta_Games", new SelectBETAButton(this)); + }, "SF", "Beta_Games", new SelectBETAButton(this)); } private void add(int slot, Material material, String title, String[] lore, String serverTag, String boosterGroup, IButton button)