diff --git a/src/main/java/cf/sobrooms/Main.java b/src/main/java/cf/sobrooms/Main.java index bcff89f..49e6015 100644 --- a/src/main/java/cf/sobrooms/Main.java +++ b/src/main/java/cf/sobrooms/Main.java @@ -29,8 +29,7 @@ import java.util.Objects; public class Main extends JavaPlugin { public static File isLoggingConfig; - public static File notifyWebhookConfig; - public static File pubMessageWebhookConfig; + public static File webhookConfig; private static boolean webhooksAreValidUrls; public static void main(String... args) { @@ -48,19 +47,19 @@ public class Main extends JavaPlugin { } } isLoggingConfig = new File("./NoS/willLogCommands.bool"); - notifyWebhookConfig = new File("./NoS/notifyWebhook.json"); - pubMessageWebhookConfig = new File("./NoS/pubMessageWebhook.json"); + webhookConfig = new File("./NoS/config_webhook.json"); try { - if (isLoggingConfig.createNewFile() || notifyWebhookConfig.createNewFile() || pubMessageWebhookConfig.createNewFile()) { + if (isLoggingConfig.createNewFile()) { System.out.println("Config created: " + isLoggingConfig.getName()); - FileWriter notifyWebhookConfigWriter = new FileWriter(notifyWebhookConfig); - FileWriter pubMessageWebhookConfigWriter = new FileWriter(pubMessageWebhookConfig); - notifyWebhookConfigWriter.write("{\"url\": \"default-ns\"}"); - pubMessageWebhookConfigWriter.write("{\"url\": \"default-ns\"}"); - pubMessageWebhookConfigWriter.close(); - notifyWebhookConfigWriter.close(); + //FileWriter notifyWebhookConfigWriter = new FileWriter(notifyWebhookConfig); + //FileWriter pubMessageWebhookConfigWriter = new FileWriter(pubMessageWebhookConfig); + //notifyWebhookConfigWriter.write("{\"url_notify\": \"default-ns\"}"); + FileWriter linkConfigWriter = new FileWriter(webhookConfig); + linkConfigWriter.write("{\"url_publicmsg\": \"default-ns\", \"url_notify\": \"default-ns\"}"); + linkConfigWriter.close(); + //notifyWebhookConfigWriter.close(); } else { - System.out.println("Created config even while it already exists, skipping step..."); + System.out.println("Tried to create config even while it already exists, skipping step..."); } } catch (IOException e) { throw new RuntimeException(e); @@ -128,22 +127,22 @@ public class Main extends JavaPlugin { } public static String getPublicMessageWebhook() { try { - BufferedReader brfmsg = new BufferedReader(new FileReader(pubMessageWebhookConfig)); + BufferedReader brfmsg = new BufferedReader(new FileReader(webhookConfig)); JsonParser jsonReader = new JsonParser(); JsonElement MsgParse = jsonReader.parse(brfmsg.readLine()); - String lineMsg = MsgParse.getAsJsonObject().get("url").getAsString(); + String lineMsg = MsgParse.getAsJsonObject().get("url_publicmsg").getAsString(); // validate url being url // but this won't validate the url being an actual webhook // i can try but lazy :sob: if (lineMsg.equals("default-ns")) { - System.out.printf("Please set the webhook URL in %s and restart the server", pubMessageWebhookConfig.getAbsolutePath()); + System.out.printf("Please set the public message webhook URL in %s and restart the server", webhookConfig.getAbsolutePath()); webhooksAreValidUrls = false; return lineMsg; } else if (lineMsg.startsWith("https://") || lineMsg.startsWith("http://")) { webhooksAreValidUrls = true; return lineMsg; } else { - System.out.printf("Please set the webhook URL in %s and restart the server", pubMessageWebhookConfig.getAbsolutePath()); + System.out.printf("Please set the public message webhook URL in %s and restart the server", webhookConfig.getAbsolutePath()); webhooksAreValidUrls = false; return lineMsg; } @@ -153,22 +152,22 @@ public class Main extends JavaPlugin { } public static String getNotifyWebhook() { try { - BufferedReader brfntfy = new BufferedReader(new FileReader(notifyWebhookConfig)); + BufferedReader brfntfy = new BufferedReader(new FileReader(webhookConfig)); JsonParser jsonReader = new JsonParser(); JsonElement NtfyParse = jsonReader.parse(brfntfy.readLine()); - String lineNtfy = NtfyParse.getAsJsonObject().get("url").getAsString(); + String lineNtfy = NtfyParse.getAsJsonObject().get("url_notify").getAsString(); // validate url being url // but this won't validate the url being an actual webhook // i can try but lazy :sob: if (lineNtfy.equals("default-ns")) { - System.out.printf("Please set the webhook URL in %s and restart the server", notifyWebhookConfig.getAbsolutePath()); + System.out.printf("Please set the webhook URL in %s and restart the server", webhookConfig.getAbsolutePath()); webhooksAreValidUrls = false; return lineNtfy; } else if (lineNtfy.startsWith("https://") || lineNtfy.startsWith("http://")) { webhooksAreValidUrls = true; return lineNtfy; } else { - System.out.printf("Please set the webhook URL in %s and restart the server", notifyWebhookConfig.getAbsolutePath()); + System.out.printf("Please set the webhook URL in %s and restart the server", webhookConfig.getAbsolutePath()); webhooksAreValidUrls = false; return lineNtfy; } @@ -195,6 +194,7 @@ public class Main extends JavaPlugin { } return "err"; } + public void registerEvents() { PlayerChat playerChat = new PlayerChat(); PlayerCommandPreprocess playerCommandPreprocess = new PlayerCommandPreprocess(); diff --git a/src/main/java/cf/sobrooms/ServerUtils.java b/src/main/java/cf/sobrooms/ServerUtils.java index ad214ac..0bc6006 100644 --- a/src/main/java/cf/sobrooms/ServerUtils.java +++ b/src/main/java/cf/sobrooms/ServerUtils.java @@ -11,7 +11,7 @@ public class ServerUtils { public static String address_fallback = Utils.getServerHostPublicIP(); public static String webhook_notify = Main.getNotifyWebhook(); public static String webhook_messages = Main.getPublicMessageWebhook(); - public static String address = "mc-srv2-singapore.rrryfoo.cf"; + public static String address = Utils.getServerHostPublicIP(); public static boolean serverIsUp(String serverAddress, Integer serverPort) { /*Socket socket; diff --git a/src/main/java/cf/sobrooms/events/server/ServerLoad.java b/src/main/java/cf/sobrooms/events/server/ServerLoad.java index 12f2f39..9a09131 100644 --- a/src/main/java/cf/sobrooms/events/server/ServerLoad.java +++ b/src/main/java/cf/sobrooms/events/server/ServerLoad.java @@ -23,7 +23,7 @@ public class ServerLoad implements Listener { public void onServerStart(ServerLoadEvent event) { Bukkit.getConsoleSender().sendMessage("Triggered ServerLoad event."); if (timesCalled < 1) { - Bukkit.getConsoleSender().sendMessage("Checking if server is up on " + ServerUtils.address + " with port " + ServerUtils.port + "..."); + Bukkit.getConsoleSender().sendMessage("Checking if server is up on " + ServerUtils.address + " with port " + Bukkit.getServer().getPort() + "..."); if (ServerUtils.serverIsUp(address, Bukkit.getServer().getPort())) { System.out.println(ServerUtils.webhook_messages); System.out.println(ServerUtils.webhook_notify);