Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add option to disable ignored advancement warnings

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

31
patches/server/0008-Logger-settings-suppressing-pointless-logs.patch
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() {

8
patches/server/0036-Dont-send-useless-entity-packets.patch
View File

@@ -1,4 +1,4 @@
From b4c47eaa925f8d7de7aa66f7d2791d0ebd8145a5 Mon Sep 17 00:00:00 2001
From 154cd96b04812374e0b146234d568ee7c0b90483 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 6 Jul 2019 17:00:04 -0500
Subject: [PATCH] Dont send useless entity packets
@@ -66,11 +66,11 @@ index e5da2b19c..5b1d95935 100644
protected boolean h;
protected boolean i;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 852bbf8b8..c9cf6f3bb 100644
index d6f82d119..d3e1c8c40 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -137,6 +137,11 @@ public class PurpurConfig {
loggerSuppressWorldGenFeatureDeserializationError = getBoolean("settings.logger.suppress-world-gen-feature-deserialization-errors", loggerSuppressWorldGenFeatureDeserializationError);
@@ -139,6 +139,11 @@ public class PurpurConfig {
loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
}
+ public static boolean dontSendUselessEntityPackets = false;

8
patches/server/0047-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 9aa393207648724027cfaf417dc35ced06f803f7 Mon Sep 17 00:00:00 2001
From caa69a1bbf529f8da69d513e1e346436695598e8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Implement lagging threshold
@@ -30,11 +30,11 @@ index 8207e7f8a..4d25bd747 100644
}
midTickChunksTasksRan = 0; // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c9cf6f3bb..08d8e321b 100644
index d3e1c8c40..ab20fa2fa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -137,6 +137,11 @@ public class PurpurConfig {
loggerSuppressWorldGenFeatureDeserializationError = getBoolean("settings.logger.suppress-world-gen-feature-deserialization-errors", loggerSuppressWorldGenFeatureDeserializationError);
@@ -139,6 +139,11 @@ public class PurpurConfig {
loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
}
+ public static double laggingThreshold = 19.0D;

6
patches/server/0052-Option-for-slimes-not-pushable.patch
View File

@@ -1,4 +1,4 @@
From ecdb39d9838170d4447e8d16d9f04f726c1d1452 Mon Sep 17 00:00:00 2001
From cf638798f15948a19cdb28890f59418cd3234fa3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 21:56:31 -0500
Subject: [PATCH] Option for slimes not pushable
@@ -47,10 +47,10 @@ index 01f32659d..52ab86f0b 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 08d8e321b..622f1a7d8 100644
index ab20fa2fa..72ad9dce7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -147,6 +147,11 @@ public class PurpurConfig {
@@ -149,6 +149,11 @@ public class PurpurConfig {
dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
}

6
patches/server/0060-Alternative-Keepalive-Handling.patch
View File

@@ -1,4 +1,4 @@
From 3b007b468d4ade7d84f2f05ba7fdf11716a9c625 Mon Sep 17 00:00:00 2001
From 6b5a1fa86ca426fa82857f6d4dd082970eefe878 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 11 Oct 2019 00:17:39 -0500
Subject: [PATCH] Alternative Keepalive Handling
@@ -74,10 +74,10 @@ index 1cfe6709c..d89a30659 100644
if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 622f1a7d8..f4e73a0b1 100644
index 72ad9dce7..ed2a31277 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -142,6 +142,11 @@ public class PurpurConfig {
@@ -144,6 +144,11 @@ public class PurpurConfig {
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
}

6
patches/server/0064-Barrels-have-6-rows.patch
View File

@@ -1,4 +1,4 @@
From 4e404003c45a0bf8fbd2caac8d7673ce2c9a6b93 Mon Sep 17 00:00:00 2001
From ab494bc1eda2af20f615c0834599d80c855c7cc2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 21:50:37 -0500
Subject: [PATCH] Barrels have 6 rows
@@ -40,7 +40,7 @@ index 1e27abbea..ca3b6c9aa 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index f4e73a0b1..a1ba98a1f 100644
index ed2a31277..581e8eebe 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -7,6 +7,7 @@ import org.bukkit.Bukkit;
@@ -51,7 +51,7 @@ index f4e73a0b1..a1ba98a1f 100644
import java.io.File;
import java.io.IOException;
@@ -152,8 +153,16 @@ public class PurpurConfig {
@@ -154,8 +155,16 @@ public class PurpurConfig {
dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
}

6
patches/server/0065-Enderchest-6-rows-plus-permissions.patch
View File

@@ -1,4 +1,4 @@
From c2b7ff7ccd7b1f91deb5c4229a5f061192aedf8c Mon Sep 17 00:00:00 2001
From 5b0acaf7937c8feacc2d97a2945ea257aa1ca327 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 23 Jun 2019 17:01:26 -0500
Subject: [PATCH] Enderchest 6 rows (plus permissions)
@@ -58,10 +58,10 @@ index fd31b9a6d..903c02e9e 100644
// CraftBukkit end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index a1ba98a1f..a05c85be0 100644
index 581e8eebe..c3ecd6fc7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -155,14 +155,22 @@ public class PurpurConfig {
@@ -157,14 +157,22 @@ public class PurpurConfig {
public static boolean barrelSixRows = false;
public static boolean slimeBlocksNotPushable = false;

8
patches/server/0087-UPnP-Port-Forwarding-Service.patch
View File

@@ -1,4 +1,4 @@
From 1486feb57f39fb72713ab88f489a41494c80239d Mon Sep 17 00:00:00 2001
From d6c311e7c232a6269e25a05fb3136ef4b8aa698c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 22 Jan 2020 20:13:40 -0600
Subject: [PATCH] UPnP Port Forwarding Service
@@ -14,7 +14,7 @@ Subject: [PATCH] UPnP Port Forwarding Service
create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
diff --git a/pom.xml b/pom.xml
index cdb556405..760a4bc46 100644
index 07c50510c..5ecec5c20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,12 @@
@@ -106,10 +106,10 @@ index 7a7c9213d..971466e2a 100644
if (this.server != null) {
this.server.disablePlugins();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index a05c85be0..1822c896f 100644
index c3ecd6fc7..fe38b3ce9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -148,6 +148,11 @@ public class PurpurConfig {
@@ -150,6 +150,11 @@ public class PurpurConfig {
useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
}

6
patches/server/0097-Configurable-server-mod-name.patch
View File

@@ -1,4 +1,4 @@
From 4e8c4f58a721e72004b2bdb229e593b1c3c52314 Mon Sep 17 00:00:00 2001
From 7bbb5d4e67c00a878e483cd207408c9b08f05fdb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 21 Mar 2020 11:47:39 -0500
Subject: [PATCH] Configurable server mod name
@@ -22,10 +22,10 @@ index 971466e2a..1b76ce463 100644
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 1822c896f..429c583be 100644
index fe38b3ce9..a729e7d20 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -179,6 +179,11 @@ public class PurpurConfig {
@@ -181,6 +181,11 @@ public class PurpurConfig {
slimeBlocksNotPushable = getBoolean("settings.blocks.slime.not-movable-by-piston", slimeBlocksNotPushable);
}

6
patches/server/0099-Configurable-TPS-Catchup.patch
View File

@@ -1,4 +1,4 @@
From 9f04ce50fce43677a049219a9684992b7d205207 Mon Sep 17 00:00:00 2001
From e22a0f8752cc9b543d91067bc6140ab98ce09ff6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 19:06:22 -0500
Subject: [PATCH] Configurable TPS Catchup
@@ -27,10 +27,10 @@ index 1b76ce463..e9f1fd78a 100644
this.methodProfiler.exit();
this.methodProfiler.b();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 429c583be..a9ae5190e 100644
index a729e7d20..7bea36213 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -153,6 +153,11 @@ public class PurpurConfig {
@@ -155,6 +155,11 @@ public class PurpurConfig {
useUPnP = getBoolean("settings.upnp-port-forwarding", useUPnP);
}

6
patches/server/0102-Configurable-enchantment-max-level.patch
View File

@@ -1,4 +1,4 @@
From 8482481275e0e1410010ea0345623bf43bef961a Mon Sep 17 00:00:00 2001
From 116e110a51058adb55971fed51c8ba09e441de7d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 1 Apr 2020 17:21:42 -0500
Subject: [PATCH] Configurable enchantment max level
@@ -740,7 +740,7 @@ index 4571cdf02..aa3cbd523 100644
public float a(int i, EnumMonsterType enummonstertype) {
return this.a == 0 ? 1.0F + (float) Math.max(0, i - 1) * 0.5F : (this.a == 1 && enummonstertype == EnumMonsterType.UNDEAD ? (float) i * 2.5F : (this.a == 2 && enummonstertype == EnumMonsterType.ARTHROPOD ? (float) i * 2.5F : 0.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index a9ae5190e..8827b9d0d 100644
index 7bea36213..68bad6a13 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,6 +1,8 @@
@@ -752,7 +752,7 @@ index a9ae5190e..8827b9d0d 100644
import net.minecraft.server.MinecraftServer;
import net.pl3x.purpur.command.PurpurCommand;
import org.bukkit.Bukkit;
@@ -192,4 +194,12 @@ public class PurpurConfig {
@@ -194,4 +196,12 @@ public class PurpurConfig {
private static void timingsSettings() {
getString("settings.timings.url", "https://timings.pl3x.net");
}

6
patches/server/0116-MC-4-Fix-Item-position-desync.patch
View File

@@ -1,4 +1,4 @@
From 94b7f1d75467a481d686157ce9a6cef4f8cb04af Mon Sep 17 00:00:00 2001
From d66b7e2f84df8ce9968cd57fd67f08fd459860ab Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 6 Jul 2019 21:12:58 -0500
Subject: [PATCH] MC-4 Fix - Item position desync
@@ -44,10 +44,10 @@ index 5b1d95935..0010448e3 100644
return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 8827b9d0d..be6baf299 100644
index 68bad6a13..ab88636ca 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -161,8 +161,10 @@ public class PurpurConfig {
@@ -163,8 +163,10 @@ public class PurpurConfig {
}
public static boolean dontSendUselessEntityPackets = false;

6
patches/server/0122-Tuinity-Delay-chunk-unloads.patch
View File

@@ -1,4 +1,4 @@
From 1147b59943e44d47945854a93598659db7b894e4 Mon Sep 17 00:00:00 2001
From 768d10e0f31cc40dc3803b8631f953f4de958653 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 25 Oct 2019 02:11:30 -0700
Subject: [PATCH] Tuinity - Delay chunk unloads
@@ -185,7 +185,7 @@ index 6e0d0a54a..07f77dbb8 100644
public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
return new TicketType<>(s, comparator, 0L);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index be6baf299..ba2ac70ca 100644
index ab88636ca..becb13e0e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -4,6 +4,7 @@ import com.google.common.base.Throwables;
@@ -196,7 +196,7 @@ index be6baf299..ba2ac70ca 100644
import net.pl3x.purpur.command.PurpurCommand;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@@ -204,4 +205,12 @@ public class PurpurConfig {
@@ -206,4 +207,12 @@ public class PurpurConfig {
enchantment.setMaxLevel(maxLevel);
}
}