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

Removed more unused imports

Browse Source 
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
Fixed set descriptions
Added 'Comming soon...' to set bonuses
This commit is contained in:
LCastr0 2016-05-10 12:44:45 -03:00
parent 97ef801e3d
commit 5b8ff933b1
20 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 + "This party train won’t stop till the arrow hits your face.", 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/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 + "Music is the salve that heals the weary soul. Unlike these. These kill people.", 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/death/DeathCupidsBrokenHeart.java
View File

@ -19,7 +19,7 @@ public class DeathCupidsBrokenHeart extends DeathEffectGadget
public DeathCupidsBrokenHeart(GadgetManager manager)
{
super(manager, "Cupid's Broken Heart",
UtilText.splitLineToArray("Queue the weeping violins...", 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/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 + "Your very own swan song.", 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

@ -26,7 +26,7 @@ public class DeathPinataBurst extends DeathEffectGadget
public DeathPinataBurst(GadgetManager manager)
{
super(manager, "Piñata Burst",
UtilText.splitLineToArray(C.cGray + "Kill ‘em with kindness and candy!", LineFormat.LORE),
UtilText.splitLineToArray(C.cGray + "Kill 'em with kindness and " + C.cPurple + "candy!", LineFormat.LORE),
1, Material.SUGAR_CANE, (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 + "Propel yourself in the air with the power of FREEDOM!", 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 + "For when you’re just too groovy to stay on the ground.", 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);
}

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

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

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

@ -12,7 +12,7 @@ public class SetCupidsLove extends GadgetSet
public SetCupidsLove(GadgetManager manager)
{
super(manager, "Cupid's Love", "Running into other players gives them hearts for 5 seconds.",
super(manager, "Cupid's Love", /*"Running into other players gives them hearts for 5 seconds."*/ "Coming soon...",
manager.getGadget(ArrowTrailCupid.class),
manager.getGadget(DeathCupidsBrokenHeart.class),
manager.getGadget(DoubleJumpCupidsWings.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", "Press Shift to summon a Gem Party Bomb. 24 hour cooldown.",
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),

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

@ -13,7 +13,7 @@ public class SetHowlingWinds extends GadgetSet
public SetHowlingWinds(GadgetManager manager)
{
super(manager, "Howling Winds", "Press shift to start a flood around you, water runs in all directions for 10 seconds. 5 minute cooldown.",
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),

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

@ -22,7 +22,7 @@ public class SetLove extends GadgetSet
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", "Press Shift to shoot a blast of music particles. People hit by the blast hear music for 15 seconds. 5 minute cooldown.",
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", "Press Shift to randomly teleport ~15 blocks away in a puff of shadow. 5 minute cooldown.",
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),

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

@ -13,7 +13,7 @@ public class SetVampire extends GadgetSet
public SetVampire(GadgetManager manager)
{
super(manager, "The Vampire 2000", "Press Shift to turn into a bat and be able to fly for 10 seconds. 5 Minute cooldown.",
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),

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

@ -12,7 +12,7 @@ public class SetWisdom extends GadgetSet
public SetWisdom(GadgetManager manager)
{
super(manager, "Wisdom", "Wearing the full Wisdom set when opening a chest slightly increases your chest roll %.",
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),