diff --git a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemAction.java b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemAction.java index 7114a04a..8cc70dfa 100644 --- a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemAction.java +++ b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemAction.java @@ -8,20 +8,20 @@ import org.bukkit.Bukkit; public interface UseItemAction extends TimerBotAction { /** - * Gets the equivalent right-click hold duration in ticks. - * Default is -1, which means will not be released. + * Gets the equivalent right-click hold duration timeout in ticks. + * Default is -1, which means no timeout. * - * @return the equivalent right-click hold duration + * @return the equivalent right-click hold duration timeout */ - int getUseTick(); + int getUseTickTimeout(); /** - * Sets the equivalent right-click hold duration in ticks. + * Sets the equivalent right-click hold duration timeout in ticks. * - * @param useTick the equivalent right-click hold duration + * @param timeout the equivalent right-click hold duration timeout * @return this action instance */ - UseItemAction setUseTick(int useTick); + UseItemAction setUseTickTimeout(int timeout); static UseItemAction create() { return Bukkit.getBotManager().newAction(UseItemAction.class); diff --git a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemAutoAction.java b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemAutoAction.java index feb6d163..a4d7af33 100644 --- a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemAutoAction.java +++ b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemAutoAction.java @@ -8,20 +8,20 @@ import org.bukkit.Bukkit; public interface UseItemAutoAction extends TimerBotAction { /** - * Gets the equivalent right-click hold duration in ticks. - * Default is -1, which means will not be released. + * Gets the equivalent right-click hold duration timeout in ticks. + * Default is -1, which means no timeout. * - * @return the equivalent right-click hold duration + * @return the equivalent right-click hold duration timeout */ - int getUseTick(); + int getUseTickTimeout(); /** - * Sets the equivalent right-click hold duration in ticks. + * Sets the equivalent right-click hold duration timeout in ticks. * - * @param useTick the equivalent right-click hold duration + * @param timeout the equivalent right-click hold duration timeout * @return this action instance */ - UseItemAutoAction setUseTick(int useTick); + UseItemAutoAction setUseTickTimeout(int timeout); static UseItemAutoAction create() { return Bukkit.getBotManager().newAction(UseItemAutoAction.class); diff --git a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOffhandAction.java b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOffhandAction.java index a96b1833..4bd4cc35 100644 --- a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOffhandAction.java +++ b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOffhandAction.java @@ -8,20 +8,20 @@ import org.bukkit.Bukkit; public interface UseItemOffhandAction extends TimerBotAction { /** - * Gets the equivalent right-click hold duration in ticks. - * Default is -1, which means will not be released. + * Gets the equivalent right-click hold duration timeout in ticks. + * Default is -1, which means no timeout. * - * @return the equivalent right-click hold duration + * @return the equivalent right-click hold duration timeout */ - int getUseTick(); + int getUseTickTimeout(); /** - * Sets the equivalent right-click hold duration in ticks. + * Sets the equivalent right-click hold duration timeout in ticks. * - * @param useTick the equivalent right-click hold duration + * @param timeout the equivalent right-click hold duration timeout * @return this action instance */ - UseItemOffhandAction setUseTick(int useTick); + UseItemOffhandAction setUseTickTimeout(int timeout); static UseItemOffhandAction create() { return Bukkit.getBotManager().newAction(UseItemOffhandAction.class); diff --git a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOnAction.java b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOnAction.java index 166c7a35..6697bb24 100644 --- a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOnAction.java +++ b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOnAction.java @@ -8,20 +8,20 @@ import org.bukkit.Bukkit; public interface UseItemOnAction extends TimerBotAction { /** - * Gets the equivalent right-click hold duration in ticks. - * Default is -1, which means will not be released. + * Gets the equivalent right-click hold duration timeout in ticks. + * Default is -1, which means no timeout. * - * @return the equivalent right-click hold duration + * @return the equivalent right-click hold duration timeout */ - int getUseTick(); + int getUseTickTimeout(); /** - * Sets the equivalent right-click hold duration in ticks. + * Sets the equivalent right-click hold duration timeout in ticks. * - * @param useTick the equivalent right-click hold duration + * @param timeout the equivalent right-click hold duration timeout * @return this action instance */ - UseItemOnAction setUseTick(int useTick); + UseItemOnAction setUseTickTimeout(int timeout); static UseItemOnAction create() { return Bukkit.getBotManager().newAction(UseItemOnAction.class); diff --git a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOnOffhandAction.java b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOnOffhandAction.java index 663e99d6..cd1859ea 100644 --- a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOnOffhandAction.java +++ b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemOnOffhandAction.java @@ -8,20 +8,20 @@ import org.bukkit.Bukkit; public interface UseItemOnOffhandAction extends TimerBotAction { /** - * Gets the equivalent right-click hold duration in ticks. - * Default is -1, which means will not be released. + * Gets the equivalent right-click hold duration timeout in ticks. + * Default is -1, which means no timeout. * - * @return the equivalent right-click hold duration + * @return the equivalent right-click hold duration timeout */ - int getUseTick(); + int getUseTickTimeout(); /** - * Sets the equivalent right-click hold duration in ticks. + * Sets the equivalent right-click hold duration timeout in ticks. * - * @param useTick the equivalent right-click hold duration + * @param timeout the equivalent right-click hold duration timeout * @return this action instance */ - UseItemOnOffhandAction setUseTick(int useTick); + UseItemOnOffhandAction setUseTickTimeout(int timeout); static UseItemOnOffhandAction create() { return Bukkit.getBotManager().newAction(UseItemOnOffhandAction.class); diff --git a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemToAction.java b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemToAction.java index afa143a4..d9c3b733 100644 --- a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemToAction.java +++ b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemToAction.java @@ -8,20 +8,20 @@ import org.bukkit.Bukkit; public interface UseItemToAction extends TimerBotAction { /** - * Gets the equivalent right-click hold duration in ticks. - * Default is -1, which means will not be released. + * Gets the equivalent right-click hold duration timeout in ticks. + * Default is -1, which means no timeout. * - * @return the equivalent right-click hold duration + * @return the equivalent right-click hold duration timeout */ - int getUseTick(); + int getUseTickTimeout(); /** - * Sets the equivalent right-click hold duration in ticks. + * Sets the equivalent right-click hold duration timeout in ticks. * - * @param useTick the equivalent right-click hold duration + * @param timeout the equivalent right-click hold duration timeout * @return this action instance */ - UseItemToAction setUseTick(int useTick); + UseItemToAction setUseTickTimeout(int timeout); static UseItemToAction create() { return Bukkit.getBotManager().newAction(UseItemToAction.class); diff --git a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemToOffhandAction.java b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemToOffhandAction.java index 8cb10781..9469c6ef 100644 --- a/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemToOffhandAction.java +++ b/leaves-api/src/main/java/org/leavesmc/leaves/entity/bot/action/UseItemToOffhandAction.java @@ -8,20 +8,20 @@ import org.bukkit.Bukkit; public interface UseItemToOffhandAction extends TimerBotAction { /** - * Gets the equivalent right-click hold duration in ticks. - * Default is -1, which means will not be released. + * Gets the equivalent right-click hold duration timeout in ticks. + * Default is -1, which means no timeout. * - * @return the equivalent right-click hold duration + * @return the equivalent right-click hold duration timeout */ - int getUseTick(); + int getUseTickTimeout(); /** - * Sets the equivalent right-click hold duration in ticks. + * Sets the equivalent right-click hold duration timeout in ticks. * - * @param useTick the equivalent right-click hold duration + * @param timeout the equivalent right-click hold duration timeout * @return this action instance */ - UseItemToOffhandAction setUseTick(int useTick); + UseItemToOffhandAction setUseTickTimeout(int timeout); static UseItemToOffhandAction create() { return Bukkit.getBotManager().newAction(UseItemToOffhandAction.class); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerBotAction.java index 68bb9eeb..f92f25d7 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerBotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerBotAction.java @@ -225,23 +225,11 @@ public abstract class ServerBotAction> { this.onFail = onFail; } - public Consumer getOnFail() { - return onFail; - } - public void setOnSuccess(Consumer onSuccess) { this.onSuccess = onSuccess; } - public Consumer getOnSuccess() { - return onSuccess; - } - public void setOnStop(Consumer onStop) { this.onStop = onStop; } - - public Consumer getOnStop() { - return onStop; - } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseBotAction.java index fbbd5aec..48c7a29d 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseBotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseBotAction.java @@ -15,19 +15,19 @@ import java.util.List; import java.util.function.Supplier; public abstract class ServerUseBotAction> extends ServerTimerBotAction { - private int useTick = -1; + private int useTickTimeout = -1; private int alreadyUsedTick = 0; private int useItemRemainingTicks = 0; public ServerUseBotAction(String name, Supplier supplier) { super(name, CommandArgument.of(CommandArgumentType.INTEGER, CommandArgumentType.INTEGER, CommandArgumentType.INTEGER, CommandArgumentType.INTEGER), supplier); - this.setSuggestion(3, Pair.of(List.of("-1"), "[UseTick]")); + this.setSuggestion(3, Pair.of(List.of("-1"), "[UseTickTimeout]")); } @Override public void loadCommand(ServerPlayer player, @NotNull CommandArgumentResult result) { super.loadCommand(player, result); - this.useTick = result.readInt(-1); + this.useTickTimeout = result.readInt(-1); } @Override @@ -73,7 +73,7 @@ public abstract class ServerUseBotAction> extend } private boolean isUseTickLimitExceeded() { - int useTickLimit = useTick == -1 ? Integer.MAX_VALUE : useTick; + int useTickLimit = useTickTimeout == -1 ? Integer.MAX_VALUE : useTickTimeout; return alreadyUsedTick > useTickLimit; } @@ -97,7 +97,7 @@ public abstract class ServerUseBotAction> extend @NotNull public CompoundTag save(@NotNull CompoundTag nbt) { super.save(nbt); - nbt.putInt("useTick", this.useTick); + nbt.putInt("useTick", this.useTickTimeout); nbt.putInt("alreadyUsedTick", this.alreadyUsedTick); return nbt; } @@ -105,18 +105,18 @@ public abstract class ServerUseBotAction> extend @Override public void load(@NotNull CompoundTag nbt) { super.load(nbt); - this.useTick = nbt.getInt("useTick").orElseThrow(); + this.useTickTimeout = nbt.getInt("useTick").orElseThrow(); this.alreadyUsedTick = nbt.getInt("alreadyUsedTick").orElseGet( - () -> this.useTick - nbt.getInt("tickToRelease").orElseThrow() + () -> this.useTickTimeout - nbt.getInt("tickToRelease").orElseThrow() ); } - public int getUseTick() { - return useTick; + public int getUseTickTimeout() { + return useTickTimeout; } - public void setUseTick(int useTick) { - this.useTick = useTick; + public void setUseTickTimeout(int useTickTimeout) { + this.useTickTimeout = useTickTimeout; } @Override diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseItemAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseItemAction.java index 567f7a0f..0172692f 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseItemAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseItemAction.java @@ -18,6 +18,7 @@ public class ServerUseItemAction extends ServerUseBotAction } public static @NotNull InteractionResult useItem(@NotNull ServerBot bot, InteractionHand hand) { + bot.updateItemInHand(hand); InteractionResult result = bot.gameMode.useItem(bot, bot.level(), bot.getItemInHand(hand), hand); if (shouldSwing(result)) { bot.swing(hand); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseItemOnAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseItemOnAction.java index 523f0e5f..bec8358f 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseItemOnAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerUseItemOnAction.java @@ -30,6 +30,7 @@ public class ServerUseItemOnAction extends ServerUseBotAction