Include server.properties in timings

patches/server/0008-Include-server.properties-in-timings.patch

@@ -0,0 +1,234 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Sat, 24 Dec 2022 17:56:41 +0100
+Subject: [PATCH] Include server.properties in timings
+
+License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+Gale - https://galemc.org
+
+diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
+index ce257cf454300603d93ed68eb409461111bbac31..1982a9f7dedfedc358234d84766be7ccca82bdc7 100644
+--- a/src/main/java/co/aikar/timings/TimingsExport.java
++++ b/src/main/java/co/aikar/timings/TimingsExport.java
+@@ -35,6 +35,7 @@ import org.bukkit.Material;
+ import org.bukkit.configuration.ConfigurationSection;
+ import org.bukkit.configuration.MemorySection;
+ import org.bukkit.entity.EntityType;
++import org.galemc.gale.configuration.timingsexport.VanillaServerPropertiesTimingsExport;
+ import org.json.simple.JSONObject;
+ import org.json.simple.JSONValue;
+ import oshi.SystemInfo;
+@@ -239,6 +240,7 @@ public class TimingsExport extends Thread {
+         // Information on the users Config
+ 
+         parent.put("config", createObject(
++            pair("server.properties", VanillaServerPropertiesTimingsExport.get()), // Gale - include server.properties in timings
+             pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
+             pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
+             // Gale start - Gale configuration - including in timings
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
+index c7e4330c93baff1f3027d7c75cf857b673d38970..aea446e4a849151dc4f4aab6217572ee9477b2f7 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
+@@ -68,6 +68,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+     public final Difficulty difficulty;
+     public final GameType gamemode;
+     public final String levelName;
++    public final String levelSeed; // Gale - include server.properties in timings
+     public final int serverPort;
+     @Nullable
+     public final Boolean announcePlayerAchievements;
+@@ -100,12 +101,13 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+     public final boolean hideOnlinePlayers;
+     public final int entityBroadcastRangePercentage;
+     public final String textFilteringConfig;
++    public final String resourcePackPrompt; // Gale - include server.properties in timings
+     public final Optional<MinecraftServer.ServerResourcePackInfo> serverResourcePackInfo;
+     public final DataPackConfig initialDataPackConfiguration;
+     public final Settings<DedicatedServerProperties>.MutableValue<Integer> playerIdleTimeout;
+     public final Settings<DedicatedServerProperties>.MutableValue<Boolean> whiteList;
+     public final boolean enforceSecureProfile;
+-    private final DedicatedServerProperties.WorldDimensionData worldDimensionData;
++    public final DedicatedServerProperties.WorldDimensionData worldDimensionData; // Gale - include server.properties in timings - private -> public
+     public final WorldOptions worldOptions;
+ 
+     public final String rconIp; // Paper - Add rcon ip
+@@ -156,6 +158,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+         this.whiteList = this.getMutable("white-list", false);
+         this.enforceSecureProfile = this.get("enforce-secure-profile", true);
+         String s = this.get("level-seed", "");
++        this.levelSeed = s; // Gale - include server.properties in timings
+         boolean flag = this.get("generate-structures", true);
+         long i = WorldOptions.parseSeed(s).orElse(WorldOptions.randomSeed());
+ 
+@@ -165,7 +168,10 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
+         }, new JsonObject()), (String) this.get("level-type", (s1) -> {
+             return s1.toLowerCase(Locale.ROOT);
+         }, WorldPresets.NORMAL.location().toString()));
+-        this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(this.get("resource-pack", ""), this.get("resource-pack-sha1", ""), this.getLegacyString("resource-pack-hash"), this.get("require-resource-pack", false), this.get("resource-pack-prompt", ""));
++        // Gale start - include server.properties in timings
++        this.resourcePackPrompt = this.get("resource-pack-prompt", "");
++        this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(this.get("resource-pack", ""), this.get("resource-pack-sha1", ""), this.getLegacyString("resource-pack-hash"), this.get("require-resource-pack", false), this.resourcePackPrompt);
++        // Gale end - include server.properties in timings
+         this.initialDataPackConfiguration = DedicatedServerProperties.getDatapackConfig(this.get("initial-enabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getEnabled())), this.get("initial-disabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getDisabled())));
+         // Paper start - Configurable rcon ip
+         final String rconIp = this.getStringRaw("rcon.ip");
+diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+index 8f8fd98f96cd390ba43033521982a13044df91cf..a6bfe19bc7c0fb714533c2c55d5a0b98da61cfca 100644
+--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
++++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+@@ -27,4 +27,28 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+ 
+     }
+ 
++    public Misc misc;
++    public class Misc extends ConfigurationPart {
++
++        // Gale start - include server.properties in timings
++        public IncludeInTimingsReport includeInTimingsReport;
++        public class IncludeInTimingsReport extends ConfigurationPart {
++            public boolean dataPacks = true;
++            public boolean enableRcon = false;
++            public boolean generatorSettings = true;
++            public boolean levelName = false;
++            public boolean motd = false;
++            public boolean queryPort = false;
++            public boolean rconPort = false;
++            public boolean resourcePackPrompt = false;
++            @Setting("resource-pack-and-resource-pack-sha1")
++            public boolean resourcePackAndResourcePackSha1 = false;
++            public boolean serverIp = false;
++            public boolean serverPort = false;
++            public boolean textFilteringConfig = false;
++        }
++        // Gale end - include server.properties in timings
++
++    }
++
+ }
+diff --git a/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java b/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..b8c2d4e74d99d1f955d300d403f519cd68017ac4
+--- /dev/null
++++ b/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java
+@@ -0,0 +1,120 @@
++// Gale - include server.properties in timings
++
++package org.galemc.gale.configuration.timingsexport;
++
++import net.minecraft.server.MinecraftServer;
++import net.minecraft.server.dedicated.DedicatedServer;
++import org.galemc.gale.configuration.GaleGlobalConfiguration;
++import org.jetbrains.annotations.NotNull;
++import org.json.simple.JSONObject;
++
++import java.util.Optional;
++
++public final class VanillaServerPropertiesTimingsExport {
++
++    private VanillaServerPropertiesTimingsExport() {}
++
++    @SuppressWarnings("unchecked")
++    public static @NotNull JSONObject get() {
++
++        var json = new JSONObject();
++        var properties = ((DedicatedServer) MinecraftServer.getServer()).getProperties();
++        var includeConfig = GaleGlobalConfiguration.get().misc.includeInTimingsReport;
++
++        json.put("allow-flight", String.valueOf(properties.allowFlight));
++        json.put("allow-nether", String.valueOf(properties.allowNether));
++        json.put("broadcast-console-to-ops", String.valueOf(properties.broadcastConsoleToOps));
++        json.put("broadcast-rcon-to-ops", String.valueOf(properties.broadcastRconToOps));
++        json.put("debug", String.valueOf(properties.debug));
++        json.put("difficulty", String.valueOf(properties.difficulty));
++        json.put("enable-command-block", String.valueOf(properties.enableCommandBlock));
++        json.put("enable-jmx-monitoring", String.valueOf(properties.enableJmxMonitoring));
++        json.put("enable-query", String.valueOf(properties.enableQuery));
++        if (includeConfig.enableRcon) {
++            json.put("enable-rcon", String.valueOf(properties.enableRcon));
++        }
++        json.put("enable-status", String.valueOf(properties.enableStatus));
++        json.put("enforce-secure-profile", String.valueOf(properties.enforceSecureProfile));
++        json.put("enforce-whitelist", String.valueOf(properties.enforceWhitelist));
++        json.put("entity-broadcast-range-percentage", String.valueOf(properties.entityBroadcastRangePercentage));
++        json.put("force-gamemode", String.valueOf(properties.forceGameMode));
++        json.put("function-permission-level", String.valueOf(properties.functionPermissionLevel));
++        json.put("gamemode", String.valueOf(properties.gamemode));
++        Optional.ofNullable(properties.worldOptions).ifPresent(worldOptions -> json.put("generate-structures", String.valueOf(worldOptions.generateStructures())));
++        if (includeConfig.generatorSettings) {
++            Optional.ofNullable(properties.worldDimensionData).ifPresent(worldDimensionData -> json.put("generator-settings", String.valueOf(worldDimensionData.generatorSettings())));
++        }
++        json.put("hardcore", String.valueOf(properties.hardcore));
++        json.put("hide-online-players", String.valueOf(properties.hideOnlinePlayers));
++        if (includeConfig.dataPacks) {
++            Optional.ofNullable(properties.initialDataPackConfiguration).ifPresent(initialDataPackConfiguration -> {
++                json.put("initial-enabled-packs", String.valueOf(initialDataPackConfiguration.getEnabled()));
++                json.put("initial-disabled-packs", String.valueOf(initialDataPackConfiguration.getDisabled()));
++            });
++        }
++        if (includeConfig.levelName) {
++            json.put("level-name", String.valueOf(properties.levelName));
++        }
++        // Note: level-seed is never included to prevent it being leaked
++//        if (includeConfig.levelSeed) {
++//            json.put("level-seed", String.valueOf(properties.levelSeed));
++//        }
++        Optional.ofNullable(properties.worldDimensionData).ifPresent(worldDimensionData -> json.put("level-type", String.valueOf(worldDimensionData.levelType())));
++        json.put("max-chained-neighbor-updates", String.valueOf(properties.maxChainedNeighborUpdates));
++        json.put("max-players", String.valueOf(properties.maxPlayers));
++        json.put("max-tick-time", String.valueOf(properties.maxTickTime));
++        json.put("max-world-size", String.valueOf(properties.maxWorldSize));
++        if (includeConfig.motd) {
++            json.put("motd", String.valueOf(properties.motd));
++        }
++        json.put("network-compression-threshold", String.valueOf(properties.networkCompressionThreshold));
++        json.put("online-mode", String.valueOf(properties.onlineMode));
++        json.put("op-permission-level", String.valueOf(properties.opPermissionLevel));
++        Optional.ofNullable(properties.playerIdleTimeout).ifPresent(playerIdleTimeout -> json.put("player-idle-timeout", String.valueOf(playerIdleTimeout.get())));
++        json.put("prevent-proxy-connections", String.valueOf(properties.preventProxyConnections));
++        json.put("pvp", String.valueOf(properties.pvp));
++        if (includeConfig.queryPort) {
++            json.put("query-port", String.valueOf(properties.queryPort));
++        }
++        json.put("rate-limit", String.valueOf(properties.rateLimitPacketsPerSecond));
++        // Note: rcon-password is never included to prevent it being leaked
++//        if (includeConfig.rconPassword) {
++//            json.put("rcon-password", String.valueOf(properties.rconPassword));
++//        }
++        if (includeConfig.rconPort) {
++            json.put("rcon-port", String.valueOf(properties.queryPort));
++        }
++        properties.serverResourcePackInfo.ifPresent(serverResourcePackInfo -> {
++            json.put("require-resource-pack", String.valueOf(serverResourcePackInfo.isRequired()));
++            if (includeConfig.resourcePackAndResourcePackSha1) {
++                json.put("resource-pack", String.valueOf(serverResourcePackInfo.url()));
++                json.put("resource-pack-sha1", String.valueOf(serverResourcePackInfo.hash()));
++            }
++        });
++        if (includeConfig.resourcePackPrompt) {
++            json.put("resource-pack-prompt", String.valueOf(properties.resourcePackPrompt));
++        }
++        if (includeConfig.serverIp) {
++            json.put("server-ip", String.valueOf(properties.serverIp));
++        }
++        if (includeConfig.serverPort) {
++            json.put("server-port", String.valueOf(properties.serverPort));
++        }
++        json.put("simulation-distance", String.valueOf(properties.simulationDistance));
++        json.put("spawn-animals", String.valueOf(properties.spawnAnimals));
++        json.put("spawn-monsters", String.valueOf(properties.spawnMonsters));
++        json.put("spawn-npcs", String.valueOf(properties.spawnNpcs));
++        json.put("spawn-protection", String.valueOf(properties.spawnProtection));
++        json.put("sync-chunk-writes", String.valueOf(properties.syncChunkWrites));
++        if (includeConfig.textFilteringConfig) {
++            json.put("text-filtering-config", String.valueOf(properties.textFilteringConfig));
++        }
++        json.put("use-native-transport", String.valueOf(properties.useNativeTransport));
++        json.put("view-distance", String.valueOf(properties.viewDistance));
++        Optional.ofNullable(properties.whiteList).ifPresent(whiteList -> json.put("white-list", String.valueOf(whiteList.get())));
++
++        return json;
++
++    }
++
++}

