Include hardware specs in timings

patches/server/0005-Gale-configuration.patch

@@ -13,7 +13,7 @@ As part of: Paper (https://github.com/PaperMC/Paper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 06bff37e4c1fddd3be6343049a66787c63fb420c..ce257cf454300603d93ed68eb409461111bbac31 100644
+index 06bff37e4c1fddd3be6343049a66787c63fb420c..2a4904b09b4b13e41c7aaa211c7eae6d48582b7a 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -241,7 +241,10 @@ public class TimingsExport extends Thread {
@@ -21,10 +21,10 @@ index 06bff37e4c1fddd3be6343049a66787c63fb420c..ce257cf454300603d93ed68eb4094611
              pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
              pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
 -            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
-+            // Gale start - Gale configuration - including in timings
++            // Gale start - Gale configuration - include in timings
 +            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
 +            pair("gale", mapAsJSON(Bukkit.spigot().getGaleConfig(), null))
-+            // Gale end - Gale configuration - including in timings
++            // Gale end - Gale configuration - include in timings
          ));
  
          new TimingsExport(listeners, parent, history).start();

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

@@ -7,7 +7,7 @@ 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
+index 2a4904b09b4b13e41c7aaa211c7eae6d48582b7a..636d0531a7962c3fd87dd3c476f11907b714daca 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;
@@ -25,7 +25,7 @@ index ce257cf454300603d93ed68eb409461111bbac31..1982a9f7dedfedc358234d84766be7cc
 +            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
+             // Gale start - Gale configuration - include 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
@@ -74,34 +74,39 @@ index c7e4330c93baff1f3027d7c75cf857b673d38970..aea446e4a849151dc4f4aab6217572ee
          // 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
+index 8f8fd98f96cd390ba43033521982a13044df91cf..dbb0f523608a9208e8c656898b18ce1b9505a1e0 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 {
+@@ -27,4 +27,33 @@ 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;
++            // Gale start - include server.properties in timings
-+            public boolean generatorSettings = true;
++            public ServerProperties serverProperties;
-+            public boolean levelName = false;
++            public class ServerProperties extends ConfigurationPart {
-+            public boolean motd = false;
++                public boolean dataPacks = true;
-+            public boolean queryPort = false;
++                public boolean enableRcon = false;
-+            public boolean rconPort = false;
++                public boolean generatorSettings = true;
-+            public boolean resourcePackPrompt = false;
++                public boolean levelName = false;
-+            @Setting("resource-pack-and-resource-pack-sha1")
++                public boolean motd = false;
-+            public boolean resourcePackAndResourcePackSha1 = false;
++                public boolean queryPort = false;
-+            public boolean serverIp = false;
++                public boolean rconPort = false;
-+            public boolean serverPort = false;
++                public boolean resourcePackPrompt = false;
-+            public boolean textFilteringConfig = 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
++
 +        }
-+        // Gale end - include server.properties in timings
 +
 +    }
 +

patches/server/0009-Include-hardware-specs-in-timings.patch

