diff --git a/Visual Bukkit Project/Build/pom.xml b/Visual Bukkit Project/Build/pom.xml index cdbe78d..e8c7e0e 100644 --- a/Visual Bukkit Project/Build/pom.xml +++ b/Visual Bukkit Project/Build/pom.xml @@ -6,7 +6,7 @@ vb dankchatroom - 1.0.5 + 1.0.6 UTF-8 diff --git a/Visual Bukkit Project/Build/src/main/java/vb/$dankchatroom/PluginMain.java b/Visual Bukkit Project/Build/src/main/java/vb/$dankchatroom/PluginMain.java index 11a9bc1..ce7f8f9 100644 --- a/Visual Bukkit Project/Build/src/main/java/vb/$dankchatroom/PluginMain.java +++ b/Visual Bukkit Project/Build/src/main/java/vb/$dankchatroom/PluginMain.java @@ -13,6 +13,7 @@ public class PluginMain extends JavaPlugin implements Listener { public static Object GLOBAL_54bc2ca21fe9f603fdf50a6cae5269ec; public static Object GLOBAL_9ce148715491d15c729aff6847d37f60; + public static Object GLOBAL_c5c29952652c4a76ae64d39c1db91561; public static Object GLOBAL_65e48c28264992f0f46da7786376f6c3; public static Object GLOBAL_6613e6c3dc9064e6ad3422610595df88; public static Object GLOBAL_d92cf494435f80e45b01635d54d1c17f; @@ -25,18 +26,8 @@ public void onEnable() { new Metrics(PluginMain.getInstance(), ((int) (19689d))); PluginMain.GLOBAL_54bc2ca21fe9f603fdf50a6cae5269ec = ((java.lang.Object) (Object) (0d)); PluginMain.GLOBAL_9ce148715491d15c729aff6847d37f60 = ((java.lang.Object) (Object) false); - new org.bukkit.scheduler.BukkitRunnable() { - public void run() { - try { - if (PluginMain.checkEquals(GLOBAL_9ce148715491d15c729aff6847d37f60, - ((java.lang.Object) (Object) false))) { - PluginMain.procedure("chatroom_enabler", new ArrayList()); - } - } catch (Exception ex) { - ex.printStackTrace(); - } - } - }.runTaskTimerAsynchronously(PluginMain.getInstance(), 0, ((long) (18000d))); + PluginMain.GLOBAL_c5c29952652c4a76ae64d39c1db91561 = ((java.lang.Object) (Object) false); + PluginMain.procedure("keep-alive", new ArrayList()); ((org.bukkit.command.CommandSender) (Object) ((org.bukkit.command.ConsoleCommandSender) org.bukkit.Bukkit .getConsoleSender())).sendMessage(ChatColor.translateAlternateColorCodes('&', "\n\n\n&l&c 888 888 \n&l&c 888 888 s i r &f.&c d a n k &f'&c s \n&l&c 888 888 \n&l&c .d88888 8888b. 88888b. 888 888 888 888 888 8888b. 888d888 .d88b. \n&l&cd88\" 888 \"88b 888 \"88b 888 .88P 888 888 888 \"88b 888P\" d8P Y8b \n&l&c888 888 .d888888 888 888 888888K 888 888 888 .d888888 888 88888888 \n&l&cY88b 888 888 888 888 888 888 \"88b Y88b 888 d88P 888 888 888 Y8b. \n&l&c \"Y88888 \"Y888888 888 888 888 888 \"Y8888888P\" \"Y888888 888 \"Y8888 \n\n \n ")); @@ -62,11 +53,12 @@ public boolean onCommand(CommandSender commandSender, Command command, String la if (PluginMain.checkEquals(GLOBAL_9ce148715491d15c729aff6847d37f60, ((java.lang.Object) (Object) true))) { PluginMain.GLOBAL_9ce148715491d15c729aff6847d37f60 = ((java.lang.Object) (Object) false); + PluginMain.GLOBAL_c5c29952652c4a76ae64d39c1db91561 = ((java.lang.Object) (Object) true); commandSender.sendMessage(ChatColor.translateAlternateColorCodes('&', - "&6[&cdank&6.&cserver&6] \u27A4 &cYou have been disconnected&6!")); + "&6[&cdank&6.&cchatroom&6] \u27A4 &cYou have been disconnected&6!")); } else { commandSender.sendMessage(ChatColor.translateAlternateColorCodes('&', - "&6[&cdank&6.&cserver&6] \u27A4 &cYou are already disconnected&6!")); + "&6[&cdank&6.&cchatroom&6] \u27A4 &cYou are already disconnected&6!")); } } catch (Exception e) { e.printStackTrace(); @@ -78,11 +70,12 @@ public boolean onCommand(CommandSender commandSender, Command command, String la if (PluginMain.checkEquals(GLOBAL_9ce148715491d15c729aff6847d37f60, ((java.lang.Object) (Object) true))) { commandSender.sendMessage(ChatColor.translateAlternateColorCodes('&', - "&6[&cdank&6.&cserver&6] \u27A4 &cYou are already connected&6!")); + "&6[&cdank&6.&cchatroom&6] \u27A4 &cYou are already connected&6!")); } else { - PluginMain.procedure("chatroom_enabler", new ArrayList()); + PluginMain.GLOBAL_c5c29952652c4a76ae64d39c1db91561 = ((java.lang.Object) (Object) false); commandSender.sendMessage(ChatColor.translateAlternateColorCodes('&', - "&6[&cdank&6.&cserver&6] \u27A4 &cTrying to connect&6...")); + "&6[&cdank&6.&cchatroom&6] \u27A4 &cTrying to connect&6...")); + PluginMain.procedure("chatroom_enabler", new ArrayList()); } } catch (Exception e) { e.printStackTrace(); @@ -93,6 +86,23 @@ public boolean onCommand(CommandSender commandSender, Command command, String la } public static void procedure(String procedure, List procedureArgs) throws Exception { + if (procedure.equalsIgnoreCase("keep-alive")) { + new org.bukkit.scheduler.BukkitRunnable() { + public void run() { + try { + if ((PluginMain.checkEquals(GLOBAL_9ce148715491d15c729aff6847d37f60, + ((java.lang.Object) (Object) false)) + && PluginMain.checkEquals(GLOBAL_c5c29952652c4a76ae64d39c1db91561, + ((java.lang.Object) (Object) false)))) { + PluginMain.procedure("chatroom_enabler", new ArrayList()); + } + } catch (Exception ex) { + ex.printStackTrace(); + } + } + }.runTaskTimerAsynchronously(PluginMain.getInstance(), 0, ((long) (18000d))); + return; + } if (procedure.equalsIgnoreCase("chatroom_login")) { Object $01903771aa49381d3482b07d777054c5 = null; try { @@ -100,7 +110,7 @@ public static void procedure(String procedure, List procedureArgs) throws Except new ArrayList(Arrays.asList("https://dank-site.onrender.com/chatroom-login", "POST", GLOBAL_6613e6c3dc9064e6ad3422610595df88))); PluginMain.getInstance().getLogger().info("Logged in!"); - } catch (Exception opYbrseqSDNRyeva) { + } catch (Exception bayUzJNAOgqyyUOg) { PluginMain.getInstance().getLogger().severe("Failed to login!"); PluginMain.GLOBAL_9ce148715491d15c729aff6847d37f60 = ((java.lang.Object) (Object) false); } @@ -121,7 +131,7 @@ public void run() { ((java.lang.Object) (Object) true))) { try { PluginMain.procedure("chatroom_validator", new ArrayList()); - } catch (Exception jxbnpJyhvKaFvtlz) { + } catch (Exception MZIFvqBtEEVifQwE) { PluginMain.getInstance().getLogger().severe("Failed to validate!"); PluginMain.GLOBAL_9ce148715491d15c729aff6847d37f60 = ((java.lang.Object) (Object) false); cancel(); @@ -141,7 +151,7 @@ public void run() { ((java.lang.Object) (Object) true))) { try { PluginMain.procedure("chatroom_grabber_and_output", new ArrayList()); - } catch (Exception jZSqAixvHcBWNPtc) { + } catch (Exception aYOKTdLpoJOCtWKt) { PluginMain.getInstance().getLogger().severe("Failed to get chat!"); PluginMain.GLOBAL_9ce148715491d15c729aff6847d37f60 = ((java.lang.Object) (Object) false); cancel(); @@ -236,7 +246,7 @@ public void run() { PluginMain.getInstance().getLogger() .info(("HWID: " + String.valueOf(GLOBAL_65e48c28264992f0f46da7786376f6c3))); PluginMain.GLOBAL_9ce148715491d15c729aff6847d37f60 = ((java.lang.Object) (Object) true); - } catch (Exception QmNyXkBszBvWsfuc) { + } catch (Exception fwXgaBznLpQBGhTd) { PluginMain.getInstance().getLogger().severe("Failed to get HWID!"); PluginMain.GLOBAL_9ce148715491d15c729aff6847d37f60 = ((java.lang.Object) (Object) false); } @@ -375,7 +385,7 @@ public void event1(org.bukkit.event.player.AsyncPlayerChatEvent event) throws Ex + ((java.lang.String) ((org.bukkit.command.CommandSender) (Object) ((org.bukkit.entity.Player) event .getPlayer())).getName())) + "] > ") + ((java.lang.String) event.getMessage()))))); - } catch (Exception YVzEZUHAbgOgdKjG) { + } catch (Exception PePTDjGCmbfRvCGj) { PluginMain.getInstance().getLogger().severe("Input Failed!"); PluginMain.GLOBAL_9ce148715491d15c729aff6847d37f60 = ((java.lang.Object) (Object) false); } diff --git a/Visual Bukkit Project/Build/src/main/resources/plugin.yml b/Visual Bukkit Project/Build/src/main/resources/plugin.yml index ec52466..e096f46 100644 --- a/Visual Bukkit Project/Build/src/main/resources/plugin.yml +++ b/Visual Bukkit Project/Build/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: "DankChatroom" -version: "1.0.5" +version: "1.0.6" main: "vb.$dankchatroom.PluginMain" api-version: 1.13 authors: [SirDank] diff --git a/Visual Bukkit Project/Build/target/classes/plugin.yml b/Visual Bukkit Project/Build/target/classes/plugin.yml index ec52466..e096f46 100644 --- a/Visual Bukkit Project/Build/target/classes/plugin.yml +++ b/Visual Bukkit Project/Build/target/classes/plugin.yml @@ -1,5 +1,5 @@ name: "DankChatroom" -version: "1.0.5" +version: "1.0.6" main: "vb.$dankchatroom.PluginMain" api-version: 1.13 authors: [SirDank] diff --git a/Visual Bukkit Project/Build/target/dankchatroom.jar b/Visual Bukkit Project/Build/target/dankchatroom.jar index 1cd01cc..d468ca6 100644 Binary files a/Visual Bukkit Project/Build/target/dankchatroom.jar and b/Visual Bukkit Project/Build/target/dankchatroom.jar differ diff --git a/Visual Bukkit Project/Build/target/maven-archiver/pom.properties b/Visual Bukkit Project/Build/target/maven-archiver/pom.properties index e06c9b4..5ecf936 100644 --- a/Visual Bukkit Project/Build/target/maven-archiver/pom.properties +++ b/Visual Bukkit Project/Build/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Sep 15 18:31:11 IST 2023 +#Sat Sep 16 15:32:31 IST 2023 groupId=vb artifactId=dankchatroom -version=1.0.5 +version=1.0.6 diff --git a/Visual Bukkit Project/data.json b/Visual Bukkit Project/data.json index c0d2a99..7479803 100644 --- a/Visual Bukkit Project/data.json +++ b/Visual Bukkit Project/data.json @@ -1,9 +1,9 @@ { "plugin.dependencies": "", "plugin.load-before": "", - "plugin.version": "1.0.5", + "plugin.version": "1.0.6", "debug-build-mode": false, - "open-tab": 1, + "open-tab": 3, "plugin-components": [ { "children": [ @@ -39,42 +39,22 @@ ] }, { - "children": [{ - "children": [{ - "=": "stat-execute-procedure", - "parameters": [ - "chatroom_enabler", - {"=": "expr-new-list"} - ] - }], - "=": "stat-if-statement", - "parameters": [ - { - "=": "expr-is-equal", - "parameters": [ - { - "=": "expr-global-variable", - "parameters": ["running"] - }, - { - "=": "expr-boolean", - "parameters": ["false"] - } - ] - }, - "normal" - ] - }], - "=": "stat-schedule-task", + "=": "stat-set-global-variable", "parameters": [ - "async", - "repeat", + "terminated", { - "=": "expr-number", - "parameters": ["18000"] + "=": "expr-boolean", + "parameters": ["false"] } ] }, + { + "=": "stat-execute-procedure", + "parameters": [ + "keep-alive", + {"=": "expr-new-list"} + ] + }, { "=": "org.bukkit.command.CommandSender#sendMessage(java.lang.String)", "parameters": [ @@ -942,7 +922,7 @@ {"=": "expr-command-sender"}, { "=": "expr-string", - "parameters": ["&6[&cdank&6.&cserver&6] ➤ &cYou are already connected&6!"] + "parameters": ["&6[&cdank&6.&cchatroom&6] ➤ &cYou are already connected&6!"] } ] }], @@ -967,10 +947,13 @@ { "children": [ { - "=": "stat-execute-procedure", + "=": "stat-set-global-variable", "parameters": [ - "chatroom_enabler", - {"=": "expr-new-list"} + "terminated", + { + "=": "expr-boolean", + "parameters": ["false"] + } ] }, { @@ -979,9 +962,16 @@ {"=": "expr-command-sender"}, { "=": "expr-string", - "parameters": ["&6[&cdank&6.&cserver&6] ➤ &cTrying to connect&6..."] + "parameters": ["&6[&cdank&6.&cchatroom&6] ➤ &cTrying to connect&6..."] } ] + }, + { + "=": "stat-execute-procedure", + "parameters": [ + "chatroom_enabler", + {"=": "expr-new-list"} + ] } ], "=": "stat-else-statement" @@ -1011,13 +1001,23 @@ } ] }, + { + "=": "stat-set-global-variable", + "parameters": [ + "terminated", + { + "=": "expr-boolean", + "parameters": ["true"] + } + ] + }, { "=": "org.bukkit.command.CommandSender#sendMessage(java.lang.String)", "parameters": [ {"=": "expr-command-sender"}, { "=": "expr-string", - "parameters": ["&6[&cdank&6.&cserver&6] ➤ &cYou have been disconnected&6!"] + "parameters": ["&6[&cdank&6.&cchatroom&6] ➤ &cYou have been disconnected&6!"] } ] } @@ -1047,7 +1047,7 @@ {"=": "expr-command-sender"}, { "=": "expr-string", - "parameters": ["&6[&cdank&6.&cserver&6] ➤ &cYou are already disconnected&6!"] + "parameters": ["&6[&cdank&6.&cchatroom&6] ➤ &cYou are already disconnected&6!"] } ] }], @@ -1133,19 +1133,82 @@ ], "=": "comp-procedure", "parameters": ["chatroom_login"] + }, + { + "children": [{ + "children": [{ + "children": [{ + "=": "stat-execute-procedure", + "parameters": [ + "chatroom_enabler", + {"=": "expr-new-list"} + ] + }], + "=": "stat-if-statement", + "parameters": [ + { + "=": "expr-boolean-logic", + "parameters": [ + { + "=": "expr-is-equal", + "parameters": [ + { + "=": "expr-global-variable", + "parameters": ["running"] + }, + { + "=": "expr-boolean", + "parameters": ["false"] + } + ] + }, + "AND", + { + "=": "expr-is-equal", + "parameters": [ + { + "=": "expr-global-variable", + "parameters": ["terminated"] + }, + { + "=": "expr-boolean", + "parameters": ["false"] + } + ] + } + ] + }, + "normal" + ] + }], + "=": "stat-schedule-task", + "parameters": [ + "async", + "repeat", + { + "=": "expr-number", + "parameters": ["18000"] + } + ] + }], + "=": "comp-procedure", + "parameters": ["keep-alive"] } ], "plugin.soft-dependencies": "", "plugin.name": "DankChatroom", "plugin.prefix": "dank.chatroom", - "current-plugin-component": 1, + "current-plugin-component": 3, "extensions": ["bStats"], "plugin.author": "SirDank", "plugin.description": "Minecraft server integration for the dank.tool's chatroom!", "plugin.permissions": "", "open-plugin-components": [ - 8, - 9 + 9, + 15, + 0, + 13, + 12 ], "plugin.website": "https://github.com/SirDank/dank.chatroom-plugin" } \ No newline at end of file