From b0d77892f451f90c62f26af3efbbefd23cf1b112 Mon Sep 17 00:00:00 2001 From: jakub Date: Sun, 12 Nov 2023 12:33:28 +0100 Subject: [PATCH] Merge remote-tracking branch 'origin/CommandPomoc' into dev # Conflicts: # src/main/java/xyz/mineconomia/mineconomiacore/MineconomiaCore.java --- .../mineconomiacore/MineconomiaCore.java | 6 ++- .../BookCommand.java | 2 +- .../mineconomiacore/commands/tpw.java | 43 +++++++++++++++++++ src/main/resources/plugin.yml | 5 ++- 4 files changed, 52 insertions(+), 4 deletions(-) rename src/main/java/xyz/mineconomia/mineconomiacore/{BookHandler => commands}/BookCommand.java (98%) create mode 100644 src/main/java/xyz/mineconomia/mineconomiacore/commands/tpw.java diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/MineconomiaCore.java b/src/main/java/xyz/mineconomia/mineconomiacore/MineconomiaCore.java index 71b706f..8a003ff 100644 --- a/src/main/java/xyz/mineconomia/mineconomiacore/MineconomiaCore.java +++ b/src/main/java/xyz/mineconomia/mineconomiacore/MineconomiaCore.java @@ -2,8 +2,9 @@ package xyz.mineconomia.mineconomiacore; import org.bukkit.plugin.java.JavaPlugin; import xyz.mineconomia.mineconomiacore.CustomItems.ItemManager; -import xyz.mineconomia.mineconomiacore.BookHandler.BookCommand; +import xyz.mineconomia.mineconomiacore.commands.BookCommand; import xyz.mineconomia.mineconomiacore.commands.mcore; +import xyz.mineconomia.mineconomiacore.commands.tpw; import java.util.Objects; import java.util.logging.Logger; @@ -30,7 +31,8 @@ public final class MineconomiaCore extends JavaPlugin { Objects.requireNonNull(plugin.getCommand("mcore")).setExecutor(new mcore()); //BookCommand - getCommand("pomoc").setExecutor(new BookCommand()); + Objects.requireNonNull(getCommand("pomoc")).setExecutor(new BookCommand()); + Objects.requireNonNull(getCommand("tpw")).setExecutor(new tpw()); //CustomItems ItemManager.init(); diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/BookHandler/BookCommand.java b/src/main/java/xyz/mineconomia/mineconomiacore/commands/BookCommand.java similarity index 98% rename from src/main/java/xyz/mineconomia/mineconomiacore/BookHandler/BookCommand.java rename to src/main/java/xyz/mineconomia/mineconomiacore/commands/BookCommand.java index 1d4e395..e9b7d6f 100644 --- a/src/main/java/xyz/mineconomia/mineconomiacore/BookHandler/BookCommand.java +++ b/src/main/java/xyz/mineconomia/mineconomiacore/commands/BookCommand.java @@ -1,4 +1,4 @@ -package xyz.mineconomia.mineconomiacore.BookHandler; +package xyz.mineconomia.mineconomiacore.commands; import net.md_5.bungee.api.chat.*; import org.bukkit.ChatColor; diff --git a/src/main/java/xyz/mineconomia/mineconomiacore/commands/tpw.java b/src/main/java/xyz/mineconomia/mineconomiacore/commands/tpw.java new file mode 100644 index 0000000..e34fe37 --- /dev/null +++ b/src/main/java/xyz/mineconomia/mineconomiacore/commands/tpw.java @@ -0,0 +1,43 @@ +package xyz.mineconomia.mineconomiacore.commands; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.World; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +import java.lang.reflect.Array; + +public class tpw implements CommandExecutor { + @Override + public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, String[] args) { + if (commandSender instanceof Player){ + if (args.length > 0){ + if (Bukkit.getWorld(args[0]) != null){ + commandSender.sendMessage(ChatColor.AQUA + "Budeš teleportován!"); + World world = Bukkit.getWorld(args[0]); + Player player = (Player) commandSender; + assert world != null; + player.teleport(world.getSpawnLocation()); + return true; + }else { + commandSender.sendMessage(ChatColor.RED + "Svět neexistuje"); + commandSender.sendMessage(ChatColor.YELLOW + "Dostupné světy:"); + for (World world: Bukkit.getWorlds()){ + commandSender.sendMessage(world.getName()); + } + } + }else{ + commandSender.sendMessage("Musíš definovat svět. /tpw "); + } + + }else { + commandSender.sendMessage(ChatColor.RED + "Pouze pro hráče."); + } + return false; + } +} + diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ee60bf6..d5f43b1 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -8,5 +8,8 @@ commands: mcore: permission: mcore.admin description: "administrator's command" + tpw: + permission: mcore.admin + description: "administrator's command" pomoc: - usage: + usage: "toto je potřeba někdy dodělat - Kubík"