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

Make sure Cake Wars doesn't try and load any progression related classes

This commit is contained in:
Sam 2017-10-26 17:53:55 +01:00 committed by Alexander Meech
parent 18acbd20b7
commit 965d94f386
7 changed files with 15 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Plugins/Mineplex.Core/src/mineplex/core/kit/KitManager.java
View File

@ -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");
}
}

5
Plugins/Mineplex.Core/src/mineplex/core/kit/evolvedkit/EvolvedProgressionManager.java
View File

@ -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<List<EvolvedTrack>>
@ -20,16 +19,12 @@ public class EvolvedProgressionManager extends MiniClientPlugin<List<EvolvedTrac
private final CoreClientManager _clientManager;
private final DonationManager _donationManager;
private final EvKitShop _shop;
private EvolvedProgressionManager()
{
super("Evolved Progression");
_clientManager = require(CoreClientManager.class);
_donationManager = require(DonationManager.class);
_shop = new EvKitShop(this, _clientManager, _donationManager);
}
public EvolvedTrack get(Player player, String kitName)

24
Plugins/Mineplex.Core/src/mineplex/core/kit/ui/EvKitShop.java
View File

@ -1,24 +0,0 @@
package mineplex.core.kit.ui;
import org.bukkit.entity.Player;
import mineplex.core.account.CoreClientManager;
import mineplex.core.donation.DonationManager;
import mineplex.core.kit.evolvedkit.EvolvedProgressionManager;
import mineplex.core.shop.ShopBase;
import mineplex.core.shop.page.ShopPageBase;
public class EvKitShop extends ShopBase<EvolvedProgressionManager>
{
public EvKitShop(EvolvedProgressionManager plugin, CoreClientManager clientManager, DonationManager donationManager)
{
super(plugin, clientManager, donationManager, "Evolved Kit");
}
@Override
protected ShopPageBase<EvolvedProgressionManager, ? extends ShopBase<EvolvedProgressionManager>> buildPagesFor(Player player)
{
return null;
}
}

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeArcher.java
View File

@ -36,6 +36,11 @@ public class KitCakeArcher extends ProgressingKit
@Override
public void GiveItems(Player player)
{
}
@Override
public boolean usesXp()
{
return false;
}
}

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeBuilder.java
View File

@ -38,6 +38,11 @@ public class KitCakeBuilder extends ProgressingKit
@Override
public void GiveItems(Player player)
{
}
@Override
public boolean usesXp()
{
return false;
}
}

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/KitCakeWarrior.java
View File

@ -38,6 +38,11 @@ public class KitCakeWarrior extends ProgressingKit
@Override
public void GiveItems(Player player)
{
}
@Override
public boolean usesXp()
{
return false;
}
}

34
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/kitprogression/EvKit.java
View File

@ -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;
}
}