diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java index 836600a88..81108bc0e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java @@ -16,7 +16,11 @@ import mineplex.core.gadget.gadgets.outfit.spacesuit.OutfitSpaceSuitChestplate; import mineplex.core.gadget.gadgets.outfit.spacesuit.OutfitSpaceSuitHelmet; import mineplex.core.gadget.gadgets.outfit.spacesuit.OutfitSpaceSuitLeggings; import mineplex.core.gadget.gadgets.outfit.windupsuit.*; +import mineplex.core.gadget.gadgets.particle.*; import mineplex.core.gadget.set.*; +import mineplex.core.gadget.set.suits.SetRaveSuit; +import mineplex.core.gadget.set.suits.SetSpaceSuit; +import mineplex.core.gadget.set.suits.SetWindUpSuit; import mineplex.core.gadget.types.gamemodifiers.kits.KitGameModifier; import mineplex.core.gadget.types.gamemodifiers.kits.KitModifierType; import mineplex.core.gadget.types.gamemodifiers.kits.bridges.PotatoKitGameModifier; @@ -61,14 +65,13 @@ import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailCupid; import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailEmerald; import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailEnchant; import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailFrostLord; -import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailHearts; import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailMusic; import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailShadow; import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailStorm; import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailTitan; import mineplex.core.gadget.gadgets.death.DeathBlood; import mineplex.core.gadget.gadgets.death.DeathCandyCane; -import mineplex.core.gadget.gadgets.death.DeathCupidsBorkenHeart; +import mineplex.core.gadget.gadgets.death.DeathCupidsBrokenHeart; import mineplex.core.gadget.gadgets.death.DeathEmerald; import mineplex.core.gadget.gadgets.death.DeathEnchant; import mineplex.core.gadget.gadgets.death.DeathFrostLord; @@ -85,7 +88,6 @@ import mineplex.core.gadget.gadgets.doublejump.DoubleJumpEmerald; import mineplex.core.gadget.gadgets.doublejump.DoubleJumpEnchant; import mineplex.core.gadget.gadgets.doublejump.DoubleJumpFirecracker; import mineplex.core.gadget.gadgets.doublejump.DoubleJumpFrostLord; -import mineplex.core.gadget.gadgets.doublejump.DoubleJumpHearts; import mineplex.core.gadget.gadgets.doublejump.DoubleJumpMusic; import mineplex.core.gadget.gadgets.doublejump.DoubleJumpShadow; import mineplex.core.gadget.gadgets.doublejump.DoubleJumpStorm; @@ -115,26 +117,6 @@ import mineplex.core.gadget.gadgets.morph.MorphSnowman; import mineplex.core.gadget.gadgets.morph.MorphTitan; import mineplex.core.gadget.gadgets.morph.MorphVillager; import mineplex.core.gadget.gadgets.morph.MorphWither; -import mineplex.core.gadget.gadgets.particle.ParticleBlood; -import mineplex.core.gadget.gadgets.particle.ParticleCandyCane; -import mineplex.core.gadget.gadgets.particle.ParticleCoalFumes; -import mineplex.core.gadget.gadgets.particle.ParticleEmerald; -import mineplex.core.gadget.gadgets.particle.ParticleEnchant; -import mineplex.core.gadget.gadgets.particle.ParticleFairy; -import mineplex.core.gadget.gadgets.particle.ParticleFireRings; -import mineplex.core.gadget.gadgets.particle.ParticleFoot; -import mineplex.core.gadget.gadgets.particle.ParticleFrostLord; -import mineplex.core.gadget.gadgets.particle.ParticleHeart; -import mineplex.core.gadget.gadgets.particle.ParticleLegend; -import mineplex.core.gadget.gadgets.particle.ParticleMusic; -import mineplex.core.gadget.gadgets.particle.ParticlePartyTime; -import mineplex.core.gadget.gadgets.particle.ParticleRain; -import mineplex.core.gadget.gadgets.particle.ParticleTitan; -import mineplex.core.gadget.gadgets.particle.ParticleWingsAngel; -import mineplex.core.gadget.gadgets.particle.ParticleWingsDemons; -import mineplex.core.gadget.gadgets.particle.ParticleWingsInfernal; -import mineplex.core.gadget.gadgets.particle.ParticleWingsPixie; -import mineplex.core.gadget.gadgets.particle.ParticleYinYang; import mineplex.core.gadget.gadgets.wineffect.WinEffectBabyChicken; import mineplex.core.gadget.gadgets.wineffect.WinEffectDragonRider; import mineplex.core.gadget.gadgets.wineffect.WinEffectFireworks; @@ -236,19 +218,21 @@ public class GadgetManager extends MiniPlugin addSet(new SetFrostLord(this)); addSet(new SetCandyCane(this)); addSet(new SetTitan(this)); - addSet(new SetLove(this)); + + // Removes Lovely Set (Duplicate of Cupid's Love) + //addSet(new SetLove(this)); //Costumes addSet(new SetRaveSuit(this)); addSet(new SetSpaceSuit(this)); addSet(new SetWindUpSuit(this)); addSet(new SetParty(this)); - addSet(new SetCupidsWings(this)); + addSet(new SetCupidsLove(this)); addSet(new SetEmerald(this)); addSet(new SetShadow(this)); - addSet(new SetEnchant(this)); - addSet(new SetStorm(this)); - addSet(new SetBlood(this)); + addSet(new SetWisdom(this)); + addSet(new SetHowlingWinds(this)); + addSet(new SetVampire(this)); addSet(new SetMusic(this)); } @@ -323,7 +307,7 @@ public class GadgetManager extends MiniPlugin addGadget(new ParticleCandyCane(this)); addGadget(new ParticleCoalFumes(this)); addGadget(new ParticlePartyTime(this)); - addGadget(new ParticleHeart(this)); + addGadget(new ParticleHeart(this)); addGadget(new ParticleEmerald(this)); addGadget(new ParticleWingsDemons(this)); addGadget(new ParticleEnchant(this)); @@ -348,21 +332,23 @@ public class GadgetManager extends MiniPlugin addGadget(new ArrowTrailStorm(this)); addGadget(new ArrowTrailBlood(this)); addGadget(new ArrowTrailMusic(this)); - addGadget(new ArrowTrailHearts(this)); + // Removes Lovely Set (Duplicate of Cupid's Love) + //addGadget(new ArrowTrailHearts(this)); // Death Effect addGadget(new DeathFrostLord(this)); addGadget(new DeathTitan(this)); addGadget(new DeathCandyCane(this)); addGadget(new DeathPinataBurst(this)); - addGadget(new DeathCupidsBorkenHeart(this)); + addGadget(new DeathCupidsBrokenHeart(this)); addGadget(new DeathEmerald(this)); addGadget(new DeathShadow(this)); addGadget(new DeathEnchant(this)); addGadget(new DeathStorm(this)); addGadget(new DeathBlood(this)); addGadget(new DeathMusic(this)); - addGadget(new DeathHearts(this)); + // Removes Lovely Set (Duplicate of Cupid's Love) + //addGadget(new DeathHearts(this)); // Double Jump addGadget(new DoubleJumpFrostLord(this)); @@ -376,7 +362,8 @@ public class GadgetManager extends MiniPlugin addGadget(new DoubleJumpStorm(this)); addGadget(new DoubleJumpBlood(this)); addGadget(new DoubleJumpMusic(this)); - addGadget(new DoubleJumpHearts(this)); + // Removes Lovely Set (Duplicate of Cupid's Love) + //addGadget(new DoubleJumpHearts(this)); // Hat addGadget(new HatSanta(this)); @@ -560,6 +547,7 @@ public class GadgetManager extends MiniPlugin return null; } + // Gets all the Game modifiers that are related to kits public KitGameModifier getActiveGameModifier(Player player, KitModifierType kitType, Predicate selector) { for (GadgetGameModifier g : getGameModifiers(kitType)) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailBlood.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailBlood.java index 5b577183a..9d6f73f2d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailBlood.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailBlood.java @@ -18,7 +18,7 @@ public class ArrowTrailBlood extends ArrowEffectGadget public ArrowTrailBlood(GadgetManager manager) { super(manager, "Bloody Arrows", - UtilText.splitLineToArray(C.cGray + "Arrows soaking in blood, freshly pulled out from your enemies corpse", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Arrows soaked in blood. No effect, but your enemies may fear getting icky right before dying.", LineFormat.LORE), 1, Material.REDSTONE, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailConfetti.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailConfetti.java index 07637af78..cc8f715f8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailConfetti.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailConfetti.java @@ -20,7 +20,7 @@ public class ArrowTrailConfetti extends ArrowEffectGadget public ArrowTrailConfetti(GadgetManager manager) { super(manager, "Arrow Confetti", - UtilText.splitLineToArray(C.cGray + "Party like a rockstar!... With Arrows!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "This party train won’t stop till the arrow hits your face.", LineFormat.LORE), 1, Material.FIREWORK, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCupid.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCupid.java index 7b84a0a37..91b0bf59e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCupid.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCupid.java @@ -20,7 +20,7 @@ public class ArrowTrailCupid extends ArrowEffectGadget public ArrowTrailCupid(GadgetManager manager) { super(manager, "Cupid's Arrows", - UtilText.splitLineToArray("❤ Spread the love with your arrows ❤", LineFormat.LORE), + UtilText.splitLineToArray("That’s the power of love!", LineFormat.LORE), 1, Material.APPLE, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEmerald.java index b37be4469..a307ca22b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEmerald.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEmerald.java @@ -1,16 +1,13 @@ package mineplex.core.gadget.gadgets.arrowtrail; +import mineplex.core.common.util.*; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Arrow; import org.bukkit.util.Vector; -import mineplex.core.common.util.LineFormat; -import mineplex.core.common.util.UtilAlg; -import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilParticle.ViewDist; -import mineplex.core.common.util.UtilText; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.types.ArrowEffectGadget; @@ -20,7 +17,7 @@ public class ArrowTrailEmerald extends ArrowEffectGadget public ArrowTrailEmerald(GadgetManager manager) { super(manager, "Green Arrows", - UtilText.splitLineToArray("Shoot swirly green arrows", LineFormat.LORE), + UtilText.splitLineToArray(C.cGreen + "The arrows of a hero long past. Some say he hung out with bats and canaries.", LineFormat.LORE), 1, Material.EMERALD, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEnchant.java index cc9512caa..0a9a4fe0e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEnchant.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEnchant.java @@ -30,7 +30,7 @@ public class ArrowTrailEnchant extends ArrowEffectGadget public ArrowTrailEnchant(GadgetManager manager) { super(manager, "Smart Arrows", - UtilText.splitLineToArray(C.cGray + "Arrows so smart that they can't be bothered with helping you hit your target", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Ancient runes speed these arrows along their path.", LineFormat.LORE), 1, Material.BOOK, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailMusic.java index b036161fc..df42e126a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailMusic.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailMusic.java @@ -18,7 +18,7 @@ public class ArrowTrailMusic extends ArrowEffectGadget public ArrowTrailMusic(GadgetManager manager) { super(manager, "Music Arrows", - UtilText.splitLineToArray(C.cGray + "Share your music with your friends using the new .arrow format", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Music is the salve that heals the weary soul. Unlike these. These kill people.", LineFormat.LORE), 1, Material.GREEN_RECORD, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailShadow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailShadow.java index 8dccd6456..17a420340 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailShadow.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailShadow.java @@ -19,7 +19,7 @@ public class ArrowTrailShadow extends ArrowEffectGadget public ArrowTrailShadow(GadgetManager manager) { super(manager, "Shadow Arrows", - UtilText.splitLineToArray(C.cGray + "Very very dark arrows", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + C.Italics + "\"What's blacker than black? None more black.\"", LineFormat.LORE), 1, Material.COAL, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailStorm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailStorm.java index 33590f880..5d03b1709 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailStorm.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailStorm.java @@ -18,7 +18,7 @@ public class ArrowTrailStorm extends ArrowEffectGadget public ArrowTrailStorm(GadgetManager manager) { super(manager, "Rain Arrows", - UtilText.splitLineToArray(C.cGray + "Take your sadness to new hights and ranges", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Arrows that bless the rain down in Africa.", LineFormat.LORE), 1, Material.INK_SACK, (byte) 4); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathBlood.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathBlood.java index cc5afad3d..2b2098573 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathBlood.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathBlood.java @@ -19,7 +19,7 @@ public class DeathBlood extends DeathEffectGadget public DeathBlood(GadgetManager manager) { super(manager, "Gory Blood Death", - UtilText.splitLineToArray(C.cGray + "Dye in the nastiest and bloodiest way possible. Soak your enemies in your blood every time you die!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "A gruesome display fit for Kill Bill.", LineFormat.LORE), 1, Material.REDSTONE, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBorkenHeart.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBrokenHeart.java similarity index 78% rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBorkenHeart.java rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBrokenHeart.java index 5a8a6e4a1..7fde375be 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBorkenHeart.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBrokenHeart.java @@ -12,13 +12,13 @@ import mineplex.core.common.util.UtilText; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.types.DeathEffectGadget; -public class DeathCupidsBorkenHeart extends DeathEffectGadget +public class DeathCupidsBrokenHeart extends DeathEffectGadget { - public DeathCupidsBorkenHeart(GadgetManager manager) + public DeathCupidsBrokenHeart(GadgetManager manager) { super(manager, "Cupid's Broken Heart", - UtilText.splitLineToArray("Make love, not war. Explode into a cloud of hearts.", LineFormat.LORE), + UtilText.splitLineToArray("Queue the weeping violins...", LineFormat.LORE), 1, Material.APPLE, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEmerald.java index 8459ad1ff..09e6d6302 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEmerald.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEmerald.java @@ -16,7 +16,7 @@ public class DeathEmerald extends DeathEffectGadget public DeathEmerald(GadgetManager manager) { super(manager, "Green Death", - UtilText.splitLineToArray(C.cGreen + "I might be dead, but at least I got emeralds", LineFormat.LORE), + UtilText.splitLineToArray(C.cGreen + "Watch your power fade into an emerald mist.", LineFormat.LORE), 1, Material.EMERALD, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEnchant.java index bf6949703..c03cafb21 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEnchant.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEnchant.java @@ -31,7 +31,7 @@ public class DeathEnchant extends DeathEffectGadget public DeathEnchant(GadgetManager manager) { super(manager, "Death of Wisdom", - UtilText.splitLineToArray(C.cGray + "Only a fool would continue fighting when he knows he have lost. Die with some cool and smart particles instead ;)", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "You know what’s more valuable than winning? KNOWLEDGE", LineFormat.LORE), 1, Material.BOOK, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMusic.java index 914fedd4d..c11d7593a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMusic.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMusic.java @@ -31,7 +31,7 @@ public class DeathMusic extends DeathEffectGadget public DeathMusic(GadgetManager manager) { super(manager, "Musical Death", - UtilText.splitLineToArray(C.cGray + "The body might die, but the music lives on!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Your very own swan song.", LineFormat.LORE), 1, Material.GREEN_RECORD, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java index fc3eec698..8a5330f95 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java @@ -26,7 +26,7 @@ public class DeathPinataBurst extends DeathEffectGadget public DeathPinataBurst(GadgetManager manager) { super(manager, "Piñata Burst", - UtilText.splitLineToArray(C.cGray + "Oh man, I shouldn't have eaten all that candy yesterday...", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Kill ‘em with kindness and candy!", LineFormat.LORE), 1, Material.SUGAR_CANE, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathShadow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathShadow.java index 7f574f9e4..5e228ed01 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathShadow.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathShadow.java @@ -19,7 +19,7 @@ public class DeathShadow extends DeathEffectGadget public DeathShadow(GadgetManager manager) { super(manager, "Shadow Death", - UtilText.splitLineToArray(C.cGray + "Disappear in a cloud of smoke", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "A poof of smoke, and you’re gone!", LineFormat.LORE), 1, Material.COAL, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathStorm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathStorm.java index fc089830f..c49b64374 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathStorm.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathStorm.java @@ -19,7 +19,7 @@ public class DeathStorm extends DeathEffectGadget public DeathStorm(GadgetManager manager) { super(manager, "Gloomy Death", - UtilText.splitLineToArray(C.cGray + "Is your death not sad enugh? Make it even more sad by adding some rainy weather too it!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Drown in a puddle of your own tears.", LineFormat.LORE), 1, Material.INK_SACK, (byte) 4); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpBlood.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpBlood.java index 9e4af8216..e733832a4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpBlood.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpBlood.java @@ -18,7 +18,7 @@ public class DoubleJumpBlood extends DoubleJumpEffectGadget public DoubleJumpBlood(GadgetManager manager) { super(manager, "Bloody Leap", - UtilText.splitLineToArray(C.cGray + "Oh, I gotta leap. No time to bursh of the enemies blood!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Their blood gives you power, the power to soar!", LineFormat.LORE), 1, Material.REDSTONE, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCupidsWings.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCupidsWings.java index 97c8365cc..fd6760a8f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCupidsWings.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCupidsWings.java @@ -30,7 +30,7 @@ public class DoubleJumpCupidsWings extends DoubleJumpEffectGadget public DoubleJumpCupidsWings(GadgetManager manager) { super(manager, "Cupid's Wings", - UtilText.splitLineToArray("Spread the love, one jump at a time", LineFormat.LORE), + UtilText.splitLineToArray("Take flight on the wings of love!", LineFormat.LORE), 1, Material.APPLE, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEmerald.java index a22e62857..e61682df0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEmerald.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEmerald.java @@ -30,7 +30,7 @@ public class DoubleJumpEmerald extends DoubleJumpEffectGadget public DoubleJumpEmerald(GadgetManager manager) { super(manager, "Green Jump", - UtilText.splitLineToArray(C.cGreen + "Oh, some just released a big one...", LineFormat.LORE), + UtilText.splitLineToArray(C.cGreen + "Harness the ancient emerald energy to leap through the air.", LineFormat.LORE), 1, Material.EMERALD, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEnchant.java index 240d5b51c..2d4d070e7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEnchant.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEnchant.java @@ -31,7 +31,7 @@ public class DoubleJumpEnchant extends DoubleJumpEffectGadget public DoubleJumpEnchant(GadgetManager manager) { super(manager, "Leap of Wisdom", - UtilText.splitLineToArray(C.cGray + "Lett your widowm aid you in every leap you take", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Distant sages use this leap to reach the highest shelves in their library.", LineFormat.LORE), 1, Material.BOOK, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFirecracker.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFirecracker.java index 91c6ed0a9..6ad87be4f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFirecracker.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFirecracker.java @@ -20,7 +20,7 @@ public class DoubleJumpFirecracker extends DoubleJumpEffectGadget public DoubleJumpFirecracker(GadgetManager manager) { super(manager, "Firecracker Leap", - UtilText.splitLineToArray(C.cGray + "Oh shoot! There is a live firework at my Feet!!!", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Propel yourself in the air with the power of FREEDOM!", LineFormat.LORE), 1, Material.FIREWORK, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMusic.java index afe57b17c..04c18a468 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMusic.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMusic.java @@ -30,7 +30,7 @@ public class DoubleJumpMusic extends DoubleJumpEffectGadget public DoubleJumpMusic(GadgetManager manager) { super(manager, "Musical Leap", - UtilText.splitLineToArray(C.cGray + "Take your leaps and dance moves to the next level with.", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "For when you’re just too groovy to stay on the ground.", LineFormat.LORE), 1, Material.GREEN_RECORD, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpShadow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpShadow.java index 620c10c7f..afc5ef8ae 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpShadow.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpShadow.java @@ -1,5 +1,6 @@ package mineplex.core.gadget.gadgets.doublejump; +import mineplex.core.common.util.C; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -17,7 +18,7 @@ public class DoubleJumpShadow extends DoubleJumpEffectGadget public DoubleJumpShadow(GadgetManager manager) { super(manager, "Shadow Leap", - UtilText.splitLineToArray("Lead out of the shadows", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "A shadowy leap preferred by master assassins.", LineFormat.LORE), 1, Material.COAL, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpStorm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpStorm.java index 52c1da360..7b2006b64 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpStorm.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpStorm.java @@ -18,7 +18,7 @@ public class DoubleJumpStorm extends DoubleJumpEffectGadget public DoubleJumpStorm(GadgetManager manager) { super(manager, "Wet Leap", - UtilText.splitLineToArray(C.cGray + "Make a wet and sad leap. Perfekt for those off bridges.", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "Time to get your feet wet.", LineFormat.LORE), 1, Material.INK_SACK, (byte) 4); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCompanionBlock.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCompanionBlock.java index de0c382d6..6b1ab978a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCompanionBlock.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCompanionBlock.java @@ -13,7 +13,7 @@ public class HatCompanionBlock extends HatGadget public HatCompanionBlock(GadgetManager manager) { super(manager, "Companion Block", - UtilText.splitLineToArray(C.cGray + "The Enrichment Center is required to remind you that the Weighted Companion Cube cannot talk. In the event that it does talk The Enrichment Centre asks you to ignore its advice.", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + "The Enrichment Center is required to remind you that the Weighted Companion cube cannot talk. In the event that it does talk The Enrichment Center asks you to ignore its advice.", LineFormat.LORE), 1, SkinData.COMPANION_CUBE.getSkull(), "Companion Block"); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/windupsuit/OutfitWindUpSuit.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/windupsuit/OutfitWindUpSuit.java index 2d731d145..8b720a81d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/windupsuit/OutfitWindUpSuit.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/windupsuit/OutfitWindUpSuit.java @@ -71,6 +71,9 @@ public class OutfitWindUpSuit extends OutfitGadget if (!IsActive(player)) return; + if (!getSet().isActive(player)) + return; + // Checks if player has effects if (_boosterManager.hasEffects(player)) return; @@ -165,12 +168,6 @@ public class OutfitWindUpSuit extends OutfitGadget if (event.getTick() % 5 == 0) { player.playSound(player.getLocation(), Sound.NOTE_BASS_DRUM, 1f, 1f); - } - } - else if (phase == 3) - { - if (event.getTick() % 20 == 0) - { UtilTextBottom.display(C.cRedB + "Wind Up booster is ready! Sneak to activate!" + ChatColor.RESET, player); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleMusic.java index 6291d04ac..478b5aed8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleMusic.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleMusic.java @@ -1,6 +1,5 @@ package mineplex.core.gadget.gadgets.particle; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -22,7 +21,8 @@ public class ParticleMusic extends ParticleGadget public ParticleMusic(GadgetManager manager) { - super(manager, "Music", UtilText.splitLineToArray(C.cAqua + "And the beat goes?", LineFormat.LORE), 1, Material.GREEN_RECORD, (byte) 0); + super(manager, "Music", + UtilText.splitLineToArray(C.cGray + C.Italics + "\u266B Don't stop the beat! Can't control my feet! \u266B", LineFormat.LORE), 1, Material.GREEN_RECORD, (byte) 0); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java index b15aacac5..c1c8d8d58 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java @@ -23,8 +23,8 @@ public class ParticleWingsAngel extends ParticleGadget public ParticleWingsAngel(GadgetManager manager) { - super(manager, "Angle Wings", - UtilText.splitLineToArray(C.cGray + "The wings of the angelic creature, made of long, soft feathers like the fur of a polar bear, thick and so soft it feels like a cloud. They are whiter than a soft coloured cloud on a bleating summers day, so white that a pure glow seems to emit from them.", LineFormat.LORE), + super(manager, "Angel Wings", + UtilText.splitLineToArray(C.cGray + "Sprout wings like your favorite archangel!", LineFormat.LORE), 1, Material.NETHER_STAR, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java index fa08f1823..733370b8a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java @@ -25,7 +25,7 @@ public class ParticleWingsDemons extends ParticleGadget public ParticleWingsDemons(GadgetManager manager) { super(manager, "Demon Wings", - UtilText.splitLineToArray(C.cGray + "Even the shadows can't hide you from the demons", LineFormat.LORE), + UtilText.splitLineToArray(C.cGray + C.Italics + "\"I'm just excited to see my Lord and Savior Baphomet represented in such glorious Italian stone.\"", LineFormat.LORE), 1, Material.COAL, (byte) 1); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java index 4c1687989..a30e3edd7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java @@ -23,7 +23,7 @@ public class ParticleWingsInfernal extends ParticleGadget public ParticleWingsInfernal(GadgetManager manager) { - super(manager, "Infernal Wings", UtilText.splitLineToArray(C.cGray + "These wings harnesses the power of the infernal flames of doom.", LineFormat.LORE), + super(manager, "Infernal Wings", UtilText.splitLineToArray(C.cGray + C.Italics + "\"I didn't take your mail Mrs. Pemberton! Stop asking me that. Leave me alone! I don't know. Satan's pretty cool!\"", LineFormat.LORE), 1, Material.MAGMA_CREAM, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java index 7ae457a07..18fcb41c7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java @@ -23,7 +23,7 @@ public class ParticleWingsPixie extends ParticleGadget public ParticleWingsPixie(GadgetManager manager) { - super(manager, "Pixie Wings", UtilText.splitLineToArray(C.cGray + "Pixie Wings. Much blue. Little Pink.", LineFormat.LORE), + super(manager, "Pixie Wings", UtilText.splitLineToArray(C.cGray + "Most kinds of pixies steal coins from weary travelers, but this kind just looks fabulous.", LineFormat.LORE), 1, Material.INK_SACK, (byte) 12); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java index ee511b6fb..7a10e1721 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java @@ -25,7 +25,7 @@ public class ParticleYinYang extends ParticleGadget public ParticleYinYang(GadgetManager manager) { super(manager, "Yin and Yang", - UtilText.splitLineToArray(ChatColor.GRAY + "Keeping the cosmos in balance since 800 B.C.", LineFormat.LORE), + UtilText.splitLineToArray(ChatColor.GRAY + "Achieve the balance of the universe and watch it spin beneath your feet.", LineFormat.LORE), 1, Material.RECORD_9, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java index 5ed096c80..28c1f881a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java @@ -44,7 +44,7 @@ public class WinEffectBabyChicken extends WinEffectGadget public WinEffectBabyChicken(GadgetManager manager) { - super(manager, "Baby Chicken", UtilText.splitLineToArray(C.cGray + "Who said you can't win by being a chicken???", LineFormat.LORE), 1, + super(manager, "Baby Chicken", UtilText.splitLineToArray(C.cGray + "Bawk Bawk strikes again! Summon his minions and run around as an itty bitty chicken.", LineFormat.LORE), 1, Material.EGG, (byte) 0); // teleportMode = WinEffectTeleportMode.Grid_Team_Behind; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java index 8effadf14..1279ff1f2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java @@ -26,7 +26,7 @@ public class WinEffectFireworks extends WinEffectGadget public WinEffectFireworks(GadgetManager manager) { - super(manager, "Fireworks", UtilText.splitLineToArray(C.cGray + "Celebrate your victory with some good old firework.", LineFormat.LORE), + super(manager, "Fireworks", UtilText.splitLineToArray(C.cGray + "What’s more appropriate for victory than EXPLOSIONS?", LineFormat.LORE), 1, Material.FIREWORK, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java index 93ae6fe8e..08885322d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java @@ -26,7 +26,7 @@ public class WinEffectFlames extends WinEffectGadget public WinEffectFlames(GadgetManager manager) { - super(manager, "Flames", UtilText.splitLineToArray(C.cGray + "Oh shit, my feets are on fire!", LineFormat.LORE), + super(manager, "Flames", UtilText.splitLineToArray(C.cGray + "Is this NBA Jam 1993? Because you’re ON FIRE!", LineFormat.LORE), 1, Material.BLAZE_POWDER, (byte) 0); _schematicName = "FlamesPodium"; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLavaTrap.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLavaTrap.java index 49c0a02c3..391c96805 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLavaTrap.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLavaTrap.java @@ -45,7 +45,7 @@ public class WinEffectLavaTrap extends WinEffectGadget public WinEffectLavaTrap(GadgetManager manager) { - super(manager, "Lava Trap", UtilText.splitLineToArray(C.cGray + "FINALLY! A movie where the villain's master plan succeeds!", LineFormat.LORE), + super(manager, "Lava Trap", UtilText.splitLinesToArray(new String[] {C.cGray + C.Italics + "\"Do you expect me to talk?\"", C.cGray + C.Italics + "\"No Mr. Bond, I expect you to die!\""}, LineFormat.LORE), 1, Material.LAVA_BUCKET, (byte) 0); _schematicName = "LavaTrapPodium"; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java index 86c4ec6bc..c0b1cd6a2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java @@ -20,7 +20,7 @@ public class WinEffectLightningStrike extends WinEffectGadget public WinEffectLightningStrike(GadgetManager manager) { - super(manager, "Lightning Strike", UtilText.splitLinesToArray(new String[] {C.cGray + C.Italics + "He just stood there, like nothing was ever going to happen.", C.cGray + C.Italics + "Then BOOM! A lightning striked from clear sky onto the man. A large cloud of dust and smoke had blown up from the explosion. When it settled the man that had previously been standing there rised back up, but he was now wearing diamond armor, standing even more glorified than he had ever before."}, LineFormat.LORE), + super(manager, "Lightning Strike", UtilText.splitLineToArray(C.cGray + "They say lightning doesn’t strike twice, but they must lose a lot.", LineFormat.LORE), 1, Material.DIAMOND_SWORD, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectMrPunchMan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectMrPunchMan.java index 54ae47a19..feb07893f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectMrPunchMan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectMrPunchMan.java @@ -33,7 +33,7 @@ public class WinEffectMrPunchMan extends WinEffectGadget public WinEffectMrPunchMan(GadgetManager manager) { - super(manager, "Mr.Punchman", UtilText.splitLinesToArray(new String[]{C.cGray + "Mister postman look and see.", C.cGray + "Is there a letter in your bag for me.", C.cGray + "I been waiting a long long time.", C.cGray + "Since I heard from that girl of mine.", " ", " ", C.cGray + "Wait a minute.... you are not the postman..."}, LineFormat.LORE), + super(manager, "Mr.Punchman", UtilText.splitLineToArray(C.cGray + "Some say he’s still punching on that oversized punching bag in the sky.", LineFormat.LORE), 1, Material.IRON_AXE, (byte) 0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java index b00afab5c..f8c3efad0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java @@ -28,7 +28,7 @@ public class WinEffectPodium extends WinEffectGadget public WinEffectPodium(GadgetManager manager) { - super(manager, "Podium", UtilText.splitLineToArray(C.cGray + "May the winner please step onto the podium?", LineFormat.LORE), + super(manager, "Podium", UtilText.splitLineToArray(C.cGray + "You are the wiener! I mean WINNER! Phew, glad that didn’t make it into the release.", LineFormat.LORE), 0, Material.DIAMOND, (byte)0); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java index 6b9ddf581..35f0961fe 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java @@ -27,7 +27,7 @@ public class WinEffectSnowTrails extends WinEffectGadget public WinEffectSnowTrails(GadgetManager manager) { - super(manager, "Snow Trail", UtilText.splitLinesToArray(new String[] {C.cGray + "Oh the weather outside is frightful.", C.cGray + "But the fire is so delightful.", C.cGray + "And since we've no place to go.", C.cGray + "Let It Snow! Let It Snow! Let It Snow!"}, LineFormat.LORE), + super(manager, "Snow Trail", UtilText.splitLineToArray(C.cGray + "What killed the dinosaurs? THE ICE AGE! Talk about the cold shoulder. Haha, puns.", LineFormat.LORE), 1, Material.SNOW_BALL, (byte) 0); _schematicName = "SnowPodium"; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCandyCane.java index 8a1acaf71..bae19a6d2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCandyCane.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCandyCane.java @@ -1,8 +1,5 @@ package mineplex.core.gadget.set; -import org.bukkit.entity.Player; - -import mineplex.core.common.util.F; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailCandyCane; import mineplex.core.gadget.gadgets.death.DeathCandyCane; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsWings.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsLove.java similarity index 61% rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsWings.java rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsLove.java index 8ba0f8070..1dd04ed10 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsWings.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsLove.java @@ -2,19 +2,19 @@ package mineplex.core.gadget.set; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailCupid; -import mineplex.core.gadget.gadgets.death.DeathCupidsBorkenHeart; +import mineplex.core.gadget.gadgets.death.DeathCupidsBrokenHeart; import mineplex.core.gadget.gadgets.doublejump.DoubleJumpCupidsWings; import mineplex.core.gadget.gadgets.particle.ParticleHeart; import mineplex.core.gadget.types.GadgetSet; -public class SetCupidsWings extends GadgetSet +public class SetCupidsLove extends GadgetSet { - public SetCupidsWings(GadgetManager manager) + public SetCupidsLove(GadgetManager manager) { - super(manager, "Cupid's Love", "Spread the love even when you move!", + super(manager, "Cupid's Love", "Running into other players gives them hearts for 5 seconds.", manager.getGadget(ArrowTrailCupid.class), - manager.getGadget(DeathCupidsBorkenHeart.class), + manager.getGadget(DeathCupidsBrokenHeart.class), manager.getGadget(DoubleJumpCupidsWings.class), manager.getGadget(ParticleHeart.class)); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEmerald.java index 7977c1956..5ec181abc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEmerald.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEmerald.java @@ -12,7 +12,7 @@ public class SetEmerald extends GadgetSet public SetEmerald(GadgetManager manager) { - super(manager, "Emerald", "Improved Emerald Twirl", + super(manager, "Emerald", "Press Shift to summon a Gem Party Bomb. 24 hour cooldown.", manager.getGadget(ParticleEmerald.class), manager.getGadget(ArrowTrailEmerald.class), manager.getGadget(DeathEmerald.class), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetStorm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetHowlingWinds.java similarity index 71% rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetStorm.java rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetHowlingWinds.java index d49518062..1f0179e7b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetStorm.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetHowlingWinds.java @@ -8,12 +8,12 @@ import mineplex.core.gadget.gadgets.particle.ParticleRain; import mineplex.core.gadget.types.Gadget; import mineplex.core.gadget.types.GadgetSet; -public class SetStorm extends GadgetSet +public class SetHowlingWinds extends GadgetSet { - public SetStorm(GadgetManager manager) + public SetHowlingWinds(GadgetManager manager) { - super(manager, "Set of the Howling Winds", "Improves ???", + super(manager, "Howling Winds", "Press shift to start a flood around you, water runs in all directions for 10 seconds. 5 minute cooldown.", manager.getGadget(ArrowTrailStorm.class), manager.getGadget(DeathStorm.class), manager.getGadget(DoubleJumpStorm.class), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetLove.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetLove.java index 60f474c73..8a072ca48 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetLove.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetLove.java @@ -1,6 +1,7 @@ package mineplex.core.gadget.set; import mineplex.core.gadget.GadgetManager; +import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailCupid; import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailHearts; import mineplex.core.gadget.gadgets.death.DeathHearts; import mineplex.core.gadget.gadgets.doublejump.DoubleJumpHearts; @@ -13,7 +14,12 @@ public class SetLove extends GadgetSet * Created by: Mysticate * Timestamp: February 4, 2016 */ - + + /* Note by LCastr0, at May 3rd, 2016: + * Seems to be a dupe of Cupid's Love set, will be commenting + * out the addition of this set to the GadgetManager. + * */ + public SetLove(GadgetManager manager) { super(manager, "Lovely!", "Coming Soon", diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetMusic.java index 1821409be..31ba8dfe1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetMusic.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetMusic.java @@ -12,7 +12,7 @@ public class SetMusic extends GadgetSet public SetMusic(GadgetManager manager) { - super(manager, "Ultimate Music Collection Set", "Improves Particle", + super(manager, "Ultimate Music Collection", "Press Shift to shoot a blast of music particles. People hit by the blast hear music for 15 seconds. 5 minute cooldown.", manager.getGadget(ArrowTrailMusic.class), manager.getGadget(DeathMusic.class), manager.getGadget(DoubleJumpMusic.class), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetShadow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetShadow.java index 22a988d5e..7c311f4f7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetShadow.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetShadow.java @@ -12,7 +12,7 @@ public class SetShadow extends GadgetSet public SetShadow(GadgetManager manager) { - super(manager, "Shadow Set", "Improves arrow ???", + super(manager, "Shadow", "Press Shift to randomly teleport ~15 blocks away in a puff of shadow. 5 minute cooldown.", manager.getGadget(ArrowTrailShadow.class), manager.getGadget(DeathShadow.class), manager.getGadget(DoubleJumpShadow.class), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetBlood.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetVampire.java similarity index 74% rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetBlood.java rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetVampire.java index 70ebf29f2..533ffec8a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetBlood.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetVampire.java @@ -8,12 +8,12 @@ import mineplex.core.gadget.gadgets.particle.ParticleBlood; import mineplex.core.gadget.types.Gadget; import mineplex.core.gadget.types.GadgetSet; -public class SetBlood extends GadgetSet +public class SetVampire extends GadgetSet { - public SetBlood(GadgetManager manager) + public SetVampire(GadgetManager manager) { - super(manager, "The Vampire Set 2000", "Improves ???", + super(manager, "The Vampire 2000", "Press Shift to turn into a bat and be able to fly for 10 seconds. 5 Minute cooldown.", manager.getGadget(ArrowTrailBlood.class), manager.getGadget(DeathBlood.class), manager.getGadget(DoubleJumpBlood.class), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWisdom.java similarity index 74% rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEnchant.java rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWisdom.java index ba996950c..cfd7471f6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEnchant.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWisdom.java @@ -7,12 +7,12 @@ import mineplex.core.gadget.gadgets.doublejump.DoubleJumpEnchant; import mineplex.core.gadget.gadgets.particle.ParticleEnchant; import mineplex.core.gadget.types.GadgetSet; -public class SetEnchant extends GadgetSet +public class SetWisdom extends GadgetSet { - public SetEnchant(GadgetManager manager) + public SetWisdom(GadgetManager manager) { - super(manager, "Set of Wisdom", "Improves ???", + super(manager, "Wisdom", "Wearing the full Wisdom set when opening a chest slightly increases your chest roll %.", manager.getGadget(ArrowTrailEnchant.class), manager.getGadget(DeathEnchant.class), manager.getGadget(DoubleJumpEnchant.class), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetRaveSuit.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetRaveSuit.java similarity index 94% rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetRaveSuit.java rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetRaveSuit.java index 21bdf9883..ee510e0c9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetRaveSuit.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetRaveSuit.java @@ -1,4 +1,4 @@ -package mineplex.core.gadget.set; +package mineplex.core.gadget.set.suits; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.outfit.ravesuit.OutfitRaveSuitBoots; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetSpaceSuit.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetSpaceSuit.java similarity index 94% rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetSpaceSuit.java rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetSpaceSuit.java index eb10d36b3..f61a093fa 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetSpaceSuit.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetSpaceSuit.java @@ -1,4 +1,4 @@ -package mineplex.core.gadget.set; +package mineplex.core.gadget.set.suits; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.outfit.spacesuit.OutfitSpaceSuitBoots; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWindUpSuit.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetWindUpSuit.java similarity index 95% rename from Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWindUpSuit.java rename to Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetWindUpSuit.java index f82f33e46..94717c90f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWindUpSuit.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetWindUpSuit.java @@ -1,4 +1,4 @@ -package mineplex.core.gadget.set; +package mineplex.core.gadget.set.suits; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.outfit.windupsuit.OutfitWindUpSuitBoots;