diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Actions.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Actions.java index 17a3ed3f..366951b0 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Actions.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Actions.java @@ -29,8 +29,7 @@ public class Actions { register(new ServerUseItemOffhandAction(), UseItemOffhandAction.class); register(new ServerUseItemOnOffhandAction(), UseItemOnOffhandAction.class); register(new ServerUseItemToOffhandAction(), UseItemToOffhandAction.class); - register(new ServerLookAction.TO(), LookAction.class); - register(new ServerLookAction.ON(), LookAction.class); + register(new ServerLookAction(), LookAction.class); register(new ServerFishAction(), FishAction.class); register(new ServerSwimAction(), SwimAction.class); register(new ServerRotationAction(), RotationAction.class); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerLookAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerLookAction.java index 59a4609a..abc10852 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerLookAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerLookAction.java @@ -1,8 +1,10 @@ package org.leavesmc.leaves.bot.agent.actions; import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import org.apache.commons.lang3.tuple.Pair; +import org.bukkit.entity.Player; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.bot.ServerBot; @@ -14,17 +16,24 @@ import org.leavesmc.leaves.entity.bot.actions.CraftLookAction; import java.text.DecimalFormat; import java.util.Arrays; import java.util.List; -import java.util.function.Supplier; +import java.util.stream.Stream; -public abstract class ServerLookAction> extends ServerBotAction { +public class ServerLookAction extends ServerBotAction { private static final Vector ZERO_VECTOR = new Vector(0, 0, 0); + private static final DecimalFormat DF = new DecimalFormat("0.0"); private Vector pos = ZERO_VECTOR; private ServerPlayer target = null; - private ServerLookAction(String name, CommandArgument argument, Supplier creator) { - super(name, argument, creator); + public ServerLookAction() { + super("look", CommandArgument.of(CommandArgumentType.STRING, CommandArgumentType.DOUBLE, CommandArgumentType.DOUBLE), ServerLookAction::new); + this.setSuggestion(0, (sender, arg) -> sender instanceof Player player ? + Pair.of(Stream.concat(Arrays.stream(MinecraftServer.getServer().getPlayerNames()), Stream.of(DF.format(player.getX()))).toList(), "|") : + Pair.of(Stream.concat(Arrays.stream(MinecraftServer.getServer().getPlayerNames()), Stream.of("0")).toList(), "|") + ); + this.setSuggestion(1, (sender, arg) -> sender instanceof Player player ? Pair.of(List.of(DF.format(player.getY())), "") : Pair.of(List.of("0"), "")); + this.setSuggestion(2, (sender, arg) -> sender instanceof Player player ? Pair.of(List.of(DF.format(player.getZ())), "") : Pair.of(List.of("0"), "")); } @Override @@ -45,13 +54,11 @@ public abstract class ServerLookAction> extends Se @Override public void load(@NotNull CompoundTag nbt) { super.load(nbt); - this.setPos( - new Vector( - nbt.getDouble("x").orElse(0.0), - nbt.getDouble("y").orElse(0.0), - nbt.getDouble("z").orElse(0.0) - ) - ); + this.setPos(new Vector( + nbt.getDouble("x").orElse(0.0), + nbt.getDouble("y").orElse(0.0), + nbt.getDouble("z").orElse(0.0) + )); } public void setPos(Vector pos) { @@ -80,42 +87,19 @@ public abstract class ServerLookAction> extends Se return true; } - public static class TO extends ServerLookAction { - public TO() { - super("look_to", CommandArgument.of(CommandArgumentType.STRING), TO::new); - this.setSuggestion(0, (sender, arg) -> sender instanceof ServerPlayer player ? Pair.of(Arrays.asList(player.getServer().getPlayerNames()), "") : Pair.of(List.of("0"), "")); + @Override + public void loadCommand(ServerPlayer player, @NotNull CommandArgumentResult result) { + String nameOrX = result.readString(player.getScoreboardName()); + ServerPlayer player1 = player.getServer().getPlayerList().getPlayerByName(nameOrX); + if (player1 != null) { + this.setTarget(player1); + return; } - - @Override - public void loadCommand(ServerPlayer player, @NotNull CommandArgumentResult result) { - String name = result.readString(player.getScoreboardName()); - ServerPlayer player1 = player.getServer().getPlayerList().getPlayerByName(name); - if (player1 == null) { - throw new IllegalArgumentException("No such player"); - } else { - this.setTarget(player1); - } - } - } - - public static class ON extends ServerLookAction { - private static final DecimalFormat DF = new DecimalFormat("0.0"); - - public ON() { - super("look_on", CommandArgument.of(CommandArgumentType.DOUBLE, CommandArgumentType.BOOLEAN, CommandArgumentType.BOOLEAN), ON::new); - this.setSuggestion(0, (sender, arg) -> sender instanceof ServerPlayer player ? Pair.of(List.of(DF.format(player.getX())), "") : Pair.of(List.of("0"), "")); - this.setSuggestion(1, (sender, arg) -> sender instanceof ServerPlayer player ? Pair.of(List.of(DF.format(player.getY())), "") : Pair.of(List.of("0"), "")); - this.setSuggestion(2, (sender, arg) -> sender instanceof ServerPlayer player ? Pair.of(List.of(DF.format(player.getZ())), "") : Pair.of(List.of("0"), "")); - } - - @Override - public void loadCommand(ServerPlayer player, @NotNull CommandArgumentResult result) { - Vector vector = result.readVector(); - if (vector == null) { - throw new IllegalArgumentException("Invalid vector"); - } else { - this.setPos(vector); - } + try { + Vector vector = result.readVectorYZ(Double.parseDouble(nameOrX)); + this.setPos(vector); + } catch (Exception e) { + throw new IllegalArgumentException("Invalid vector"); } } @@ -123,4 +107,4 @@ public abstract class ServerLookAction> extends Se public Object asCraft() { return new CraftLookAction(this); } -} +} \ No newline at end of file diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java index 09077735..687806cf 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java @@ -9,7 +9,6 @@ import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.entity.bot.actions.CraftMountAction; -import java.util.Collection; import java.util.Comparator; import java.util.List; @@ -22,13 +21,11 @@ public class ServerMountAction extends ServerBotAction { @Override public boolean doTick(@NotNull ServerBot bot) { Location center = bot.getBukkitEntity().getLocation(); - Collection nearbyVehicles = center.getNearbyEntitiesByType( + List vehicles = center.getNearbyEntitiesByType( Vehicle.class, 3, vehicle -> manhattanDistance(bot, ((CraftVehicle) vehicle).getHandle()) <= 2 - ); - - List vehicles = nearbyVehicles.stream().sorted(Comparator.comparingDouble( + ).stream().sorted(Comparator.comparingDouble( (vehicle) -> center.distanceSquared(vehicle.getLocation()) )).toList(); @@ -48,7 +45,7 @@ public class ServerMountAction extends ServerBotAction { private double manhattanDistance(@NotNull Entity entity1, @NotNull Entity entity2) { return Math.abs(entity1.getX() - entity2.getX()) + - Math.abs(entity1.getY() - entity2.getY()) + - Math.abs(entity1.getZ() - entity2.getZ()); + Math.abs(entity1.getY() - entity2.getY()) + + Math.abs(entity1.getZ() - entity2.getZ()); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMoveAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMoveAction.java index c194547b..6f3e8b80 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMoveAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMoveAction.java @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.List; public class ServerMoveAction extends ServerStateBotAction { + private static final Pair, String> suggestions = Pair.of( Arrays.stream(MoveDirection.values()).map((it) -> it.name).toList(), "" @@ -23,7 +24,7 @@ public class ServerMoveAction extends ServerStateBotAction { public ServerMoveAction() { super("move", CommandArgument.of(CommandArgumentType.ofEnum(MoveDirection.class)), ServerMoveAction::new); - this.setSuggestion(0, (sender, arg) -> suggestions); + this.setSuggestion(0, suggestions); } @Override @@ -68,4 +69,4 @@ public class ServerMoveAction extends ServerStateBotAction { public Object asCraft() { return new CraftMoveAction(this); } -} +} \ No newline at end of file diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerRotationAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerRotationAction.java index a545dc1e..0c278ea4 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerRotationAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerRotationAction.java @@ -3,6 +3,7 @@ package org.leavesmc.leaves.bot.agent.actions; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; import org.apache.commons.lang3.tuple.Pair; +import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.command.CommandArgument; @@ -20,8 +21,8 @@ public class ServerRotationAction extends ServerBotAction public ServerRotationAction() { super("rotation", CommandArgument.of(CommandArgumentType.FLOAT, CommandArgumentType.FLOAT), ServerRotationAction::new); - this.setSuggestion(0, (sender, arg) -> sender instanceof ServerPlayer player ? Pair.of(List.of(DF.format(player.getYRot())), "[yaw]") : Pair.of(List.of("0"), "")); - this.setSuggestion(1, (sender, arg) -> sender instanceof ServerPlayer player ? Pair.of(List.of(DF.format(player.getXRot())), "[pitch]") : Pair.of(List.of("0"), "")); + this.setSuggestion(0, (sender, arg) -> sender instanceof Player player ? Pair.of(List.of(DF.format(player.getYaw())), "[yaw]") : Pair.of(List.of("0"), "")); + this.setSuggestion(1, (sender, arg) -> sender instanceof Player player ? Pair.of(List.of(DF.format(player.getPitch())), "[pitch]") : Pair.of(List.of("0"), "")); } private float yaw = 0.0f; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerStateBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerStateBotAction.java index 12452a22..c67b7acb 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerStateBotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerStateBotAction.java @@ -5,6 +5,7 @@ import org.leavesmc.leaves.command.CommandArgument; import java.util.function.Supplier; public abstract class ServerStateBotAction> extends ServerBotAction { + public ServerStateBotAction(String name, CommandArgument argument, Supplier creator) { super(name, argument, creator); this.setDoNumber(-1); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerTimerBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerTimerBotAction.java index 63d172ca..40edda63 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerTimerBotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerTimerBotAction.java @@ -7,7 +7,6 @@ import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; import org.leavesmc.leaves.command.CommandArgumentType; -import java.util.Collections; import java.util.List; import java.util.function.Supplier; @@ -19,8 +18,8 @@ public abstract class ServerTimerBotAction> ex public ServerTimerBotAction(String name, CommandArgument argument, Supplier creator) { super(name, argument, creator); - this.setSuggestion(0, Pair.of(Collections.singletonList("0"), "[TickDelay]")); - this.setSuggestion(1, Pair.of(Collections.singletonList("20"), "[TickInterval]")); + this.setSuggestion(0, Pair.of(List.of("0"), "[TickDelay]")); + this.setSuggestion(1, Pair.of(List.of("20"), "[TickInterval]")); this.setSuggestion(2, Pair.of(List.of("1", "-1"), "[DoNumber]")); } 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 b8838f4d..a0a95fb9 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 @@ -12,7 +12,7 @@ import org.leavesmc.leaves.command.CommandArgumentType; import org.leavesmc.leaves.entity.bot.actions.CraftUseItemAction; import org.leavesmc.leaves.event.bot.BotActionStopEvent; -import java.util.Collections; +import java.util.List; public class ServerUseItemAction extends ServerTimerBotAction { private int useTick = -1; @@ -20,7 +20,7 @@ public class ServerUseItemAction extends ServerTimerBotAction { private int useTick = -1; @@ -22,7 +22,7 @@ public class ServerUseItemAutoAction extends ServerTimerBotAction { private int useTick = -1; @@ -20,7 +20,7 @@ public class ServerUseItemOffhandAction extends ServerTimerBotAction { private int useTick = -1; @@ -28,7 +28,7 @@ public class ServerUseItemOnAction extends ServerTimerBotAction { private int useTick = -1; @@ -28,7 +28,7 @@ public class ServerUseItemOnOffhandAction extends ServerTimerBotAction { private int useTick = -1; @@ -22,7 +22,7 @@ public class ServerUseItemToAction extends ServerTimerBotAction { private int useTick = -1; @@ -22,7 +22,7 @@ public class ServerUseItemToOffhandAction extends ServerTimerBotAction onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftAttackAction extends CraftTimerBotAction implements AttackAction { public CraftAttackAction(ServerAttackAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftAttackAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftAttackAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftAttackAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); + super(serverAction, CraftAttackAction::new); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBotAction.java index 57da8852..7f007233 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBotAction.java @@ -1,7 +1,86 @@ package org.leavesmc.leaves.entity.bot.actions; +import org.jetbrains.annotations.NotNull; +import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; +import org.leavesmc.leaves.entity.bot.action.*; -public abstract class CraftBotAction { - public abstract ServerBotAction getHandle(); +import java.util.UUID; +import java.util.function.Consumer; +import java.util.function.Function; + +public abstract class CraftBotAction, S extends ServerBotAction> implements BotAction { + + protected final S serverAction; + protected final Function creator; + + protected Consumer onFail = null; + protected Consumer onSuccess = null; + protected Consumer onStop = null; + + public CraftBotAction(S serverAction, Function creator) { + this.serverAction = serverAction; + this.creator = creator; + } + + public ServerBotAction getHandle() { + return serverAction; + } + + @Override + public String getName() { + return serverAction.getName(); + } + + @Override + public UUID getUUID() { + return serverAction.getUUID(); + } + + public boolean doTick(@NotNull ServerBot bot) { + return serverAction.doTick(bot); + } + + @Override + public void setOnFail(Consumer onFail) { + this.onFail = onFail; + serverAction.setOnFail(it -> onFail.accept(creator.apply(it))); + } + + @Override + public Consumer getOnFail() { + return onFail; + } + + @Override + public void setOnSuccess(Consumer onSuccess) { + this.onSuccess = onSuccess; + serverAction.setOnSuccess(it -> onSuccess.accept(creator.apply(it))); + } + + @Override + public Consumer getOnSuccess() { + return onSuccess; + } + + @Override + public void setOnStop(Consumer onStop) { + this.onStop = onStop; + serverAction.setOnStop(it -> onStop.accept(creator.apply(it))); + } + + @Override + public Consumer getOnStop() { + return onStop; + } + + @Override + public void setCancelled(boolean cancel) { + serverAction.setCancelled(cancel); + } + + @Override + public boolean isCancelled() { + return serverAction.isCancelled(); + } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBreakBlockAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBreakBlockAction.java index 58c1a14c..fb2af4da 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBreakBlockAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBreakBlockAction.java @@ -1,122 +1,11 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftBreakBlockAction extends CraftBotAction implements BreakBlockAction { - private final ServerBreakBlockAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftBreakBlockAction extends CraftTimerBotAction implements BreakBlockAction { public CraftBreakBlockAction(ServerBreakBlockAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftBreakBlockAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftBreakBlockAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftBreakBlockAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); + super(serverAction, CraftBreakBlockAction::new); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftDropAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftDropAction.java index 4336f6d0..81178cfe 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftDropAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftDropAction.java @@ -1,122 +1,11 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftDropAction extends CraftBotAction implements DropAction { - private final ServerDropAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftDropAction extends CraftTimerBotAction implements DropAction { public CraftDropAction(ServerDropAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftDropAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftDropAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftDropAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); + super(serverAction, CraftDropAction::new); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftFishAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftFishAction.java index 2c931331..21f74b85 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftFishAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftFishAction.java @@ -1,122 +1,11 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftFishAction extends CraftBotAction implements FishAction { - private final ServerFishAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftFishAction extends CraftTimerBotAction implements FishAction { public CraftFishAction(ServerFishAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftFishAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftFishAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftFishAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); + super(serverAction, CraftFishAction::new); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftJumpAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftJumpAction.java index f6f3ea73..081386ac 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftJumpAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftJumpAction.java @@ -1,122 +1,11 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftJumpAction extends CraftBotAction implements JumpAction { - private final ServerJumpAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftJumpAction extends CraftTimerBotAction implements JumpAction { public CraftJumpAction(ServerJumpAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftJumpAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftJumpAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftJumpAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); + super(serverAction, CraftJumpAction::new); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftLookAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftLookAction.java index 83eb913f..f3f02d27 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftLookAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftLookAction.java @@ -3,84 +3,13 @@ package org.leavesmc.leaves.entity.bot.actions; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerLookAction; +import org.leavesmc.leaves.entity.bot.action.LookAction; -import java.util.UUID; -import java.util.function.Consumer; +public class CraftLookAction extends CraftBotAction implements LookAction { -public class CraftLookAction extends CraftBotAction implements LookAction { - private final ServerLookAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; - - public CraftLookAction(ServerLookAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftLookAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftLookAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftLookAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; + public CraftLookAction(ServerLookAction serverAction) { + super(serverAction, CraftLookAction::new); } @Override @@ -104,4 +33,4 @@ public class CraftLookAction extends CraftBotAction implements LookAction { public Player getTarget() { return serverAction.getTarget().getBukkitEntity(); } -} +} \ No newline at end of file diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMountAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMountAction.java index 7fe776c1..6355ad90 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMountAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMountAction.java @@ -1,82 +1,11 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftMountAction extends CraftBotAction implements MountAction { - private final ServerMountAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftMountAction extends CraftBotAction implements MountAction { public CraftMountAction(ServerMountAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftMountAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftMountAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftMountAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; + super(serverAction, CraftMountAction::new); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMoveAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMoveAction.java index dfdd1bb1..c40cb4ae 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMoveAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMoveAction.java @@ -1,83 +1,12 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftMoveAction extends CraftBotAction implements MoveAction { - private final ServerMoveAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftMoveAction extends CraftBotAction implements MoveAction { public CraftMoveAction(ServerMoveAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftMoveAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftMoveAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftMoveAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; + super(serverAction, CraftMoveAction::new); } @Override diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftRotationAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftRotationAction.java index de4676aa..facb48f1 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftRotationAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftRotationAction.java @@ -1,83 +1,12 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftRotationAction extends CraftBotAction implements RotationAction { - private final ServerRotationAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftRotationAction extends CraftBotAction implements RotationAction { public CraftRotationAction(ServerRotationAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftRotationAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftRotationAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftRotationAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; + super(serverAction, CraftRotationAction::new); } @Override diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSneakAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSneakAction.java index 9d984c95..2d291b90 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSneakAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSneakAction.java @@ -1,82 +1,11 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftSneakAction extends CraftBotAction implements SneakAction { - private final ServerSneakAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftSneakAction extends CraftBotAction implements SneakAction { public CraftSneakAction(ServerSneakAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftSneakAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftSneakAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftSneakAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; + super(serverAction, CraftSneakAction::new); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwimAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwimAction.java index d438e773..a770feb6 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwimAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwimAction.java @@ -1,82 +1,11 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftSwimAction extends CraftBotAction implements SwimAction { - private final ServerSwimAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftSwimAction extends CraftBotAction implements SwimAction { public CraftSwimAction(ServerSwimAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); - } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftSwimAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftSwimAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftSwimAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; + super(serverAction, CraftSwimAction::new); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftTimerBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftTimerBotAction.java new file mode 100644 index 00000000..fefead60 --- /dev/null +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftTimerBotAction.java @@ -0,0 +1,53 @@ +package org.leavesmc.leaves.entity.bot.actions; + +import org.leavesmc.leaves.bot.agent.actions.*; +import org.leavesmc.leaves.entity.bot.action.*; + +import java.util.function.Function; + +public class CraftTimerBotAction, S extends ServerTimerBotAction> extends CraftBotAction implements TimerBotAction { + + public CraftTimerBotAction(S serverAction, Function creator) { + super(serverAction, creator); + } + + @Override + public void setStartDelayTick(int delayTick) { + serverAction.setStartDelayTick(delayTick); + } + + @Override + public int getStartDelayTick() { + return serverAction.getStartDelayTick(); + } + + @Override + public void setDoIntervalTick(int intervalTick) { + serverAction.setDoIntervalTick(intervalTick); + } + + @Override + public int getDoIntervalTick() { + return serverAction.getDoIntervalTick(); + } + + @Override + public void setDoNumber(int doNumber) { + serverAction.setDoNumber(doNumber); + } + + @Override + public int getDoNumber() { + return serverAction.getDoNumber(); + } + + @Override + public int getTickToNext() { + return serverAction.getTickToNext(); + } + + @Override + public int getDoNumberRemaining() { + return serverAction.getDoNumberRemaining(); + } +} \ No newline at end of file diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAction.java index 17ae335e..4e2d9dba 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAction.java @@ -5,17 +5,10 @@ import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftUseItemAction extends CraftBotAction implements UseItemAction { - private final ServerUseItemAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftUseItemAction extends CraftTimerBotAction implements UseItemAction { public CraftUseItemAction(ServerUseItemAction serverAction) { - this.serverAction = serverAction; + super(serverAction, CraftUseItemAction::new); } public boolean doTick(@NotNull ServerBot bot) { @@ -32,102 +25,4 @@ public class CraftUseItemAction extends CraftBotAction implements UseItemAction serverAction.setUseTick(useTick); return this; } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftUseItemAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftUseItemAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftUseItemAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); - } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAutoAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAutoAction.java index d604cbc8..1c9a0ff5 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAutoAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAutoAction.java @@ -1,25 +1,12 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftUseItemAutoAction extends CraftBotAction implements UseItemAutoAction { - private final ServerUseItemAutoAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftUseItemAutoAction extends CraftTimerBotAction implements UseItemAutoAction { public CraftUseItemAutoAction(ServerUseItemAutoAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); + super(serverAction, CraftUseItemAutoAction::new); } @Override @@ -32,102 +19,4 @@ public class CraftUseItemAutoAction extends CraftBotAction implements UseItemAut serverAction.setUseTick(useTick); return this; } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftUseItemAutoAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftUseItemAutoAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftUseItemAutoAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); - } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOffhandAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOffhandAction.java index 7ea1534c..0575be68 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOffhandAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOffhandAction.java @@ -1,25 +1,12 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftUseItemOffhandAction extends CraftBotAction implements UseItemOffhandAction { - private final ServerUseItemOffhandAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftUseItemOffhandAction extends CraftTimerBotAction implements UseItemOffhandAction { public CraftUseItemOffhandAction(ServerUseItemOffhandAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); + super(serverAction, CraftUseItemOffhandAction::new); } @Override @@ -32,102 +19,4 @@ public class CraftUseItemOffhandAction extends CraftBotAction implements UseItem serverAction.setUseTick(useTick); return this; } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftUseItemOffhandAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftUseItemOffhandAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftUseItemOffhandAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); - } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnAction.java index cb5301c9..ca9f39cb 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnAction.java @@ -1,25 +1,12 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftUseItemOnAction extends CraftBotAction implements UseItemOnAction { - private final ServerUseItemOnAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftUseItemOnAction extends CraftTimerBotAction implements UseItemOnAction { public CraftUseItemOnAction(ServerUseItemOnAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); + super(serverAction, CraftUseItemOnAction::new); } @Override @@ -32,102 +19,4 @@ public class CraftUseItemOnAction extends CraftBotAction implements UseItemOnAct serverAction.setUseTick(useTick); return this; } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftUseItemOnAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftUseItemOnAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftUseItemOnAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); - } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnOffhandAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnOffhandAction.java index 30ea83b8..1a2c15d4 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnOffhandAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnOffhandAction.java @@ -1,25 +1,12 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftUseItemOnOffhandAction extends CraftBotAction implements UseItemOnOffhandAction { - private final ServerUseItemOnOffhandAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftUseItemOnOffhandAction extends CraftTimerBotAction implements UseItemOnOffhandAction { public CraftUseItemOnOffhandAction(ServerUseItemOnOffhandAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); + super(serverAction, CraftUseItemOnOffhandAction::new); } @Override @@ -32,102 +19,4 @@ public class CraftUseItemOnOffhandAction extends CraftBotAction implements UseIt serverAction.setUseTick(useTick); return this; } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftUseItemOnOffhandAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftUseItemOnOffhandAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftUseItemOnOffhandAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); - } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToAction.java index dd7cd8b6..b018a321 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToAction.java @@ -1,25 +1,12 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftUseItemToAction extends CraftBotAction implements UseItemToAction { - private final ServerUseItemToAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftUseItemToAction extends CraftTimerBotAction implements UseItemToAction { public CraftUseItemToAction(ServerUseItemToAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); + super(serverAction, CraftUseItemToAction::new); } @Override @@ -32,102 +19,4 @@ public class CraftUseItemToAction extends CraftBotAction implements UseItemToAct serverAction.setUseTick(useTick); return this; } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftUseItemToAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftUseItemToAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftUseItemToAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); - } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToOffhandAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToOffhandAction.java index 6715f0a5..89f65bae 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToOffhandAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToOffhandAction.java @@ -1,25 +1,12 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.actions.*; import org.leavesmc.leaves.entity.bot.action.*; -import java.util.UUID; -import java.util.function.Consumer; - -public class CraftUseItemToOffhandAction extends CraftBotAction implements UseItemToOffhandAction { - private final ServerUseItemToOffhandAction serverAction; - private Consumer onFail = null; - private Consumer onSuccess = null; - private Consumer onStop = null; +public class CraftUseItemToOffhandAction extends CraftTimerBotAction implements UseItemToOffhandAction { public CraftUseItemToOffhandAction(ServerUseItemToOffhandAction serverAction) { - this.serverAction = serverAction; - } - - public boolean doTick(@NotNull ServerBot bot) { - return serverAction.doTick(bot); + super(serverAction, CraftUseItemToOffhandAction::new); } @Override @@ -32,102 +19,4 @@ public class CraftUseItemToOffhandAction extends CraftBotAction implements UseIt serverAction.setUseTick(useTick); return this; } - - @Override - public ServerBotAction getHandle() { - return serverAction; - } - - @Override - public String getName() { - return serverAction.getName(); - } - - @Override - public UUID getUUID() { - return serverAction.getUUID(); - } - - @Override - public void setCancelled(boolean cancel) { - serverAction.setCancelled(cancel); - } - - @Override - public boolean isCancelled() { - return serverAction.isCancelled(); - } - - @Override - public void setOnFail(Consumer onFail) { - this.onFail = onFail; - serverAction.setOnFail(it -> onFail.accept(new CraftUseItemToOffhandAction(it))); - } - - @Override - public Consumer getOnFail() { - return onFail; - } - - @Override - public void setOnSuccess(Consumer onSuccess) { - this.onSuccess = onSuccess; - serverAction.setOnSuccess(it -> onSuccess.accept(new CraftUseItemToOffhandAction(it))); - } - - @Override - public Consumer getOnSuccess() { - return onSuccess; - } - - @Override - public void setOnStop(Consumer onStop) { - this.onStop = onStop; - serverAction.setOnStop(it -> onStop.accept(new CraftUseItemToOffhandAction(it))); - } - - @Override - public Consumer getOnStop() { - return onStop; - } - - @Override - public void setStartDelayTick(int delayTick) { - serverAction.setStartDelayTick(delayTick); - } - - @Override - public int getStartDelayTick() { - return serverAction.getStartDelayTick(); - } - - @Override - public void setDoIntervalTick(int intervalTick) { - serverAction.setDoIntervalTick(intervalTick); - } - - @Override - public int getDoIntervalTick() { - return serverAction.getDoIntervalTick(); - } - - @Override - public void setDoNumber(int doNumber) { - serverAction.setDoNumber(doNumber); - } - - @Override - public int getDoNumber() { - return serverAction.getDoNumber(); - } - - @Override - public int getTickToNext() { - return serverAction.getTickToNext(); - } - - @Override - public int getDoNumberRemaining() { - return serverAction.getDoNumberRemaining(); - } -} +} \ No newline at end of file