From df967d4a223ebc81c76bbaf0998f8767a04ded3e Mon Sep 17 00:00:00 2001 From: mangorifo Date: Thu, 27 Apr 2023 09:41:17 +0800 Subject: [PATCH] notify on /stop --- .idea/.gitignore | 3 - .idea/gradle.xml | 1 - .idea/misc.xml | 4 +- .idea/uiDesigner.xml | 124 ------------------ src/main/java/cf/sobrooms/ServerUtils.java | 16 --- src/main/java/cf/sobrooms/Utils.java | 2 - .../player/PlayerCommandPreprocess.java | 17 +++ src/main/resources/plugin.yml | 2 +- 8 files changed, 19 insertions(+), 150 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/uiDesigner.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 611e7c8..ce1c62c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,6 @@ - - - + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/cf/sobrooms/ServerUtils.java b/src/main/java/cf/sobrooms/ServerUtils.java index 0bc6006..81c7bcf 100644 --- a/src/main/java/cf/sobrooms/ServerUtils.java +++ b/src/main/java/cf/sobrooms/ServerUtils.java @@ -14,22 +14,6 @@ public class ServerUtils { public static String address = Utils.getServerHostPublicIP(); public static boolean serverIsUp(String serverAddress, Integer serverPort) { - /*Socket socket; - try { - socket = new Socket(address, port); - socket.close(); - return true; - } catch (Exception e) { - try { - System.out.println("Server is inactive on default address. Pinging on fallback address (" + address_fallback + ")..."); - Socket socket2 = new Socket(address_fallback, port); - socket2.close(); - return true; - } catch (Exception exception) { - System.out.println("Server is inactive on fallback address. No longer pinging..."); - return false; - } - }*/ try { Server server = Bukkit.getServer(); Socket s = new Socket(); diff --git a/src/main/java/cf/sobrooms/Utils.java b/src/main/java/cf/sobrooms/Utils.java index 41edc0c..3abe018 100644 --- a/src/main/java/cf/sobrooms/Utils.java +++ b/src/main/java/cf/sobrooms/Utils.java @@ -7,9 +7,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.InetAddress; -import java.net.MalformedURLException; import java.net.URL; -import java.net.UnknownHostException; public class Utils { public static String getActivePlayers() { diff --git a/src/main/java/cf/sobrooms/events/player/PlayerCommandPreprocess.java b/src/main/java/cf/sobrooms/events/player/PlayerCommandPreprocess.java index d88eb08..f37255d 100644 --- a/src/main/java/cf/sobrooms/events/player/PlayerCommandPreprocess.java +++ b/src/main/java/cf/sobrooms/events/player/PlayerCommandPreprocess.java @@ -10,6 +10,7 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent; import java.awt.*; import java.io.IOException; +import java.sql.Timestamp; import java.util.Date; public class PlayerCommandPreprocess implements Listener { @@ -30,5 +31,21 @@ public class PlayerCommandPreprocess implements Listener { } catch (IOException e) { throw new RuntimeException(e); } + + // temp: log on /stop + if (command[0].equals("/stop")) { + DiscordWebhook ntf = new DiscordWebhook(ServerUtils.webhook_notify); + DiscordWebhook.EmbedObject embed = new DiscordWebhook.EmbedObject() + .setTitle("Server stopped") + .setDescription("The server was stopped using the `/stop` command.") + .addField("Date", "".formatted(new Timestamp(System.currentTimeMillis()).getTime()), true) + .addField("Player name", player.getName(), true); + ntf.addEmbed(embed); + try { + ntf.execute(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } } } \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index aabddf2..c7efd66 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -16,5 +16,5 @@ commands: usage: /set-logging permission: op ping-server: - description: Pings the server... + description: Pings the server. Will not work on Bedrock clients. (ex. through geyser) usage: /ping-server \ No newline at end of file