@@ -0,0 +1,127 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Sat, 24 Dec 2022 20:28:31 +0100
+Subject: [PATCH] Include hardware specs 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 636d0531a7962c3fd87dd3c476f11907b714daca..dc9d304257d86109c06ec9b7673d3ee27d5ee875 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.GaleGlobalConfiguration;
+ import org.galemc.gale.configuration.timingsexport.VanillaServerPropertiesTimingsExport;
+ import org.json.simple.JSONObject;
+ import org.json.simple.JSONValue;
+@@ -51,6 +52,8 @@ import java.lang.management.RuntimeMXBean;
+ import java.net.HttpURLConnection;
+ import java.net.InetAddress;
+ import java.net.URL;
++import java.util.Arrays;
++import java.util.LinkedHashMap;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+@@ -134,6 +137,59 @@ public class TimingsExport extends Thread {
+ 
+         HardwareAbstractionLayer hardwareInfo = new SystemInfo().getHardware();
+ 
++        // Gale start - include hardware specs in timings
++        var processor = hardwareInfo.getProcessor();
++        var processorIdentifier = processor.getProcessorIdentifier();
++        var memory = hardwareInfo.getMemory();
++
++        Map<String, Object> hardwareSpecsMap = new LinkedHashMap<>();
++        if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.cpu) {
++            hardwareSpecsMap.put("cpu", createObject(
++                pair("logicalprocessorcount", processor.getLogicalProcessorCount()),
++                pair("physicalprocessorcount", processor.getPhysicalProcessorCount()),
++                pair("physicalpackagecount", processor.getPhysicalPackageCount()),
++                pair("contextswitches", processor.getContextSwitches()),
++                pair("interrupts", processor.getInterrupts()),
++                pair("maxfreq", processor.getMaxFreq()),
++                pair("currentfreq", Arrays.toString(processor.getCurrentFreq())),
++                pair("identifier", createObject(
++                    pair("vendor", String.valueOf(processorIdentifier.getVendor()).trim()),
++                    pair("name", String.valueOf(processorIdentifier.getName()).trim()),
++                    pair("family", String.valueOf(processorIdentifier.getFamily()).trim()),
++                    pair("model", String.valueOf(processorIdentifier.getModel()).trim()),
++                    pair("vendor", String.valueOf(processorIdentifier.getVendor()).trim()),
++                    pair("cpu64bit", processorIdentifier.isCpu64bit()),
++                    pair("vendorfreq", processorIdentifier.getVendorFreq()),
++                    pair("microarchitecture", String.valueOf(processorIdentifier.getMicroarchitecture()).trim())
++                ))
++            ));
++        }
++        if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.disks) {
++            hardwareSpecsMap.put("diskstores", toArrayMapper(hardwareInfo.getDiskStores(), disk -> createObject(
++                pair("name", String.valueOf(disk.getName()).trim()),
++                pair("model", String.valueOf(disk.getModel()).trim()),
++                pair("serial", String.valueOf(disk.getSerial()).trim()),
++                pair("size", disk.getSize())
++            )));
++        }
++        if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.gpus) {
++            hardwareSpecsMap.put("gpus", toArrayMapper(hardwareInfo.getGraphicsCards(), gpu -> createObject(
++                pair("name", String.valueOf(gpu.getName()).trim()),
++                pair("deviceid", String.valueOf(gpu.getDeviceId()).trim()),
++                pair("vendor", String.valueOf(gpu.getVendor()).trim()),
++                pair("versioninfo", String.valueOf(gpu.getVersionInfo()).trim()),
++                pair("vram", gpu.getVRam())
++            )));
++        }
++        if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.memory) {
++            hardwareSpecsMap.put("memory", createObject(
++                pair("total", memory.getTotal()),
++                pair("available", memory.getAvailable()),
++                pair("pagesize", memory.getPageSize())
++            ));
++        }
++        // Gale end - include hardware specs in timings
++
+         parent.put("system", createObject(
+                 pair("timingcost", getCost()),
+                 pair("loadavg", osInfo.getSystemLoadAverage()),
+@@ -151,6 +207,7 @@ public class TimingsExport extends Thread {
+                 )),
+                 pair("cpu", runtime.availableProcessors()),
+                 pair("cpuname", hardwareInfo.getProcessor().getProcessorIdentifier().getName().trim()),
++                pair("hardwarespecs", hardwareSpecsMap), // Gale - include hardware specs in timings
+                 pair("runtime", runtimeBean.getUptime()),
+                 pair("flags", StringUtils.join(runtimeBean.getInputArguments(), " ")),
+                 pair("gc", toObjectMapper(ManagementFactory.getGarbageCollectorMXBeans(), input -> pair(input.getName(), toArray(input.getCollectionCount(), input.getCollectionTime()))))
+diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+index dbb0f523608a9208e8c656898b18ce1b9505a1e0..2a3cd1baab364126d10a42c8ab59f3da8ca9bdfb 100644
+--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
++++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+@@ -32,7 +32,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+ 
+         public IncludeInTimingsReport includeInTimingsReport;
+         public class IncludeInTimingsReport extends ConfigurationPart {
+-            
++
+             // Gale start - include server.properties in timings
+             public ServerProperties serverProperties;
+             public class ServerProperties extends ConfigurationPart {
+@@ -52,6 +52,16 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+             }
+             // Gale end - include server.properties in timings
+ 
++            // Gale start - include hardware specs in timings
++            public HardwareSpecs hardwareSpecs;
++            public class HardwareSpecs extends ConfigurationPart {
++                public boolean cpu = true;
++                public boolean disks = true;
++                public boolean gpus = true;
++                public boolean memory = true;
++            }
++            // Gale end - include hardware specs in timings
++
+         }
+ 
+     }

