From 4a887caf3def948469b9b0b647dce5f9fdcfd6dd Mon Sep 17 00:00:00 2001 From: Lyft <127234178+Lyfts@users.noreply.github.com> Date: Mon, 16 Dec 2024 15:37:55 +0100 Subject: [PATCH 1/3] Proper fix for subcommand permissions (#159) Signed-off-by: Lyfts <127234178+Lyfts@users.noreply.github.com> --- src/main/java/serverutils/lib/command/CommandTreeBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/serverutils/lib/command/CommandTreeBase.java b/src/main/java/serverutils/lib/command/CommandTreeBase.java index bedbd3d3..35399e21 100644 --- a/src/main/java/serverutils/lib/command/CommandTreeBase.java +++ b/src/main/java/serverutils/lib/command/CommandTreeBase.java @@ -77,7 +77,7 @@ public List addTabCompletionOptions(ICommandSender sender, String[] args List keys = new ArrayList<>(); for (ICommand c : getSubCommands()) { - if (c.canCommandSenderUseCommand(sender)) { + if (canUseSubcommand(sender, c)) { keys.add(c.getCommandName()); } } @@ -122,7 +122,7 @@ public void processCommand(ICommandSender sender, String[] args) throws CommandE "commands.tree_base.invalid_cmd.list_subcommands", args[0], subCommandsString); - } else if (!cmd.canCommandSenderUseCommand(sender)) { + } else if (!canUseSubcommand(sender, cmd)) { throw new CommandException("commands.generic.permission"); } else { cmd.processCommand(sender, shiftArgs(args)); From 148665e55eeb6818707adf067f91c652aeae4c2e Mon Sep 17 00:00:00 2001 From: Guillaume Mercier Date: Thu, 19 Dec 2024 10:09:26 -0500 Subject: [PATCH 2/3] Fix nbtedit using the wrong datatypes. (#164) --- src/main/java/serverutils/client/gui/GuiEditNBT.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/serverutils/client/gui/GuiEditNBT.java b/src/main/java/serverutils/client/gui/GuiEditNBT.java index 94370819..934e96a3 100644 --- a/src/main/java/serverutils/client/gui/GuiEditNBT.java +++ b/src/main/java/serverutils/client/gui/GuiEditNBT.java @@ -212,7 +212,12 @@ public void onCallback(ConfigValue value, boolean set) { if (set) { switch (nbt.getId()) { case Constants.NBT.TAG_BYTE: + nbt = new NBTTagByte((byte) Math.max(Byte.MIN_VALUE, Math.min(Byte.MAX_VALUE, value.getInt()))); + break; case Constants.NBT.TAG_SHORT: + nbt = new NBTTagShort( + (short) Math.max(Short.MIN_VALUE, Math.min(Short.MAX_VALUE, value.getInt()))); + break; case Constants.NBT.TAG_INT: nbt = new NBTTagInt(value.getInt()); break; @@ -220,6 +225,8 @@ public void onCallback(ConfigValue value, boolean set) { nbt = new NBTTagLong(Long.parseLong(value.getString())); break; case Constants.NBT.TAG_FLOAT: + nbt = new NBTTagFloat((float) value.getDouble()); + break; case Constants.NBT.TAG_DOUBLE: case Constants.NBT.TAG_ANY_NUMERIC: nbt = new NBTTagDouble(value.getDouble()); From 80d809d823e570de2bf741a3b742f060a62ebf42 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 19 Dec 2024 20:49:15 +0100 Subject: [PATCH 3/3] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 024e2627..a52bb64a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -3,7 +3,7 @@ dependencies { api("com.github.GTNewHorizons:GTNHLib:0.5.22:dev") - compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.6.51-GTNH:dev") + compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.0-GTNH:dev") compileOnly("com.github.GTNewHorizons:EnderIO:2.8.22:dev") compileOnly("com.github.GTNewHorizons:Navigator:1.0.15:dev") compileOnly('org.jetbrains:annotations:25.0.0')