Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve System.out catcher

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-05 01:00:26 -05:00
parent 8b67a588a8
commit c830758f9f
2 changed files with 110 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/server/0223-Redirect-System.out-calls-to-plugin-loggers.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Redirect System.out calls to plugin loggers
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 66d2559e5bd8630c6cbca0fe8d0eb1f756c388df..cb4226abf377e0edb4512dc762bb8e487b1b29ad 100644
index 66d2559e5bd8630c6cbca0fe8d0eb1f756c388df..76ff4b0c1ebf4f7b3cf7b752ee8ec4f418c622b9 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -177,8 +177,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -14,17 +14,17 @@ index 66d2559e5bd8630c6cbca0fe8d0eb1f756c388df..cb4226abf377e0edb4512dc762bb8e48
- System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream());
- System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream());
+ System.setOut(new net.pl3x.purpur.PurpurPrintStream(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream())); // Purpur
+ System.setErr(new net.pl3x.purpur.PurpurPrintStream(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream())); // Purpur
+ System.setOut(new net.pl3x.purpur.PurpurPrintStream(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream(), java.util.logging.Logger::info)); // Purpur
+ System.setErr(new net.pl3x.purpur.PurpurPrintStream(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream(), java.util.logging.Logger::severe)); // Purpur
// CraftBukkit end
thread.setDaemon(true);
diff --git a/src/main/java/net/pl3x/purpur/PurpurPrintStream.java b/src/main/java/net/pl3x/purpur/PurpurPrintStream.java
new file mode 100644
index 0000000000000000000000000000000000000000..bfed147052492789350107f069fe38a3cb7531cb
index 0000000000000000000000000000000000000000..17030b88d80bfdfc5790b3f63ea006756ef26d90
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurPrintStream.java
@@ -0,0 +1,60 @@
@@ -0,0 +1,70 @@
+/*
+ * MIT License
+ *
@@ -50,21 +50,28 @@ index 0000000000000000000000000000000000000000..bfed147052492789350107f069fe38a3
+ */
+package net.pl3x.purpur;
+
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.Arrays;
+import java.util.function.BiConsumer;
+import java.util.logging.Logger;
+
+/**
+ * Logic borrowed from SysoutCatcher
+ *
+ * <p>
+ * https://www.spigotmc.org/resources/sysoutcatcher.79076/
+ */
+
+public class PurpurPrintStream extends PrintStream {
+ public PurpurPrintStream(@NotNull OutputStream out) {
+ private final BiConsumer<Logger, String> consumer;
+
+ public PurpurPrintStream(@NotNull OutputStream out, BiConsumer<Logger, String> consumer) {
+ super(out);
+ this.consumer = consumer;
+ }
+
+ @Override
@@ -73,15 +80,18 @@ index 0000000000000000000000000000000000000000..bfed147052492789350107f069fe38a3
+ StackTraceElement element = Thread.currentThread().getStackTrace()[2];
+ try {
+ // Get the class name at that index and the JavaPlugin that "owns" it
+ Class<?> clazz = Class.forName(element.getClassName());
+ JavaPlugin plugin = JavaPlugin.getProvidingPlugin(clazz);
+ JavaPlugin plugin = JavaPlugin.getProvidingPlugin(element.getClassName());
+
+ // Instead of just printing the message, send it to the plugin's logger
+ plugin.getLogger().info(line);
+ } catch (ClassNotFoundException | IllegalArgumentException e) {
+ // If anything happens, the calling class doesn't exist, there is no JavaPlugin that "owns" the calling class, etc
+ // Just print out normally, with some added information
+ super.printf("(%s:%d) %s\n", element.getClassName(), element.getLineNumber(), line);
+ if (plugin != null) {
+ // Instead of just printing the message, send it to the plugin's logger
+ consumer.accept(plugin.getLogger(), line);
+ return;
+ }
+ } catch (Throwable ignore) {
+ }
+
+ // If anything happens, the calling class doesn't exist, there is no JavaPlugin that "owns" the calling class, etc
+ // Just print to Bukkit logger, with some added information
+ consumer.accept(Bukkit.getLogger(), String.format("(%s:%d) %s", element.getClassName(), element.getLineNumber(), line));
+ }
+}