From c7fdad965faefa5087a32445b36ec64a7e094091 Mon Sep 17 00:00:00 2001 From: ChomeNS Date: Fri, 24 Mar 2023 16:15:26 +0700 Subject: [PATCH] add kaboom in config for self care and core --- src/main/java/me/chayapak1/chomens_bot/Bot.java | 4 +++- src/main/java/me/chayapak1/chomens_bot/Configuration.java | 1 + src/main/java/me/chayapak1/chomens_bot/Main.java | 3 ++- .../java/me/chayapak1/chomens_bot/plugins/CorePlugin.java | 7 +++++-- .../me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java | 4 ++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/chayapak1/chomens_bot/Bot.java b/src/main/java/me/chayapak1/chomens_bot/Bot.java index 83a77b1..618875f 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Bot.java +++ b/src/main/java/me/chayapak1/chomens_bot/Bot.java @@ -22,6 +22,7 @@ public class Bot { @Getter private final String host; @Getter private final int port; private final String _username; + @Getter private final boolean kaboom; @Getter private final List allBots; @Getter private final Configuration config; @@ -41,10 +42,11 @@ public class Bot { @Getter private final MusicPlayerPlugin music; @Getter private final TPSPlugin tps; - public Bot (String host, int port, String _username, List allBots, Configuration config) { + public Bot (String host, int port, String _username, boolean kaboom, List allBots, Configuration config) { this.host = host; this.port = port; this._username = _username; + this.kaboom = kaboom; this.allBots = allBots; this.config = config; diff --git a/src/main/java/me/chayapak1/chomens_bot/Configuration.java b/src/main/java/me/chayapak1/chomens_bot/Configuration.java index 43ad9cb..da47da3 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Configuration.java +++ b/src/main/java/me/chayapak1/chomens_bot/Configuration.java @@ -37,5 +37,6 @@ public class Configuration { @Getter public String host; @Getter public int port; @Getter public String username; + @Getter public boolean kaboom = false; } } diff --git a/src/main/java/me/chayapak1/chomens_bot/Main.java b/src/main/java/me/chayapak1/chomens_bot/Main.java index 7b9991a..7b68621 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Main.java +++ b/src/main/java/me/chayapak1/chomens_bot/Main.java @@ -54,9 +54,10 @@ public class Main { final String host = botOption.host(); final int port = botOption.port(); final String username = botOption.username(); + final boolean kaboom = botOption.kaboom(); new Thread(() -> { - final Bot bot = new Bot(host, port, username, allBots, config); + final Bot bot = new Bot(host, port, username, kaboom, allBots, config); allBots.add(bot); latch.countDown(); 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 fe32b35..8837379 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java @@ -36,8 +36,11 @@ public class CorePlugin extends PositionPlugin.PositionListener { public Vector3i relativeCorePosition = Vector3i.from(coreStart); + private boolean kaboom; + public CorePlugin (Bot bot) { this.bot = bot; + this.kaboom = bot.kaboom(); bot.position().addListener(this); @@ -61,7 +64,7 @@ public class CorePlugin extends PositionPlugin.PositionListener { bot.session().send(new ServerboundSetCommandBlockPacket( absoluteCorePosition(), command, - CommandBlockMode.REDSTONE, + kaboom ? CommandBlockMode.AUTO : CommandBlockMode.REDSTONE, true, false, true @@ -155,7 +158,7 @@ public class CorePlugin extends PositionPlugin.PositionListener { ); final Session session = bot.session(); - session.send(new ServerboundSetCreativeModeSlotPacket(36, new ItemStack(347 /* command block id */, 64, new CompoundTag("", tag)))); + session.send(new ServerboundSetCreativeModeSlotPacket(36, new ItemStack(kaboom ? 466 /* repeating command block id */ : 347 /* command block id */, 64, new CompoundTag("", tag)))); session.send(new ServerboundPlayerActionPacket(PlayerAction.START_DIGGING, temporaryBlockPosition, Direction.NORTH, 0)); session.send(new ServerboundUseItemOnPacket(temporaryBlockPosition, Direction.UP, Hand.MAIN_HAND, 0.5f, 0.5f, 0.5f, false, 1)); } diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java index 1bcbcae..f6ce4d4 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java @@ -82,12 +82,12 @@ public class SelfCarePlugin extends SessionAdapter { if (selfCares.gamemode() && gamemode != GameMode.CREATIVE) bot.chat().send("/minecraft:gamemode creative @s[type=player]"); else if (selfCares.op() && permissionLevel < 2) bot.chat().send("/minecraft:op @s[type=player]"); - else if (selfCares.cspy() && !cspy) bot.chat().send("/commandspy:commandspy on"); + else if (selfCares.cspy() && !cspy && bot.kaboom()) bot.chat().send("/commandspy:commandspy on"); else if (selfCares.vanish() && !vanish && !visibility) bot.chat().send("/essentials:vanish enable"); else if (selfCares.nickname() && !nickname) bot.chat().send("/essentials:nickname off"); else if (selfCares.socialspy() && !socialspy) bot.chat().send("/essentials:socialspy enable"); else if (selfCares.mute() && muted) bot.chat().send("/essentials:mute " + bot.username()); - else if (selfCares.prefix() && !prefix) bot.chat().send("/extras:prefix &8[&eChomeNS Bot&8]"); + else if (selfCares.prefix() && !prefix && bot.kaboom()) bot.chat().send("/extras:prefix &8[&eChomeNS Bot&8]"); } @Override