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

Finishing touches

Browse Source
This commit is contained in:
AlexTheCoder 2017-09-23 03:34:12 -04:00
parent 128e16cbcd
commit 333c632030
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
View File

@ -77,7 +77,7 @@ import net.minecraft.server.v1_8_R3.MinecraftServer;
public class Clans extends JavaPlugin
{
public static final String MAP = "Season 3";
public static final String MAP = "Season 4";
public static boolean HARDCORE = false;

1
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/cash/CashOverviewPage.java
View File

@ -52,7 +52,6 @@ public class CashOverviewPage extends ShopPageBase<CashShopManager, CashShop>
int skeleton = inv.getItemCount("Clans Boss Token Skeleton");
int wizard = inv.getItemCount("Clans Boss Token Wizard");
addButtonNoAction(OVERVIEW_BUTTON_SLOT, new ItemBuilder(Material.EMERALD)
.setData((short)2)
.setTitle(C.cRed + C.Scramble + "1 " + C.cRed + "Mineplex Shop" + " " + C.Scramble + "1")
.addLore(C.cYellow + "Purchase powerful supply drops, boss summoning items,")
.addLore(C.cYellow + "and exclusive cosmetic items in our online store!")

3
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java
View File

@ -4,13 +4,10 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import mineplex.core.Managers;
import mineplex.core.common.weight.WeightSet;
import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.mounts.Mount.MountType;
import mineplex.game.clans.economy.GoldManager;
import mineplex.game.clans.items.GearManager;
import mineplex.game.clans.items.runes.RuneManager;
public class LootManager
{

8
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/supplydrop/SupplyDropManager.java
View File

@ -220,13 +220,13 @@ public class SupplyDropManager extends MiniPlugin
public static enum SupplyDropType
{
NORMAL("Clans Supply Drop", "Supply Drop", 5, 15, () ->
NORMAL("Clans Supply Drop", "Supply Drop", 5, 7, () ->
{
GearManager gear = ClansManager.getInstance().getGearManager();
ItemType[] itemTypes = {ItemType.ARMOR, ItemType.BOW, ItemType.WEAPON};
Material[] weaponTypes = {Material.IRON_AXE, Material.IRON_SWORD};
Material[] armorTypes = Stream.of(Material.values()).filter(UtilItem::isArmor).toArray(size -> new Material[size]);
GoldTokenLoot goldLoot = new GoldTokenLoot(30, 70);
GoldTokenLoot goldLoot = new GoldTokenLoot(30000, 70000);
MountLoot mountLoot = new MountLoot(1, 2);
return (amount) ->
@ -272,7 +272,7 @@ public class SupplyDropManager extends MiniPlugin
return items;
};
}),
GILDED("Clans Gilded Supply Drop", "Gilded Supply Drop", 20, 25, () ->
GILDED("Clans Gilded Supply Drop", "Gilded Supply Drop", 8, 10, () ->
{
GearManager gear = ClansManager.getInstance().getGearManager();
List<Class<? extends LegendaryItem>> legendaryTypes = Lists.newArrayList(gear.getFindableLegendaries());
@ -280,7 +280,7 @@ public class SupplyDropManager extends MiniPlugin
ItemType[] itemTypes = {ItemType.ARMOR, ItemType.BOW, ItemType.WEAPON};
Material[] weaponTypes = {Material.IRON_AXE, Material.IRON_SWORD};
Material[] armorTypes = Stream.of(Material.values()).filter(UtilItem::isArmor).toArray(size -> new Material[size]);
GoldTokenLoot goldLoot = new GoldTokenLoot(30, 70);
GoldTokenLoot goldLoot = new GoldTokenLoot(30000, 70000);
MountLoot mountLoot = new MountLoot(1, 3);
RuneLoot runeLoot = new RuneLoot();

6
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/supplydrop/SupplyDropPage.java
View File

@ -1,5 +1,6 @@
package mineplex.game.clans.clans.supplydrop;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -33,12 +34,13 @@ public class SupplyDropPage extends ShopPageBase<SupplyDropManager, SupplyDropSh
int owned = getPlugin().getAmountOwned(getPlayer(), type);
int slot = slots[i++];
SkinData buttonData = type == SupplyDropType.GILDED ? SkinData.CLANS_GILDED_SUPPLY_DROP : SkinData.CLANS_SUPPLY_DROP;
List<String> buttonLore = Arrays.asList(C.cYellow + "Open a Supply Drop containing powerful items!",
List<String> buttonLore = new ArrayList<>();
buttonLore.addAll(Arrays.asList(C.cYellow + "Open a Supply Drop containing powerful items!",
C.cRed + " ",
C.cGreen + ">Click to Activate<",
C.cBlue + " ",
C.cDAqua + "You own " + F.greenElem(String.valueOf(Math.max(owned, 0))) + C.cDAqua + " " + type.getDisplayName() + "s"
);
));
if (type == SupplyDropType.GILDED)
{
buttonLore.add(C.cGreen + " ");