From 7c77a89b48d1d3a59a9011f11c44f7c3968aa027 Mon Sep 17 00:00:00 2001 From: Graphica Date: Sat, 29 Jul 2017 22:26:12 -0400 Subject: [PATCH] Add ppc and flags to treasure --- .../src/mineplex/core/gadget/GadgetManager.java | 8 ++++++-- .../mineplex/core/powerplayclub/PowerPlayClubRewards.java | 1 + .../src/mineplex/core/treasure/gui/TreasurePage.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java index 18632e6f6..096d71cc9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java @@ -16,6 +16,7 @@ import mineplex.core.gadget.gadgets.doublejump.DoubleJumpMaple; import mineplex.core.gadget.gadgets.flag.FlagType; import mineplex.core.gadget.gadgets.morph.MorphBobRoss; import mineplex.core.gadget.gadgets.morph.MorphFreedomFighter; +import mineplex.core.gadget.gadgets.morph.MorphMelonHead; import mineplex.core.gadget.gadgets.particle.freedom.ParticleAuraNiceness; import mineplex.core.gadget.gadgets.particle.freedom.ParticleCanadian; import mineplex.core.gadget.gadgets.particle.freedom.ParticleFreedomFireworks; @@ -469,6 +470,7 @@ public class GadgetManager extends MiniPlugin addGadget(new MorphAwkwardRabbit(this)); addGadget(new MorphBobRoss(this, _hologramManager)); addGadget(new MorphFreedomFighter(this)); + addGadget(new MorphMelonHead(this)); // Particles addGadget(new ParticleFoot(this)); @@ -651,8 +653,10 @@ public class GadgetManager extends MiniPlugin addGadget(new RainbowTaunt(this)); // Flags - addGadget(new FlagGadget(this, FlagType.UNITED_STATES)); - addGadget(new FlagGadget(this, FlagType.CANADA)); + for (FlagType flag : FlagType.values()) + { + addGadget(new FlagGadget(this, flag)); + } // Kit Selectors addGadget(new WaterWingsKitSelector(this)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java b/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java index 8dc08a791..9f40681c2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java @@ -40,6 +40,7 @@ public class PowerPlayClubRewards .put(YearMonth.of(2017, Month.MAY), new UnknownSalesPackageItem("King")) .put(YearMonth.of(2017, Month.JUNE), new UnknownSalesPackageItem("Bob Ross Morph")) .put(YearMonth.of(2017, Month.JULY), new UnknownSalesPackageItem("Freedom Fighter")) + .put(YearMonth.of(2017, Month.AUGUST), new UnknownSalesPackageItem("Melonhead Morph")) .build(); public interface PowerPlayClubItem diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java index 9abd2b5e6..d4efbd24a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java @@ -752,7 +752,7 @@ public class TreasurePage extends ShopPageBase _gadgetManager.getHatGadget(HatType.AMERICA), _gadgetManager.getHatGadget(HatType.CANADA), _gadgetManager.getFlagGadget(FlagType.CANADA), - _gadgetManager.getFlagGadget(FlagType.UNITED_STATES), + _gadgetManager.getFlagGadget(FlagType.USA), }; Mount freedomMount = _gadgetManager.getMountManager().getMount("Freedom Mount"); if (freedomMount != null)