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

Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder

Browse Source
This commit is contained in:
Virizion 2015-12-14 00:08:32 -05:00
commit 09643d3e61
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
View File

@ -86,7 +86,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
if (gadget.getSet() != null) if (gadget.getSet() != null)
{ {
itemLore.add(C.cBlack); itemLore.add(C.cBlack);
itemLore.add(C.cGray + gadget.getSet().getName() + " Set;"); itemLore.add(C.cWhite + gadget.getSet().getName() + " Set;");
//Elements //Elements
for (Gadget cur : gadget.getSet().getGadgets()) for (Gadget cur : gadget.getSet().getGadgets())
@ -95,7 +95,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
itemLore.add(C.cBlack); itemLore.add(C.cBlack);
//Bonus //Bonus
itemLore.add(C.cGray + gadget.getSet().getName() + " Set Bonus;"); itemLore.add(C.cWhite + gadget.getSet().getName() + " Set Bonus;");
for (String bonus : gadget.getSet().getBonus()) for (String bonus : gadget.getSet().getBonus())
itemLore.add(" " + (gadget.getSet().isActive(getPlayer()) ? C.cGreen : C.cGray) + bonus); itemLore.add(" " + (gadget.getSet().isActive(getPlayer()) ? C.cGreen : C.cGray) + bonus);
} }

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitRaveSuit.java
View File

@ -33,7 +33,7 @@ public class OutfitRaveSuit extends OutfitGadget
int cost, ArmorSlot slot, Material mat, byte data) int cost, ArmorSlot slot, Material mat, byte data)
{ {
super(manager, name, super(manager, name,
UtilText.splitLineToArray(C.cWhite + "There's nothing more suitable for celebration than this high tech flashing outfit!", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "There's nothing more suitable for celebration than this high tech flashing outfit!", LineFormat.LORE),
cost, slot, mat, data); cost, slot, mat, data);
} }

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitSpaceSuit.java
View File

@ -23,7 +23,7 @@ public class OutfitSpaceSuit extends OutfitGadget
int cost, ArmorSlot slot, Material mat, byte data) int cost, ArmorSlot slot, Material mat, byte data)
{ {
super(manager, name, super(manager, name,
UtilText.splitLineToArray(C.cWhite + "Designed specifically for combat in deep space for a sport known as \'Gravity\'", LineFormat.LORE), UtilText.splitLineToArray(C.cGray + "Designed specifically for combat in deep space for a sport known as \'Gravity\'", LineFormat.LORE),
cost, slot, mat, data); cost, slot, mat, data);
} }

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

@ -33,7 +33,7 @@ public class ParticleCoalFumes extends ParticleGadget
for(Player p : GetActive()) for(Player p : GetActive())
{ {
UtilParticle.PlayParticleToAll(ParticleType.LARGE_SMOKE, p.getLocation(), 0.8f, 0, 0.8f, 0, 6, ViewDist.NORMAL); UtilParticle.PlayParticleToAll(ParticleType.LARGE_SMOKE, p.getLocation(), 0.8f, 0, 0.8f, 0, 12, ViewDist.NORMAL);
} }
} }