patches/server/0009-Use-timin.gs-by-default.patch

@@ -13,7 +13,7 @@ As part of: Mirai (https://github.com/etil2jz/Mirai)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..20bbb6473f7e8574bc52842e72c12ffb29c68d23 100644
+index 8d442c5a498ecf288a0cc0c54889c6e2fda849ce..811a35412b5cba79287195762e7a205eca6aa442 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -52,7 +52,7 @@ public class GlobalConfiguration extends ConfigurationPart {

patches/server/0010-Recommend-disabling-timings-on-startup.patch

@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 20bbb6473f7e8574bc52842e72c12ffb29c68d23..81a7e10a0cb30e6c51c985afdc6a11e023b3e3d2 100644
+index 811a35412b5cba79287195762e7a205eca6aa442..66512a1385b7b907763a82bdb52661c3b0821ba7 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -7,6 +7,7 @@ import net.kyori.adventure.text.Component;

patches/server/0041-SIMD-support.patch

@@ -68,7 +68,7 @@ index 9c3ccbbd657d1605b8fabb6e01c11ff31f39a17e..1d1db89362b78ac34d46cdd71b9ab274
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
          this.setMotd(dedicatedserverproperties.motd);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 8f8fd98f96cd390ba43033521982a13044df91cf..d46f952e5e425eb90f8c435276bfc4542e85f6a7 100644
+index a6bfe19bc7c0fb714533c2c55d5a0b98da61cfca..82612656d46403b3cbaffe1add0bce4d1d7d15b4 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -25,6 +25,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -85,4 +85,4 @@ index 8f8fd98f96cd390ba43033521982a13044df91cf..d46f952e5e425eb90f8c435276bfc454
 +
      }
  
- }
+     public Misc misc;

