diff options
author | tylermurphy534 <tylermurphy534@gmail.com> | 2022-10-31 23:28:45 -0400 |
---|---|---|
committer | tylermurphy534 <tylermurphy534@gmail.com> | 2022-10-31 23:28:45 -0400 |
commit | 7530fe5e2dad89cabd694aefc91758a651ca9196 (patch) | |
tree | 0fc693e6b33b05a20c85ef0027a4c3638ae1511f /src/main/java/net/tylermurphy/hideAndSeek/Main.java | |
parent | finish beta build of multi map support (diff) | |
download | kenshinshideandseek-7530fe5e2dad89cabd694aefc91758a651ca9196.tar.gz kenshinshideandseek-7530fe5e2dad89cabd694aefc91758a651ca9196.tar.bz2 kenshinshideandseek-7530fe5e2dad89cabd694aefc91758a651ca9196.zip |
1.7.0 beta 1
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/Main.java')
-rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/Main.java | 53 |
1 files changed, 44 insertions, 9 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/Main.java b/src/main/java/net/tylermurphy/hideAndSeek/Main.java index aace88e..b22af5b 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/Main.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/Main.java @@ -19,6 +19,9 @@ package net.tylermurphy.hideAndSeek; +import net.tylermurphy.hideAndSeek.command.*; +import net.tylermurphy.hideAndSeek.command.location.*; +import net.tylermurphy.hideAndSeek.command.map.*; import net.tylermurphy.hideAndSeek.configuration.Config; import net.tylermurphy.hideAndSeek.configuration.Items; import net.tylermurphy.hideAndSeek.configuration.Localization; @@ -26,13 +29,13 @@ import net.tylermurphy.hideAndSeek.configuration.Maps; import net.tylermurphy.hideAndSeek.database.Database; import net.tylermurphy.hideAndSeek.game.*; import net.tylermurphy.hideAndSeek.game.util.Status; -import net.tylermurphy.hideAndSeek.util.CommandHandler; +import net.tylermurphy.hideAndSeek.command.util.CommandGroup; import net.tylermurphy.hideAndSeek.game.listener.*; import net.tylermurphy.hideAndSeek.util.PAPIExpansion; -import net.tylermurphy.hideAndSeek.util.TabCompleter; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; @@ -43,8 +46,8 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static net.tylermurphy.hideAndSeek.configuration.Config.exitPosition; -import static net.tylermurphy.hideAndSeek.configuration.Config.exitWorld; +import static net.tylermurphy.hideAndSeek.configuration.Config.*; +import static net.tylermurphy.hideAndSeek.configuration.Localization.message; public class Main extends JavaPlugin implements Listener { @@ -56,6 +59,7 @@ public class Main extends JavaPlugin implements Listener { private Disguiser disguiser; private EntityHider entityHider; private Game game; + private CommandGroup commandGroup; public void onEnable() { Main.instance = this; @@ -72,9 +76,36 @@ public class Main extends JavaPlugin implements Listener { this.entityHider = new EntityHider(this, EntityHider.Policy.BLACKLIST); this.registerListeners(); - CommandHandler.registerCommands(); + this.commandGroup = new CommandGroup("hs", + new About(), + new Debug(), + new Help(), + new Reload(), + new Join(), + new Leave(), + new Start(), + new Stop(), + new CommandGroup("map", + new CommandGroup("set", + new SetLobbyLocation(), + new SetSpawnLocation(), + new SetSeekerLobbyLocation(), + new SetBorder(), + new SetBounds() + ), + new AddMap(), + new RemoveMap(), + new ListMaps(), + new SetMap(), + new Setup(), + new SaveMap() + ), + new SetExitLocation(), + new Top(), + new Wins() + ); - game = new Game(game.getCurrentMap(), board); + game = new Game(null, board); getServer().getScheduler().runTaskTimer(this, this::onTick,0,1).getTaskId(); @@ -102,7 +133,7 @@ public class Main extends JavaPlugin implements Listener { } private void onTick() { - if(game.getStatus() == Status.ENDED) game = new Game(board); + if(game.getStatus() == Status.ENDED) game = new Game(game.getCurrentMap(), board); game.onTick(); disguiser.check(); } @@ -130,11 +161,15 @@ public class Main extends JavaPlugin implements Listener { } public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) { - return CommandHandler.handleCommand(sender, args); + if (!(sender instanceof Player)) { + sender.sendMessage(errorPrefix + message("COMMAND_PLAYER_ONLY")); + return true; + } + return commandGroup.handleCommand((Player)sender, "", args); } public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - return TabCompleter.handleTabComplete(sender, args); + return commandGroup.handleTabComplete(sender, args); } public static Main getInstance() { |