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

Added names, icons and lores

This commit is contained in:
LCastr0 2017-05-03 23:30:16 -03:00
parent 196e0b9688
commit b3f46ad4fc
13 changed files with 51 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
View File

@ -224,7 +224,7 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
if (enabled.containsKey(type)) addGlow(balloonsSlot);
type = GadgetType.KIT_SELECTOR;
lore = getLore(ownedCount.get(type), maxCount.get(type), "Placeholder", VISIBILITY_GAME_HUB, enabled.get(type));
lore = getLore(ownedCount.get(type), maxCount.get(type), "Click here to select different particles to indicate which kit you have selected!", VISIBILITY_GAME_HUB, enabled.get(type));
addButton(kitSelectorSlot, new ShopItem(Material.LEVER, "Kit Selector Particles", lore, 1, false), new OpenKitSelector(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(kitSelectorSlot);
}

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/HaloKitSelector.java
View File

@ -24,8 +24,8 @@ public class HaloKitSelector extends KitSelectorGadget
public HaloKitSelector(GadgetManager manager)
{
super(manager, "Halo", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE),
0, Material.GLASS, (byte) 0);
super(manager, "Halo", UtilText.splitLinesToArray(new String[]{C.cGray + "Fight like an Angel."}, LineFormat.LORE),
0, Material.GOLD_HELMET, (byte) 0);
}
@Override

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/RainCloudKitSelector.java
View File

@ -17,8 +17,8 @@ public class RainCloudKitSelector extends KitSelectorGadget
public RainCloudKitSelector(GadgetManager manager)
{
super(manager, "Rain Cloud", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE),
0, Material.GLASS, (byte) 0);
super(manager, "Rain Cloud", UtilText.splitLinesToArray(new String[]{C.cGray + "The rain keeps falling, and the kit keeps calling."}, LineFormat.LORE),
0, Material.POTION, (byte) 0);
}

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/RainbowDanceKitSelector.java
View File

@ -32,8 +32,8 @@ public class RainbowDanceKitSelector extends KitSelectorGadget
public RainbowDanceKitSelector(GadgetManager manager)
{
super(manager, "Rainbow Dance", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE),
0, Material.GLASS, (byte) 0);
super(manager, "Rainbow Dance", UtilText.splitLinesToArray(new String[]{C.cGray + "At the end of this Rainbow is the kit of your dreams."}, LineFormat.LORE),
0, Material.WOOL, (byte) 6);
}
@Override

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/ShimmeringRingKitSelector.java
View File

@ -27,8 +27,8 @@ public class ShimmeringRingKitSelector extends KitSelectorGadget
public ShimmeringRingKitSelector(GadgetManager manager)
{
super(manager, "Shimmering Ring", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE),
0, Material.GLASS, (byte) 0);
super(manager, "Shimmering Ring", UtilText.splitLinesToArray(new String[]{C.cGray + "Encaged in your golden rings, your kits weapon still sing."}, LineFormat.LORE),
0, Material.WOOL, (byte) 4);
}
@Override

12
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/SingleParticleKitSelector.java
View File

@ -33,12 +33,12 @@ public class SingleParticleKitSelector extends KitSelectorGadget
public enum SingleParticleSelectors
{
FLAMES_OF_FURY("Flames Of Fury", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE),
0, Material.GLASS, (byte) 0, UtilParticle.ParticleType.FLAME),
EMBER("Ember", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE),
0, Material.GLASS, (byte) 0, UtilParticle.ParticleType.SMOKE, 3),
LOVE("Kit Love", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE),
0, Material.GLASS, (byte) 0, UtilParticle.ParticleType.HEART);
FLAMES_OF_FURY("Flames Of Fury", UtilText.splitLinesToArray(new String[]{C.cGray + "Through the Fire and the Flames we will ride"}, LineFormat.LORE),
0, Material.FIRE, (byte) 0, UtilParticle.ParticleType.FLAME),
EMBER("Ember", UtilText.splitLinesToArray(new String[]{C.cGray + "I'd like my kit well done."}, LineFormat.LORE),
0, Material.COAL, (byte) 0, UtilParticle.ParticleType.SMOKE, 3),
LOVE("Kit Love", UtilText.splitLinesToArray(new String[]{C.cGray + "I think I LIKE this kit, if you know what I mean."}, LineFormat.LORE),
0, Material.POTION, (byte) 8233, UtilParticle.ParticleType.HEART);
private String _name;
private String[] _lore;

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/WaterWingsKitSelector.java
View File

