From 48761085c4781999b460e83bbc794fb1624f78f6 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Mon, 23 Oct 2023 20:53:19 +0200 Subject: [PATCH] Cleaned up code Added delapy when stopping to ensure that the server-stopped message was sent --- .../dev/jonasjones/yadcl/config/ModConfigs.java | 6 +++--- .../dev/jonasjones/yadcl/dcbot/DiscordBot.java | 14 ++++++++++---- .../jonasjones/yadcl/mixin/PlayerManagerMixin.java | 10 +++++----- .../jonasjones/yadcl/mixin/ServerStopMixin.java | 1 - 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/dev/jonasjones/yadcl/config/ModConfigs.java b/src/main/java/dev/jonasjones/yadcl/config/ModConfigs.java index a301a3b..3afae6a 100644 --- a/src/main/java/dev/jonasjones/yadcl/config/ModConfigs.java +++ b/src/main/java/dev/jonasjones/yadcl/config/ModConfigs.java @@ -17,7 +17,7 @@ public class ModConfigs { //public static Boolean PLAYER_COMMAND_MSG; public static Boolean SERVER_START_STOP_MSG; - public static String BOT_STATUS; + //public static String BOT_STATUS; public static void registerConfigs() { configs = new ModConfigProvider(); @@ -37,7 +37,7 @@ public class ModConfigs { configs.addKeyValuePair(new Pair<>("bot.player_chat_msgs", true), "Should the bot send a message when a player sends a chat message"); //configs.addKeyValuePair(new Pair<>("bot.player_command_msgs", true), "Should the bot send a message when a player sends a command"); configs.addKeyValuePair(new Pair<>("bot.server_start_stop_msgs", true), "Should the bot send a message when the server starts or stops"); - configs.addKeyValuePair(new Pair<>("bot.status", "PlayerCount"), "What status should the bot display [None, PlayerCount, IP, Uptime]"); + //configs.addKeyValuePair(new Pair<>("bot.status", "PlayerCount"), "What status should the bot display [None, PlayerCount, IP, Uptime]"); } private static void assignConfigs() { @@ -49,7 +49,7 @@ public class ModConfigs { PLAYER_CHAT_MSG = CONFIG.getOrDefault("bot.player_chat_msgs", true); //PLAYER_COMMAND_MSG = CONFIG.getOrDefault("bot.player_command_msgs", true); SERVER_START_STOP_MSG = CONFIG.getOrDefault("bot.server_start_stop_msgs", true); - BOT_STATUS = CONFIG.getOrDefault("bot.status", "PlayerCount"); + //BOT_STATUS = CONFIG.getOrDefault("bot.status", "PlayerCount"); YetAnotherDiscordChatLink.LOGGER.info("All " + configs.getConfigsList().size() + " Configs have been set properly"); } diff --git a/src/main/java/dev/jonasjones/yadcl/dcbot/DiscordBot.java b/src/main/java/dev/jonasjones/yadcl/dcbot/DiscordBot.java index df7c951..2455088 100644 --- a/src/main/java/dev/jonasjones/yadcl/dcbot/DiscordBot.java +++ b/src/main/java/dev/jonasjones/yadcl/dcbot/DiscordBot.java @@ -45,7 +45,7 @@ public class DiscordBot { } }); // Set the bot status - if (ModConfigs.BOT_STATUS.equals("Uptime")) { + /*if (ModConfigs.BOT_STATUS.equals("Uptime")) { new Thread(() -> { while (isBotRunning) { botStatus(ModConfigs.BOT_STATUS); @@ -58,7 +58,7 @@ public class DiscordBot { }).start(); } else { botStatus(ModConfigs.BOT_STATUS); - } + }*/ } catch (Exception e) { LOGGER.error("Failed to start Discord bot. Check the provided discord token in the config file."); return; @@ -104,11 +104,17 @@ public class DiscordBot { ServerLifecycleEvents.SERVER_STOPPED.register(server -> { sendToDiscord("Server is stopped!"); + //wait for 2 seconds to make sure the message is sent + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + e.printStackTrace(); + } stopBot(); }); } - public static void botStatus(String status) { + /*public static void botStatus(String status) { if (!isBotRunning) { return; } @@ -150,5 +156,5 @@ public class DiscordBot { } return duration.toString(); - } + }*/ } diff --git a/src/main/java/dev/jonasjones/yadcl/mixin/PlayerManagerMixin.java b/src/main/java/dev/jonasjones/yadcl/mixin/PlayerManagerMixin.java index e7e2a29..ac4656f 100644 --- a/src/main/java/dev/jonasjones/yadcl/mixin/PlayerManagerMixin.java +++ b/src/main/java/dev/jonasjones/yadcl/mixin/PlayerManagerMixin.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static dev.jonasjones.yadcl.dcbot.DiscordBot.botStatus; +//import static dev.jonasjones.yadcl.dcbot.DiscordBot.botStatus; import static dev.jonasjones.yadcl.dcbot.DiscordBot.sendToDiscord; @Mixin(PlayerManager.class) @@ -19,9 +19,9 @@ public class PlayerManagerMixin { public void onPlayerConnect​(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) { if (ModConfigs.PLAYER_JOIN_LEAVE_MSG) { sendToDiscord(player.getDisplayName().getString() + " joined the game"); - if (ModConfigs.BOT_STATUS.equals("PlayerCount")) { + /*if (ModConfigs.BOT_STATUS.equals("PlayerCount")) { botStatus(ModConfigs.BOT_STATUS); - } + }*/ } } @@ -29,9 +29,9 @@ public class PlayerManagerMixin { public void remove(ServerPlayerEntity player, CallbackInfo ci) { if (ModConfigs.PLAYER_JOIN_LEAVE_MSG) { sendToDiscord(player.getDisplayName().getString() + " left the game"); - if (ModConfigs.BOT_STATUS.equals("PlayerCount")) { + /*if (ModConfigs.BOT_STATUS.equals("PlayerCount")) { botStatus(ModConfigs.BOT_STATUS); - } + }*/ } } } \ No newline at end of file diff --git a/src/main/java/dev/jonasjones/yadcl/mixin/ServerStopMixin.java b/src/main/java/dev/jonasjones/yadcl/mixin/ServerStopMixin.java index 15cad94..349d0ef 100644 --- a/src/main/java/dev/jonasjones/yadcl/mixin/ServerStopMixin.java +++ b/src/main/java/dev/jonasjones/yadcl/mixin/ServerStopMixin.java @@ -8,7 +8,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import static dev.jonasjones.yadcl.dcbot.DiscordBot.sendToDiscord; -import static dev.jonasjones.yadcl.dcbot.DiscordBot.stopBot; @Mixin(MinecraftServer.class) public class ServerStopMixin {