mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
1bbb033479
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@a9201d4 [ci skip] Move logic in our patches to ItemType/BlockType (#10772) PaperMC/Paper@3de408e Fix equipment slot and group API (#10767) PaperMC/Paper@d408381 Print CommandRegisteredEvent deprecation warnings again (#10756) PaperMC/Paper@6de7a1f Improve default item attributes API (#10765) PaperMC/Paper@2a90732 Remove incorrect logic for Fireball#setVelocity (#10764) PaperMC/Paper@5e7b65a Allow using PluginLoader classpath API from Bukkit plugins (#10758)
47 lines
2.6 KiB
Diff
47 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Krakenied <Krakenied1@gmail.com>
|
|
Date: Fri, 14 Oct 2022 23:11:27 +0200
|
|
Subject: [PATCH] Add log suppression for LibraryLoader
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..f1e58639213be0c43cd2ff090b625e7d0a67e8be 100644
|
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
@@ -55,6 +55,7 @@ public final class JavaPluginLoader implements PluginLoader {
|
|
private final Pattern[] fileFilters = new Pattern[]{Pattern.compile("\\.jar$")};
|
|
private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
|
|
private final LibraryLoader libraryLoader;
|
|
+ public static boolean SuppressLibraryLoaderLogger = false; // Purpur
|
|
|
|
/**
|
|
* This class was not meant to be constructed explicitly
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
|
index c66252802c51174bc26f266cb5cdecdd856ff220..97f580fccd06a8db5f592a53c8b95a7a6159adac 100644
|
|
--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
|
+++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
|
@@ -68,6 +68,7 @@ public class LibraryLoader
|
|
@Override
|
|
public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException
|
|
{
|
|
+ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
|
|
logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
|
|
}
|
|
} );
|
|
@@ -94,6 +95,7 @@ public class LibraryLoader
|
|
{
|
|
return null;
|
|
}
|
|
+ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
|
|
logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
|
|
{
|
|
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
|
|
@@ -144,6 +146,7 @@ public class LibraryLoader
|
|
}
|
|
|
|
jarFiles.add( url );
|
|
+ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
|
|
logger.log( Level.INFO, "[{0}] Loaded library {1}", new Object[]
|
|
{
|
|
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), file // Paper - use configured log prefix
|