From 079c579b0e24d7c8bb3fb37c98fcc16d71f1a736 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Wed, 19 Mar 2025 15:14:24 +0700 Subject: [PATCH] fix: core tracked query issue --- build-number.txt | 2 +- .../chayapak1/chomens_bot/commands/CommandBlockCommand.java | 2 +- .../java/me/chayapak1/chomens_bot/commands/EvalCommand.java | 2 +- .../me/chayapak1/chomens_bot/commands/FindAltsCommand.java | 2 +- .../java/me/chayapak1/chomens_bot/commands/MailCommand.java | 2 +- .../java/me/chayapak1/chomens_bot/commands/MusicCommand.java | 2 +- .../java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java | 2 +- .../java/me/chayapak1/chomens_bot/plugins/CorePlugin.java | 4 ++-- .../java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java | 2 +- .../chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java | 2 +- .../java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java | 4 ++-- .../chomens_bot/plugins/ServerPluginsManagerPlugin.java | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build-number.txt b/build-number.txt index ca9836af..b3c8e537 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -1977 \ No newline at end of file +1988 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java index 70b4fc7f..155ad681 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/CommandBlockCommand.java @@ -107,7 +107,7 @@ public class CommandBlockCommand extends Command { if (future == null) return; - future.thenApplyAsync(output -> { + future.thenApply(output -> { if (player == null) context.sendOutput(output); else { final Component component = Component diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java index 4bc0d60b..8ec7a260 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/EvalCommand.java @@ -38,7 +38,7 @@ public class EvalCommand extends Command { final CompletableFuture future = bot.eval.run(command); - future.thenApplyAsync(output -> { + future.thenApply(output -> { if (output.isError()) context.sendOutput(Component.text(output.output()).color(NamedTextColor.RED)); else context.sendOutput(Component.text(output.output())); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java index a1c4f26d..37ba8341 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/FindAltsCommand.java @@ -54,7 +54,7 @@ public class FindAltsCommand extends Command { final String tempFinalPlayer = player; - future.thenApplyAsync(targetIP -> { + future.thenApply(targetIP -> { context.sendOutput(handle(bot, targetIP, false, tempFinalPlayer, allServer)); return targetIP; diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java index e46a539c..7b205e04 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/MailCommand.java @@ -74,7 +74,7 @@ public class MailCommand extends Command { "SelectedItem.components.minecraft:custom_data.message" ); - future.thenApplyAsync(output -> { + future.thenApply(output -> { try { if (output == null) { throw new CommandException(Component.text("Player has no `message` NBT tag in their selected item's minecraft:custom_data")); diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java index 50e07768..4ec422a5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/MusicCommand.java @@ -187,7 +187,7 @@ public class MusicCommand extends Command { "SelectedItem.components.minecraft:custom_data.SongItemData.SongData" ); - future.thenApplyAsync(output -> { + future.thenApply(output -> { if (output == null) { context.sendOutput(Component.text("Player has no `SongItemData.SongData` NBT tag in their selected item's minecraft:custom_data").color(NamedTextColor.RED)); return null; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java index 14cb82b2..bf93e995 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/AuthPlugin.java @@ -32,7 +32,7 @@ public class AuthPlugin extends PlayersPlugin.Listener { future.completeOnTimeout("", 10, TimeUnit.SECONDS); - future.thenApplyAsync(ip -> { + future.thenApply(ip -> { bot.logger.log( LogType.AUTH, Component.translatable( diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java index 89716cb6..0ea9c8ad 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java @@ -220,7 +220,7 @@ public class CorePlugin extends PositionPlugin.Listener { return null; } - final Vector3i coreBlock = block; + final Vector3i coreBlock = block.clone(); run(command); @@ -228,7 +228,7 @@ public class CorePlugin extends PositionPlugin.Listener { final CompletableFuture future = bot.query.block(coreBlock, "LastOutput"); - future.thenApplyAsync(output -> { + future.thenApply(output -> { if (output == null) return null; trackedFuture.complete( diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java index 20d2e617..38535051 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/IPFilterPlugin.java @@ -71,7 +71,7 @@ public class IPFilterPlugin extends PlayersPlugin.Listener { if (future == null) return; - future.thenApplyAsync(output -> { + future.thenApply(output -> { handleFilterManager(output, target); return output; diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java index 3a38f5c9..cf06d39c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java @@ -156,7 +156,7 @@ public class PlayersDatabasePlugin extends PlayersPlugin.Listener { if (future == null) return; - future.thenApplyAsync(output -> { + future.thenApply(output -> { if (output == null) return null; try { diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java index 1519f07b..022bc19c 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java @@ -90,7 +90,7 @@ public class PlayersPlugin extends Bot.Listener { trackedCoreFuture.completeOnTimeout(null, 5, TimeUnit.SECONDS); - trackedCoreFuture.thenApplyAsync(output -> { + trackedCoreFuture.thenApply(output -> { final List children = output.children(); String stringified = ComponentUtilities.stringify(Component.join(JoinConfiguration.separator(Component.empty()), children)); @@ -236,7 +236,7 @@ public class PlayersPlugin extends Bot.Listener { private void check (PlayerEntry target) { final CompletableFuture future = getLastKnownName(target.profile.getIdAsString()); - future.thenApplyAsync(lastKnownName -> { + future.thenApply(lastKnownName -> { if (lastKnownName == null) { list.remove(target); diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/ServerPluginsManagerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/ServerPluginsManagerPlugin.java index b6002ba5..ae47fd39 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/ServerPluginsManagerPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/ServerPluginsManagerPlugin.java @@ -28,7 +28,7 @@ public class ServerPluginsManagerPlugin extends Bot.Listener { public void connected (ConnectedEvent event) { final CompletableFuture future = bot.tabComplete.tabComplete("ver "); - future.thenApplyAsync((packet) -> { + future.thenApply((packet) -> { final String[] matches = packet.getMatches(); // should i just use the plugins as the String array instead of a list?