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

Merge branch 'project-cosmetics' of

Browse Source 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java
This commit is contained in:
xGamingDudex 2016-05-10 20:21:37 +02:00
commit 276f572009
58 changed files with 102 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
View File

@ -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<GadgetGameModifier> selector)
{
for (GadgetGameModifier g : getGameModifiers(kitType))

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailBlood.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailConfetti.java
View File

@ -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 " + C.cPurple + "party train" + C.cGray + "won't stop till the arrow hits your face.", LineFormat.LORE),
1, Material.FIREWORK, (byte)0);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailCupid.java
View File

@ -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);
}

7
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEmerald.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailEnchant.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailMusic.java
View File

@ -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 + C.Italics + "\u266B Music is the salve that heals the weary soul. Unlike these. These kill people. \u266B", LineFormat.LORE),
1, Material.GREEN_RECORD, (byte) 0);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailShadow.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/ArrowTrailStorm.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathBlood.java
View File

@ -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);
}

6
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBorkenHeart.java → Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathCupidsBrokenHeart.java
View File

@ -13,13 +13,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("Cue the weeping violins...", LineFormat.LORE),
1, Material.APPLE, (byte) 0);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEmerald.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathEnchant.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathMusic.java
View File

@ -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 + C.Italics + "\u266B Your very own swan song. \u266B", LineFormat.LORE),
1, Material.GREEN_RECORD, (byte) 0);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java
View File

@ -20,7 +20,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 " + C.cPurple + "candy!", LineFormat.LORE),
1, Material.FIREWORK, (byte)0);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathShadow.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathStorm.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpBlood.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpCupidsWings.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEmerald.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpEnchant.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpFirecracker.java
View File

@ -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 " + C.cPurple + "FREEDOM!", LineFormat.LORE),
1, Material.FIREWORK, (byte)0);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpMusic.java
View File

@ -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 + C.Italics + "\u266B For when you’re just too groovy to stay on the ground. \u266B", LineFormat.LORE),
1, Material.GREEN_RECORD, (byte) 0);
}

3
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpShadow.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/DoubleJumpStorm.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatCompanionBlock.java
View File

@ -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");
}

9
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/windupsuit/OutfitWindUpSuit.java
View File

@ -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);
}
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEmerald.java
View File

@ -21,7 +21,7 @@ public class ParticleEmerald extends ParticleGadget
public ParticleEmerald(GadgetManager manager)
{
super(manager, "Emerald Twirl",
UtilText.splitLineToArray(C.cGray + "With these sparkles, you can sparkle while sparkle with CaptainSparklez!", LineFormat.LORE),
UtilText.splitLineToArray(C.cGreen + "With these sparkles, you can sparkle while sparkle with CaptainSparklez!", LineFormat.LORE),
-2, Material.EMERALD, (byte) 0, "Green Ring");
}

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleMusic.java
View File

@ -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

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticlePartyTime.java
View File

@ -41,7 +41,7 @@ public class ParticlePartyTime extends ParticleGadget
public ParticlePartyTime(GadgetManager manager)
{
super(manager, "Party Time",
UtilText.splitLineToArray(C.cWhite + "It is " + C.cPurple + "PARTY TIME!", LineFormat.LORE),
UtilText.splitLineToArray(C.cGray + "It is " + C.cPurple + "PARTY TIME!", LineFormat.LORE),
-3, Material.FIREWORK, (byte)-1);
}

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java
View File

@ -26,7 +26,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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java
View File

@ -24,7 +24,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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java
View File

@ -27,7 +27,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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java
View File

@ -49,7 +49,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);
_schematicName = "ChickenPodium";

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java
View File

@ -31,7 +31,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";

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLavaTrap.java
View File

@ -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";

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectMrPunchMan.java
View File

@ -29,7 +29,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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java
View File

@ -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);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java
View File

@ -31,7 +31,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";

3
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCandyCane.java
View File

@ -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;

