diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotCommand.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotCommand.java index 4bf25cb2..03a3a4b8 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotCommand.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotCommand.java @@ -18,8 +18,8 @@ import org.leavesmc.leaves.LeavesConfig; import org.leavesmc.leaves.LeavesLogger; import org.leavesmc.leaves.bot.agent.Actions; -import org.leavesmc.leaves.bot.agent.BotAction; -import org.leavesmc.leaves.bot.agent.BotConfig; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotConfig; import org.leavesmc.leaves.bot.agent.Configs; import org.leavesmc.leaves.bot.agent.actions.CraftCustomBotAction; import org.leavesmc.leaves.command.CommandArgumentResult; @@ -116,7 +116,7 @@ public BotCommand(String name) { list.add(String.valueOf(i)); } } else { - BotAction action = Actions.getForName(args[2]); + AbstractBotAction action = Actions.getForName(args[2]); if (action != null) { list.addAll(action.getArgument().tabComplete(args.length - 4)); } @@ -326,9 +326,9 @@ private void onAction(CommandSender sender, String @NotNull [] args) { String index = args[3]; if (index.equals("all")) { - Set> forRemoval = new HashSet<>(); + Set> forRemoval = new HashSet<>(); for (int i = 0; i < bot.getBotActions().size(); i++) { - BotAction action = bot.getBotActions().get(i); + AbstractBotAction action = bot.getBotActions().get(i); BotActionStopEvent event = new BotActionStopEvent( bot.getBukkitEntity(), action.getName(), action.getUUID(), BotActionStopEvent.Reason.COMMAND, sender ); @@ -347,7 +347,7 @@ private void onAction(CommandSender sender, String @NotNull [] args) { return; } - BotAction action = bot.getBotActions().get(i); + AbstractBotAction action = bot.getBotActions().get(i); BotActionStopEvent event = new BotActionStopEvent( bot.getBukkitEntity(), action.getName(), action.getUUID(), BotActionStopEvent.Reason.COMMAND, sender ); @@ -364,7 +364,7 @@ private void onAction(CommandSender sender, String @NotNull [] args) { return; } - BotAction action = Actions.getForName(args[2]); + AbstractBotAction action = Actions.getForName(args[2]); if (action == null) { sender.sendMessage(text("Invalid action", NamedTextColor.RED)); return; @@ -382,7 +382,7 @@ private void onAction(CommandSender sender, String @NotNull [] args) { System.arraycopy(args, 3, realArgs, 0, realArgs.length); } - BotAction newAction; + AbstractBotAction newAction; try { if (action instanceof CraftCustomBotAction customBotAction) { newAction = customBotAction.createCraft(player, realArgs); @@ -427,7 +427,7 @@ private void onConfig(CommandSender sender, String @NotNull [] args) { return; } - BotConfig config = Objects.requireNonNull(Configs.getConfig(args[2])).config; + AbstractBotConfig config = Objects.requireNonNull(Configs.getConfig(args[2])).config; if (args.length < 4) { config.getMessage().forEach(sender::sendMessage); } else { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java index 022812a2..94aee660 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java @@ -50,8 +50,8 @@ import org.leavesmc.leaves.LeavesConfig; import org.leavesmc.leaves.LeavesLogger; import org.leavesmc.leaves.bot.agent.Actions; -import org.leavesmc.leaves.bot.agent.BotAction; -import org.leavesmc.leaves.bot.agent.BotConfig; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotConfig; import org.leavesmc.leaves.bot.agent.Configs; import org.leavesmc.leaves.entity.CraftBot; import org.leavesmc.leaves.event.bot.BotActionScheduleEvent; @@ -70,11 +70,10 @@ import java.util.UUID; import java.util.function.Predicate; -// TODO test public class ServerBot extends ServerPlayer { - private final Map, BotConfig> configs; - private final List> actions; + private final Map, AbstractBotConfig> configs; + private final List> actions; public boolean resume = false; public BotCreateState createState; @@ -97,7 +96,7 @@ public ServerBot(MinecraftServer server, ServerLevel world, GameProfile profile) this.gameMode = new ServerBotGameMode(this); this.actions = new ArrayList<>(); - ImmutableMap.Builder, BotConfig> configBuilder = ImmutableMap.builder(); + ImmutableMap.Builder, AbstractBotConfig> configBuilder = ImmutableMap.builder(); for (Configs config : Configs.getConfigs()) { configBuilder.put(config, config.config.create(this)); } @@ -399,7 +398,7 @@ public void addAdditionalSaveData(@NotNull CompoundTag nbt) { if (!this.actions.isEmpty()) { ListTag actionNbt = new ListTag(); - for (BotAction action : this.actions) { + for (AbstractBotAction action : this.actions) { actionNbt.add(action.save(new CompoundTag())); } nbt.put("actions", actionNbt); @@ -407,7 +406,7 @@ public void addAdditionalSaveData(@NotNull CompoundTag nbt) { if (!this.configs.isEmpty()) { ListTag configNbt = new ListTag(); - for (BotConfig config : this.configs.values()) { + for (AbstractBotConfig config : this.configs.values()) { configNbt.add(config.save(new CompoundTag())); } nbt.put("configs", configNbt); @@ -442,9 +441,9 @@ public void readAdditionalSaveData(@NotNull CompoundTag nbt) { ListTag actionNbt = nbt.getList("actions", 10); for (int i = 0; i < actionNbt.size(); i++) { CompoundTag actionTag = actionNbt.getCompound(i); - BotAction action = Actions.getForName(actionTag.getString("actionName")); + AbstractBotAction action = Actions.getForName(actionTag.getString("actionName")); if (action != null) { - BotAction newAction = action.create(); + AbstractBotAction newAction = action.create(); newAction.load(actionTag); this.actions.add(newAction); } @@ -509,11 +508,11 @@ public void dropAll() { private void runAction() { if (LeavesConfig.modify.fakeplayer.canUseAction) { this.actions.forEach(action -> action.tryTick(this)); - this.actions.removeIf(BotAction::isCancelled); + this.actions.removeIf(AbstractBotAction::isCancelled); } } - public boolean addBotAction(BotAction action, CommandSender sender) { + public boolean addBotAction(AbstractBotAction action, CommandSender sender) { if (!LeavesConfig.modify.fakeplayer.canUseAction) { return false; } @@ -527,7 +526,7 @@ public boolean addBotAction(BotAction action, CommandSender sender) { return true; } - public List> getBotActions() { + public List> getBotActions() { return actions; } @@ -537,8 +536,8 @@ public List> getBotActions() { } @SuppressWarnings("unchecked") - public BotConfig getConfig(Configs config) { - return (BotConfig) Objects.requireNonNull(this.configs.get(config)); + public AbstractBotConfig getConfig(Configs config) { + return (AbstractBotConfig) Objects.requireNonNull(this.configs.get(config)); } public E getConfigValue(Configs config) { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/BotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/AbstractBotAction.java similarity index 96% rename from leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/BotAction.java rename to leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/AbstractBotAction.java index 3bd512b4..50a874e8 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/BotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/AbstractBotAction.java @@ -14,7 +14,7 @@ import java.util.UUID; import java.util.function.Supplier; -public abstract class BotAction> { +public abstract class AbstractBotAction> { private final String name; private final CommandArgument argument; @@ -28,7 +28,7 @@ public abstract class BotAction> { private int needWaitTick; private int canDoNumber; - public BotAction(String name, CommandArgument argument, Supplier creator) { + public AbstractBotAction(String name, CommandArgument argument, Supplier creator) { this.name = name; this.argument = argument; this.uuid = UUID.randomUUID(); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/BotConfig.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/AbstractBotConfig.java similarity index 81% rename from leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/BotConfig.java rename to leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/AbstractBotConfig.java index c889a240..4135fcc6 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/BotConfig.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/AbstractBotConfig.java @@ -9,20 +9,20 @@ import java.util.List; import java.util.function.Supplier; -public abstract class BotConfig { +public abstract class AbstractBotConfig { private final String name; private final CommandArgument argument; - private final Supplier> creator; + private final Supplier> creator; protected ServerBot bot; - public BotConfig(String name, CommandArgument argument, Supplier> creator) { + public AbstractBotConfig(String name, CommandArgument argument, Supplier> creator) { this.name = name; this.argument = argument; this.creator = creator; } - public BotConfig setBot(ServerBot bot) { + public AbstractBotConfig setBot(ServerBot bot) { this.bot = bot; return this; } @@ -48,7 +48,7 @@ public CommandArgument getArgument() { } @NotNull - public BotConfig create(ServerBot bot) { + public AbstractBotConfig create(ServerBot bot) { return this.creator.get().setBot(bot); } 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 a37513e1..cd3a8530 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 @@ -12,7 +12,7 @@ public class Actions { - private static final Map> actions = new HashMap<>(); + private static final Map> actions = new HashMap<>(); public static void registerAll() { register(new AttackAction()); @@ -33,7 +33,7 @@ public static void registerAll() { register(new RotationAction()); } - public static boolean register(@NotNull BotAction action) { + public static boolean register(@NotNull AbstractBotAction action) { if (!actions.containsKey(action.getName())) { actions.put(action.getName(), action); return true; @@ -51,7 +51,7 @@ public static boolean unregister(@NotNull String name) { @NotNull @Contract(pure = true) - public static Collection> getAll() { + public static Collection> getAll() { return actions.values(); } @@ -61,7 +61,7 @@ public static Set getNames() { } @Nullable - public static BotAction getForName(String name) { + public static AbstractBotAction getForName(String name) { return actions.get(name); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Configs.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Configs.java index d99f459b..b65bfdff 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Configs.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Configs.java @@ -9,6 +9,7 @@ import java.util.HashMap; import java.util.Map; +@SuppressWarnings("unused") public class Configs { private static final Map> configs = new HashMap<>(); @@ -18,9 +19,9 @@ public class Configs { public static final Configs SPAWN_PHANTOM = register(new SpawnPhantomConfig()); public static final Configs SIMULATION_DISTANCE = register(new SimulationDistanceConfig()); - public final BotConfig config; + public final AbstractBotConfig config; - private Configs(BotConfig config) { + private Configs(AbstractBotConfig config) { this.config = config; } @@ -36,7 +37,7 @@ public static Configs getConfig(String name) { } @NotNull - private static Configs register(BotConfig botConfig) { + private static Configs register(AbstractBotConfig botConfig) { Configs config = new Configs<>(botConfig); configs.put(botConfig.getName(), config); return config; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/AbstractTimerAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/AbstractTimerAction.java index be55a308..39b9bc97 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/AbstractTimerAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/AbstractTimerAction.java @@ -3,7 +3,7 @@ import net.minecraft.server.level.ServerPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.leavesmc.leaves.bot.agent.BotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; import org.leavesmc.leaves.command.CommandArgumentType; @@ -11,7 +11,7 @@ import java.util.List; import java.util.function.Supplier; -public abstract class AbstractTimerAction> extends BotAction { +public abstract class AbstractTimerAction> extends AbstractBotAction { public AbstractTimerAction(String name, Supplier creator) { super(name, CommandArgument.of(CommandArgumentType.INTEGER, CommandArgumentType.INTEGER), creator); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftBotAction.java index d96fc7b9..6dff4297 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftBotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftBotAction.java @@ -4,33 +4,33 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.bot.agent.Actions; -import org.leavesmc.leaves.bot.agent.BotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.entity.botaction.BotActionType; import org.leavesmc.leaves.entity.botaction.LeavesBotAction; public class CraftBotAction extends LeavesBotAction { - private final BotAction handle; + private final AbstractBotAction handle; - public CraftBotAction(@NotNull BotAction action) { + public CraftBotAction(@NotNull AbstractBotAction action) { super(BotActionType.valueOf(action.getName()), action.getTickDelay(), action.getCanDoNumber()); this.handle = action; } @Contract("_ -> new") @NotNull - public static LeavesBotAction asAPICopy(BotAction action) { + public static LeavesBotAction asAPICopy(AbstractBotAction action) { return new CraftBotAction(action); } @NotNull - public static BotAction asInternalCopy(@NotNull LeavesBotAction action) { - BotAction act = Actions.getForName(action.getActionName()); + public static AbstractBotAction asInternalCopy(@NotNull LeavesBotAction action) { + AbstractBotAction act = Actions.getForName(action.getActionName()); if (act == null) { throw new IllegalArgumentException("Invalid action name!"); } - BotAction newAction = null; + AbstractBotAction newAction = null; String[] args = new String[]{String.valueOf(action.getExecuteInterval()), String.valueOf(action.getRemainingExecuteTime())}; try { if (act instanceof CraftCustomBotAction customBotAction) { @@ -48,7 +48,7 @@ public static BotAction asInternalCopy(@NotNull LeavesBotAction action) { return newAction; } - public BotAction getHandle() { + public AbstractBotAction getHandle() { return handle; } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomBotAction.java index 7b149243..1a72cee7 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomBotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/CraftCustomBotAction.java @@ -5,12 +5,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.BotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; import org.leavesmc.leaves.entity.botaction.CustomBotAction; -public class CraftCustomBotAction extends BotAction { +public class CraftCustomBotAction extends AbstractBotAction { private final CustomBotAction realAction; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/LookAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/LookAction.java index 8be962cf..0bfc658f 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/LookAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/LookAction.java @@ -6,14 +6,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.BotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; import org.leavesmc.leaves.command.CommandArgumentType; import java.util.List; -public class LookAction extends BotAction { +public class LookAction extends AbstractBotAction { public LookAction() { super("look", CommandArgument.of(CommandArgumentType.DOUBLE, CommandArgumentType.DOUBLE, CommandArgumentType.DOUBLE), LookAction::new); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/RotateAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/RotateAction.java index 84eb7bd7..8b339308 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/RotateAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/RotateAction.java @@ -5,11 +5,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.BotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; -public class RotateAction extends BotAction { +public class RotateAction extends AbstractBotAction { public RotateAction() { super("rotate", CommandArgument.EMPTY, RotateAction::new); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/RotationAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/RotationAction.java index 6f6ea32f..c56578c0 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/RotationAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/RotationAction.java @@ -5,14 +5,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.BotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; import org.leavesmc.leaves.command.CommandArgumentType; import java.util.List; -public class RotationAction extends BotAction { +public class RotationAction extends AbstractBotAction { public RotationAction() { super("rotation", CommandArgument.of(CommandArgumentType.FLOAT, CommandArgumentType.FLOAT), RotationAction::new); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/SneakAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/SneakAction.java index 923cf55d..b2ca6f57 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/SneakAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/SneakAction.java @@ -4,11 +4,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.BotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; -public class SneakAction extends BotAction { +public class SneakAction extends AbstractBotAction { public SneakAction() { super("sneak", CommandArgument.EMPTY, SneakAction::new); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/SwimAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/SwimAction.java index b5ccedee..b53402b7 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/SwimAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/SwimAction.java @@ -5,11 +5,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.BotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; -public class SwimAction extends BotAction { +public class SwimAction extends AbstractBotAction { public SwimAction() { super("swim", CommandArgument.EMPTY, SwimAction::new); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/AlwaysSendDataConfig.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/AlwaysSendDataConfig.java index 1ee9a806..c8bdcf9b 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/AlwaysSendDataConfig.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/AlwaysSendDataConfig.java @@ -4,14 +4,14 @@ import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.LeavesConfig; -import org.leavesmc.leaves.bot.agent.BotConfig; +import org.leavesmc.leaves.bot.agent.AbstractBotConfig; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; import org.leavesmc.leaves.command.CommandArgumentType; import java.util.List; -public class AlwaysSendDataConfig extends BotConfig { +public class AlwaysSendDataConfig extends AbstractBotConfig { private boolean value; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SimulationDistanceConfig.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SimulationDistanceConfig.java index c8a22433..3ec252ca 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SimulationDistanceConfig.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SimulationDistanceConfig.java @@ -2,7 +2,7 @@ import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.agent.BotConfig; +import org.leavesmc.leaves.bot.agent.AbstractBotConfig; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; import org.leavesmc.leaves.command.CommandArgumentType; @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; -public class SimulationDistanceConfig extends BotConfig { +public class SimulationDistanceConfig extends AbstractBotConfig { public SimulationDistanceConfig() { super("simulation_distance", CommandArgument.of(CommandArgumentType.INTEGER).setTabComplete(0, List.of("2", "10", "")), SimulationDistanceConfig::new); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SkipSleepConfig.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SkipSleepConfig.java index b2b1be24..5fa0a1d6 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SkipSleepConfig.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SkipSleepConfig.java @@ -2,7 +2,7 @@ import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; -import org.leavesmc.leaves.bot.agent.BotConfig; +import org.leavesmc.leaves.bot.agent.AbstractBotConfig; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; import org.leavesmc.leaves.command.CommandArgumentType; @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; -public class SkipSleepConfig extends BotConfig { +public class SkipSleepConfig extends AbstractBotConfig { public SkipSleepConfig() { super("skip_sleep", CommandArgument.of(CommandArgumentType.BOOLEAN).setTabComplete(0, List.of("true", "false")), SkipSleepConfig::new); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SpawnPhantomConfig.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SpawnPhantomConfig.java index 24e3c3cf..8e4a8e06 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SpawnPhantomConfig.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/SpawnPhantomConfig.java @@ -3,14 +3,14 @@ import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.LeavesConfig; -import org.leavesmc.leaves.bot.agent.BotConfig; +import org.leavesmc.leaves.bot.agent.AbstractBotConfig; import org.leavesmc.leaves.command.CommandArgument; import org.leavesmc.leaves.command.CommandArgumentResult; import org.leavesmc.leaves.command.CommandArgumentType; import java.util.List; -public class SpawnPhantomConfig extends BotConfig { +public class SpawnPhantomConfig extends AbstractBotConfig { private boolean value; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBot.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBot.java index aaa5f8a3..6f2054b9 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBot.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBot.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.bot.BotList; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.BotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.bot.agent.actions.CraftBotAction; import org.leavesmc.leaves.entity.botaction.LeavesBotAction; import org.leavesmc.leaves.event.bot.BotActionStopEvent; @@ -60,7 +60,7 @@ public void stopAction(int index) { @Override public void stopAllActions() { - for (BotAction action : this.getHandle().getBotActions()) { + for (AbstractBotAction action : this.getHandle().getBotActions()) { action.stop(this.getHandle(), BotActionStopEvent.Reason.PLUGIN); } } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBotManager.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBotManager.java index 422640df..cae7749d 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBotManager.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/CraftBotManager.java @@ -10,7 +10,7 @@ import org.leavesmc.leaves.bot.BotList; import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.Actions; -import org.leavesmc.leaves.bot.agent.BotAction; +import org.leavesmc.leaves.bot.agent.AbstractBotAction; import org.leavesmc.leaves.bot.agent.actions.CraftCustomBotAction; import org.leavesmc.leaves.entity.botaction.CustomBotAction; import org.leavesmc.leaves.event.bot.BotCreateEvent; @@ -66,7 +66,7 @@ public boolean registerCustomBotAction(String name, CustomBotAction action) { @Override public boolean unregisterCustomBotAction(String name) { - BotAction action = Actions.getForName(name); + AbstractBotAction action = Actions.getForName(name); if (action instanceof CraftCustomBotAction) { return Actions.unregister(name); } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/profile/LeavesMinecraftSessionService.java b/leaves-server/src/main/java/org/leavesmc/leaves/profile/LeavesMinecraftSessionService.java index 133c7619..609f79a5 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/profile/LeavesMinecraftSessionService.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/profile/LeavesMinecraftSessionService.java @@ -74,13 +74,12 @@ public ProfileResult hasJoinedServer(String profileName, String serverId, @Nulla final HasJoinedMinecraftServerResponse response = client.get(url, HasJoinedMinecraftServerResponse.class); if (response != null && response.id() != null) { if (LeavesConfig.mics.yggdrasil.loginProtect && cache != null) { - if (response.id() != cache.getId()) { + if (!response.id().equals(cache.getId())) { continue; } } final GameProfile result1 = new GameProfile(response.id(), profileName); - if (response.properties() != null) { result1.getProperties().putAll(response.properties()); }