diff --git a/patches/server/0005-Gale-configuration.patch b/patches/server/0005-Gale-configuration.patch index c9fead8..60188a0 100644 --- a/patches/server/0005-Gale-configuration.patch +++ b/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(); diff --git a/patches/server/0008-Include-server.properties-in-timings.patch b/patches/server/0008-Include-server.properties-in-timings.patch index edd0850..99d61cd 100644 --- a/patches/server/0008-Include-server.properties-in-timings.patch +++ b/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; -+ 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 start - include server.properties in timings ++ public ServerProperties serverProperties; ++ public class ServerProperties 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 ++ + } -+ // Gale end - include server.properties in timings + + } + diff --git a/patches/server/0009-Include-hardware-specs-in-timings.patch b/patches/server/0009-Include-hardware-specs-in-timings.patch new file mode 100644 index 0000000..6e8f54f --- /dev/null +++ b/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 +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 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 ++ + } + + } diff --git a/patches/server/0009-Use-timin.gs-by-default.patch b/patches/server/0010-Use-timin.gs-by-default.patch similarity index 100% rename from patches/server/0009-Use-timin.gs-by-default.patch rename to patches/server/0010-Use-timin.gs-by-default.patch diff --git a/patches/server/0010-Recommend-disabling-timings-on-startup.patch b/patches/server/0011-Recommend-disabling-timings-on-startup.patch similarity index 100% rename from patches/server/0010-Recommend-disabling-timings-on-startup.patch rename to patches/server/0011-Recommend-disabling-timings-on-startup.patch diff --git a/patches/server/0011-Final-timings-calls.patch b/patches/server/0012-Final-timings-calls.patch similarity index 100% rename from patches/server/0011-Final-timings-calls.patch rename to patches/server/0012-Final-timings-calls.patch diff --git a/patches/server/0012-Remove-vanilla-profiler.patch b/patches/server/0013-Remove-vanilla-profiler.patch similarity index 100% rename from patches/server/0012-Remove-vanilla-profiler.patch rename to patches/server/0013-Remove-vanilla-profiler.patch diff --git a/patches/server/0013-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0014-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0013-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0014-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0014-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0015-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 100% rename from patches/server/0014-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to patches/server/0015-Simpler-ShapelessRecipe-comparison-for-vanilla.patch diff --git a/patches/server/0015-Reduce-projectile-chunk-loading.patch b/patches/server/0016-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0015-Reduce-projectile-chunk-loading.patch rename to patches/server/0016-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0016-Predict-Halloween.patch b/patches/server/0017-Predict-Halloween.patch similarity index 100% rename from patches/server/0016-Predict-Halloween.patch rename to patches/server/0017-Predict-Halloween.patch diff --git a/patches/server/0017-Move-random-tick-random.patch b/patches/server/0018-Move-random-tick-random.patch similarity index 100% rename from patches/server/0017-Move-random-tick-random.patch rename to patches/server/0018-Move-random-tick-random.patch diff --git a/patches/server/0018-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0019-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from patches/server/0018-Optimize-random-calls-in-chunk-ticking.patch rename to patches/server/0019-Optimize-random-calls-in-chunk-ticking.patch diff --git a/patches/server/0019-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0020-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from patches/server/0019-Reduce-enderman-teleport-chunk-lookups.patch rename to patches/server/0020-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/patches/server/0020-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0021-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0020-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0021-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0021-Remove-iterators-from-Inventory-contains.patch b/patches/server/0022-Remove-iterators-from-Inventory-contains.patch similarity index 100% rename from patches/server/0021-Remove-iterators-from-Inventory-contains.patch rename to patches/server/0022-Remove-iterators-from-Inventory-contains.patch diff --git a/patches/server/0022-Check-targeting-range-before-getting-visibility.patch b/patches/server/0023-Check-targeting-range-before-getting-visibility.patch similarity index 100% rename from patches/server/0022-Check-targeting-range-before-getting-visibility.patch rename to patches/server/0023-Check-targeting-range-before-getting-visibility.patch diff --git a/patches/server/0023-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0024-Print-stack-trace-for-plugins-not-shutting-down-task.patch similarity index 100% rename from patches/server/0023-Print-stack-trace-for-plugins-not-shutting-down-task.patch rename to patches/server/0024-Print-stack-trace-for-plugins-not-shutting-down-task.patch diff --git a/patches/server/0024-Improve-fluid-direction-caching.patch b/patches/server/0025-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0024-Improve-fluid-direction-caching.patch rename to patches/server/0025-Improve-fluid-direction-caching.patch diff --git a/patches/server/0025-Cache-on-climbable-check.patch b/patches/server/0026-Cache-on-climbable-check.patch similarity index 100% rename from patches/server/0025-Cache-on-climbable-check.patch rename to patches/server/0026-Cache-on-climbable-check.patch diff --git a/patches/server/0026-Use-array-for-gamerule-storage.patch b/patches/server/0027-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0026-Use-array-for-gamerule-storage.patch rename to patches/server/0027-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0027-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0028-Make-EntityCollisionContext-a-live-representation.patch similarity index 100% rename from patches/server/0027-Make-EntityCollisionContext-a-live-representation.patch rename to patches/server/0028-Make-EntityCollisionContext-a-live-representation.patch diff --git a/patches/server/0028-Improve-container-checking-with-a-bitset.patch b/patches/server/0029-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0028-Improve-container-checking-with-a-bitset.patch rename to patches/server/0029-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0029-Better-checking-for-useless-move-packets.patch b/patches/server/0030-Better-checking-for-useless-move-packets.patch similarity index 100% rename from patches/server/0029-Better-checking-for-useless-move-packets.patch rename to patches/server/0030-Better-checking-for-useless-move-packets.patch diff --git a/patches/server/0030-Use-fast-item-merge-raytracing.patch b/patches/server/0031-Use-fast-item-merge-raytracing.patch similarity index 100% rename from patches/server/0030-Use-fast-item-merge-raytracing.patch rename to patches/server/0031-Use-fast-item-merge-raytracing.patch diff --git a/patches/server/0031-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0032-Use-aging-cache-for-biome-temperatures.patch similarity index 100% rename from patches/server/0031-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0032-Use-aging-cache-for-biome-temperatures.patch diff --git a/patches/server/0032-Inline-level-height.patch b/patches/server/0033-Inline-level-height.patch similarity index 100% rename from patches/server/0032-Inline-level-height.patch rename to patches/server/0033-Inline-level-height.patch diff --git a/patches/server/0033-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0034-Use-ThreadUnsafeRandom-for-mob-spawning.patch similarity index 100% rename from patches/server/0033-Use-ThreadUnsafeRandom-for-mob-spawning.patch rename to patches/server/0034-Use-ThreadUnsafeRandom-for-mob-spawning.patch diff --git a/patches/server/0034-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0035-Remove-streams-and-iterators-from-range-check.patch similarity index 100% rename from patches/server/0034-Remove-streams-and-iterators-from-range-check.patch rename to patches/server/0035-Remove-streams-and-iterators-from-range-check.patch diff --git a/patches/server/0035-Remove-streams-from-getting-nearby-players.patch b/patches/server/0036-Remove-streams-from-getting-nearby-players.patch similarity index 100% rename from patches/server/0035-Remove-streams-from-getting-nearby-players.patch rename to patches/server/0036-Remove-streams-from-getting-nearby-players.patch diff --git a/patches/server/0036-Skip-cloning-loot-parameters.patch b/patches/server/0037-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0036-Skip-cloning-loot-parameters.patch rename to patches/server/0037-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0037-Block-goal-does-not-load-chunks.patch b/patches/server/0038-Block-goal-does-not-load-chunks.patch similarity index 100% rename from patches/server/0037-Block-goal-does-not-load-chunks.patch rename to patches/server/0038-Block-goal-does-not-load-chunks.patch diff --git a/patches/server/0038-Reduce-entity-allocations.patch b/patches/server/0039-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0038-Reduce-entity-allocations.patch rename to patches/server/0039-Reduce-entity-allocations.patch diff --git a/patches/server/0039-Remove-lambda-from-ticking-guard.patch b/patches/server/0040-Remove-lambda-from-ticking-guard.patch similarity index 100% rename from patches/server/0039-Remove-lambda-from-ticking-guard.patch rename to patches/server/0040-Remove-lambda-from-ticking-guard.patch diff --git a/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0041-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0041-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0041-SIMD-support.patch b/patches/server/0042-SIMD-support.patch similarity index 97% rename from patches/server/0041-SIMD-support.patch rename to patches/server/0042-SIMD-support.patch index 4ba56f8..13a183d 100644 --- a/patches/server/0041-SIMD-support.patch +++ b/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 { diff --git a/patches/server/0042-Optimize-entity-coordinate-key.patch b/patches/server/0043-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0042-Optimize-entity-coordinate-key.patch rename to patches/server/0043-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0043-Reduce-in-wall-checks.patch b/patches/server/0044-Reduce-in-wall-checks.patch similarity index 100% rename from patches/server/0043-Reduce-in-wall-checks.patch rename to patches/server/0044-Reduce-in-wall-checks.patch diff --git a/patches/server/0044-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0045-Don-t-trigger-lootable-refresh-for-non-player-intera.patch similarity index 100% rename from patches/server/0044-Don-t-trigger-lootable-refresh-for-non-player-intera.patch rename to patches/server/0045-Don-t-trigger-lootable-refresh-for-non-player-intera.patch diff --git a/patches/server/0045-Reduce-hopper-item-checks.patch b/patches/server/0046-Reduce-hopper-item-checks.patch similarity index 100% rename from patches/server/0045-Reduce-hopper-item-checks.patch rename to patches/server/0046-Reduce-hopper-item-checks.patch diff --git a/patches/server/0046-Reduce-villager-item-re-pickup.patch b/patches/server/0047-Reduce-villager-item-re-pickup.patch similarity index 100% rename from patches/server/0046-Reduce-villager-item-re-pickup.patch rename to patches/server/0047-Reduce-villager-item-re-pickup.patch diff --git a/patches/server/0047-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0048-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 100% rename from patches/server/0047-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/server/0048-Do-not-process-chat-commands-before-player-has-joine.patch diff --git a/patches/server/0048-Do-not-log-invalid-statistics.patch b/patches/server/0049-Do-not-log-invalid-statistics.patch similarity index 91% rename from patches/server/0048-Do-not-log-invalid-statistics.patch rename to patches/server/0049-Do-not-log-invalid-statistics.patch index e84c713..f4bf1ab 100644 --- a/patches/server/0048-Do-not-log-invalid-statistics.patch +++ b/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; -@@ -59,4 +60,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart { + + // Gale start - include server.properties in timings +@@ -74,4 +75,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart { } diff --git a/patches/server/0049-Do-not-log-empty-message-warnings.patch b/patches/server/0050-Do-not-log-empty-message-warnings.patch similarity index 93% rename from patches/server/0049-Do-not-log-empty-message-warnings.patch rename to patches/server/0050-Do-not-log-empty-message-warnings.patch index 76ed26c..7f33176 100644 --- a/patches/server/0049-Do-not-log-empty-message-warnings.patch +++ b/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 diff --git a/patches/server/0050-Do-not-log-ignored-advancements.patch b/patches/server/0051-Do-not-log-ignored-advancements.patch similarity index 95% rename from patches/server/0050-Do-not-log-ignored-advancements.patch rename to patches/server/0051-Do-not-log-ignored-advancements.patch index d39c844..67ccd37 100644 --- a/patches/server/0050-Do-not-log-ignored-advancements.patch +++ b/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 diff --git a/patches/server/0051-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0052-Do-not-log-setBlock-in-far-chunks.patch similarity index 95% rename from patches/server/0051-Do-not-log-setBlock-in-far-chunks.patch rename to patches/server/0052-Do-not-log-setBlock-in-far-chunks.patch index 66e52b4..f1c2881 100644 --- a/patches/server/0051-Do-not-log-setBlock-in-far-chunks.patch +++ b/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 diff --git a/patches/server/0052-Do-not-log-unrecognized-recipes.patch b/patches/server/0053-Do-not-log-unrecognized-recipes.patch similarity index 96% rename from patches/server/0052-Do-not-log-unrecognized-recipes.patch rename to patches/server/0053-Do-not-log-unrecognized-recipes.patch index acb9f91..d9f5708 100644 --- a/patches/server/0052-Do-not-log-unrecognized-recipes.patch +++ b/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 diff --git a/patches/server/0053-Do-not-log-legacy-Material-initialization.patch b/patches/server/0054-Do-not-log-legacy-Material-initialization.patch similarity index 96% rename from patches/server/0053-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0054-Do-not-log-legacy-Material-initialization.patch index ed93a38..ed0c23e 100644 --- a/patches/server/0053-Do-not-log-legacy-Material-initialization.patch +++ b/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 diff --git a/patches/server/0054-Do-not-log-expired-message-warnings.patch b/patches/server/0055-Do-not-log-expired-message-warnings.patch similarity index 94% rename from patches/server/0054-Do-not-log-expired-message-warnings.patch rename to patches/server/0055-Do-not-log-expired-message-warnings.patch index a9952bb..a885c69 100644 --- a/patches/server/0054-Do-not-log-expired-message-warnings.patch +++ b/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 diff --git a/patches/server/0055-Do-not-log-Not-Secure-marker.patch b/patches/server/0056-Do-not-log-Not-Secure-marker.patch similarity index 96% rename from patches/server/0055-Do-not-log-Not-Secure-marker.patch rename to patches/server/0056-Do-not-log-Not-Secure-marker.patch index dc3a551..ddeff1f 100644 --- a/patches/server/0055-Do-not-log-Not-Secure-marker.patch +++ b/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 diff --git a/patches/server/0056-Do-not-log-run-as-root-warning.patch b/patches/server/0057-Do-not-log-run-as-root-warning.patch similarity index 100% rename from patches/server/0056-Do-not-log-run-as-root-warning.patch rename to patches/server/0057-Do-not-log-run-as-root-warning.patch diff --git a/patches/server/0057-Do-not-log-offline-mode-warning.patch b/patches/server/0058-Do-not-log-offline-mode-warning.patch similarity index 100% rename from patches/server/0057-Do-not-log-offline-mode-warning.patch rename to patches/server/0058-Do-not-log-offline-mode-warning.patch diff --git a/patches/server/0058-Softly-log-invalid-pool-element-errors.patch b/patches/server/0059-Softly-log-invalid-pool-element-errors.patch similarity index 95% rename from patches/server/0058-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0059-Softly-log-invalid-pool-element-errors.patch index 1219f60..f3fc3a5 100644 --- a/patches/server/0058-Softly-log-invalid-pool-element-errors.patch +++ b/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 } diff --git a/patches/server/0059-Fix-legacy-colors-in-console.patch b/patches/server/0060-Fix-legacy-colors-in-console.patch similarity index 97% rename from patches/server/0059-Fix-legacy-colors-in-console.patch rename to patches/server/0060-Fix-legacy-colors-in-console.patch index 8fb4b0f..354b4a2 100644 --- a/patches/server/0059-Fix-legacy-colors-in-console.patch +++ b/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 diff --git a/patches/server/0060-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0061-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0060-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0061-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0061-Make-sand-duping-fix-configurable.patch b/patches/server/0062-Make-sand-duping-fix-configurable.patch similarity index 100% rename from patches/server/0061-Make-sand-duping-fix-configurable.patch rename to patches/server/0062-Make-sand-duping-fix-configurable.patch diff --git a/patches/server/0062-Fix-MC-238526.patch b/patches/server/0063-Fix-MC-238526.patch similarity index 100% rename from patches/server/0062-Fix-MC-238526.patch rename to patches/server/0063-Fix-MC-238526.patch diff --git a/patches/server/0063-Fix-MC-123848.patch b/patches/server/0064-Fix-MC-123848.patch similarity index 100% rename from patches/server/0063-Fix-MC-123848.patch rename to patches/server/0064-Fix-MC-123848.patch diff --git a/patches/server/0064-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0065-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0064-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0065-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0065-Fix-MC-121706.patch b/patches/server/0066-Fix-MC-121706.patch similarity index 100% rename from patches/server/0065-Fix-MC-121706.patch rename to patches/server/0066-Fix-MC-121706.patch diff --git a/patches/server/0066-Fix-MC-110386.patch b/patches/server/0067-Fix-MC-110386.patch similarity index 100% rename from patches/server/0066-Fix-MC-110386.patch rename to patches/server/0067-Fix-MC-110386.patch diff --git a/patches/server/0067-Fix-MC-31819.patch b/patches/server/0068-Fix-MC-31819.patch similarity index 100% rename from patches/server/0067-Fix-MC-31819.patch rename to patches/server/0068-Fix-MC-31819.patch diff --git a/patches/server/0068-Fix-MC-26304.patch b/patches/server/0069-Fix-MC-26304.patch similarity index 100% rename from patches/server/0068-Fix-MC-26304.patch rename to patches/server/0069-Fix-MC-26304.patch diff --git a/patches/server/0069-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0070-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0069-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0070-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0070-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0071-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch similarity index 100% rename from patches/server/0070-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch rename to patches/server/0071-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch diff --git a/patches/server/0071-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0072-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 100% rename from patches/server/0071-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0072-Make-arrow-movement-resetting-despawn-counter-config.patch diff --git a/patches/server/0072-Reduce-array-allocations.patch b/patches/server/0073-Reduce-array-allocations.patch similarity index 99% rename from patches/server/0072-Reduce-array-allocations.patch rename to patches/server/0073-Reduce-array-allocations.patch index d87101e..21c4cd6 100644 --- a/patches/server/0072-Reduce-array-allocations.patch +++ b/patches/server/0073-Reduce-array-allocations.patch @@ -409,7 +409,7 @@ index 31faf2d6492696f7d0c99a48edbc0d6f15db1209..0c4c62674b4c7e8e3921c7eb3ef72675 OptionSpec optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]); OptionSpec 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; diff --git a/patches/server/0073-Optimize-sun-burn-tick.patch b/patches/server/0074-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0073-Optimize-sun-burn-tick.patch rename to patches/server/0074-Optimize-sun-burn-tick.patch diff --git a/patches/server/0074-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0075-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0074-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0075-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0075-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0076-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0075-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0076-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0076-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0077-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0076-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0077-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0077-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0078-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0077-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0078-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0078-Replace-class-map-with-optimized-collection.patch b/patches/server/0079-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0078-Replace-class-map-with-optimized-collection.patch rename to patches/server/0079-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0079-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0080-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0079-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0080-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0080-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0081-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0080-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0081-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0081-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0082-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0081-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0082-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0082-Cache-BlockStatePairKey-hash.patch b/patches/server/0083-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0082-Cache-BlockStatePairKey-hash.patch rename to patches/server/0083-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0083-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0084-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0083-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0084-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0084-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0085-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0084-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0085-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0085-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0086-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0085-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0086-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0086-Check-frozen-ticks-before-landing-block.patch b/patches/server/0087-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0086-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0087-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0087-Faster-chunk-serialization.patch b/patches/server/0088-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0087-Faster-chunk-serialization.patch rename to patches/server/0088-Faster-chunk-serialization.patch diff --git a/patches/server/0088-Update-boss-bar-within-tick.patch b/patches/server/0089-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0088-Update-boss-bar-within-tick.patch rename to patches/server/0089-Update-boss-bar-within-tick.patch diff --git a/patches/server/0089-Cache-ominous-banner-item.patch b/patches/server/0090-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0089-Cache-ominous-banner-item.patch rename to patches/server/0090-Cache-ominous-banner-item.patch diff --git a/patches/server/0090-Precompute-piston-shapes.patch b/patches/server/0091-Precompute-piston-shapes.patch similarity index 100% rename from patches/server/0090-Precompute-piston-shapes.patch rename to patches/server/0091-Precompute-piston-shapes.patch diff --git a/patches/server/0091-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0092-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0091-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0092-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0092-Cache-world-generator-sea-level.patch b/patches/server/0093-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0092-Cache-world-generator-sea-level.patch rename to patches/server/0093-Cache-world-generator-sea-level.patch diff --git a/patches/server/0093-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0094-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0093-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0094-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0094-Store-mob-counts-in-an-array.patch b/patches/server/0095-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0094-Store-mob-counts-in-an-array.patch rename to patches/server/0095-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0095-Use-linked-map-for-entity-trackers.patch b/patches/server/0096-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0095-Use-linked-map-for-entity-trackers.patch rename to patches/server/0096-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0096-Optimize-noise-generation.patch b/patches/server/0097-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0096-Optimize-noise-generation.patch rename to patches/server/0097-Optimize-noise-generation.patch diff --git a/patches/server/0097-Optimize-sheep-offspring-color.patch b/patches/server/0098-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0097-Optimize-sheep-offspring-color.patch rename to patches/server/0098-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0098-Ignore-durability-change-equipment-updates.patch b/patches/server/0099-Ignore-durability-change-equipment-updates.patch similarity index 100% rename from patches/server/0098-Ignore-durability-change-equipment-updates.patch rename to patches/server/0099-Ignore-durability-change-equipment-updates.patch diff --git a/patches/server/0099-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0100-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0099-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0100-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0100-Skip-cloning-advancement-criteria.patch b/patches/server/0101-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0100-Skip-cloning-advancement-criteria.patch rename to patches/server/0101-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0101-Reduce-block-destruction-packet-allocations.patch b/patches/server/0102-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0101-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0102-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0102-Send-set-head-rotation-packets-only-for-living-entit.patch b/patches/server/0103-Send-set-head-rotation-packets-only-for-living-entit.patch similarity index 100% rename from patches/server/0102-Send-set-head-rotation-packets-only-for-living-entit.patch rename to patches/server/0103-Send-set-head-rotation-packets-only-for-living-entit.patch diff --git a/patches/server/0103-Player-canSee-by-entity-UUID.patch b/patches/server/0104-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0103-Player-canSee-by-entity-UUID.patch rename to patches/server/0104-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0104-Spread-out-sending-all-player-info.patch b/patches/server/0105-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0104-Spread-out-sending-all-player-info.patch rename to patches/server/0105-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0105-Optimize-player-list-for-sending-player-info.patch b/patches/server/0106-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0105-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0106-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0106-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0107-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0106-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0107-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0107-Send-multiple-keep-alive-packets.patch b/patches/server/0108-Send-multiple-keep-alive-packets.patch similarity index 97% rename from patches/server/0107-Send-multiple-keep-alive-packets.patch rename to patches/server/0108-Send-multiple-keep-alive-packets.patch index 29e4a6b..b13bd2c 100644 --- a/patches/server/0107-Send-multiple-keep-alive-packets.patch +++ b/patches/server/0108-Send-multiple-keep-alive-packets.patch @@ -109,12 +109,12 @@ 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 0cdae0f868e0136f6f74cff8efa76f37252e8d12..ca37994763c45767d2def1b88768d44863a4b8c2 100644 +index 2d8d042112db908d76da023329f16402791029aa..d87db127a13c37cd4d9e0ff2f0a5b5387c5fbb0b 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -@@ -62,6 +62,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart { +@@ -77,6 +77,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart { + } - // Gale end - include server.properties in timings + public Keepalive keepalive; + public class Keepalive extends ConfigurationPart { diff --git a/patches/server/0108-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0109-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0108-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0109-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0109-CraftBukkit-UUID-to-world-map.patch b/patches/server/0110-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0109-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0110-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0110-Specific-interval-TPS-API.patch b/patches/server/0111-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0110-Specific-interval-TPS-API.patch rename to patches/server/0111-Specific-interval-TPS-API.patch diff --git a/patches/server/0111-5-second-TPS-average.patch b/patches/server/0112-5-second-TPS-average.patch similarity index 98% rename from patches/server/0111-5-second-TPS-average.patch rename to patches/server/0112-5-second-TPS-average.patch index 52f9e85..a6335d8 100644 --- a/patches/server/0111-5-second-TPS-average.patch +++ b/patches/server/0112-5-second-TPS-average.patch @@ -59,7 +59,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..fac07dda413002c12276131efbe4ee38 setListData(vector); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 700f8fc483ab847dc8f7fb5398a3c4ed43b0df35..e20e26fb0dcf8e344eddb7c29d7322b1f421036f 100644 +index c485cec0e9f4e1d55b526c8f6d915a355538a475..98c8c5946b2474676a5b6af76f23140d6290a244 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1034,6 +1034,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop