Add tuinity.yml and server.properties to timings config tab

patches/api/0003-Purpur-config-files.patch

@@ -1,25 +1,78 @@
-From 2cab1732fb9596bf2c2b692f3f018dd51609596f Mon Sep 17 00:00:00 2001
+From 3c223fc899501579d3656f7e73da79b195c59f39 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:30:03 -0600
 Subject: [PATCH] Purpur config files
 
 ---
- src/main/java/org/bukkit/Server.java | 7 +++++++
+ .../java/co/aikar/timings/TimingsExport.java  | 24 ++++++++++++++++---
- 1 file changed, 7 insertions(+)
+ src/main/java/org/bukkit/Server.java          | 17 +++++++++++++
+ 2 files changed, 38 insertions(+), 3 deletions(-)
 
+diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
+index 93d5a3f97..b5111928d 100644
+--- a/src/main/java/co/aikar/timings/TimingsExport.java
++++ b/src/main/java/co/aikar/timings/TimingsExport.java
+@@ -204,9 +204,14 @@ class TimingsExport extends Thread {
+         // Information on the users Config
+ 
+         parent.put("config", createObject(
+-            pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
+-            pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
+-            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
++                // Purpur start
++                pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
++                pair("bukkit.yml", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
++                pair("spigot.yml", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
++                pair("paper.yml", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
++                pair("tuinity.yml", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)),
++                pair("purpur.yml", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
++                // Purpur end
+         ));
+ 
+         new TimingsExport(listeners, parent, history).start();
+@@ -247,6 +252,19 @@ class TimingsExport extends Thread {
+         return timingsCost;
+     }
+ 
++    // Purpur start
++    private static JSONObject mapAsJSON(java.util.Properties properties) {
++        JSONObject object = new JSONObject();
++        for (String key : properties.stringPropertyNames()) {
++            if (TimingsManager.hiddenConfigs.contains(key)) {
++                continue;
++            }
++            object.put(key, valAsJSON(properties.get(key), key));
++        }
++        return object;
++    }
++    // Purpur end
++
+     private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
+ 
+         JSONObject object = new JSONObject();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 98e7ba900..765f8059a 100644
+index 98e7ba900..bea600c65 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1331,6 +1331,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1331,6 +1331,23 @@ public interface Server extends PluginMessageRecipient {
          }
          // Paper end
  
 +        // Purpur start
 +        @NotNull
++        public org.bukkit.configuration.file.YamlConfiguration getTuinityConfig() {
++            throw new UnsupportedOperationException("Not supported yet.");
++        }
++
++        @NotNull
 +        public org.bukkit.configuration.file.YamlConfiguration getPurpurConfig() {
 +            throw new UnsupportedOperationException("Not supported yet.");
 +        }
++
++        @NotNull
++        public java.util.Properties getServerProperties() {
++            throw new UnsupportedOperationException("Not supported yet.");
++        }
 +        // Purpur end
 +
          /**

patches/api/0004-Host-our-own-timings.patch

@@ -1,27 +1,17 @@
-From 31d3ec5ad187df9a8a60c212260a729abc029703 Mon Sep 17 00:00:00 2001
+From c9e3dae6773177302297c61c55d0bbbe9f1c6f9c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:38:26 -0600
 Subject: [PATCH] Host our own timings
 
 ---
- src/main/java/co/aikar/timings/TimingsExport.java | 5 +++--
+ src/main/java/co/aikar/timings/TimingsExport.java | 2 +-
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 93d5a3f97..a4ae730da 100644
+index b5111928d..63d21ddbc 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -206,7 +206,8 @@ class TimingsExport extends Thread {
+@@ -301,7 +301,7 @@ class TimingsExport extends Thread {
-         parent.put("config", createObject(
-             pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
-             pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
--            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
-+            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
-+            pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null)) // Purpur
-         ));
- 
-         new TimingsExport(listeners, parent, history).start();
-@@ -283,7 +284,7 @@ class TimingsExport extends Thread {
          String response = null;
          String timingsURL = null;
          try {

patches/api/0010-Add-tick-times-API.patch

@@ -1,4 +1,4 @@
-From edf1d2066b94a4e52c17e326ace3b64289ecee8b Mon Sep 17 00:00:00 2001
+From 7237c98d2466a3bbbf909eced8c728aa5242fdcf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 30 Jan 2020 00:41:08 -0600
 Subject: [PATCH] Add tick times API
@@ -39,10 +39,10 @@ index 50415189c..8fbda2aee 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e0d207d73..6be24c16c 100644
+index 0c45c9af3..75bf097ed 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1420,4 +1420,21 @@ public interface Server extends PluginMessageRecipient {
+@@ -1430,4 +1430,21 @@ public interface Server extends PluginMessageRecipient {
       */
      int getCurrentTick();
      // Paper end

patches/api/0011-Bring-back-server-name.patch

@@ -1,4 +1,4 @@
-From 598786fbe7fa753987cb8593d89e16758f118fc6 Mon Sep 17 00:00:00 2001
+From ab2f131fdd232bd09bedb76172d48ca5f6458435 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:18:40 -0500
 Subject: [PATCH] Bring back server name
@@ -29,10 +29,10 @@ index 8fbda2aee..a2cf8e29b 100644
       * Get a sample of the servers last tick times (in nanos)
       * 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6be24c16c..6690ef00c 100644
+index 75bf097ed..89100f3f5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1422,6 +1422,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1432,6 +1432,13 @@ public interface Server extends PluginMessageRecipient {
      // Paper end
  
      // Purpur start

patches/api/0015-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 438626929d0f7ecdc1a476539c93fe94230d4226 Mon Sep 17 00:00:00 2001
+From e87e36de2b313502386d54bcae4f7c531f1c183b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:24 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -29,10 +29,10 @@ index a2cf8e29b..220cc96c0 100644
       * Get a sample of the servers last tick times (in nanos)
       * 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6690ef00c..8ce12a1c0 100644
+index 89100f3f5..ee0f2d6b2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1429,6 +1429,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1439,6 +1439,13 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      String getServerName();
  

patches/server/0003-Purpur-config-files.patch

@@ -1,19 +1,20 @@
-From c9be48cc2164c8c8aa6d1e8c0003c48dcc2b5f0e Mon Sep 17 00:00:00 2001
+From 33b955d71a7fe318ade45591dad05f8f7f100069 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
 
 ---
  .../com/destroystokyo/paper/PaperConfig.java  |   2 +
+ .../tuinity/tuinity/config/TuinityConfig.java |   2 +-
  .../net/minecraft/server/DedicatedServer.java |   9 +
  src/main/java/net/minecraft/server/World.java |   2 +
  src/main/java/net/pl3x/purpur/Metrics.java    | 598 ++++++++++++++++++
  .../java/net/pl3x/purpur/PurpurCommand.java   |  66 ++
  .../java/net/pl3x/purpur/PurpurConfig.java    | 135 ++++
  .../net/pl3x/purpur/PurpurWorldConfig.java    |  67 ++
- .../org/bukkit/craftbukkit/CraftServer.java   |  11 +
+ .../org/bukkit/craftbukkit/CraftServer.java   |  20 +
  .../java/org/bukkit/craftbukkit/Main.java     |   8 +
- 9 files changed, 898 insertions(+)
+ 10 files changed, 908 insertions(+), 1 deletion(-)
  create mode 100644 src/main/java/net/pl3x/purpur/Metrics.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurCommand.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -36,6 +37,19 @@ index 1d7d1ffbf..d886f1d14 100644
      }
  
      static void readConfig(Class<?> clazz, Object instance) {
+diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
+index 5edae85e7..76d8e55ca 100644
+--- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
++++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
+@@ -19,7 +19,7 @@ public final class TuinityConfig {
+     private static final Object[] EMPTY = new Object[0];
+ 
+     private static File configFile;
+-    private static YamlConfiguration config;
++    public static YamlConfiguration config; // Purpur - private -> public
+     private static int configVersion;
+ 
+     public static void init(final File file) {
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
 index ede436939..8c7156bb5 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -967,7 +981,7 @@ index 000000000..eda37fa43
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 23c3a69fa..b64413084 100644
+index 23c3a69fa..0e4cea4db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -797,6 +797,7 @@ public final class CraftServer implements Server {
@@ -994,16 +1008,25 @@ index 23c3a69fa..b64413084 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2065,6 +2068,14 @@ public final class CraftServer implements Server {
+@@ -2065,6 +2068,23 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  
 +        // Purpur start
 +        @Override
-+        public YamlConfiguration getPurpurConfig()
++        public YamlConfiguration getTuinityConfig() {
-+        {
++            return com.tuinity.tuinity.config.TuinityConfig.config;
++        }
++
++        @Override
++        public YamlConfiguration getPurpurConfig() {
 +            return net.pl3x.purpur.PurpurConfig.config;
 +        }
++
++        @Override
++        public java.util.Properties getServerProperties() {
++            return getProperties().properties;
++        }
 +        // Purpur end
 +
          @Override

patches/server/0051-Add-tick-times-API.patch

@@ -1,4 +1,4 @@
-From 004331f50a3cc77a2d50470add031656636aa32b Mon Sep 17 00:00:00 2001
+From 42536b66da5e998b17a32575fa4a188ee81902bf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 30 Jan 2020 00:41:24 -0600
 Subject: [PATCH] Add tick times API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API
  2 files changed, 28 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b64413084..85c7fc177 100644
+index 0e4cea4db..26e76df12 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2202,4 +2202,21 @@ public final class CraftServer implements Server {
+@@ -2211,4 +2211,21 @@ public final class CraftServer implements Server {
          return net.minecraft.server.MinecraftServer.currentTick;
      }
      // Paper end

patches/server/0053-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From 0233b14a5cb692e047870000eaba4701e309d311 Mon Sep 17 00:00:00 2001
+From 172f860ac4786be57a1d686a6e40e0c25810263f 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
@@ -46,10 +46,10 @@ index e1a1ef860..2537a5add 100644
      public static double packetRateLimitInterval = 10.0; // seconds
      public static String packetRateLimitKickMessage = "Sent too many packets";
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 85c7fc177..2b5ae8c86 100644
+index 26e76df12..7ba8c8f59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2218,5 +2218,10 @@ public final class CraftServer implements Server {
+@@ -2227,5 +2227,10 @@ public final class CraftServer implements Server {
          }
          return ((double) total / (double) tickTimes.length) * 1.0E-6D;
      }

patches/server/0059-Bring-back-server-name.patch

@@ -1,4 +1,4 @@
-From e8b75fc5bfd3619380d62b876fc5c8da828f37ba Mon Sep 17 00:00:00 2001
+From 70088fccf5b04d58f38c9126e3825c8991d93e1b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
@@ -21,10 +21,10 @@ index 0c3ec8357..309f5562b 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2b5ae8c86..0c63f5ed7 100644
+index 7ba8c8f59..7fae8ffd9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2204,6 +2204,11 @@ public final class CraftServer implements Server {
+@@ -2213,6 +2213,11 @@ public final class CraftServer implements Server {
      // Paper end
  
      // Purpur start