diff --git a/build.sh b/build.sh index 0e75572..ce08a1a 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ if [ $? -eq 0 ]; then # SFTP upload SFTP_HOST="home-server" SFTP_USER="trouper" - SFTP_REMOTE_DIR="/home/trouper/minecraft/data/plugins/" + SFTP_REMOTE_DIR="/home/trouper/testing/data/plugins/" # Create a temporary file with a unique name TEMP_FILE=$(mktemp) diff --git a/libs/PDK-1.3.3.jar b/libs/PDK-1.3.3.jar index 84c267d..4813d3f 100644 Binary files a/libs/PDK-1.3.3.jar and b/libs/PDK-1.3.3.jar differ diff --git a/libs/PDK-1.3.4.jar b/libs/PDK-1.3.4.jar deleted file mode 100644 index e949bf1..0000000 Binary files a/libs/PDK-1.3.4.jar and /dev/null differ diff --git a/src/main/java/me/trouper/ultrautils/UltraUtils.java b/src/main/java/me/trouper/ultrautils/UltraUtils.java index d7ae732..def1cb9 100644 --- a/src/main/java/me/trouper/ultrautils/UltraUtils.java +++ b/src/main/java/me/trouper/ultrautils/UltraUtils.java @@ -54,10 +54,10 @@ public final class UltraUtils extends JavaPlugin { new UltraUtilsCommand().register(); new GamemodeCommand().register(); - new GMACommand().register(); - new GMCCommand().register(); - new GMSPCommand().register(); - new GMSCommand().register(); +// new GMACommand().register(); +// new GMCCommand().register(); +// new GMSPCommand().register(); +// new GMSCommand().register(); new AnvilCommand().register(); new CartographyCommand().register(); new CraftingCommand().register(); diff --git a/src/main/java/me/trouper/ultrautils/commands/EnderChestCommand.java b/src/main/java/me/trouper/ultrautils/commands/EnderChestCommand.java index 0f7ead7..9878f57 100644 --- a/src/main/java/me/trouper/ultrautils/commands/EnderChestCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/EnderChestCommand.java @@ -14,7 +14,7 @@ import org.bukkit.entity.Player; @CommandRegistry(value = "enderchest",permission = @Permission("ultrautils.enderchest"),playersOnly = true) public class EnderChestCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { Player user = (Player) sender; Player target = Bukkit.getPlayer(args.get(0).toString()); if (target == null) target = user; diff --git a/src/main/java/me/trouper/ultrautils/commands/UltraUtilsCommand.java b/src/main/java/me/trouper/ultrautils/commands/UltraUtilsCommand.java index 8ceef67..a9dbb53 100644 --- a/src/main/java/me/trouper/ultrautils/commands/UltraUtilsCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/UltraUtilsCommand.java @@ -25,7 +25,7 @@ import java.util.List; public class UltraUtilsCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label,Args args) { Player p = (Player) sender; switch (args.get(0).toString()) { diff --git a/src/main/java/me/trouper/ultrautils/commands/admin/BroadcastCommand.java b/src/main/java/me/trouper/ultrautils/commands/admin/BroadcastCommand.java index f254bb2..b43ac56 100644 --- a/src/main/java/me/trouper/ultrautils/commands/admin/BroadcastCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/admin/BroadcastCommand.java @@ -15,7 +15,7 @@ import org.bukkit.command.CommandSender; public class BroadcastCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender commandSender, Command command, Args args) { + public void dispatchCommand(CommandSender commandSender, Command command, String label, Args args) { Bukkit.getServer().broadcast(Component.text(Text.color(UltraUtils.config.broadcastPrefix + args.getAll().toString()))); } diff --git a/src/main/java/me/trouper/ultrautils/commands/admin/MacroToolCommand.java b/src/main/java/me/trouper/ultrautils/commands/admin/MacroToolCommand.java index b5448d5..d71ac24 100644 --- a/src/main/java/me/trouper/ultrautils/commands/admin/MacroToolCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/admin/MacroToolCommand.java @@ -26,7 +26,7 @@ import java.util.List; @CommandRegistry(value = "macrotool",permission = @Permission("ultrautils.macrotool"),playersOnly = true,printStackTrace = true) public class MacroToolCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command cmd, Args args) { + public void dispatchCommand(CommandSender sender, Command cmd, String label, Args args) { Player p = (Player) sender; String command = args.getAll(1).toString(); ItemStack item = p.getInventory().getItemInMainHand(); diff --git a/src/main/java/me/trouper/ultrautils/commands/admin/WorldCommand.java b/src/main/java/me/trouper/ultrautils/commands/admin/WorldCommand.java index ea58a63..7518d7a 100644 --- a/src/main/java/me/trouper/ultrautils/commands/admin/WorldCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/admin/WorldCommand.java @@ -21,7 +21,7 @@ import java.util.List; public class WorldCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { String worldName = args.get(0).toString(); World world = Bukkit.getWorld(worldName); if (world == null) { diff --git a/src/main/java/me/trouper/ultrautils/commands/gamemode/GMACommand.java b/src/main/java/me/trouper/ultrautils/commands/gamemode/GMACommand.java index 08b6683..8bac3b7 100644 --- a/src/main/java/me/trouper/ultrautils/commands/gamemode/GMACommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/gamemode/GMACommand.java @@ -16,7 +16,7 @@ import org.bukkit.entity.Player; public class GMACommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender commandSender, Command command, Args args) { + public void dispatchCommand(CommandSender commandSender, Command command, String label, Args args) { Player target = Bukkit.getPlayer(args.get(0).toString()); if (target == null && (commandSender instanceof Player)) target = (Player) commandSender; if (target == null) { diff --git a/src/main/java/me/trouper/ultrautils/commands/gamemode/GMCCommand.java b/src/main/java/me/trouper/ultrautils/commands/gamemode/GMCCommand.java index c082f13..8927b4a 100644 --- a/src/main/java/me/trouper/ultrautils/commands/gamemode/GMCCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/gamemode/GMCCommand.java @@ -16,7 +16,7 @@ import org.bukkit.entity.Player; public class GMCCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender commandSender, Command command, Args args) { + public void dispatchCommand(CommandSender commandSender, Command command, String label, Args args) { Player target = Bukkit.getPlayer(args.get(0).toString()); if (target == null && (commandSender instanceof Player)) target = (Player) commandSender; if (target == null) { diff --git a/src/main/java/me/trouper/ultrautils/commands/gamemode/GMSCommand.java b/src/main/java/me/trouper/ultrautils/commands/gamemode/GMSCommand.java index 2a134fa..dab8605 100644 --- a/src/main/java/me/trouper/ultrautils/commands/gamemode/GMSCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/gamemode/GMSCommand.java @@ -16,7 +16,7 @@ import org.bukkit.entity.Player; public class GMSCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender commandSender, Command command, Args args) { + public void dispatchCommand(CommandSender commandSender, Command command, String label, Args args) { Player target = Bukkit.getPlayer(args.get(0).toString()); if (target == null && (commandSender instanceof Player)) target = (Player) commandSender; if (target == null) { diff --git a/src/main/java/me/trouper/ultrautils/commands/gamemode/GMSPCommand.java b/src/main/java/me/trouper/ultrautils/commands/gamemode/GMSPCommand.java index 19be441..7b835a7 100644 --- a/src/main/java/me/trouper/ultrautils/commands/gamemode/GMSPCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/gamemode/GMSPCommand.java @@ -16,7 +16,7 @@ import org.bukkit.entity.Player; public class GMSPCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender commandSender, Command command, Args args) { + public void dispatchCommand(CommandSender commandSender, Command command, String label, Args args) { Player target = Bukkit.getPlayer(args.get(0).toString()); if (target == null && (commandSender instanceof Player)) target = (Player) commandSender; if (target == null) { diff --git a/src/main/java/me/trouper/ultrautils/commands/gamemode/GamemodeCommand.java b/src/main/java/me/trouper/ultrautils/commands/gamemode/GamemodeCommand.java index a2be5e9..e82ba33 100644 --- a/src/main/java/me/trouper/ultrautils/commands/gamemode/GamemodeCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/gamemode/GamemodeCommand.java @@ -18,18 +18,49 @@ import javax.annotation.Nullable; public class GamemodeCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { Player target = Bukkit.getPlayer(args.get(1).toString()); if (target == null && (sender instanceof Player)) target = (Player) sender; if (target == null) { sender.sendMessage(Text.prefix("Only players may execute that command")); return; } + target.sendMessage("Target: %s, Sender: %s, Command: %s, Label: %s, Args: %s".formatted(target,sender,command,label,args)); + switch (label) { + case "gma" -> { + setGameMode(sender,target,GameMode.ADVENTURE, "ultrautils.gamemode.adventure"); + return; + } + case "gmc" -> { + setGameMode(sender,target,GameMode.CREATIVE,"ultrautils.gamemode.creative"); + return; + } + case "gms" -> { + setGameMode(sender,target,GameMode.SURVIVAL,"ultrautils.gamemode.survival"); + return; + } + case "gmsp" -> { + setGameMode(sender,target,GameMode.SPECTATOR,"ultrautils.gamemode.spectator"); + return; + } + } switch (args.get(0).toString()) { - case "a","adventure","adv","gma" -> setGameMode(sender,target,GameMode.ADVENTURE, "ultrautils.gamemode.adventure"); - case "c","creative","cre","gmc" -> setGameMode(sender,target,GameMode.CREATIVE,"ultrautils.gamemode.creative"); - case "s","survival","sur","gms" -> setGameMode(sender,target,GameMode.SURVIVAL,"ultrautils.gamemode.survival"); - case "sp","spectator","spec","gmsp" -> setGameMode(sender,target,GameMode.SPECTATOR,"ultrautils.gamemode.spectator"); + case "a","adventure","adv","gma" -> { + setGameMode(sender,target,GameMode.ADVENTURE, "ultrautils.gamemode.adventure"); + return; + } + case "c","creative","cre","gmc" -> { + setGameMode(sender,target,GameMode.CREATIVE,"ultrautils.gamemode.creative"); + return; + } + case "s","survival","sur","gms" -> { + setGameMode(sender,target,GameMode.SURVIVAL,"ultrautils.gamemode.survival"); + return; + } + case "sp","spectator","spec","gmsp" -> { + setGameMode(sender,target,GameMode.SPECTATOR,"ultrautils.gamemode.spectator"); + return; + } } } diff --git a/src/main/java/me/trouper/ultrautils/commands/mobility/FlyCommand.java b/src/main/java/me/trouper/ultrautils/commands/mobility/FlyCommand.java index f5bf4ab..3bb3231 100644 --- a/src/main/java/me/trouper/ultrautils/commands/mobility/FlyCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/mobility/FlyCommand.java @@ -18,7 +18,7 @@ import java.util.List; @CommandRegistry(value = "fly", permission = @Permission("ultrautils.flight"),printStackTrace = true) public class FlyCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { Player user = (Player) sender; Player target = Bukkit.getPlayer(args.get(1).toString()); if (target == null && (sender instanceof Player)) target = (Player) sender; diff --git a/src/main/java/me/trouper/ultrautils/commands/mobility/SpeedCommand.java b/src/main/java/me/trouper/ultrautils/commands/mobility/SpeedCommand.java index 8e8c7a1..64a4aa4 100644 --- a/src/main/java/me/trouper/ultrautils/commands/mobility/SpeedCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/mobility/SpeedCommand.java @@ -18,7 +18,7 @@ import java.util.List; @CommandRegistry(value = "speed", permission = @Permission("ultrautils.speed"),printStackTrace = true) public class SpeedCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { String type = args.get(1).toString(); float speed = args.get(0).toFloat(); Player user = (Player) sender; diff --git a/src/main/java/me/trouper/ultrautils/commands/workstations/AnvilCommand.java b/src/main/java/me/trouper/ultrautils/commands/workstations/AnvilCommand.java index 8282be0..ed66892 100644 --- a/src/main/java/me/trouper/ultrautils/commands/workstations/AnvilCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/workstations/AnvilCommand.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; @CommandRegistry(value = "anvil", permission = @Permission("ultrautils.anvil"),playersOnly = true) public class AnvilCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { Player p = (Player) sender; p.openAnvil(p.getLocation(),true); } diff --git a/src/main/java/me/trouper/ultrautils/commands/workstations/CartographyCommand.java b/src/main/java/me/trouper/ultrautils/commands/workstations/CartographyCommand.java index 670ab55..691e04b 100644 --- a/src/main/java/me/trouper/ultrautils/commands/workstations/CartographyCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/workstations/CartographyCommand.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; @CommandRegistry(value = "cartography", permission = @Permission("ultrautils.cartography"),playersOnly = true) public class CartographyCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { Player p = (Player) sender; p.openCartographyTable(p.getLocation(),true); } diff --git a/src/main/java/me/trouper/ultrautils/commands/workstations/CraftingCommand.java b/src/main/java/me/trouper/ultrautils/commands/workstations/CraftingCommand.java index f87ec8e..8e26c8d 100644 --- a/src/main/java/me/trouper/ultrautils/commands/workstations/CraftingCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/workstations/CraftingCommand.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; @CommandRegistry(value = "craft", permission = @Permission("ultrautils.craft"),playersOnly = true) public class CraftingCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { Player p = (Player) sender; p.openWorkbench(p.getLocation(),true); } diff --git a/src/main/java/me/trouper/ultrautils/commands/workstations/GrindstoneCommand.java b/src/main/java/me/trouper/ultrautils/commands/workstations/GrindstoneCommand.java index ba8cb39..96a8cdb 100644 --- a/src/main/java/me/trouper/ultrautils/commands/workstations/GrindstoneCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/workstations/GrindstoneCommand.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; @CommandRegistry(value = "grindstone", permission = @Permission("ultrautils.grind"),playersOnly = true) public class GrindstoneCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { Player p = (Player) sender; p.openGrindstone(p.getLocation(),true); } diff --git a/src/main/java/me/trouper/ultrautils/commands/workstations/LoomCommand.java b/src/main/java/me/trouper/ultrautils/commands/workstations/LoomCommand.java index 42eab02..9b3a464 100644 --- a/src/main/java/me/trouper/ultrautils/commands/workstations/LoomCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/workstations/LoomCommand.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; @CommandRegistry(value = "smith", permission = @Permission("ultrautils.smith"),playersOnly = true) public class LoomCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { Player p = (Player) sender; p.openLoom(p.getLocation(),true); } diff --git a/src/main/java/me/trouper/ultrautils/commands/workstations/SmithingCommand.java b/src/main/java/me/trouper/ultrautils/commands/workstations/SmithingCommand.java index 4665b8a..824eb64 100644 --- a/src/main/java/me/trouper/ultrautils/commands/workstations/SmithingCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/workstations/SmithingCommand.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; @CommandRegistry(value = "smith", permission = @Permission("ultrautils.smith"),playersOnly = true) public class SmithingCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { Player p = (Player) sender; p.openSmithingTable(p.getLocation(),true); } diff --git a/src/main/java/me/trouper/ultrautils/commands/workstations/StonecutterCommand.java b/src/main/java/me/trouper/ultrautils/commands/workstations/StonecutterCommand.java index 0867a30..05f8d6f 100644 --- a/src/main/java/me/trouper/ultrautils/commands/workstations/StonecutterCommand.java +++ b/src/main/java/me/trouper/ultrautils/commands/workstations/StonecutterCommand.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; @CommandRegistry(value = "stonecutter", permission = @Permission("ultrautils.stonecut"),playersOnly = true) public class StonecutterCommand implements CustomCommand { @Override - public void dispatchCommand(CommandSender sender, Command command, Args args) { + public void dispatchCommand(CommandSender sender, Command command, String label, Args args) { Player p = (Player) sender; p.openStonecutter(p.getLocation(),true); } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 9d5c563..1b47cbc 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -80,27 +80,16 @@ commands: usage: /ultrautils permission: ultrautils.admin aliases: - - uu - gma: - description: Change gamemode to adventure - permission: ultrautils.gamemode.adventure - usage: /gma [] - gmc: - description: Change gamemode to creative - permission: ultrautils.gamemode.creative - usage: /gmc [] - gms: - description: Change gamemode to survival - permission: ultrautils.gamemode.survival - usage: /gms [] - gmsp: - description: Change gamemode to spectator - permission: ultrautils.gamemode.spectator - usage: /gmsp [] + - uur gamemode: description: Root gamemode changing command. Required for all the other gamemode commands. permission: ultrautils.gamemode usage: /gamemode [] + aliases: + - gmc + - gms + - gmsp + - gma anvil: permission: ultrautils.anvil description: a portable anvil