@ -29,8 +29,8 @@ public class WaterWingsKitSelector extends KitSelectorGadget
public WaterWingsKitSelector(GadgetManager manager)
{
super(manager, "Water Wings", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE),
0, Material.GLASS, (byte) 0);
super(manager, "Water Wings", UtilText.splitLinesToArray(new String[]{C.cGray + "These wings won't help you float or fly, but they look pretty sweet."}, LineFormat.LORE),
0, Material.WATER_BUCKET, (byte) 0);
}
@Override

41
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/WinEffectRankBased.java
View File

@ -5,9 +5,6 @@ import org.bukkit.entity.Player;
import mineplex.core.Managers;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilText;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.types.WinEffectGadget;
@ -26,11 +23,11 @@ public abstract class WinEffectRankBased extends WinEffectGadget
* @param winEffectType The win effect type, used to display in menus
* @param alternativeSalepackageNames
*/
public WinEffectRankBased(GadgetManager manager, Rank rank, WinEffectType winEffectType, String... alternativeSalepackageNames)
public WinEffectRankBased(GadgetManager manager, String name, String[] lore, Material material, byte data, Rank rank, WinEffectType winEffectType, String... alternativeSalepackageNames)
{
super(manager, winEffectType.getName() + " " + rank.getRawTag(), winEffectType.getLore(),
super(manager, name, lore,
(rank.equals(Rank.ETERNAL) ? -15 : (rank.equals(Rank.TITAN) ? -13 : (rank.equals(Rank.LEGEND) ? -12 : (rank.equals(Rank.HERO) ? -11 : -10)))),
winEffectType.getMaterial(), winEffectType.getData(), true, alternativeSalepackageNames);
material, data, true, alternativeSalepackageNames);
_rank = rank;
_winEffectType = winEffectType;
_schematicName = winEffectType.getSchematic().replace("%r%", rank.getRawTag());
@ -67,43 +64,15 @@ public abstract class WinEffectRankBased extends WinEffectGadget
public enum WinEffectType
{
RANK_WIN_EFFECT("Rank Win Effect", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE), Material.GLASS, (byte) 0, "WinRank%r%");
RANK_WIN_EFFECT("WinRank%r%");
private String _name;
private String[] _lore;
private Material _material;
private byte _data;
private String _schematic;
WinEffectType(String name, String[] lore, Material material, byte data, String schematic)
WinEffectType(String schematic)
{
_name = name;
_lore = lore;
_material = material;
_data = data;
_schematic = schematic;
}
public String getName()
{
return _name;
}
public String[] getLore()
{
return _lore;
}
public Material getMaterial()
{
return _material;
}
public byte getData()
{
return _data;
}
public String getSchematic()
{
return _schematic;

7
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankEternal.java
View File

@ -14,9 +14,12 @@ import org.bukkit.util.Vector;
import mineplex.core.common.MaterialData;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilText;
import mineplex.core.disguise.disguises.DisguisePlayer;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.gadgets.wineffect.rankrooms.WinEffectRankBased;
@ -36,7 +39,9 @@ public class WinEffectRankEternal extends WinEffectRankBased
public WinEffectRankEternal(GadgetManager manager)
{
super(manager, Rank.ETERNAL, WinEffectType.RANK_WIN_EFFECT);
super(manager, "Eternal Win Effect",
UtilText.splitLinesToArray(new String[]{C.cGray + "GWEN is ALWAYS watching."}, LineFormat.LORE),
Material.PRISMARINE_SHARD, (byte) 0, Rank.ETERNAL, WinEffectType.RANK_WIN_EFFECT);
}
@Override

7
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankHero.java
View File

@ -14,9 +14,12 @@ import org.bukkit.util.Vector;
import mineplex.core.common.MaterialData;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilText;
import mineplex.core.disguise.disguises.DisguisePlayer;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.gadgets.wineffect.rankrooms.WinEffectRankBased;
@ -36,7 +39,9 @@ public class WinEffectRankHero extends WinEffectRankBased
public WinEffectRankHero(GadgetManager manager)
{
super(manager, Rank.HERO, WinEffectType.RANK_WIN_EFFECT);
super(manager, "Hero Win Effect",
UtilText.splitLinesToArray(new String[]{C.cGray + "To become a True Hero you must first defeat the Dragon."}, LineFormat.LORE),
Material.DRAGON_EGG, (byte) 0, Rank.HERO, WinEffectType.RANK_WIN_EFFECT);
}
@Override

7
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankLegend.java
View File

@ -14,9 +14,12 @@ import org.bukkit.util.Vector;
import mineplex.core.common.MaterialData;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilText;
import mineplex.core.disguise.disguises.DisguisePlayer;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.gadgets.wineffect.rankrooms.WinEffectRankBased;
@ -36,7 +39,9 @@ public class WinEffectRankLegend extends WinEffectRankBased
public WinEffectRankLegend(GadgetManager manager)
{
super(manager, Rank.LEGEND, WinEffectType.RANK_WIN_EFFECT);
super(manager, "Legend Win Effect",
UtilText.splitLinesToArray(new String[]{C.cGray + "Can you weather this Withering Assault?"}, LineFormat.LORE),
Material.SKULL_ITEM, (byte) 1, Rank.LEGEND, WinEffectType.RANK_WIN_EFFECT);
}
@Override

7
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankTitan.java
View File

@ -13,9 +13,12 @@ import org.bukkit.event.entity.EntityDamageEvent;
import mineplex.core.common.MaterialData;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilText;
import mineplex.core.disguise.disguises.DisguisePlayer;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.gadgets.wineffect.rankrooms.WinEffectRankBased;
@ -30,7 +33,9 @@ public class WinEffectRankTitan extends WinEffectRankBased
public WinEffectRankTitan(GadgetManager manager)
{
super(manager, Rank.TITAN, WinEffectType.RANK_WIN_EFFECT);
super(manager, "Titan Win Effect",
UtilText.splitLinesToArray(new String[]{C.cGray + "Legend has it that the Titans were so powerful they towered over even the gods."}, LineFormat.LORE),
Material.ROTTEN_FLESH, (byte) 0, Rank.TITAN, WinEffectType.RANK_WIN_EFFECT);
}
@Override

6
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankUltra.java
View File

@ -14,9 +14,12 @@ import org.bukkit.event.entity.EntityExplodeEvent;
import mineplex.core.common.MaterialData;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilText;
import mineplex.core.disguise.disguises.DisguisePlayer;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.gadgets.wineffect.rankrooms.WinEffectRankBased;
@ -31,7 +34,8 @@ public class WinEffectRankUltra extends WinEffectRankBased
public WinEffectRankUltra(GadgetManager manager)
{
super(manager, Rank.ULTRA, WinEffectType.RANK_WIN_EFFECT);
super(manager, "Ultra Win Effect", UtilText.splitLinesToArray(new String[]{C.cGray + "Always check behind you."}, LineFormat.LORE),
Material.SKULL_ITEM, (byte) 4, Rank.ULTRA, WinEffectType.RANK_WIN_EFFECT);
}
@Override