From d478261f8e15f24edcb4459b72571046faaf0926 Mon Sep 17 00:00:00 2001
From: nitricspace <nitricspace@users.noreply.github.com>
Date: Wed, 5 Aug 2020 14:36:35 -0500
Subject: [PATCH] Hide Purpur's configurable seeds in timings reports

---
 .../server/0108-Configurable-end-spike-seed.patch | 15 ++++++++++++---
 .../server/0109-Configurable-dungeon-seed.patch   | 11 +++++++----
 patches/server/0116-Populator-seed-controls.patch | 14 +++++++++++---
 ...option-to-disable-mushroom-block-updates.patch |  4 ++--
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/patches/server/0108-Configurable-end-spike-seed.patch b/patches/server/0108-Configurable-end-spike-seed.patch
index 5d02dce8a..735ab877d 100644
--- a/patches/server/0108-Configurable-end-spike-seed.patch
+++ b/patches/server/0108-Configurable-end-spike-seed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end spike seed
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenEnder.java b/src/main/java/net/minecraft/server/WorldGenEnder.java
-index 495d98e15..9df359d0b 100644
+index 495d98e154..9df359d0ba 100644
 --- a/src/main/java/net/minecraft/server/WorldGenEnder.java
 +++ b/src/main/java/net/minecraft/server/WorldGenEnder.java
 @@ -23,12 +23,14 @@ public class WorldGenEnder extends WorldGenerator<WorldGenFeatureEndSpikeConfigu
@@ -25,16 +25,25 @@ index 495d98e15..9df359d0b 100644
          List<WorldGenEnder.Spike> list = worldgenfeatureendspikeconfiguration.b();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 2abbc6b17..f9b382dcc 100644
+index 2abbc6b177..4c68d65f69 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 {
+@@ -1,5 +1,6 @@
+ package net.pl3x.purpur;
+ 
++import co.aikar.timings.TimingsManager;
+ import com.google.common.base.Throwables;
+ import net.minecraft.server.MinecraftServer;
+ import net.pl3x.purpur.command.PurpurCommand;
+@@ -142,6 +143,13 @@ public class PurpurConfig {
          cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
      }
  
 +    public static int endSpikeSeed = -1;
 +    private static void seedSettings() {
 +        endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed);
++        TimingsManager.hiddenConfigs.add("settings.seed");
++        TimingsManager.hiddenConfigs.add("settings.seed.end-spike");
 +    }
 +
      public static String serverModName = "Purpur";
diff --git a/patches/server/0109-Configurable-dungeon-seed.patch b/patches/server/0109-Configurable-dungeon-seed.patch
index a6f49f066..7c4c64505 100644
--- a/patches/server/0109-Configurable-dungeon-seed.patch
+++ b/patches/server/0109-Configurable-dungeon-seed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable dungeon seed
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java b/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java
-index 70d222996..2bebbd699 100644
+index 70d2229960..2bebbd6995 100644
 --- a/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java
 +++ b/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java
 @@ -6,6 +6,7 @@ import java.util.stream.IntStream;
@@ -38,7 +38,7 @@ index 70d222996..2bebbd699 100644
              return new BlockPosition(k, i1, l);
          });
 diff --git a/src/main/java/net/minecraft/server/WorldGenDungeons.java b/src/main/java/net/minecraft/server/WorldGenDungeons.java
-index 3c7c93645..1f6ff7848 100644
+index 3c7c936453..1f6ff78488 100644
 --- a/src/main/java/net/minecraft/server/WorldGenDungeons.java
 +++ b/src/main/java/net/minecraft/server/WorldGenDungeons.java
 @@ -11,12 +11,21 @@ public class WorldGenDungeons extends WorldGenerator<WorldGenFeatureEmptyConfigu
@@ -64,10 +64,10 @@ index 3c7c93645..1f6ff7848 100644
          int i = random.nextInt(2) + 2;
          int j = -i - 1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f9b382dcc..cd524cabc 100644
+index 4c68d65f69..2e75ad1a75 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -142,8 +142,10 @@ public class PurpurConfig {
+@@ -143,10 +143,13 @@ public class PurpurConfig {
          cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
      }
  
@@ -76,5 +76,8 @@ index f9b382dcc..cd524cabc 100644
      private static void seedSettings() {
 +        dungeonSeed = getInt("settings.seed.dungeon", dungeonSeed);
          endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed);
+         TimingsManager.hiddenConfigs.add("settings.seed");
++        TimingsManager.hiddenConfigs.add("settings.seed.dungeon");
+         TimingsManager.hiddenConfigs.add("settings.seed.end-spike");
      }
  
diff --git a/patches/server/0116-Populator-seed-controls.patch b/patches/server/0116-Populator-seed-controls.patch
index 3d1a3b119..83adf86e9 100644
--- a/patches/server/0116-Populator-seed-controls.patch
+++ b/patches/server/0116-Populator-seed-controls.patch
@@ -5,10 +5,17 @@ Subject: [PATCH] Populator seed controls
 
 
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index 1c7b858ed5..9257da9680 100644
+index 1c7b858ed5..199221c0d8 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-@@ -249,6 +249,11 @@ public final class TuinityConfig {
+@@ -1,5 +1,6 @@
+ package com.tuinity.tuinity.config;
+ 
++import co.aikar.timings.TimingsManager;
+ import com.destroystokyo.paper.util.SneakyThrow;
+ import net.minecraft.server.TicketType;
+ import org.bukkit.Bukkit;
+@@ -249,6 +250,11 @@ public final class TuinityConfig {
              return this.config.getDouble(path, this.worldDefaults.getDouble(path));
          }
  
@@ -20,7 +27,7 @@ index 1c7b858ed5..9257da9680 100644
          /** ignored if {@link TuinityConfig#tickWorldsInParallel} == false */
          public int threads;
  
-@@ -274,6 +279,18 @@ public final class TuinityConfig {
+@@ -274,6 +280,19 @@ public final class TuinityConfig {
              this.spawnLimitAmbient = this.getInt(path + ".ambient", -1);
          }
  
@@ -34,6 +41,7 @@ index 1c7b858ed5..9257da9680 100644
 +            } else if (!seedString.equalsIgnoreCase("default")) {
 +                this.populatorSeed = Long.parseLong(seedString);
 +            }
++            TimingsManager.hiddenConfigs.add("worldgen.seeds.populator");
 +        }
 +
      }
diff --git a/patches/server/0119-Add-option-to-disable-mushroom-block-updates.patch b/patches/server/0119-Add-option-to-disable-mushroom-block-updates.patch
index 1f021e6d0..75d1ee3ed 100644
--- a/patches/server/0119-Add-option-to-disable-mushroom-block-updates.patch
+++ b/patches/server/0119-Add-option-to-disable-mushroom-block-updates.patch
@@ -73,10 +73,10 @@ index e8f340b9f2..3490af6fe0 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index cd524cabcd..765248e803 100644
+index 2e75ad1a75..b040d7b58b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -203,6 +203,11 @@ public class PurpurConfig {
+@@ -207,6 +207,11 @@ public class PurpurConfig {
          allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
      }