diff --git a/build-number.txt b/build-number.txt index 29940999..1391eeb8 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -3471 \ No newline at end of file +3473 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/Configuration.java b/src/main/java/me/chayapak1/chomens_bot/Configuration.java index 36780a4c..199e44ae 100644 --- a/src/main/java/me/chayapak1/chomens_bot/Configuration.java +++ b/src/main/java/me/chayapak1/chomens_bot/Configuration.java @@ -156,7 +156,6 @@ public class Configuration { public String serverName; public String discordChannelId; public String ircChannel; - public boolean isAyunBoom = false; public boolean hidden = false; public boolean useCore = true; public boolean useCorePlaceBlock = false; 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 a40a4728..6e916731 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java @@ -5,7 +5,6 @@ import me.chayapak1.chomens_bot.data.listener.Listener; import me.chayapak1.chomens_bot.data.player.PlayerEntry; import me.chayapak1.chomens_bot.data.selfCare.SelfCare; import me.chayapak1.chomens_bot.data.selfCare.SelfData; -import me.chayapak1.chomens_bot.selfCares.ayunboom.AyunBoomSelfCare; import me.chayapak1.chomens_bot.selfCares.essentials.*; import me.chayapak1.chomens_bot.selfCares.kaboom.commandSpy.CommandSpySelfCare; import me.chayapak1.chomens_bot.selfCares.kaboom.extras.PrefixSelfCare; @@ -35,9 +34,6 @@ public class SelfCarePlugin implements Listener { public SelfCarePlugin (final Bot bot) { this.bot = bot; - // ayunboom - selfCares.add(new AyunBoomSelfCare(bot)); - // vanilla selfCares.add(new OperatorSelfCare(bot)); selfCares.add(new GameModeSelfCare(bot)); diff --git a/src/main/java/me/chayapak1/chomens_bot/selfCares/ayunboom/AyunBoomSelfCare.java b/src/main/java/me/chayapak1/chomens_bot/selfCares/ayunboom/AyunBoomSelfCare.java deleted file mode 100644 index 9c4e8b38..00000000 --- a/src/main/java/me/chayapak1/chomens_bot/selfCares/ayunboom/AyunBoomSelfCare.java +++ /dev/null @@ -1,43 +0,0 @@ -package me.chayapak1.chomens_bot.selfCares.ayunboom; - -import me.chayapak1.chomens_bot.Bot; -import me.chayapak1.chomens_bot.data.selfCare.SelfCare; -import net.kyori.adventure.text.Component; -import org.geysermc.mcprotocollib.network.packet.Packet; -import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundLoginPacket; - -public class AyunBoomSelfCare extends SelfCare { - public AyunBoomSelfCare (final Bot bot) { - super(bot); - } - - @Override - public boolean shouldRun () { - return bot.options.isAyunBoom; - } - - @Override - public void onPacketReceived (final Packet packet) { - if (packet instanceof final ClientboundLoginPacket t_packet) onPacketReceived(t_packet); - } - - private void onPacketReceived (final ClientboundLoginPacket ignoredPacket) { - this.needsRunning = true; - } - - @Override - public void onMessageReceived (final Component component, final String string) { - if (string.equals("Unable to connect you to ayunboom. Please try again later.")) this.needsRunning = true; - else if (string.equals("You are already connected to this server!")) this.needsRunning = false; - } - - @Override - public void run () { - bot.chat.sendCommandInstantly("server ayunboom"); - } - - @Override - public void cleanup () { - this.needsRunning = true; - } -} diff --git a/src/main/resources/default-config.yml b/src/main/resources/default-config.yml index c4366b64..e10bd689 100644 --- a/src/main/resources/default-config.yml +++ b/src/main/resources/default-config.yml @@ -160,7 +160,6 @@ bots: # serverName: 'Localhost' # discordChannelId: '1234567890' # ircChannel: '#chomens/localhost' - # isAyunBoom: false # hidden: false # useCore: true # useCorePlaceBlock: false