patches/server/0042-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 a6bfe19bc7c0fb714533c2c55d5a0b98da61cfca..82612656d46403b3cbaffe1add0bce4d1d7d15b4 100644
+index 2a3cd1baab364126d10a42c8ab59f3da8ca9bdfb..5ade5d2ff3a68cf9e0240fc86e4b63432cb899c0 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 {

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

@@ -44,18 +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 82612656d46403b3cbaffe1add0bce4d1d7d15b4..6f2d920dbae80740732e2a871365425cbccd8b86 100644
+index 5ade5d2ff3a68cf9e0240fc86e4b63432cb899c0..4fd116ba1666b154650805ce5558221ffc6f4190 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 {
+@@ -39,6 +39,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+     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;
+             // Gale start - include server.properties in timings
-@@ -59,4 +60,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -74,4 +75,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
      }
  

patches/server/0050-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 6f2d920dbae80740732e2a871365425cbccd8b86..17df0f36ee469118a8ae69669af749e7d2ff12f9 100644
+index 4fd116ba1666b154650805ce5558221ffc6f4190..85239fb626a1ea7b81d0be4711822fcadf4d1022 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -65,6 +65,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -80,6 +80,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
  

patches/server/0051-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 17df0f36ee469118a8ae69669af749e7d2ff12f9..92c94f946986550b0efa50a2c3fee6136564625f 100644
+index 85239fb626a1ea7b81d0be4711822fcadf4d1022..5d4ddec708638aa3f22391cfbc27059c9980f367 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -64,6 +64,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -79,6 +79,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      public class LogToConsole extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics

patches/server/0052-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 92c94f946986550b0efa50a2c3fee6136564625f..f54b31f5ed4658bb31f18c9a6ff016d5ccf6852c 100644
+index 5d4ddec708638aa3f22391cfbc27059c9980f367..7641e941027153cea10699b1928122241befe2c2 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -65,6 +65,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -80,6 +80,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/0053-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 f54b31f5ed4658bb31f18c9a6ff016d5ccf6852c..6ed23528eace48554dc9cf953eecd7f90d7fa162 100644
+index 7641e941027153cea10699b1928122241befe2c2..efd05ee1eed398eaef04419166a928302b8a8bb2 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -66,6 +66,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -81,6 +81,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/0054-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 6ed23528eace48554dc9cf953eecd7f90d7fa162..c2f6cb4bc7a65f749bee2926a5fbf17bc739cb09 100644
+index efd05ee1eed398eaef04419166a928302b8a8bb2..578207b0a2b202a33f0690541f7ee7b8afc1c13b 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -67,6 +67,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -82,6 +82,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/0055-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 c2f6cb4bc7a65f749bee2926a5fbf17bc739cb09..c98202f89cf919874459e557da017368c47ec976 100644
+index 578207b0a2b202a33f0690541f7ee7b8afc1c13b..881619cd6231bafa8319c8562273009557399723 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -72,6 +72,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -87,6 +87,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/0056-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 c98202f89cf919874459e557da017368c47ec976..ea01742510e04cf6c94fc0abeddec51caee61074 100644
+index 881619cd6231bafa8319c8562273009557399723..5c2e99459227f363179ea3cb964c839fd27f016b 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -73,6 +73,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -88,6 +88,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/0059-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 ea01742510e04cf6c94fc0abeddec51caee61074..655e750c52472aa2f6d535cbf4a5499d37378b3e 100644
+index 5c2e99459227f363179ea3cb964c839fd27f016b..eb9e845cbdf239718e42e1c04699fa41d2f3905f 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 ea01742510e04cf6c94fc0abeddec51caee61074..655e750c52472aa2f6d535cbf4a5499d
  @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
  public class GaleGlobalConfiguration extends ConfigurationPart {
      static final int CURRENT_VERSION = 1;
-@@ -61,7 +65,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -76,7 +80,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      }
  
      public LogToConsole logToConsole;
@@ -64,7 +64,7 @@ index ea01742510e04cf6c94fc0abeddec51caee61074..655e750c52472aa2f6d535cbf4a5499d
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
-@@ -76,6 +80,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -91,6 +95,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
              public boolean notSecureMarker = true; // Gale - do not log Not Secure marker
          }
  

patches/server/0060-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 655e750c52472aa2f6d535cbf4a5499d37378b3e..0cdae0f868e0136f6f74cff8efa76f37252e8d12 100644
+index eb9e845cbdf239718e42e1c04699fa41d2f3905f..2d8d042112db908d76da023329f16402791029aa 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -67,6 +67,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -82,6 +82,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/0073-Reduce-array-allocations.patch

@@ -409,7 +409,7 @@ index 31faf2d6492696f7d0c99a48edbc0d6f15db1209..0c4c62674b4c7e8e3921c7eb3ef72675
          OptionSpec<Integer> optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]);
          OptionSpec<String> optionspec12 = optionparser.accepts("serverId").withRequiredArg();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 480846d3d90c9dd8dd2a7c0f3837c3220fd7a57f..700f8fc483ab847dc8f7fb5398a3c4ed43b0df35 100644
+index cdac47539c8989c21e6a5edf5f63f7f5c02b2f30..c485cec0e9f4e1d55b526c8f6d915a355538a475 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -49,6 +49,8 @@ import java.util.stream.Collectors;