10
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsWings.java → Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetCupidsLove.java
View File

@ -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."*/ "Coming soon...",
manager.getGadget(ArrowTrailCupid.class),
manager.getGadget(DeathCupidsBorkenHeart.class),
manager.getGadget(DeathCupidsBrokenHeart.class),
manager.getGadget(DoubleJumpCupidsWings.class),
manager.getGadget(ParticleHeart.class));
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEmerald.java
View File

@ -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."*/ "Coming soon...",
manager.getGadget(ParticleEmerald.class),
manager.getGadget(ArrowTrailEmerald.class),
manager.getGadget(DeathEmerald.class),

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetFrostLord.java
View File

@ -15,7 +15,7 @@ public class SetFrostLord extends GadgetSet
public SetFrostLord(GadgetManager manager)
{
super(manager, "Frost Lord", "Improved Wind of the Frost Lord",
super(manager, "Frost Lord", /*"Improved Wind of the Frost Lord"*/ "Coming soon...",
manager.getGadget(ArrowTrailFrostLord.class),
manager.getGadget(DeathFrostLord.class),
manager.getGadget(DoubleJumpFrostLord.class),

6
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetStorm.java → Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetHowlingWinds.java
View File

@ -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."*/ "Coming soon...",
manager.getGadget(ArrowTrailStorm.class),
manager.getGadget(DeathStorm.class),
manager.getGadget(DoubleJumpStorm.class),

10
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetLove.java
View File

@ -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,10 +14,15 @@ 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",
super(manager, "Lovely!", "Coming soon...",
manager.getGadget(ArrowTrailHearts.class),
manager.getGadget(DeathHearts.class),
manager.getGadget(DoubleJumpHearts.class),

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetMusic.java
View File

@ -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."*/ "Coming soon...",
manager.getGadget(ArrowTrailMusic.class),
manager.getGadget(DeathMusic.class),
manager.getGadget(DoubleJumpMusic.class),

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetParty.java
View File

@ -12,7 +12,7 @@ public class SetParty extends GadgetSet
public SetParty(GadgetManager manager)
{
super(manager, "Party", "Improved Party Time",
super(manager, "Party", /*"Improved Party Time"*/ "Coming soon...",
manager.getGadget(ArrowTrailConfetti.class),
manager.getGadget(DeathPinataBurst.class),
manager.getGadget(DoubleJumpFirecracker.class),

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetShadow.java
View File

@ -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."*/ "Coming soon...",
manager.getGadget(ArrowTrailShadow.class),
manager.getGadget(DeathShadow.class),
manager.getGadget(DoubleJumpShadow.class),

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetTitan.java
View File

@ -15,7 +15,7 @@ public class SetTitan extends GadgetSet
public SetTitan(GadgetManager manager)
{
super(manager, "The Titans", "Improved Flame of the Titans",
super(manager, "The Titans", /*"Improved Flame of the Titans"*/ "Coming soon...",
manager.getGadget(ArrowTrailTitan.class),
manager.getGadget(DeathTitan.class),
manager.getGadget(DoubleJumpTitan.class),

6
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetBlood.java → Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetVampire.java
View File

@ -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."*/ "Coming soon...",
manager.getGadget(ArrowTrailBlood.class),
manager.getGadget(DeathBlood.class),
manager.getGadget(DoubleJumpBlood.class),

6
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetEnchant.java → Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWisdom.java
View File

@ -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 %."*/ "Coming soon...",
manager.getGadget(ArrowTrailEnchant.class),
manager.getGadget(DeathEnchant.class),
manager.getGadget(DoubleJumpEnchant.class),

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetRaveSuit.java → Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetRaveSuit.java
View File

@ -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;

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetSpaceSuit.java → Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetSpaceSuit.java
View File

@ -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;

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/set/SetWindUpSuit.java → Plugins/Mineplex.Core/src/mineplex/core/gadget/set/suits/SetWindUpSuit.java
View File

@ -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;