From ecbb4806611d3cb839141709b6222c05fe0a067c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 May 2019 06:09:09 -0500 Subject: [PATCH] Add verbose option to purpur config --- patches/server/0002-Purpur-config-files.patch | 22 +++++++++++-------- ...fig-to-suppress-specific-log-outputs.patch | 6 ++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch index 8bbbc7c30..16cdd0c2a 100644 --- a/patches/server/0002-Purpur-config-files.patch +++ b/patches/server/0002-Purpur-config-files.patch @@ -1,4 +1,4 @@ -From 2d2f2793e13ed5c14e91f1457efb7f54761f3b85 Mon Sep 17 00:00:00 2001 +From 27442799204447265317974670fb7e1ab7ed172c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 18:09:43 -0500 Subject: [PATCH] Purpur config files @@ -6,11 +6,11 @@ Subject: [PATCH] Purpur config files --- .../net/minecraft/server/DedicatedServer.java | 8 ++ src/main/java/net/minecraft/server/World.java | 3 + - .../java/net/pl3x/purpur/PurpurConfig.java | 101 ++++++++++++++++++ + .../java/net/pl3x/purpur/PurpurConfig.java | 105 ++++++++++++++++++ .../net/pl3x/purpur/PurpurWorldConfig.java | 63 +++++++++++ .../org/bukkit/craftbukkit/CraftServer.java | 2 + .../java/org/bukkit/craftbukkit/Main.java | 8 ++ - 6 files changed, 185 insertions(+) + 6 files changed, 189 insertions(+) create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -34,7 +34,7 @@ index 3d452fe0e..22e81ee10 100644 // Paper end diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4caf5d9af..a9a358955 100644 +index c04d73e73..668eb4cbf 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -94,6 +94,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -56,10 +56,10 @@ index 4caf5d9af..a9a358955 100644 this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java new file mode 100644 -index 000000000..28f80e1a5 +index 000000000..e91bd0a36 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -0,0 +1,101 @@ +@@ -0,0 +1,105 @@ +package net.pl3x.purpur; + +import com.google.common.base.Throwables; @@ -80,7 +80,8 @@ index 000000000..28f80e1a5 + private static final String HEADER = "This is the main configuration file for Purpur."; + private static File CONFIG_FILE; + static YamlConfiguration config; -+ static int version; ++ private static int version; ++ private static boolean verbose; + + public static void init(File configFile) { + CONFIG_FILE = configFile; @@ -94,6 +95,7 @@ index 000000000..28f80e1a5 + } + config.options().header(HEADER); + config.options().copyDefaults(true); ++ verbose = getBoolean("verbose", false); + + version = getInt("config-version", CONFIG_VERSION); + set("config-version", version); @@ -106,7 +108,9 @@ index 000000000..28f80e1a5 + } + + protected static void log(Level level, String s) { -+ Bukkit.getLogger().log(level, s); ++ if (verbose) { ++ Bukkit.getLogger().log(level, s); ++ } + } + + static void readConfig(Class clazz, Object instance) { @@ -231,7 +235,7 @@ index 000000000..30f11fe26 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 347e3f918..69ecd9cc1 100644 +index 188d322ee..d087be7d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -788,6 +788,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch b/patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch index 89d87c463..eddd95884 100644 --- a/patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch +++ b/patches/server/0013-Add-config-to-suppress-specific-log-outputs.patch @@ -1,4 +1,4 @@ -From 015122f2521686cbc28dbfb986d376b666402cf6 Mon Sep 17 00:00:00 2001 +From c55bbd3eae4fc9be0c23ec7d5f83a8caad4a2925 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 10 May 2019 19:17:36 -0500 Subject: [PATCH] Add config to suppress specific log outputs @@ -35,10 +35,10 @@ index 3ed12672e..d82102bd8 100644 WorldServer.LOGGER.error("Deleting duplicate entity {}", entity); // CraftBukkit // paper diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 28f80e1a5..d75580ce6 100644 +index e91bd0a36..734b8026d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -98,4 +98,11 @@ public class PurpurConfig { +@@ -102,4 +102,11 @@ public class PurpurConfig { config.addDefault(path, def); return config.getString(path, config.getString(path)); }