Altitude/CometSkyBlock
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some more output to commands

Browse Source
This commit is contained in:
Len 2024-02-16 10:21:34 +01:00
parent b04fc5d8a1
commit dc6293eb45
11 changed files with 33 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugin/src/main/java/com/alttd/cometskyblock/commands/challenges/ChallengeCommand.java
View File

@ -17,6 +17,7 @@ public class ChallengeCommand extends PlayerSubCommand {
@Override @Override
public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) {
// open challenge inventory - not implemented yet -- TODO // open challenge inventory - not implemented yet -- TODO
player.sendRichMessage("<red>Not implemented yet, please wait for a future update.");
return true; return true;
} }

5
plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandCommand.java
View File

@ -20,7 +20,6 @@ public class IslandCommand extends PlayerSubCommand {
registerSubCommand(new IslandAccept(plugin)); registerSubCommand(new IslandAccept(plugin));
registerSubCommand(new IslandDeny(plugin)); registerSubCommand(new IslandDeny(plugin));
registerSubCommand(new IslandLeave(plugin)); registerSubCommand(new IslandLeave(plugin));
registerSubCommand(new IslandLevel(plugin)); // TODO -- Add IslandLevelCommand
// registerSubCommand(new IslandTop(plugin)); // TODO -- Add IslandTopCommand // registerSubCommand(new IslandTop(plugin)); // TODO -- Add IslandTopCommand
registerSubCommand(new IslandInvite(plugin)); registerSubCommand(new IslandInvite(plugin));
registerSubCommand(new IslandKick(plugin)); // TODO -- Add IslandKickCommand registerSubCommand(new IslandKick(plugin)); // TODO -- Add IslandKickCommand
@ -31,13 +30,13 @@ public class IslandCommand extends PlayerSubCommand {
@Override @Override
public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) {
if (islandPlayer.islandId() == 0) { if (islandPlayer.islandId() == 0) {
// You need an island to be able to do this player.sendRichMessage("<red>You should create an island before doing this. Do /island go");
return true; return true;
} }
Island island = Island.getIsland(islandPlayer.islandUUID()); Island island = Island.getIsland(islandPlayer.islandUUID());
if (island == null) { if (island == null) {
// "Could not load your island. Contact an administrator" player.sendRichMessage("<red>Could not load your island. Contact an administrator");
return true; return true;
} }
new IslandGUI(island).open(player); new IslandGUI(island).open(player);

2
plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandKick.java
View File

@ -13,6 +13,8 @@ public class IslandKick extends PlayerSubCommand {
@Override @Override
public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) {
// TODO -- implement island kick
player.sendRichMessage("<red>Not implemented yet, please wait for a future update.");
return true; return true;
} }
} }

18
plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandLevel.java
View File

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

2
plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestart.java
View File

@ -30,7 +30,7 @@ public class IslandRestart extends PlayerSubCommand {
} }
Island island = Island.getIsland(islandPlayer.islandUUID()); Island island = Island.getIsland(islandPlayer.islandUUID());
if (island == null) { if (island == null) {
// could not load island player.sendRichMessage("<red>Could not load your island. Contact an administrator");
return true; return true;
} }
island.request(new RestartRequest(plugin, player, player)); island.request(new RestartRequest(plugin, player, player));

4
plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestartConfirm.java
View File

