OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 07:08:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Unify plugin remapping debug flags

Browse source
This commit is contained in:
Jason Penilla 2024-04-27 11:41:56 -07:00
parent 5731f346e2
commit f037f08035
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
patches/server/0020-Plugin-remapping.patch
View file

@ -222,10 +222,10 @@ index 87128685015d550440a798028f50be24bc755f6c..8d0da6e46d4eb5eb05c3144510c4ef08
PaperPluginParent.PaperBootstrapProvider bootstrapPluginProvider = null; PaperPluginParent.PaperBootstrapProvider bootstrapPluginProvider = null;
diff --git a/src/main/java/io/papermc/paper/pluginremap/DebugLogger.java b/src/main/java/io/papermc/paper/pluginremap/DebugLogger.java diff --git a/src/main/java/io/papermc/paper/pluginremap/DebugLogger.java b/src/main/java/io/papermc/paper/pluginremap/DebugLogger.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..37024fe35f686490bba0df2e71d2198882e09db2 index 0000000000000000000000000000000000000000..99e658e3a0f08dbd90b3cf48609613e8a085fd64
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/pluginremap/DebugLogger.java +++ b/src/main/java/io/papermc/paper/pluginremap/DebugLogger.java
@@ -0,0 +1,65 @@ @@ -0,0 +1,63 @@
+package io.papermc.paper.pluginremap; +package io.papermc.paper.pluginremap;
+ +
+import java.io.IOException; +import java.io.IOException;
@ -239,13 +239,11 @@ index 0000000000000000000000000000000000000000..37024fe35f686490bba0df2e71d21988
+ +
+/** +/**
+ * {@link PrintWriter}-backed logger implementation for use with {@link net.neoforged.art.api.Renamer} which + * {@link PrintWriter}-backed logger implementation for use with {@link net.neoforged.art.api.Renamer} which
+ * only opens the backing writer and logs messages when the {@link #DEBUG} system property + * only opens the backing writer and logs messages when the {@link PluginRemapper#DEBUG_LOGGING} system property
+ * is set to true. + * is set to true.
+ */ + */
+@DefaultQualifier(NonNull.class) +@DefaultQualifier(NonNull.class)
+final class DebugLogger implements Consumer<String>, AutoCloseable { +final class DebugLogger implements Consumer<String>, AutoCloseable {
+ private static final boolean DEBUG = Boolean.getBoolean("paper.remap-debug");
+
+ private final @Nullable PrintWriter writer; + private final @Nullable PrintWriter writer;
+ +
+ DebugLogger(final Path logFile) { + DebugLogger(final Path logFile) {
@ -282,7 +280,7 @@ index 0000000000000000000000000000000000000000..37024fe35f686490bba0df2e71d21988
+ } + }
+ +
+ private static @Nullable PrintWriter createWriter(final Path logFile) throws IOException { + private static @Nullable PrintWriter createWriter(final Path logFile) throws IOException {
+ if (!DEBUG) { + if (!PluginRemapper.DEBUG_LOGGING) {
+ return null; + return null;
+ } + }
+ if (!Files.exists(logFile.getParent())) { + if (!Files.exists(logFile.getParent())) {