diff --git a/src/main/java/net/cherrycraft/cherryskypvp/Loader.java b/src/main/java/net/cherrycraft/cherryskypvp/Loader.java index ca7cbbc..151c2e3 100644 --- a/src/main/java/net/cherrycraft/cherryskypvp/Loader.java +++ b/src/main/java/net/cherrycraft/cherryskypvp/Loader.java @@ -1,31 +1,24 @@ package net.cherrycraft.cherryskypvp; +import net.cherrycraft.cherryskypvp.bounty.commands.BountyCommand; +import net.cherrycraft.cherryskypvp.economy.command.CoinsCommand; import net.cherrycraft.cherryskypvp.launcher.LaunchpadSystem; import net.cherrycraft.cherryskypvp.manager.CommandManager; +import net.cherrycraft.cherryskypvp.placeholders.StatsPlaceholderExpansion; import net.cherrycraft.cherryskypvp.spawn.AlwaysSpawn; import net.cherrycraft.cherryskypvp.spawn.SetSpawnCommand; import net.cherrycraft.cherryskypvp.stats.SkyPVPStats; -import net.cherrycraft.cherryskypvp.bounty.commands.BountyCommand; -import net.cherrycraft.cherryskypvp.economy.command.CoinsCommand; -import net.cherrycraft.cherryskypvp.kits.KitCommand; -import net.cherrycraft.cherryskypvp.kits.list.Jumper; -import net.cherrycraft.cherryskypvp.kits.system.KitManager; -import net.cherrycraft.cherryskypvp.placeholders.StatsPlaceholderExpansion; import org.bukkit.Bukkit; import org.bukkit.event.Listener; public class Loader implements Listener { - private static KitManager kitManager; - public static void registerCommands(CherrySkyPVP plugin) { //registeredCommand(new LanguageCommand("language"), plugin); registeredCommand(new SetSpawnCommand("setspawn"), plugin); registeredCommand(new CoinsCommand("coins"), plugin); registeredCommand(new BountyCommand("bounty"), plugin); - registeredCommand(new KitCommand("kit"), plugin); - } @@ -34,30 +27,15 @@ private static void registeredCommand(CommandManager command, CherrySkyPVP plugi plugin.getLogger().info("Command '" + command.getCommandName() + "' has been registered."); } - private static void registerKits(CherrySkyPVP plugin) { - // Register kits here - kitManager = new KitManager(); - kitManager.registerKit(new Jumper("Jumper", "Jumper kit")); - } - public static void registerListeners(CherrySkyPVP plugin) { // Register listeners here //Bukkit.getPluginManager().registerEvents(new ExampleListener(), plugin); - Bukkit.getPluginManager().registerEvents(new SkyPVPStats(),plugin); - Bukkit.getPluginManager().registerEvents(new AlwaysSpawn() ,plugin); - if(Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null){ + Bukkit.getPluginManager().registerEvents(new SkyPVPStats(), plugin); + Bukkit.getPluginManager().registerEvents(new AlwaysSpawn(), plugin); + if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { new StatsPlaceholderExpansion().register(); } - Bukkit.getPluginManager().registerEvents(new LaunchpadSystem(),plugin); - - // Register kits - registerKits(plugin); - // Register kit listeners - Bukkit.getPluginManager().registerEvents(new Jumper("Jumper","Jumper Kit"), plugin); - - } + Bukkit.getPluginManager().registerEvents(new LaunchpadSystem(), plugin); - public static KitManager getKitManager() { - return kitManager; } } \ No newline at end of file diff --git a/src/main/java/net/cherrycraft/cherryskypvp/kits/BaseKit.java b/src/main/java/net/cherrycraft/cherryskypvp/kits/BaseKit.java new file mode 100644 index 0000000..b52ccc1 --- /dev/null +++ b/src/main/java/net/cherrycraft/cherryskypvp/kits/BaseKit.java @@ -0,0 +1,6 @@ +package net.cherrycraft.cherryskypvp.kits; + +public class BaseKit { + + +} diff --git a/src/main/java/net/cherrycraft/cherryskypvp/kits/KitCommand.java b/src/main/java/net/cherrycraft/cherryskypvp/kits/KitCommand.java deleted file mode 100644 index 09ff3c4..0000000 --- a/src/main/java/net/cherrycraft/cherryskypvp/kits/KitCommand.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.cherrycraft.cherryskypvp.kits; - -import net.cherrycraft.cherryskypvp.Loader; -import net.cherrycraft.cherryskypvp.manager.CommandManager; -import net.cherrycraft.cherryskypvp.kits.system.KitsSystem; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -public class KitCommand extends CommandManager { - public KitCommand(String commandName) { - super("kit"); - setPermission("reefrealmskypvp.kit"); - } - - @Override - public void execute(CommandSender sender, String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Only players can use this command."); - return; - } - - if (args.length == 0) { - sender.sendMessage("Available kits: " + String.join(", ", Loader.getKitManager().getKits())); - return; - } - - Player player = (Player) sender; - KitsSystem kit = Loader.getKitManager().getKit(args[0]); - - if (kit == null) { - sender.sendMessage("That kit does not exist."); - return; - } - - kit.equip(player); - sender.sendMessage("You have been equipped with the " + kit.getName() + " kit."); - } -} \ No newline at end of file diff --git a/src/main/java/net/cherrycraft/cherryskypvp/kits/list/Jumper.java b/src/main/java/net/cherrycraft/cherryskypvp/kits/list/Jumper.java deleted file mode 100644 index 0261e19..0000000 --- a/src/main/java/net/cherrycraft/cherryskypvp/kits/list/Jumper.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.cherrycraft.cherryskypvp.kits.list; - -import net.cherrycraft.cherryskypvp.CherrySkyPVP; -import net.cherrycraft.cherryskypvp.kits.system.KitsSystem; -import org.bukkit.GameMode; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerMoveEvent; -import org.bukkit.event.player.PlayerToggleFlightEvent; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; -import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.scheduler.BukkitRunnable; - -import java.util.HashMap; -import java.util.UUID; - -public class Jumper extends KitsSystem implements Listener { - private final HashMap canDoubleJump = new HashMap<>(); - - public Jumper(String name, String description) { - super("Jumper", "Jumper kit"); - } - - @Override - public void equip(Player player) { - PlayerInventory inventory = player.getInventory(); - inventory.setHelmet(new ItemStack(Material.CHAINMAIL_HELMET)); - inventory.setChestplate(new ItemStack(Material.CHAINMAIL_CHESTPLATE)); - inventory.setLeggings(new ItemStack(Material.CHAINMAIL_LEGGINGS)); - inventory.setBoots(new ItemStack(Material.CHAINMAIL_BOOTS)); - inventory.setItemInMainHand(new ItemStack(Material.IRON_SWORD)); - } - - @EventHandler - public void onMove(PlayerMoveEvent event) { - Player player = event.getPlayer(); - if (player.getGameMode() == GameMode.SURVIVAL && player.isOnGround() && !canDoubleJump.getOrDefault(player.getUniqueId(), false)) { - player.setAllowFlight(true); - canDoubleJump.put(player.getUniqueId(), true); - } -} - - @EventHandler - public void onFlightAttempt(PlayerToggleFlightEvent event) { - Player player = event.getPlayer(); - if (player.getGameMode() == GameMode.SURVIVAL && canDoubleJump.getOrDefault(player.getUniqueId(), false)) { - event.setCancelled(true); - player.setAllowFlight(false); - player.setFlying(false); - player.setVelocity(player.getLocation().getDirection().multiply(1.5).setY(1)); - canDoubleJump.put(player.getUniqueId(), false); - - new BukkitRunnable() { - @Override - public void run() { - canDoubleJump.put(player.getUniqueId(), true); - } - }.runTaskLater(JavaPlugin.getPlugin(CherrySkyPVP.class), 100); // 100 ticks = 5 seconds - } - } -} \ No newline at end of file diff --git a/src/main/java/net/cherrycraft/cherryskypvp/kits/system/KitManager.java b/src/main/java/net/cherrycraft/cherryskypvp/kits/system/KitManager.java deleted file mode 100644 index 20e4516..0000000 --- a/src/main/java/net/cherrycraft/cherryskypvp/kits/system/KitManager.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.cherrycraft.cherryskypvp.kits.system; - -import java.util.HashMap; -import java.util.Set; - -public class KitManager { - private HashMap kits = new HashMap<>(); - - public void registerKit(KitsSystem kit) { - kits.put(kit.getName(), kit); - } - - public KitsSystem getKit(String name) { - return kits.get(name); - } - - public Set getKits() { - return kits.keySet(); - } -} \ No newline at end of file diff --git a/src/main/java/net/cherrycraft/cherryskypvp/kits/system/KitsSystem.java b/src/main/java/net/cherrycraft/cherryskypvp/kits/system/KitsSystem.java deleted file mode 100644 index 040559d..0000000 --- a/src/main/java/net/cherrycraft/cherryskypvp/kits/system/KitsSystem.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.cherrycraft.cherryskypvp.kits.system; - -import org.bukkit.entity.Player; - -public abstract class KitsSystem { - protected String name; - protected String description; - - public KitsSystem(String name, String description) { - this.name = name; - this.description = description; - } - - public String getName() { return name; } - - public String getDescription() { return description; } - - public abstract void equip(Player player); -} diff --git a/src/main/java/net/cherrycraft/cherryskypvp/kits/systems/Kit.java b/src/main/java/net/cherrycraft/cherryskypvp/kits/systems/Kit.java new file mode 100644 index 0000000..9792a8b --- /dev/null +++ b/src/main/java/net/cherrycraft/cherryskypvp/kits/systems/Kit.java @@ -0,0 +1,18 @@ +package net.cherrycraft.cherryskypvp.kits.systems; + +import java.util.List; + +public abstract class Kit { + private final String name; + private final String description; + + public Kit(String name, String description) { + this.name = name; + this.description = description; + } + + List getItems() { + + return null; + } +}