diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/gamemodifiers/moba/HeroSkinCategoryPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/gamemodifiers/moba/HeroSkinCategoryPage.java index 41e7ba51d..fb7c28275 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/gamemodifiers/moba/HeroSkinCategoryPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/gamemodifiers/moba/HeroSkinCategoryPage.java @@ -99,6 +99,6 @@ public class HeroSkinCategoryPage extends GadgetPage addButton(slots[index++], itemStack, (player, clickType) -> getShop().openPageForPlayer(player, new HeroSkinGadgetPage(getPlugin(), getShop(), getClientManager(), getDonationManager(), name, getPlayer(), this, gadgetDataList))); } - addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), (player, clickType) -> getShop().openPageForPlayer(getPlayer(), _previousMenu)); + addButton(4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[0], 1, false), (player, clickType) -> getShop().openPageForPlayer(getPlayer(), _previousMenu)); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java index a96536e5d..933b53a8b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java @@ -30,16 +30,12 @@ import mineplex.core.account.CoreClientManager; import mineplex.core.achievement.AchievementManager; import mineplex.core.blockrestore.BlockRestore; import mineplex.core.common.Rank; -import mineplex.core.common.skin.SkinData; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTime; -import mineplex.core.cosmetic.ui.page.GadgetPage; -import mineplex.core.cosmetic.ui.page.gamemodifiers.GameCosmeticCategoryPage; -import mineplex.core.cosmetic.ui.page.gamemodifiers.moba.HeroSkinCategoryPage; import mineplex.core.disguise.DisguiseManager; import mineplex.core.donation.DonationManager; import mineplex.core.gadget.commands.AmmoCommand; @@ -103,9 +99,8 @@ import mineplex.core.gadget.gadgets.gamemodifiers.GameCosmeticManager; import mineplex.core.gadget.gadgets.gamemodifiers.GameCosmeticType; import mineplex.core.gadget.gadgets.gamemodifiers.minestrike.GameModifierMineStrikeSkin; import mineplex.core.gadget.gadgets.gamemodifiers.minestrike.MineStrikeSkin; -import mineplex.core.gadget.gadgets.gamemodifiers.moba.HeroSkinGadget; -import mineplex.core.gadget.gadgets.gamemodifiers.moba.shopmorph.ShopMorphType; import mineplex.core.gadget.gadgets.gamemodifiers.moba.shopmorph.ShopMorphGadget; +import mineplex.core.gadget.gadgets.gamemodifiers.moba.shopmorph.ShopMorphType; import mineplex.core.gadget.gadgets.hat.HatItem; import mineplex.core.gadget.gadgets.hat.HatType; import mineplex.core.gadget.gadgets.item.ItemBatGun; @@ -203,7 +198,6 @@ 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.ParticlePulse; import mineplex.core.gadget.gadgets.particle.ParticleRain; import mineplex.core.gadget.gadgets.particle.ParticleTitan; import mineplex.core.gadget.gadgets.particle.ParticleWingsAngel; @@ -533,7 +527,7 @@ public class GadgetManager extends MiniPlugin addGadget(new ParticleAuraNiceness(this)); addGadget(new ParticleCanadian(this)); - addGadget(new ParticlePulse(this)); + //addGadget(new ParticlePulse(this)); // Arrow Trails @@ -737,28 +731,21 @@ public class GadgetManager extends MiniPlugin @Override public void addCategories() { - new GameCosmeticCategory(this, "Hero Skins", SkinData.HATTORI.getSkull(), true) - { - @Override - public void addGadgets() - { - HeroSkinGadget.getSkins().values().forEach(heroSkins -> heroSkins.forEach(skinData -> addGameGadget(new HeroSkinGadget(getManager(), this, skinData)))); - } - - @Override - public GadgetPage getGadgetPage(GameCosmeticCategoryPage parent) - { - return new HeroSkinCategoryPage(parent.getPlugin(), parent.getShop(), parent.getClientManager(), parent.getDonationManager(), getCategoryName(), parent.getClient().GetPlayer(), parent); - } - }; - new GameCosmeticCategory(this, "Base Decorations", new ItemStack(Material.WOOD_DOOR), false) - { - @Override - public void addGadgets() - { - } - }; - new GameCosmeticCategory(this, "Shop Morph", SkinData.HATTORI.getSkull(), false) +// new GameCosmeticCategory(this, "Hero Skins", SkinData.HATTORI.getSkull(), true) +// { +// @Override +// public void addGadgets() +// { +// HeroSkinGadget.getSkins().values().forEach(heroSkins -> heroSkins.forEach(skinData -> addGameGadget(new HeroSkinGadget(getManager(), this, skinData)))); +// } +// +// @Override +// public GadgetPage getGadgetPage(GameCosmeticCategoryPage parent) +// { +// return new HeroSkinCategoryPage(parent.getPlugin(), parent.getShop(), parent.getClientManager(), parent.getDonationManager(), getCategoryName(), parent.getClient().GetPlayer(), parent); +// } +// }; + new GameCosmeticCategory(this, "Shop Morph", new ItemStack(Material.SKULL_ITEM), false) { @Override public void addGadgets()