From dc6293eb45a7368515b0a633b36e62bfc8ec3184 Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Fri, 16 Feb 2024 10:21:34 +0100 Subject: [PATCH] Add some more output to commands --- .../commands/challenges/ChallengeCommand.java | 1 + .../commands/island/IslandCommand.java | 5 +-- .../commands/island/IslandKick.java | 2 + .../commands/island/IslandLevel.java | 18 --------- .../commands/island/IslandRestart.java | 2 +- .../commands/island/IslandRestartConfirm.java | 4 +- .../commands/island/IslandRestartDeny.java | 4 +- .../commands/island/IslandTop.java | 2 + .../commands/island/IslandVisit.java | 1 - .../cometskyblock/managers/IslandManager.java | 2 - .../cometskyblock/request/RestartRequest.java | 39 ++++++++++--------- 11 files changed, 33 insertions(+), 47 deletions(-) delete mode 100644 plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandLevel.java diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/challenges/ChallengeCommand.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/challenges/ChallengeCommand.java index 6287577..478b182 100644 --- a/plugin/src/main/java/com/alttd/cometskyblock/commands/challenges/ChallengeCommand.java +++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/challenges/ChallengeCommand.java @@ -17,6 +17,7 @@ public class ChallengeCommand extends PlayerSubCommand { @Override public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { // open challenge inventory - not implemented yet -- TODO + player.sendRichMessage("Not implemented yet, please wait for a future update."); return true; } diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java index ffb8dae..7713fa1 100644 --- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java +++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java @@ -20,7 +20,6 @@ public class IslandCommand extends PlayerSubCommand { registerSubCommand(new IslandAccept(plugin)); registerSubCommand(new IslandDeny(plugin)); registerSubCommand(new IslandLeave(plugin)); - registerSubCommand(new IslandLevel(plugin)); // TODO -- Add IslandLevelCommand // registerSubCommand(new IslandTop(plugin)); // TODO -- Add IslandTopCommand registerSubCommand(new IslandInvite(plugin)); registerSubCommand(new IslandKick(plugin)); // TODO -- Add IslandKickCommand @@ -31,13 +30,13 @@ public class IslandCommand extends PlayerSubCommand { @Override public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { if (islandPlayer.islandId() == 0) { - // You need an island to be able to do this + player.sendRichMessage("You should create an island before doing this. Do /island go"); return true; } Island island = Island.getIsland(islandPlayer.islandUUID()); if (island == null) { - // "Could not load your island. Contact an administrator" + player.sendRichMessage("Could not load your island. Contact an administrator"); return true; } new IslandGUI(island).open(player); diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandKick.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandKick.java index df6291e..c7b50b8 100644 --- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandKick.java +++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandKick.java @@ -13,6 +13,8 @@ public class IslandKick extends PlayerSubCommand { @Override public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { + // TODO -- implement island kick + player.sendRichMessage("Not implemented yet, please wait for a future update."); return true; } } diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandLevel.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandLevel.java deleted file mode 100644 index 4b80efe..0000000 --- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandLevel.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.alttd.cometskyblock.commands.island; - -import com.alttd.cometskyblock.CometSkyBlockPlugin; -import com.alttd.cometskyblock.commands.PlayerSubCommand; -import com.alttd.cometskyblock.island.IslandPlayer; -import org.bukkit.entity.Player; - -public class IslandLevel extends PlayerSubCommand { - - public IslandLevel(CometSkyBlockPlugin plugin) { - super(plugin, "level"); - } - - @Override - public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { - return true; - } -} diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestart.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestart.java index a85ac07..550946d 100644 --- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestart.java +++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestart.java @@ -30,7 +30,7 @@ public class IslandRestart extends PlayerSubCommand { } Island island = Island.getIsland(islandPlayer.islandUUID()); if (island == null) { - // could not load island + player.sendRichMessage("Could not load your island. Contact an administrator"); return true; } island.request(new RestartRequest(plugin, player, player)); diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestartConfirm.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestartConfirm.java index a0e858c..378569f 100644 --- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestartConfirm.java +++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestartConfirm.java @@ -27,10 +27,10 @@ public class IslandRestartConfirm extends PlayerSubCommand { } Island island = Island.getIsland(islandPlayer.islandUUID()); if (island == null) { - // could not load island + player.sendRichMessage("Could not load your island. Contact an administrator"); return true; } - // check if they have an island request, if not run create request code and ask to rerun command + Request request = island.request(); if (request == null) { player.sendRichMessage(plugin.messagesConfiguration().get().requests().noPendingRequests()); diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestartDeny.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestartDeny.java index cf9358c..6e7ce71 100644 --- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestartDeny.java +++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestartDeny.java @@ -23,10 +23,10 @@ public class IslandRestartDeny extends PlayerSubCommand { } Island island = Island.getIsland(islandPlayer.islandUUID()); if (island == null) { - // could not load island + player.sendRichMessage("Could not load your island. Contact an administrator"); return true; } - // check if they have an island request, if not run create request code and ask to rerun command + Request request = island.request(); if (request == null) { player.sendRichMessage(plugin.messagesConfiguration().get().requests().noPendingRequests()); diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandTop.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandTop.java index 33f02ed..78e84cc 100644 --- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandTop.java +++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandTop.java @@ -13,6 +13,8 @@ public class IslandTop extends PlayerSubCommand { // TODO - Finish TOP command @Override public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { + // TODO -- Implement + player.sendRichMessage("Not implemented yet, please wait for a future update."); return true; } } diff --git a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandVisit.java b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandVisit.java index ec53037..ee55c1e 100644 --- a/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandVisit.java +++ b/plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandVisit.java @@ -19,7 +19,6 @@ public class IslandVisit extends PlayerSubCommand { super(plugin, "visit"); } - // TODO -- ad @Override public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { MessageConfiguration.Commands.Island.Visit visit = plugin.messagesConfiguration().get().commands().island().visit(); diff --git a/plugin/src/main/java/com/alttd/cometskyblock/managers/IslandManager.java b/plugin/src/main/java/com/alttd/cometskyblock/managers/IslandManager.java index 294a232..e45a53a 100644 --- a/plugin/src/main/java/com/alttd/cometskyblock/managers/IslandManager.java +++ b/plugin/src/main/java/com/alttd/cometskyblock/managers/IslandManager.java @@ -8,8 +8,6 @@ public class IslandManager { private final CometSkyBlockPlugin plugin; - // TODO - move all storage data to another system - SQL / flatfile - // This loader is not made for constant saves and loads ConfigurationContainer islandData; public IslandManager(CometSkyBlockPlugin plugin) { diff --git a/plugin/src/main/java/com/alttd/cometskyblock/request/RestartRequest.java b/plugin/src/main/java/com/alttd/cometskyblock/request/RestartRequest.java index 2bd4a61..8e4892a 100644 --- a/plugin/src/main/java/com/alttd/cometskyblock/request/RestartRequest.java +++ b/plugin/src/main/java/com/alttd/cometskyblock/request/RestartRequest.java @@ -18,24 +18,27 @@ public class RestartRequest extends Request { @Override public void accept() { - IslandPlayer islandPlayer = IslandPlayer.getIslandPlayer(requester().getUniqueId()); - // Teleport everyone on the island to spawnworld - Island island = Island.getIsland(islandPlayer.islandUUID()); - if (island == null) { - // could not load island - return; - } - World islandWorld = plugin.worldGenerator().loadIslandWorld(island.worldName()); - if (islandWorld == null) { - // could not load world - return; - } - World world = Bukkit.getWorlds().get(0); - Location spawnLocation = world.getSpawnLocation(); - for (Player target : islandWorld.getPlayers()) { - target.teleport(spawnLocation); - target.sendRichMessage(requests().restart().teleported(), placeholders()); - } + requester().sendRichMessage("This feature is not activated. Please wait for a future update."); + + // TODO - finish restart +// IslandPlayer islandPlayer = IslandPlayer.getIslandPlayer(requester().getUniqueId()); +// // Teleport everyone on the island to spawnworld +// Island island = Island.getIsland(islandPlayer.islandUUID()); +// if (island == null) { +// // could not load island +// return; +// } +// World islandWorld = plugin.worldGenerator().loadIslandWorld(island.worldName()); +// if (islandWorld == null) { +// // could not load world +// return; +// } +// World world = Bukkit.getWorlds().get(0); +// Location spawnLocation = world.getSpawnLocation(); +// for (Player target : islandWorld.getPlayers()) { +// target.teleport(spawnLocation); +// target.sendRichMessage(requests().restart().teleported(), placeholders()); +// } // TODO - run code to generate a new world and update the id for all members! super.accept(); }