patches/server/0048-Do-not-log-invalid-statistics.patch

@@ -44,10 +44,18 @@ index 72946e324c575ef39f3939225b96b68f724da460..75e2a7d19a7056b73c1524902e44cca0
                              }
                          }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index d46f952e5e425eb90f8c435276bfc4542e85f6a7..265f5452128187f282e242c1d373f8295c8a9183 100644
+index 82612656d46403b3cbaffe1add0bce4d1d7d15b4..6f2d920dbae80740732e2a871365425cbccd8b86 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -35,4 +35,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -40,6 +40,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+ 
+         // Gale start - include server.properties in timings
+         public IncludeInTimingsReport includeInTimingsReport;
++
+         public class IncludeInTimingsReport extends ConfigurationPart {
+             public boolean dataPacks = true;
+             public boolean enableRcon = false;
+@@ -59,4 +60,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
      }
  

patches/server/0049-Do-not-log-empty-message-warnings.patch

@@ -29,10 +29,10 @@ index 8fac3c35b04429e66e440895ab82a65497147812..ee3acb578d4f72836eb3a4e8336701b3
              final String conversationInput = s;
              this.server.processQueue.add(new Runnable() {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 265f5452128187f282e242c1d373f8295c8a9183..c7a1ba28fd5e8ddd5cb2428bfd1897e292437dcf 100644
+index 6f2d920dbae80740732e2a871365425cbccd8b86..17df0f36ee469118a8ae69669af749e7d2ff12f9 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -40,6 +40,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -65,6 +65,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
  

patches/server/0050-Do-not-log-ignored-advancements.patch

@@ -58,10 +58,10 @@ index a0c19503aabab5378d672a30163d35a5ba05b6c1..5ba0a756d45350dcda3caa5518c9a47a
                              // CraftBukkit end
                          } else {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index c7a1ba28fd5e8ddd5cb2428bfd1897e292437dcf..90d4580b3fa7857b043957f5f148fea79076b8ca 100644
+index 17df0f36ee469118a8ae69669af749e7d2ff12f9..92c94f946986550b0efa50a2c3fee6136564625f 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -39,6 +39,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -64,6 +64,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      public class LogToConsole extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics

patches/server/0051-Do-not-log-setBlock-in-far-chunks.patch

@@ -57,10 +57,10 @@ index 877498729c66de9aa6a27c9148f7494d7895615c..d2bbbb0e73dafd2294838137bfbd16ac
              Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + pos + ", status: " + this.generatingStatus + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
              hasSetFarWarned = true;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 90d4580b3fa7857b043957f5f148fea79076b8ca..1c0e40b7dd121c80465997816aa76b1226b4c0de 100644
+index 92c94f946986550b0efa50a2c3fee6136564625f..f54b31f5ed4658bb31f18c9a6ff016d5ccf6852c 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -40,6 +40,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -65,6 +65,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements

patches/server/0052-Do-not-log-unrecognized-recipes.patch

@@ -58,10 +58,10 @@ index d13ed3069e944d138442ea440ac3eaf8d44c18d3..c89b8e5ea10a465160504f7364db4741
                      handler.accept((Recipe) optional.get());
                  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 1c0e40b7dd121c80465997816aa76b1226b4c0de..3bee9e95b392c32f77e7b23aa17c62c7498e4677 100644
+index f54b31f5ed4658bb31f18c9a6ff016d5ccf6852c..6ed23528eace48554dc9cf953eecd7f90d7fa162 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -41,6 +41,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -66,6 +66,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
          public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks

patches/server/0053-Do-not-log-legacy-Material-initialization.patch

@@ -58,10 +58,10 @@ index 110503062b3043cffa082a1cda6b8d57152869aa..951ca1e25cdcdf6a1ade4090ca397f6d
              new Exception().printStackTrace();
          }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 3bee9e95b392c32f77e7b23aa17c62c7498e4677..9816ad367cb4ec2fad09214743c6063668b3b765 100644
+index 6ed23528eace48554dc9cf953eecd7f90d7fa162..c2f6cb4bc7a65f749bee2926a5fbf17bc739cb09 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -42,6 +42,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -67,6 +67,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
          public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
          public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes

patches/server/0054-Do-not-log-expired-message-warnings.patch

@@ -28,10 +28,10 @@ index c0a80824a0307ea673805015119cc834b268f0dc..d7c6e90ccf3a8ce58e5533c5158ce626
  
                      return playerChatMessage;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 9816ad367cb4ec2fad09214743c6063668b3b765..008695312228e6605618df6c3abaf6878441cc5e 100644
+index c2f6cb4bc7a65f749bee2926a5fbf17bc739cb09..c98202f89cf919874459e557da017368c47ec976 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -47,6 +47,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -72,6 +72,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public Chat chat;
          public class Chat extends ConfigurationPart {
              public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings

patches/server/0055-Do-not-log-Not-Secure-marker.patch

@@ -49,10 +49,10 @@ index 6cc577d17201513af62ce847363ee25a3852a1b5..8a59fade265e586622bcaa2cab277261
          boolean flag1 = false;
  
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 008695312228e6605618df6c3abaf6878441cc5e..a1170d6616d1a11c10ed1b9c68946e0c8943ef6b 100644
+index c98202f89cf919874459e557da017368c47ec976..ea01742510e04cf6c94fc0abeddec51caee61074 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -48,6 +48,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -73,6 +73,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public class Chat extends ConfigurationPart {
              public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
              public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings

patches/server/0058-Softly-log-invalid-pool-element-errors.patch

@@ -39,7 +39,7 @@ index d2b4654a9095a678bbc9e004af969cf54da0fcab..d797bac97ec1adec7a25a26c8e052e70
          });
          this.rotation = Rotation.valueOf(nbt.getString("rotation"));
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index a1170d6616d1a11c10ed1b9c68946e0c8943ef6b..9e8b9bd7e863fae1fa44f5a5afbdce8d7ffb57b1 100644
+index ea01742510e04cf6c94fc0abeddec51caee61074..655e750c52472aa2f6d535cbf4a5499d37378b3e 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -4,8 +4,12 @@ package org.galemc.gale.configuration;
@@ -55,7 +55,7 @@ index a1170d6616d1a11c10ed1b9c68946e0c8943ef6b..9e8b9bd7e863fae1fa44f5a5afbdce8d
  @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
  public class GaleGlobalConfiguration extends ConfigurationPart {
      static final int CURRENT_VERSION = 1;
-@@ -36,7 +40,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -61,7 +65,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      }
  
      public LogToConsole logToConsole;
@@ -64,7 +64,7 @@ index a1170d6616d1a11c10ed1b9c68946e0c8943ef6b..9e8b9bd7e863fae1fa44f5a5afbdce8d
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
-@@ -51,6 +55,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -76,6 +80,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
              public boolean notSecureMarker = true; // Gale - do not log Not Secure marker
          }
  

