From c830758f9f3b36f6019764643e560ebd8190b331 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 5 Jul 2021 01:00:26 -0500 Subject: [PATCH] Improve System.out catcher --- ...6-API-to-geta-plugin-from-class-name.patch | 85 +++++++++++++++++++ ...t-System.out-calls-to-plugin-loggers.patch | 40 +++++---- 2 files changed, 110 insertions(+), 15 deletions(-) create mode 100644 patches/api/0046-API-to-geta-plugin-from-class-name.patch diff --git a/patches/api/0046-API-to-geta-plugin-from-class-name.patch b/patches/api/0046-API-to-geta-plugin-from-class-name.patch new file mode 100644 index 000000000..52a63ef2b --- /dev/null +++ b/patches/api/0046-API-to-geta-plugin-from-class-name.patch @@ -0,0 +1,85 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Mon, 5 Jul 2021 00:58:48 -0500 +Subject: [PATCH] API to geta plugin from class name + + +diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java +index 0e25119564dfa9cb12f3c5dc5f653d7f2c147a9d..ce9680f93886499519bca3934239bc24a972c745 100644 +--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java ++++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java +@@ -923,4 +923,18 @@ public final class SimplePluginManager implements PluginManager { + } + // Paper end + ++ // Purpur start ++ @Nullable ++ public Class getClass(@NotNull String name) { ++ Class clazz; ++ for (Plugin plugin : this.plugins) { ++ clazz = ((org.bukkit.plugin.java.JavaPluginLoader) plugin.getPluginLoader()).getClass(name); ++ if (clazz != null) { ++ return clazz; ++ } ++ } ++ return null; ++ } ++ // Purpur end ++ + } +diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +index 04fa3991f6ce4e9dad804f28fc6c947695857089..b0277f39e69945d12e18c393233223855b8a8a4f 100644 +--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java ++++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +@@ -426,4 +426,12 @@ public abstract class JavaPlugin extends PluginBase { + } + return plugin; + } ++ ++ // Purpur start ++ @Nullable ++ public static JavaPlugin getProvidingPlugin(@NotNull String name) { ++ Class clazz = ((org.bukkit.plugin.SimplePluginManager) org.bukkit.Bukkit.getPluginManager()).getClass(name); ++ return clazz == null ? null : getProvidingPlugin(clazz); ++ } ++ // Purpur end + } +diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +index b622cedeeee017f042bcf92485d81832030a8030..b7e415004bd648fe6a9aaec6bb9e66eb5cda16e1 100644 +--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java ++++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +@@ -435,4 +435,18 @@ public final class JavaPluginLoader implements PluginLoader { + } + } + } ++ ++ // Purpur start ++ @Nullable ++ public Class getClass(@NotNull String name) { ++ Class clazz; ++ for (PluginClassLoader loader : this.loaders) { ++ clazz = loader.getClass(name); ++ if (clazz != null) { ++ return clazz; ++ } ++ } ++ return null; ++ } ++ // Purpur end + } +diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +index 81292899918c4dc880661ee628384cb840a6244f..cf75fa2eb8721d67aa15dbddf0f1da98bfe82733 100644 +--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java ++++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +@@ -242,4 +242,11 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot + '}'; + } + // Paper end ++ ++ // Purpur start ++ @Nullable ++ public Class getClass(@NotNull String name) { ++ return this.classes.get(name); ++ } ++ // Purpur end + } diff --git a/patches/server/0223-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0223-Redirect-System.out-calls-to-plugin-loggers.patch index 4ee703d18..4a0b5410e 100644 --- a/patches/server/0223-Redirect-System.out-calls-to-plugin-loggers.patch +++ b/patches/server/0223-Redirect-System.out-calls-to-plugin-loggers.patch @@ -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 -+ * ++ *

+ * https://www.spigotmc.org/resources/sysoutcatcher.79076/ + */ + +public class PurpurPrintStream extends PrintStream { -+ public PurpurPrintStream(@NotNull OutputStream out) { ++ private final BiConsumer consumer; ++ ++ public PurpurPrintStream(@NotNull OutputStream out, BiConsumer 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)); + } +}