From 965d94f386f153df72f04714b11d767ee23b8764 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 26 Oct 2017 17:53:55 +0100 Subject: [PATCH] Make sure Cake Wars doesn't try and load any progression related classes --- .../src/mineplex/core/kit/KitManager.java | 17 ---------- .../evolvedkit/EvolvedProgressionManager.java | 5 --- .../src/mineplex/core/kit/ui/EvKitShop.java | 24 ------------- .../games/cakewars/kits/KitCakeArcher.java | 5 +++ .../games/cakewars/kits/KitCakeBuilder.java | 5 +++ .../games/cakewars/kits/KitCakeWarrior.java | 5 +++ .../game/modules/kitprogression/EvKit.java | 34 ------------------- 7 files changed, 15 insertions(+), 80 deletions(-) delete mode 100644 Plugins/Mineplex.Core/src/mineplex/core/kit/KitManager.java delete mode 100644 Plugins/Mineplex.Core/src/mineplex/core/kit/ui/EvKitShop.java delete mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/kitprogression/EvKit.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/kit/KitManager.java b/Plugins/Mineplex.Core/src/mineplex/core/kit/KitManager.java deleted file mode 100644 index 43ddf992b..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/kit/KitManager.java +++ /dev/null @@ -1,17 +0,0 @@ -package mineplex.core.kit; - -import mineplex.core.MiniPlugin; -import mineplex.core.ReflectivelyCreateMiniPlugin; - -@ReflectivelyCreateMiniPlugin -public class KitManager extends MiniPlugin -{ - - private KitManager() - { - super("Kit"); - } - - - -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/kit/evolvedkit/EvolvedProgressionManager.java b/Plugins/Mineplex.Core/src/mineplex/core/kit/evolvedkit/EvolvedProgressionManager.java index 9153e47f8..7b744245f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/kit/evolvedkit/EvolvedProgressionManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/kit/evolvedkit/EvolvedProgressionManager.java @@ -11,7 +11,6 @@ import mineplex.core.MiniClientPlugin; import mineplex.core.ReflectivelyCreateMiniPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.donation.DonationManager; -import mineplex.core.kit.ui.EvKitShop; @ReflectivelyCreateMiniPlugin public class EvolvedProgressionManager extends MiniClientPlugin> @@ -20,16 +19,12 @@ public class EvolvedProgressionManager extends MiniClientPlugin -{ - - public EvKitShop(EvolvedProgressionManager plugin, CoreClientManager clientManager, DonationManager donationManager) - { - super(plugin, clientManager, donationManager, "Evolved Kit"); - } - - @Override - protected ShopPageBase> buildPagesFor(Player player) - { - return null; - } -} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeArcher.java index b6c061b8e..5e0a02e79 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeArcher.java @@ -36,6 +36,11 @@ public class KitCakeArcher extends ProgressingKit @Override public void GiveItems(Player player) { + } + @Override + public boolean usesXp() + { + return false; } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeBuilder.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeBuilder.java index b0b4a3a76..401585149 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeBuilder.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeBuilder.java @@ -38,6 +38,11 @@ public class KitCakeBuilder extends ProgressingKit @Override public void GiveItems(Player player) { + } + @Override + public boolean usesXp() + { + return false; } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeWarrior.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeWarrior.java index c55096e03..baa7f79b5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeWarrior.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeWarrior.java @@ -38,6 +38,11 @@ public class KitCakeWarrior extends ProgressingKit @Override public void GiveItems(Player player) { + } + @Override + public boolean usesXp() + { + return false; } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/kitprogression/EvKit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/kitprogression/EvKit.java deleted file mode 100644 index 0ce01235d..000000000 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/kitprogression/EvKit.java +++ /dev/null @@ -1,34 +0,0 @@ -package nautilus.game.arcade.game.modules.kitprogression; - -import org.bukkit.entity.EntityType; -import org.bukkit.inventory.ItemStack; - -import mineplex.core.Managers; -import mineplex.core.kit.evolvedkit.EvolvedProgressionManager; - -import nautilus.game.arcade.ArcadeManager; -import nautilus.game.arcade.kit.KitAvailability; -import nautilus.game.arcade.kit.Perk; -import nautilus.game.arcade.kit.ProgressingKit; - -public abstract class EvKit extends ProgressingKit -{ - - private static final EvolvedProgressionManager PROGRESSION_MODULE = Managers.require(EvolvedProgressionManager.class); - - public EvKit(ArcadeManager manager, String name, String internalName, KitAvailability kitAvailability, String[] kitDesc, Perk[] kitPerks, EntityType entityType, ItemStack itemInHand) - { - this(manager, name, internalName, kitAvailability, 2000, kitDesc, kitPerks, entityType, itemInHand); - } - - public EvKit(ArcadeManager manager, String name, String internalName, KitAvailability kitAvailability, int cost, String[] kitDesc, Perk[] kitPerks, EntityType entityType, ItemStack itemInHand) - { - super(manager, name, internalName, kitAvailability, cost, kitDesc, kitPerks, entityType, itemInHand); - } - - @Override - public boolean usesXp() - { - return false; - } -}