|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Krakenied <Krakenied1@gmail.com> |
| 3 | +Date: Fri, 14 Oct 2022 23:11:27 +0200 |
| 4 | +Subject: [PATCH] Add log suppression for LibraryLoader |
| 5 | + |
| 6 | + |
| 7 | +diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java |
| 8 | +index a16c841751bc44e46d27fc4efbfc2ab23cc7b0d7..4dd9306c13aff0e54521e1c157b8a9c16db7387a 100644 |
| 9 | +--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java |
| 10 | ++++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java |
| 11 | +@@ -57,6 +57,7 @@ public final class JavaPluginLoader implements PluginLoader { |
| 12 | + private final Map<String, Integer> classLoadLockCount = new java.util.HashMap<String, Integer>(); // Paper |
| 13 | + private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>(); |
| 14 | + private final LibraryLoader libraryLoader; |
| 15 | ++ public static boolean SuppressLibraryLoaderLogger = false; // Purpur |
| 16 | + |
| 17 | + /** |
| 18 | + * This class was not meant to be constructed explicitly |
| 19 | +diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java |
| 20 | +index 6d634b0ea813ccb19f1562a7d0e5a59cea4eab21..06a7f27aa7c3963f63fe158438a83fdf67a20c51 100644 |
| 21 | +--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java |
| 22 | ++++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java |
| 23 | +@@ -62,6 +62,7 @@ class LibraryLoader |
| 24 | + @Override |
| 25 | + public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException |
| 26 | + { |
| 27 | ++ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur |
| 28 | + logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() ); |
| 29 | + } |
| 30 | + } ); |
| 31 | +@@ -77,6 +78,7 @@ class LibraryLoader |
| 32 | + { |
| 33 | + return null; |
| 34 | + } |
| 35 | ++ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur |
| 36 | + logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[] |
| 37 | + { |
| 38 | + desc.getName(), desc.getLibraries().size() |
| 39 | +@@ -115,6 +117,7 @@ class LibraryLoader |
| 40 | + } |
| 41 | + |
| 42 | + jarFiles.add( url ); |
| 43 | ++ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur |
| 44 | + logger.log( Level.INFO, "[{0}] Loaded library {1}", new Object[] |
| 45 | + { |
| 46 | + desc.getName(), file |
0 commit comments