diff --git a/build.gradle b/build.gradle index 8c72ad5..e014ee9 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,12 @@ transitive = true exclude module: 'opus-java' } + + compile fileTree(dir: 'libs', include: '*.jar') + compile group: 'dnsjava', name: 'dnsjava', version: '3.4.0' + compile group: 'org.projectlombok', name: 'lombok', version: '1.18.20' + compile group: 'net.md-5', name: 'bungeecord-chat', version: '1.16-R0.4' + //compile group: '', name: '', version: '' compile group: 'com.jagrosh', name: 'jda-utilities', version: '3.0.4' diff --git a/libs/mcserverping-1.0.4.jar b/libs/mcserverping-1.0.4.jar new file mode 100644 index 0000000..3f3cf66 --- /dev/null +++ b/libs/mcserverping-1.0.4.jar Binary files differ diff --git a/src/main/java/net/romvoid/crashbot/commands/StatusCommand.java b/src/main/java/net/romvoid/crashbot/commands/StatusCommand.java index 64c5a63..81c6acd 100644 --- a/src/main/java/net/romvoid/crashbot/commands/StatusCommand.java +++ b/src/main/java/net/romvoid/crashbot/commands/StatusCommand.java @@ -1,6 +1,7 @@ package net.romvoid.crashbot.commands; import java.awt.*; +import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.util.concurrent.TimeUnit; @@ -13,6 +14,9 @@ import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageChannel; import net.romvoid.crashbot.Bot; +import br.com.azalim.mcserverping.MCPing; +import br.com.azalim.mcserverping.MCPingOptions; +import br.com.azalim.mcserverping.MCPingResponse; import net.romvoid.crashbot.utilities.EmbedUtil; public class StatusCommand extends Command { @@ -32,21 +36,51 @@ MessageChannel channel = event.getChannel(); EmbedBuilder embed = EmbedUtil.embed("Status MFND.ru services", ""); if (checkInternetConnection(google)) { - embed.addField("", "Route to the server - OK", false); + embed.addField("Route to the server - OK", "Google traceroute", false); embed.setColor(Color.green); } else { - embed.addField("", "Route to the server - FAIL", false); + embed.addField("Route to the server - FAIL", "Google traceroute", false); embed.setColor(Color.red); } if (checkInternetConnection(mfnd)) { - embed.addField("", "Site activity - OK", false); + embed.addField("Site activity - OK", "Ping www.mfnd.ru", false); embed.setColor(Color.green); } else { - embed.addField("", "Site activity - FAIL", false); + embed.addField("Site activity - FAIL", "Ping www.mfnd.ru", false); embed.setColor(Color.red); } + MCPingOptions iisoptions = MCPingOptions.builder() + .hostname("www.mfnd.ru") + .port(22630) + .build(); + MCPingResponse iisreply; + try { + iisreply = MCPing.getPing(iisoptions); + } catch (IOException ex) { + embed.addField("", "IIS server - FAIL", false); + embed.setColor(Color.red); + return; + } + MCPingResponse.Players iisplayers = iisreply.getPlayers(); + embed.addField("IIS server - OK", "Online count: "+ iisplayers.getOnline() + "/" + iisplayers.getMax(), false); + embed.setColor(Color.green); + MCPingOptions impactoptions = MCPingOptions.builder() + .hostname("www.mfnd.ru") + .port(22631) + .build(); + MCPingResponse impactreply; + try { + impactreply = MCPing.getPing(impactoptions); + } catch (IOException ex) { + embed.addField("", "IMPACT server - FAIL", false); + embed.setColor(Color.red); + return; + } + MCPingResponse.Players impactplayers = impactreply.getPlayers(); + embed.addField("IMPACT server - OK", "Online count: "+ impactplayers.getOnline() + "/" + impactplayers.getMax(), false); + embed.setColor(Color.green); // if () { // embed.addField("", "Jabber connect - OK", false); // embed.setColor(Color.green);