patches/server/0059-Fix-legacy-colors-in-console.patch

@@ -131,10 +131,10 @@ index b9922b07cb105618390187d98acdf89e728e1f5a..a66d202749f243f6752df5027cb7c82f
 +
  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 9e8b9bd7e863fae1fa44f5a5afbdce8d7ffb57b1..fd2138ff050c36c1223843ec770d7658c09c24d9 100644
+index 655e750c52472aa2f6d535cbf4a5499d37378b3e..0cdae0f868e0136f6f74cff8efa76f37252e8d12 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -42,6 +42,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -67,6 +67,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      public LogToConsole logToConsole;
      public class LogToConsole extends ConfigurationPart.Post { // Gale - EMC - softly log invalid pool element errors
  

patches/server/0107-Send-multiple-keep-alive-packets.patch

@@ -109,23 +109,20 @@ index 60e2b951216003ae1861b1ee218e38da107b1760..315c7737f75c426a7e5c091fb340187d
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index fd2138ff050c36c1223843ec770d7658c09c24d9..c2960564ae266dce00f10178c4182f4a5338a161 100644
+index 0cdae0f868e0136f6f74cff8efa76f37252e8d12..ca37994763c45767d2def1b88768d44863a4b8c2 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -73,4 +73,16 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -62,6 +62,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
- 
          }
+         // Gale end - include server.properties in timings
  
-+    public Misc misc;
-+    public class Misc extends ConfigurationPart {
-+
 +        public Keepalive keepalive;
 +        public class Keepalive extends ConfigurationPart {
 +
 +            public boolean sendMultiple = true; // Gale end - Purpur - send multiple keep-alive packets
 +
 +        }
-+
-+    }
 +
      }
+ 
+     public LogToConsole logToConsole;