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

Amplifier rename, move podium backwards

Browse Source
This commit is contained in:
Shaun Bennett 2016-06-19 19:05:04 -05:00
parent 38058bc670
commit 63b7648608
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/boosters/BoosterManager.java
View File

@ -54,7 +54,7 @@ public class BoosterManager extends MiniPlugin
// The InventoryManager item name for boosters. This is required to activate a booster on servers
public static final String BOOSTER_ITEM = "Game Booster";
// Item in arcade lobbies that opens the booster gui
public static final ItemStack INTERFACE_ITEM = ItemStackFactory.Instance.CreateStack(Material.EMERALD, (byte)0, 1, ChatColor.RESET + C.cGreen + "Booster Menu");
public static final ItemStack INTERFACE_ITEM = ItemStackFactory.Instance.CreateStack(Material.EMERALD, (byte)0, 1, ChatColor.RESET + C.cGreen + "Game Amplifiers");
// Slot for the booster gui item
public static final int INTERFACE_SLOT = 7;

28
Plugins/Mineplex.Core/src/mineplex/core/boosters/gui/BoosterPage.java
View File

@ -27,7 +27,7 @@ public class BoosterPage extends ShopPageBase<BoosterManager, BoosterShop>
{
public BoosterPage(BoosterManager plugin, BoosterShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
{
super(plugin, shop, clientManager, donationManager, "Boosters", player, 45);
super(plugin, shop, clientManager, donationManager, "Game Amplifiers", player, 45);
buildPage();
}
@ -39,7 +39,7 @@ public class BoosterPage extends ShopPageBase<BoosterManager, BoosterShop>
int count = getPlugin().getAvailableBoosterCount(getPlayer());
lore.add(" ");
lore.add(C.cWhite + "You own " + C.cGreen + getPlugin().getAvailableBoosterCount(getPlayer()) + C.cWhite + " Game Boosters");
lore.add(C.cWhite + "You own " + C.cGreen + getPlugin().getAvailableBoosterCount(getPlayer()) + C.cWhite + " Game Amplifiers");
if (getPlugin().canActivateBoosters() && count > 0)
{
List<Booster> boosters = getPlugin().getBoosters();
@ -47,31 +47,31 @@ public class BoosterPage extends ShopPageBase<BoosterManager, BoosterShop>
long waitTime = getPlugin().getBoostTime();
if (waitTime == 0)
{
lore.add(C.cWhite + "Booster would activate " + C.cGreen + "now");
lore.add(C.cWhite + "Amplifier would activate " + C.cGreen + "now");
lore.add(" ");
lore.add(C.cGray + C.Italics + "Once a booster is activated");
lore.add(C.cGray + C.Italics + "Once an Amplifier is activated");
lore.add(C.cGray + C.Italics + "or queued, you are not able to");
lore.add(C.cGray + C.Italics + "cancel it. You will still get");
lore.add(C.cGray + C.Italics + "tips if you are offline.");
lore.add(" ");
lore.add(C.cWhite + "Click to Activate Booster");
lore.add(C.cWhite + "Click to Activate Amplifier");
}
else
{
lore.add(" ");
lore.add(C.cWhite + "There are " + C.cGreen + (boosters.size() - 1) + C.cWhite + " Boosters in queue");
lore.add(C.cWhite + "Booster would activate in " + C.cGreen + UtilTime.convertColonString(waitTime, UtilTime.TimeUnit.HOURS, UtilTime.TimeUnit.SECONDS));
lore.add(C.cWhite + "There are " + C.cGreen + (boosters.size() - 1) + C.cWhite + " Amplifiers queued");
lore.add(C.cWhite + "Amplifier would activate in " + C.cGreen + UtilTime.convertColonString(waitTime, UtilTime.TimeUnit.HOURS, UtilTime.TimeUnit.SECONDS));
lore.add(" ");
lore.add(C.cGray + C.Italics + "Once a booster is activated");
lore.add(C.cGray + C.Italics + "Once an Amplifier is activated");
lore.add(C.cGray + C.Italics + "or queued you are not able to");
lore.add(C.cGray + C.Italics + "cancel it. You will still get");
lore.add(C.cGray + C.Italics + "tips if you are offline.");
lore.add(" ");
lore.add(C.cWhite + "Click to Queue Booster");
lore.add(C.cWhite + "Click to Queue Amplifier");
}
}
ShopItem booster = new ShopItem(Material.SUGAR, "Game Booster", lore.toArray(new String[0]), 0, false, false);
ShopItem booster = new ShopItem(Material.SUGAR, "Game Amplifier", lore.toArray(new String[0]), 0, false, false);
if (getPlugin().canActivateBoosters())
{
addButton(13, booster, this::openConfirmation);
@ -88,8 +88,8 @@ public class BoosterPage extends ShopPageBase<BoosterManager, BoosterShop>
private void openConfirmation(Player player, ClickType type)
{
ArrayList<String> lore = new ArrayList<>();
lore.add(C.cWhite + "Activate booster");
ShopItem booster = new ShopItem(Material.SUGAR, "Game Booster", lore.toArray(new String[0]), 0, false, false);
lore.add(C.cWhite + "Activate Amplifier");
ShopItem booster = new ShopItem(Material.SUGAR, "Game Amplifier", lore.toArray(new String[0]), 0, false, false);
BoosterProcessor processor = new BoosterProcessor(getPlugin(), getPlayer());
ConfirmationPage<BoosterManager, BoosterShop> page = new ConfirmationPage<>(getPlugin(), getShop(),
@ -139,7 +139,7 @@ public class BoosterPage extends ShopPageBase<BoosterManager, BoosterShop>
lore.add(C.cGray + "Added " + activationTime + " ago");
ShopItem shopItem = new ShopItem(booster.isActive() ? Material.EMERALD_BLOCK : Material.REDSTONE_BLOCK,
"Game Booster", lore.toArray(new String[0]), queueIndex, !active, false);
"Game Amplifier", lore.toArray(new String[0]), queueIndex, !active, false);
setItem(slot, shopItem);
// Add glow if the booster belongs to you
@ -200,7 +200,7 @@ public class BoosterPage extends ShopPageBase<BoosterManager, BoosterShop>
lore.add(C.cGray + "Added " + activationTime + " ago");
ShopItem shopItem = new ShopItem(Material.GOLD_BLOCK,
"Game Booster", lore.toArray(new String[0]), 1, false, false);
"Game Amplifier", lore.toArray(new String[0]), 1, false, false);
setItem(startIndex + i + 27, shopItem);
}
}

2
Plugins/Mineplex.Core/src/mineplex/core/boosters/gui/BoosterShop.java
View File

@ -17,7 +17,7 @@ public class BoosterShop extends ShopBase<BoosterManager>
{
public BoosterShop(BoosterManager plugin, CoreClientManager clientManager, DonationManager donationManager)
{
super(plugin, clientManager, donationManager, "Booster Keeper");
super(plugin, clientManager, donationManager, "Game Amplifiers");
}
@Override

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/BoosterPodium.java
View File

@ -62,7 +62,7 @@ public class BoosterPodium extends MiniPlugin
NpcsRecord npcsRecord = new NpcsRecord();
npcsRecord.setServer(_npcManager.getServerName());
npcsRecord.setName(C.cGreen + "Booster Keeper");
npcsRecord.setName(C.cGreen + "Game Amplifiers");
npcsRecord.setWorld(_npcLocation.getWorld().getName());
npcsRecord.setX(_npcLocation.getX());
npcsRecord.setY(_npcLocation.getY());
@ -172,15 +172,15 @@ public class BoosterPodium extends MiniPlugin
private String getNameString(Booster booster)
{
return C.cGreen + "Boosted by " + C.cWhite + booster.getPlayerName() + C.cGreen + " - " + C.cWhite + booster.getTimeRemainingString();
return C.cGreen + "Amplified by " + C.cWhite + booster.getPlayerName() + C.cGreen + " - " + C.cWhite + booster.getTimeRemainingString();
}
private String[] getHologramText(Booster booster)
{
return new String[] {
C.cGreen + "Boosted by " + C.cWhite + booster.getPlayerName(),
C.cGreen + "Amplified by " + C.cWhite + booster.getPlayerName(),
C.cWhite + booster.getTimeRemainingString() + " Remaining",
C.cAqua + "Click to Tip. You get " + BoosterTipManager.TIP_FOR_TIPPER + " Treasure Shards"
C.cAqua + "Click to Thank. You get " + BoosterTipManager.TIP_FOR_TIPPER + " Treasure Shards"
};
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java
View File

@ -40,7 +40,7 @@ public class GameBoosterManager extends MiniPlugin
if (boosterGroup != null && boosterGroup.length() > 0)
{
_boosterPodium = new BoosterPodium(plugin, this, disguiseManager, hologramManager, npcManager, new Location(UtilWorld.getWorld("world"), 0, 101.5, -12));
_boosterPodium = new BoosterPodium(plugin, this, disguiseManager, hologramManager, npcManager, new Location(UtilWorld.getWorld("world"), 0, 101.5, -15));
}
}