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

Move stuff around, minor visual changes in CurrencyPage

Browse Source
This commit is contained in:
Spencer 2018-01-04 19:13:18 -05:00 committed by Alexander Meech
parent cba6669339
commit fa2362811c
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportCurrencyPage.java
View File

@ -28,7 +28,7 @@ public class SupportCurrencyPage extends SupportPage
int amount = CURRENCY_DEMONINATIONS[i]; int amount = CURRENCY_DEMONINATIONS[i];
addButton(slot, addButton(slot,
new ShopItem(currency.getDisplayMaterial(), currency.getColor() + C.Bold + currency.getString(amount, false), new String[] {C.mBody + "Click to award", currency.getString(amount) }, 1, false, true), new ShopItem(currency.getDisplayMaterial(), currency.getColor() + C.Bold + currency.getString(amount, false), new String[] {C.mBody + "Click to award " + currency.getString(amount) }, 1, false, true),
(p, c) -> getPlugin().getDonationManager().rewardCurrency(currency, _target, "Support - " + getPlayer().getName(), amount, true, (success) -> { (p, c) -> getPlugin().getDonationManager().rewardCurrency(currency, _target, "Support - " + getPlayer().getName(), amount, true, (success) -> {
if (success) if (success)
{ {

2
Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportHomePage.java
View File

@ -6,11 +6,11 @@ import java.lang.reflect.InvocationTargetException;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineplex.core.Managers;
import mineplex.core.account.CoreClient; import mineplex.core.account.CoreClient;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.shop.item.ShopItem; import mineplex.core.shop.item.ShopItem;
import mineplex.staffServer.customerSupport.CustomerSupport; import mineplex.staffServer.customerSupport.CustomerSupport;
import mineplex.staffServer.ui.chest.SupportChestPage;
public class SupportHomePage extends SupportPage public class SupportHomePage extends SupportPage
{ {

8
Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportChestPage.java → Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/chest/SupportChestPage.java
View File

@ -1,17 +1,13 @@
package mineplex.staffServer.ui; package mineplex.staffServer.ui.chest;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -22,6 +18,8 @@ import mineplex.core.common.util.C;
import mineplex.core.shop.item.ShopItem; import mineplex.core.shop.item.ShopItem;
import mineplex.core.treasure.types.TreasureType; import mineplex.core.treasure.types.TreasureType;
import mineplex.staffServer.customerSupport.CustomerSupport; import mineplex.staffServer.customerSupport.CustomerSupport;
import mineplex.staffServer.ui.SupportPage;
import mineplex.staffServer.ui.SupportShop;
public class SupportChestPage extends SupportPage public class SupportChestPage extends SupportPage
{ {

6
Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/SupportGiveChestPage.java → Plugins/Mineplex.StaffServer/src/mineplex/staffServer/ui/chest/SupportGiveChestPage.java
View File

@ -1,8 +1,7 @@
package mineplex.staffServer.ui; package mineplex.staffServer.ui.chest;
import java.util.Arrays; import java.util.Arrays;
import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -14,9 +13,10 @@ import mineplex.core.common.util.F;
import mineplex.core.shop.item.SalesPackageBase; import mineplex.core.shop.item.SalesPackageBase;
import mineplex.core.shop.item.ShopItem; import mineplex.core.shop.item.ShopItem;
import mineplex.core.treasure.ChestPackage; import mineplex.core.treasure.ChestPackage;
import mineplex.core.treasure.types.Treasure;
import mineplex.core.treasure.types.TreasureType; import mineplex.core.treasure.types.TreasureType;
import mineplex.staffServer.customerSupport.CustomerSupport; import mineplex.staffServer.customerSupport.CustomerSupport;
import mineplex.staffServer.ui.SupportPage;
import mineplex.staffServer.ui.SupportShop;
public class SupportGiveChestPage extends SupportPage public class SupportGiveChestPage extends SupportPage
{ {