@ -27,10 +27,10 @@ public class IslandRestartConfirm extends PlayerSubCommand {
} }
Island island = Island.getIsland(islandPlayer.islandUUID()); Island island = Island.getIsland(islandPlayer.islandUUID());
if (island == null) { if (island == null) {
// could not load island player.sendRichMessage("<red>Could not load your island. Contact an administrator");
return true; return true;
} }
// check if they have an island request, if not run create request code and ask to rerun command
Request request = island.request(); Request request = island.request();
if (request == null) { if (request == null) {
player.sendRichMessage(plugin.messagesConfiguration().get().requests().noPendingRequests()); player.sendRichMessage(plugin.messagesConfiguration().get().requests().noPendingRequests());

4
plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandRestartDeny.java
View File

@ -23,10 +23,10 @@ public class IslandRestartDeny extends PlayerSubCommand {
} }
Island island = Island.getIsland(islandPlayer.islandUUID()); Island island = Island.getIsland(islandPlayer.islandUUID());
if (island == null) { if (island == null) {
// could not load island player.sendRichMessage("<red>Could not load your island. Contact an administrator");
return true; return true;
} }
// check if they have an island request, if not run create request code and ask to rerun command
Request request = island.request(); Request request = island.request();
if (request == null) { if (request == null) {
player.sendRichMessage(plugin.messagesConfiguration().get().requests().noPendingRequests()); player.sendRichMessage(plugin.messagesConfiguration().get().requests().noPendingRequests());

2
plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandTop.java
View File

@ -13,6 +13,8 @@ public class IslandTop extends PlayerSubCommand {
// TODO - Finish TOP command // TODO - Finish TOP command
@Override @Override
public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) {
// TODO -- Implement
player.sendRichMessage("<red>Not implemented yet, please wait for a future update.");
return true; return true;
} }
} }

1
plugin/src/main/java/com/alttd/cometskyblock/commands/island/IslandVisit.java
View File

@ -19,7 +19,6 @@ public class IslandVisit extends PlayerSubCommand {
super(plugin, "visit"); super(plugin, "visit");
} }
// TODO -- ad
@Override @Override
public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) { public boolean execute(Player player, IslandPlayer islandPlayer, String[] args) {
MessageConfiguration.Commands.Island.Visit visit = plugin.messagesConfiguration().get().commands().island().visit(); MessageConfiguration.Commands.Island.Visit visit = plugin.messagesConfiguration().get().commands().island().visit();

2
plugin/src/main/java/com/alttd/cometskyblock/managers/IslandManager.java
View File

@ -8,8 +8,6 @@ public class IslandManager {
private final CometSkyBlockPlugin plugin; 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<IslandConfiguration> islandData; ConfigurationContainer<IslandConfiguration> islandData;
public IslandManager(CometSkyBlockPlugin plugin) { public IslandManager(CometSkyBlockPlugin plugin) {

39
plugin/src/main/java/com/alttd/cometskyblock/request/RestartRequest.java
View File

@ -18,24 +18,27 @@ public class RestartRequest extends Request {
@Override @Override
public void accept() { public void accept() {
IslandPlayer islandPlayer = IslandPlayer.getIslandPlayer(requester().getUniqueId()); requester().sendRichMessage("<red>This feature is not activated. Please wait for a future update.");
// Teleport everyone on the island to spawnworld
Island island = Island.getIsland(islandPlayer.islandUUID()); // TODO - finish restart
if (island == null) { // IslandPlayer islandPlayer = IslandPlayer.getIslandPlayer(requester().getUniqueId());
// could not load island // // Teleport everyone on the island to spawnworld
return; // Island island = Island.getIsland(islandPlayer.islandUUID());
} // if (island == null) {
World islandWorld = plugin.worldGenerator().loadIslandWorld(island.worldName()); // // could not load island
if (islandWorld == null) { // return;
// could not load world // }
return; // World islandWorld = plugin.worldGenerator().loadIslandWorld(island.worldName());
} // if (islandWorld == null) {
World world = Bukkit.getWorlds().get(0); // // could not load world
Location spawnLocation = world.getSpawnLocation(); // return;
for (Player target : islandWorld.getPlayers()) { // }
target.teleport(spawnLocation); // World world = Bukkit.getWorlds().get(0);
target.sendRichMessage(requests().restart().teleported(), placeholders()); // 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! // TODO - run code to generate a new world and update the id for all members!
super.accept(); super.accept();
} }