Add option to disable ignored advancement warnings

This commit is contained in:
William Blake Galbreath
2020-05-02 21:18:43 -05:00
parent b78a36de5e
commit d064334c71
13 changed files with 62 additions and 47 deletions

View File

@@ -1,15 +1,28 @@
From 52c4f9df3b07759bf0646e895f9955d822707ae0 Mon Sep 17 00:00:00 2001
From 89502c80c6cf9a1f07462f3475aef7c65949a6ef Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:52:12 -0500
Subject: [PATCH] Logger settings (suppressing pointless logs)
---
.../java/net/minecraft/server/GenericAttributes.java | 1 +
.../net/minecraft/server/WorldGenFeatureConfigured.java | 1 +
src/main/java/net/pl3x/purpur/PurpurConfig.java | 9 +++++++++
.../java/org/bukkit/craftbukkit/legacy/CraftLegacy.java | 1 +
4 files changed, 12 insertions(+)
.../net/minecraft/server/AdvancementDataPlayer.java | 1 +
.../java/net/minecraft/server/GenericAttributes.java | 1 +
.../minecraft/server/WorldGenFeatureConfigured.java | 1 +
src/main/java/net/pl3x/purpur/PurpurConfig.java | 11 +++++++++++
.../org/bukkit/craftbukkit/legacy/CraftLegacy.java | 1 +
5 files changed, 15 insertions(+)
diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
index c41e13847..44331cea7 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -162,6 +162,7 @@ public class AdvancementDataPlayer {
if (advancement == null) {
// CraftBukkit start
if (entry.getKey().getNamespace().equals("minecraft")) {
+ if (!net.pl3x.purpur.PurpurConfig.loggerSuppressIgnoredAdvancementWarnings) // Purpur
AdvancementDataPlayer.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry.getKey(), this.e);
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
index 469e293c2..ca58302cf 100644
--- a/src/main/java/net/minecraft/server/GenericAttributes.java
@@ -35,20 +48,22 @@ index 73402f2b5..1c2320cc5 100644
return new WorldGenFeatureConfigured<>(WorldGenerator.NO_OP, WorldGenFeatureEmptyConfiguration.e);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 2673de821..852bbf8b8 100644
index 2673de821..d6f82d119 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -128,6 +128,15 @@ public class PurpurConfig {
@@ -128,6 +128,17 @@ public class PurpurConfig {
return config.getString(path, config.getString(path));
}
+ public static boolean loggerSuppressUnknownAttributeWarnings = false;
+ public static boolean loggerSuppressInitLegacyMaterialError = false;
+ public static boolean loggerSuppressWorldGenFeatureDeserializationError = false;
+ public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
+ private static void loggerSettings() {
+ loggerSuppressUnknownAttributeWarnings = getBoolean("settings.logger.suppress-unknown-attribute-warnings", loggerSuppressUnknownAttributeWarnings);
+ loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
+ loggerSuppressWorldGenFeatureDeserializationError = getBoolean("settings.logger.suppress-world-gen-feature-deserialization-errors", loggerSuppressWorldGenFeatureDeserializationError);
+ loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
+ }
+
private static void timingsSettings() {