diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java index 73a0ce53..d63d78e1 100644 --- a/bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java +++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java @@ -348,8 +348,8 @@ public class FaweBukkit implements IFawe, Listener { public String getDebugInfo() { StringBuilder msg = new StringBuilder(); List pl = new ArrayList<>(); - msg.append("server.version: " + Bukkit.getVersion() + " / " + Bukkit.getBukkitVersion() + "\n"); - msg.append("server.plugins: \n"); + msg.append("Server Version: " + Bukkit.getVersion() + "\n"); + msg.append("Plugins: \n"); for (Plugin p : Bukkit.getPluginManager().getPlugins()) { msg.append(" - " + p.getName() + ": " + p.getDescription().getVersion() + "\n"); } diff --git a/core/src/main/java/com/boydti/fawe/util/IncendoPaster.java b/core/src/main/java/com/boydti/fawe/util/IncendoPaster.java index ec802804..a7c86396 100644 --- a/core/src/main/java/com/boydti/fawe/util/IncendoPaster.java +++ b/core/src/main/java/com/boydti/fawe/util/IncendoPaster.java @@ -6,6 +6,8 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import java.io.*; +import java.lang.management.ManagementFactory; +import java.lang.management.RuntimeMXBean; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; @@ -197,14 +199,15 @@ public final class IncendoPaster { b.append(Fawe.imp().getDebugInfo()).append('\n'); b.append("\n\n# YAY! Now, let's see what we can find in your JVM\n"); Runtime runtime = Runtime.getRuntime(); - b.append("memory.free: ").append(runtime.freeMemory()).append('\n'); - b.append("memory.max: ").append(runtime.maxMemory()).append('\n'); - b.append("java.specification.version: '").append(System.getProperty("java.specification.version")).append("'\n"); - b.append("java.vendor: '").append(System.getProperty("java.vendor")).append("'\n"); - b.append("java.version: '").append(System.getProperty("java.version")).append("'\n"); - b.append("os.arch: '").append(System.getProperty("os.arch")).append("'\n"); - b.append("os.name: '").append(System.getProperty("os.name")).append("'\n"); - b.append("os.version: '").append(System.getProperty("os.version")).append("'\n\n"); + RuntimeMXBean rb = ManagementFactory.getRuntimeMXBean(); + b.append("Free Memory: ").append(runtime.freeMemory() / 1024 / 1024 + " MB").append('\n'); + b.append("Max Memory: ").append(runtime.maxMemory() / 1024 / 1024 + " MB").append('\n'); + b.append("Java Name: ").append(rb.getVmName()).append('\n'); + b.append("Java Version: '").append(System.getProperty("java.version")).append("'\n"); + b.append("Java Vendor: '").append(System.getProperty("java.vendor")).append("'\n"); + b.append("Operating System: '").append(System.getProperty("os.name")).append("'\n"); + b.append("OS Version: ").append(System.getProperty("os.version")).append('\n'); + b.append("OS Arch: ").append(System.getProperty("os.arch")).append('\n'); b.append("# Okay :D Great. You are now ready to create your bug report!"); b.append("\n# You can do so at https://github.com/boy0001/FastAsyncWorldedit/issues"); b.append("\n# or via our Discord at https://discord.gg/ngZCzbU"); @@ -214,7 +217,7 @@ public final class IncendoPaster { final File logFile = new File(Fawe.imp().getDirectory(), "../../logs/latest.log"); final String file; if (Files.size(logFile.toPath()) > 14_000_000) { - file = "too big :("; + file = "Too big ..."; } else { file = readFile(logFile); } diff --git a/nukkit/src/main/resources/plugin.yml b/nukkit/src/main/resources/plugin.yml index a8b38f9b..9ba95925 100644 --- a/nukkit/src/main/resources/plugin.yml +++ b/nukkit/src/main/resources/plugin.yml @@ -2,6 +2,7 @@ name: "${name}" version: "${version}" author: Empire92 api: ["1.0.0"] +depend: [DbLib] main: com.boydti.fawe.nukkit.core.NukkitWorldEdit permissions: fawe.plotsquared: