From b3f46ad4fc6768b4d1a98b4cddcf30ef14e5a7ce Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Wed, 3 May 2017 23:30:16 -0300 Subject: [PATCH] Added names, icons and lores --- .../mineplex/core/cosmetic/ui/page/Menu.java | 2 +- .../gadgets/kitselector/HaloKitSelector.java | 4 +- .../kitselector/RainCloudKitSelector.java | 4 +- .../kitselector/RainbowDanceKitSelector.java | 4 +- .../ShimmeringRingKitSelector.java | 4 +- .../SingleParticleKitSelector.java | 12 +++--- .../kitselector/WaterWingsKitSelector.java | 4 +- .../rankrooms/WinEffectRankBased.java | 41 +++---------------- .../rankwineffects/WinEffectRankEternal.java | 7 +++- .../rankwineffects/WinEffectRankHero.java | 7 +++- .../rankwineffects/WinEffectRankLegend.java | 7 +++- .../rankwineffects/WinEffectRankTitan.java | 7 +++- .../rankwineffects/WinEffectRankUltra.java | 6 ++- 13 files changed, 51 insertions(+), 58 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java index b301263c1..8a27df36e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java @@ -224,7 +224,7 @@ public class Menu extends ShopPageBase 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); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/HaloKitSelector.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/HaloKitSelector.java index 9004ac106..c05fe3a10 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/HaloKitSelector.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/HaloKitSelector.java @@ -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 diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/RainCloudKitSelector.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/RainCloudKitSelector.java index 852680e22..55cb97461 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/RainCloudKitSelector.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/RainCloudKitSelector.java @@ -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); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/RainbowDanceKitSelector.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/RainbowDanceKitSelector.java index e82e80238..c4aed4e90 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/RainbowDanceKitSelector.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/RainbowDanceKitSelector.java @@ -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 diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/ShimmeringRingKitSelector.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/ShimmeringRingKitSelector.java index 7ed2845c1..a6535bfe9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/ShimmeringRingKitSelector.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/ShimmeringRingKitSelector.java @@ -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 diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/SingleParticleKitSelector.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/SingleParticleKitSelector.java index 70286f2ed..8ae065c88 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/SingleParticleKitSelector.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/SingleParticleKitSelector.java @@ -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; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/WaterWingsKitSelector.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/WaterWingsKitSelector.java index b3753844f..c776610f3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/WaterWingsKitSelector.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/WaterWingsKitSelector.java @@ -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 diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/WinEffectRankBased.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/WinEffectRankBased.java index 8822869ca..35993d8ca 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/WinEffectRankBased.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/WinEffectRankBased.java @@ -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; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankEternal.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankEternal.java index 030f6b24c..a925c889e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankEternal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankEternal.java @@ -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 diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankHero.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankHero.java index 9144436e5..94530ce6e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankHero.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankHero.java @@ -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 diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankLegend.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankLegend.java index d1ba4afbd..479c5d62c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankLegend.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankLegend.java @@ -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 diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankTitan.java index 8526e8df5..3a7bfb876 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankTitan.java @@ -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 diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankUltra.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankUltra.java index dc3ccc130..7d7a2766d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankUltra.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/rankrooms/rankwineffects/WinEffectRankUltra.java @@ -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