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

improved cosmetic set implementation

This commit is contained in:
Cheese 2015-12-11 20:08:36 +11:00
parent a6f664006f
commit 0cda29e135
6 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,11 +135,11 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
if (gadget.getSet() != null)
{
itemLore.add(C.cBlack);
itemLore.add(C.cGray + "Set Cosmetics;");
itemLore.add(C.cGray + gadget.getSet().getName() + " Set Cosmetics;");
for (Gadget cur : gadget.getSet())
for (Gadget cur : gadget.getSet().getGadgets())
{
itemLore.add(" "+ (cur.IsActive(getPlayer()) ? C.cGreen : C.cGray) + cur.GetName());
itemLore.add(" ●"+ (cur.IsActive(getPlayer()) ? C.cGreen : C.cGray) + cur.GetName());
}
}
}

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

@ -15,7 +15,7 @@ public class SetCandyCane extends GadgetSet
public SetCandyCane(GadgetManager manager)
{
super(manager,
super(manager, "Candy Cane",
manager.getGadget(ArrowTrailCandyCane.class),
manager.getGadget(DeathCandyCane.class),
manager.getGadget(DoubleJumpCandyCane.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,
super(manager, "Frost Lord",
manager.getGadget(ArrowTrailFrostLord.class),
manager.getGadget(DeathFrostLord.class),
manager.getGadget(DoubleJumpFrostLord.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,
super(manager, "The Titans",
manager.getGadget(ArrowTrailTitan.class),
manager.getGadget(DeathTitan.class),
manager.getGadget(DoubleJumpTitan.class),

8
Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java
View File

@ -27,7 +27,7 @@ public abstract class Gadget extends SalesPackageBase implements Listener
protected HashSet<Player> _active = new HashSet<Player>();
protected Gadget[] _set = null;
protected GadgetSet _set = null;
private String[] _alternativePackageNames;
@ -131,12 +131,12 @@ public abstract class Gadget extends SalesPackageBase implements Listener
return false;
}
public void setSet(Gadget[] gadgets)
public void setSet(GadgetSet set)
{
_set = gadgets;
_set = set;
}
public Gadget[] getSet()
public GadgetSet getSet()
{
return _set;
}

13
Plugins/Mineplex.Core/src/mineplex/core/gadget/types/GadgetSet.java
View File

@ -13,6 +13,7 @@ import mineplex.core.gadget.event.GadgetDisableEvent;
public abstract class GadgetSet implements Listener
{
private String _name;
private Gadget[] _gadgets;
@ -20,15 +21,14 @@ public abstract class GadgetSet implements Listener
HashSet<Player> _active = new HashSet<>();
public GadgetSet(GadgetManager manager, Gadget... gadgets)
public GadgetSet(GadgetManager manager, String name, Gadget... gadgets)
{
Manager = manager;
_gadgets = gadgets;
_name = name;
for (Gadget gadget : gadgets)
{
gadget.setSet(gadgets);
}
gadget.setSet(this);
Bukkit.getPluginManager().registerEvents(this, Manager.getPlugin());
}
@ -92,6 +92,11 @@ public abstract class GadgetSet implements Listener
}
return false;
}
public String getName() {
// TODO Auto-generated method stub
return null;
}