Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.

Commit 9bd5c44

Browse files
authored
Add log suppression for library loader (PurpurMC#1160)
1 parent a86e8fe commit 9bd5c44

2 files changed

Lines changed: 72 additions & 0 deletions

File tree

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
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
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Krakenied <Krakenied1@gmail.com>
3+
Date: Fri, 14 Oct 2022 23:11:16 +0200
4+
Subject: [PATCH] Add log suppression for LibraryLoader
5+
6+
7+
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
8+
index 3cfbb4300e82cce409a7a0b53ef98987f166143c..5d71e3040df116a94df7efa83e61dc1766cc4a93 100644
9+
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
10+
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
11+
@@ -488,12 +488,15 @@ public class PurpurConfig {
12+
public static boolean loggerSuppressUnrecognizedRecipeErrors = false;
13+
public static boolean loggerSuppressSetBlockFarChunk = false;
14+
public static boolean loggerSuppressSentExpiredChat = false;
15+
+ public static boolean loggerSuppressLibraryLoader = false;
16+
private static void loggerSettings() {
17+
loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
18+
loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
19+
loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
20+
loggerSuppressSetBlockFarChunk = getBoolean("settings.logger.suppress-setblock-in-far-chunk-errors", loggerSuppressSetBlockFarChunk);
21+
loggerSuppressSentExpiredChat = getBoolean("settings.logger.suppress-sent-expired-chat", loggerSuppressSentExpiredChat);
22+
+ loggerSuppressLibraryLoader = getBoolean("settings.logger.suppress-library-loader", loggerSuppressLibraryLoader);
23+
+ org.bukkit.plugin.java.JavaPluginLoader.SuppressLibraryLoaderLogger = loggerSuppressLibraryLoader;
24+
}
25+
26+
public static boolean tpsCatchup = true;

0 commit comments

Comments
 (0)