diff --git a/patches/server/0008-Include-server.properties-in-timings.patch b/patches/server/0008-Include-server.properties-in-timings.patch new file mode 100644 index 0000000..edd0850 --- /dev/null +++ b/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 +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 serverResourcePackInfo; + public final DataPackConfig initialDataPackConfiguration; + public final Settings.MutableValue playerIdleTimeout; + public final Settings.MutableValue 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 { + 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; ++ ++ } ++ ++} diff --git a/patches/server/0008-Use-timin.gs-by-default.patch b/patches/server/0009-Use-timin.gs-by-default.patch similarity index 93% rename from patches/server/0008-Use-timin.gs-by-default.patch rename to patches/server/0009-Use-timin.gs-by-default.patch index a170834..749a658 100644 --- a/patches/server/0008-Use-timin.gs-by-default.patch +++ b/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 { diff --git a/patches/server/0009-Recommend-disabling-timings-on-startup.patch b/patches/server/0010-Recommend-disabling-timings-on-startup.patch similarity index 97% rename from patches/server/0009-Recommend-disabling-timings-on-startup.patch rename to patches/server/0010-Recommend-disabling-timings-on-startup.patch index 43c2b59..b12a4aa 100644 --- a/patches/server/0009-Recommend-disabling-timings-on-startup.patch +++ b/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 . 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; diff --git a/patches/server/0010-Effectively-final-timings-calls.patch b/patches/server/0011-Effectively-final-timings-calls.patch similarity index 100% rename from patches/server/0010-Effectively-final-timings-calls.patch rename to patches/server/0011-Effectively-final-timings-calls.patch diff --git a/patches/server/0011-Remove-vanilla-profiler.patch b/patches/server/0012-Remove-vanilla-profiler.patch similarity index 100% rename from patches/server/0011-Remove-vanilla-profiler.patch rename to patches/server/0012-Remove-vanilla-profiler.patch diff --git a/patches/server/0012-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0013-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0012-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0013-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0013-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0014-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 100% rename from patches/server/0013-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to patches/server/0014-Simpler-ShapelessRecipe-comparison-for-vanilla.patch diff --git a/patches/server/0014-Reduce-projectile-chunk-loading.patch b/patches/server/0015-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0014-Reduce-projectile-chunk-loading.patch rename to patches/server/0015-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0015-Predict-Halloween.patch b/patches/server/0016-Predict-Halloween.patch similarity index 100% rename from patches/server/0015-Predict-Halloween.patch rename to patches/server/0016-Predict-Halloween.patch diff --git a/patches/server/0016-Move-random-tick-random.patch b/patches/server/0017-Move-random-tick-random.patch similarity index 100% rename from patches/server/0016-Move-random-tick-random.patch rename to patches/server/0017-Move-random-tick-random.patch diff --git a/patches/server/0017-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0018-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from patches/server/0017-Optimize-random-calls-in-chunk-ticking.patch rename to patches/server/0018-Optimize-random-calls-in-chunk-ticking.patch diff --git a/patches/server/0018-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0019-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from patches/server/0018-Reduce-enderman-teleport-chunk-lookups.patch rename to patches/server/0019-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/patches/server/0019-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0020-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0019-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0020-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0020-Remove-iterators-from-Inventory-contains.patch b/patches/server/0021-Remove-iterators-from-Inventory-contains.patch similarity index 100% rename from patches/server/0020-Remove-iterators-from-Inventory-contains.patch rename to patches/server/0021-Remove-iterators-from-Inventory-contains.patch diff --git a/patches/server/0021-Check-targeting-range-before-getting-visibility.patch b/patches/server/0022-Check-targeting-range-before-getting-visibility.patch similarity index 100% rename from patches/server/0021-Check-targeting-range-before-getting-visibility.patch rename to patches/server/0022-Check-targeting-range-before-getting-visibility.patch diff --git a/patches/server/0022-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0023-Print-stack-trace-for-plugins-not-shutting-down-task.patch similarity index 100% rename from patches/server/0022-Print-stack-trace-for-plugins-not-shutting-down-task.patch rename to patches/server/0023-Print-stack-trace-for-plugins-not-shutting-down-task.patch diff --git a/patches/server/0023-Improve-fluid-direction-caching.patch b/patches/server/0024-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0023-Improve-fluid-direction-caching.patch rename to patches/server/0024-Improve-fluid-direction-caching.patch diff --git a/patches/server/0024-Cache-on-climbable-check.patch b/patches/server/0025-Cache-on-climbable-check.patch similarity index 100% rename from patches/server/0024-Cache-on-climbable-check.patch rename to patches/server/0025-Cache-on-climbable-check.patch diff --git a/patches/server/0025-Use-array-for-gamerule-storage.patch b/patches/server/0026-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0025-Use-array-for-gamerule-storage.patch rename to patches/server/0026-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0026-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0027-Make-EntityCollisionContext-a-live-representation.patch similarity index 100% rename from patches/server/0026-Make-EntityCollisionContext-a-live-representation.patch rename to patches/server/0027-Make-EntityCollisionContext-a-live-representation.patch diff --git a/patches/server/0027-Improve-container-checking-with-a-bitset.patch b/patches/server/0028-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0027-Improve-container-checking-with-a-bitset.patch rename to patches/server/0028-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0028-Better-checking-for-useless-move-packets.patch b/patches/server/0029-Better-checking-for-useless-move-packets.patch similarity index 100% rename from patches/server/0028-Better-checking-for-useless-move-packets.patch rename to patches/server/0029-Better-checking-for-useless-move-packets.patch diff --git a/patches/server/0029-Use-fast-item-merge-raytracing.patch b/patches/server/0030-Use-fast-item-merge-raytracing.patch similarity index 100% rename from patches/server/0029-Use-fast-item-merge-raytracing.patch rename to patches/server/0030-Use-fast-item-merge-raytracing.patch diff --git a/patches/server/0030-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0031-Use-aging-cache-for-biome-temperatures.patch similarity index 100% rename from patches/server/0030-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0031-Use-aging-cache-for-biome-temperatures.patch diff --git a/patches/server/0031-Inline-level-height.patch b/patches/server/0032-Inline-level-height.patch similarity index 100% rename from patches/server/0031-Inline-level-height.patch rename to patches/server/0032-Inline-level-height.patch diff --git a/patches/server/0032-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0033-Use-ThreadUnsafeRandom-for-mob-spawning.patch similarity index 100% rename from patches/server/0032-Use-ThreadUnsafeRandom-for-mob-spawning.patch rename to patches/server/0033-Use-ThreadUnsafeRandom-for-mob-spawning.patch diff --git a/patches/server/0033-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0034-Remove-streams-and-iterators-from-range-check.patch similarity index 100% rename from patches/server/0033-Remove-streams-and-iterators-from-range-check.patch rename to patches/server/0034-Remove-streams-and-iterators-from-range-check.patch diff --git a/patches/server/0034-Remove-streams-from-getting-nearby-players.patch b/patches/server/0035-Remove-streams-from-getting-nearby-players.patch similarity index 100% rename from patches/server/0034-Remove-streams-from-getting-nearby-players.patch rename to patches/server/0035-Remove-streams-from-getting-nearby-players.patch diff --git a/patches/server/0035-Skip-cloning-loot-parameters.patch b/patches/server/0036-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0035-Skip-cloning-loot-parameters.patch rename to patches/server/0036-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0036-Block-goal-does-not-load-chunks.patch b/patches/server/0037-Block-goal-does-not-load-chunks.patch similarity index 100% rename from patches/server/0036-Block-goal-does-not-load-chunks.patch rename to patches/server/0037-Block-goal-does-not-load-chunks.patch diff --git a/patches/server/0037-Reduce-entity-allocations.patch b/patches/server/0038-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0037-Reduce-entity-allocations.patch rename to patches/server/0038-Reduce-entity-allocations.patch diff --git a/patches/server/0038-Remove-lambda-from-ticking-guard.patch b/patches/server/0039-Remove-lambda-from-ticking-guard.patch similarity index 100% rename from patches/server/0038-Remove-lambda-from-ticking-guard.patch rename to patches/server/0039-Remove-lambda-from-ticking-guard.patch diff --git a/patches/server/0039-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0039-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0040-SIMD-support.patch b/patches/server/0041-SIMD-support.patch similarity index 97% rename from patches/server/0040-SIMD-support.patch rename to patches/server/0041-SIMD-support.patch index a2b626d..4ba56f8 100644 --- a/patches/server/0040-SIMD-support.patch +++ b/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; diff --git a/patches/server/0041-Optimize-entity-coordinate-key.patch b/patches/server/0042-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0041-Optimize-entity-coordinate-key.patch rename to patches/server/0042-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0042-Reduce-in-wall-checks.patch b/patches/server/0043-Reduce-in-wall-checks.patch similarity index 100% rename from patches/server/0042-Reduce-in-wall-checks.patch rename to patches/server/0043-Reduce-in-wall-checks.patch diff --git a/patches/server/0043-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0044-Don-t-trigger-lootable-refresh-for-non-player-intera.patch similarity index 100% rename from patches/server/0043-Don-t-trigger-lootable-refresh-for-non-player-intera.patch rename to patches/server/0044-Don-t-trigger-lootable-refresh-for-non-player-intera.patch diff --git a/patches/server/0044-Reduce-hopper-item-checks.patch b/patches/server/0045-Reduce-hopper-item-checks.patch similarity index 100% rename from patches/server/0044-Reduce-hopper-item-checks.patch rename to patches/server/0045-Reduce-hopper-item-checks.patch diff --git a/patches/server/0045-Reduce-villager-item-re-pickup.patch b/patches/server/0046-Reduce-villager-item-re-pickup.patch similarity index 100% rename from patches/server/0045-Reduce-villager-item-re-pickup.patch rename to patches/server/0046-Reduce-villager-item-re-pickup.patch diff --git a/patches/server/0046-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0047-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 100% rename from patches/server/0046-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/server/0047-Do-not-process-chat-commands-before-player-has-joine.patch diff --git a/patches/server/0047-Do-not-log-invalid-statistics.patch b/patches/server/0048-Do-not-log-invalid-statistics.patch similarity index 87% rename from patches/server/0047-Do-not-log-invalid-statistics.patch rename to patches/server/0048-Do-not-log-invalid-statistics.patch index e8f716e..e84c713 100644 --- a/patches/server/0047-Do-not-log-invalid-statistics.patch +++ b/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 { } diff --git a/patches/server/0048-Do-not-log-empty-message-warnings.patch b/patches/server/0049-Do-not-log-empty-message-warnings.patch similarity index 93% rename from patches/server/0048-Do-not-log-empty-message-warnings.patch rename to patches/server/0049-Do-not-log-empty-message-warnings.patch index 9b6e8ce..76ed26c 100644 --- a/patches/server/0048-Do-not-log-empty-message-warnings.patch +++ b/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 diff --git a/patches/server/0049-Do-not-log-ignored-advancements.patch b/patches/server/0050-Do-not-log-ignored-advancements.patch similarity index 95% rename from patches/server/0049-Do-not-log-ignored-advancements.patch rename to patches/server/0050-Do-not-log-ignored-advancements.patch index 43bc285..d39c844 100644 --- a/patches/server/0049-Do-not-log-ignored-advancements.patch +++ b/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 diff --git a/patches/server/0050-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0051-Do-not-log-setBlock-in-far-chunks.patch similarity index 95% rename from patches/server/0050-Do-not-log-setBlock-in-far-chunks.patch rename to patches/server/0051-Do-not-log-setBlock-in-far-chunks.patch index a1483bd..66e52b4 100644 --- a/patches/server/0050-Do-not-log-setBlock-in-far-chunks.patch +++ b/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 diff --git a/patches/server/0051-Do-not-log-unrecognized-recipes.patch b/patches/server/0052-Do-not-log-unrecognized-recipes.patch similarity index 96% rename from patches/server/0051-Do-not-log-unrecognized-recipes.patch rename to patches/server/0052-Do-not-log-unrecognized-recipes.patch index c1eaab6..acb9f91 100644 --- a/patches/server/0051-Do-not-log-unrecognized-recipes.patch +++ b/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 diff --git a/patches/server/0052-Do-not-log-legacy-Material-initialization.patch b/patches/server/0053-Do-not-log-legacy-Material-initialization.patch similarity index 96% rename from patches/server/0052-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0053-Do-not-log-legacy-Material-initialization.patch index 8584f9d..ed93a38 100644 --- a/patches/server/0052-Do-not-log-legacy-Material-initialization.patch +++ b/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 diff --git a/patches/server/0053-Do-not-log-expired-message-warnings.patch b/patches/server/0054-Do-not-log-expired-message-warnings.patch similarity index 94% rename from patches/server/0053-Do-not-log-expired-message-warnings.patch rename to patches/server/0054-Do-not-log-expired-message-warnings.patch index 8186c83..a9952bb 100644 --- a/patches/server/0053-Do-not-log-expired-message-warnings.patch +++ b/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 diff --git a/patches/server/0054-Do-not-log-Not-Secure-marker.patch b/patches/server/0055-Do-not-log-Not-Secure-marker.patch similarity index 96% rename from patches/server/0054-Do-not-log-Not-Secure-marker.patch rename to patches/server/0055-Do-not-log-Not-Secure-marker.patch index 2b63754..dc3a551 100644 --- a/patches/server/0054-Do-not-log-Not-Secure-marker.patch +++ b/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 diff --git a/patches/server/0055-Do-not-log-run-as-root-warning.patch b/patches/server/0056-Do-not-log-run-as-root-warning.patch similarity index 100% rename from patches/server/0055-Do-not-log-run-as-root-warning.patch rename to patches/server/0056-Do-not-log-run-as-root-warning.patch diff --git a/patches/server/0056-Do-not-log-offline-mode-warning.patch b/patches/server/0057-Do-not-log-offline-mode-warning.patch similarity index 100% rename from patches/server/0056-Do-not-log-offline-mode-warning.patch rename to patches/server/0057-Do-not-log-offline-mode-warning.patch diff --git a/patches/server/0057-Softly-log-invalid-pool-element-errors.patch b/patches/server/0058-Softly-log-invalid-pool-element-errors.patch similarity index 95% rename from patches/server/0057-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0058-Softly-log-invalid-pool-element-errors.patch index eaaaf5d..1219f60 100644 --- a/patches/server/0057-Softly-log-invalid-pool-element-errors.patch +++ b/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 } diff --git a/patches/server/0058-Fix-legacy-colors-in-console.patch b/patches/server/0059-Fix-legacy-colors-in-console.patch similarity index 97% rename from patches/server/0058-Fix-legacy-colors-in-console.patch rename to patches/server/0059-Fix-legacy-colors-in-console.patch index c827995..8fb4b0f 100644 --- a/patches/server/0058-Fix-legacy-colors-in-console.patch +++ b/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 diff --git a/patches/server/0059-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0060-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0059-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0060-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0060-Make-sand-duping-fix-configurable.patch b/patches/server/0061-Make-sand-duping-fix-configurable.patch similarity index 100% rename from patches/server/0060-Make-sand-duping-fix-configurable.patch rename to patches/server/0061-Make-sand-duping-fix-configurable.patch diff --git a/patches/server/0061-Fix-MC-238526.patch b/patches/server/0062-Fix-MC-238526.patch similarity index 100% rename from patches/server/0061-Fix-MC-238526.patch rename to patches/server/0062-Fix-MC-238526.patch diff --git a/patches/server/0062-Fix-MC-123848.patch b/patches/server/0063-Fix-MC-123848.patch similarity index 100% rename from patches/server/0062-Fix-MC-123848.patch rename to patches/server/0063-Fix-MC-123848.patch diff --git a/patches/server/0063-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0064-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0063-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0064-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0064-Fix-MC-121706.patch b/patches/server/0065-Fix-MC-121706.patch similarity index 100% rename from patches/server/0064-Fix-MC-121706.patch rename to patches/server/0065-Fix-MC-121706.patch diff --git a/patches/server/0065-Fix-MC-110386.patch b/patches/server/0066-Fix-MC-110386.patch similarity index 100% rename from patches/server/0065-Fix-MC-110386.patch rename to patches/server/0066-Fix-MC-110386.patch diff --git a/patches/server/0066-Fix-MC-31819.patch b/patches/server/0067-Fix-MC-31819.patch similarity index 100% rename from patches/server/0066-Fix-MC-31819.patch rename to patches/server/0067-Fix-MC-31819.patch diff --git a/patches/server/0067-Fix-MC-26304.patch b/patches/server/0068-Fix-MC-26304.patch similarity index 100% rename from patches/server/0067-Fix-MC-26304.patch rename to patches/server/0068-Fix-MC-26304.patch diff --git a/patches/server/0068-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0069-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0068-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0069-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0069-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0070-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch similarity index 100% rename from patches/server/0069-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch rename to patches/server/0070-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch diff --git a/patches/server/0070-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0071-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 100% rename from patches/server/0070-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0071-Make-arrow-movement-resetting-despawn-counter-config.patch diff --git a/patches/server/0071-Reduce-array-allocations.patch b/patches/server/0072-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0071-Reduce-array-allocations.patch rename to patches/server/0072-Reduce-array-allocations.patch diff --git a/patches/server/0072-Optimize-sun-burn-tick.patch b/patches/server/0073-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0072-Optimize-sun-burn-tick.patch rename to patches/server/0073-Optimize-sun-burn-tick.patch diff --git a/patches/server/0073-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0074-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0073-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0074-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0074-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0075-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0074-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0075-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0075-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0076-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0075-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0076-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0076-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0077-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0076-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0077-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0077-Replace-class-map-with-optimized-collection.patch b/patches/server/0078-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0077-Replace-class-map-with-optimized-collection.patch rename to patches/server/0078-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0078-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0079-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0078-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0079-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0079-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0080-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0079-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0080-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0080-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0081-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0080-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0081-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0081-Cache-BlockStatePairKey-hash.patch b/patches/server/0082-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0081-Cache-BlockStatePairKey-hash.patch rename to patches/server/0082-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0082-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0083-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0082-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0083-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0083-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0084-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0083-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0084-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0084-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0085-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0084-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0085-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0085-Check-frozen-ticks-before-landing-block.patch b/patches/server/0086-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0085-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0086-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0086-Faster-chunk-serialization.patch b/patches/server/0087-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0086-Faster-chunk-serialization.patch rename to patches/server/0087-Faster-chunk-serialization.patch diff --git a/patches/server/0087-Update-boss-bar-within-tick.patch b/patches/server/0088-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0087-Update-boss-bar-within-tick.patch rename to patches/server/0088-Update-boss-bar-within-tick.patch diff --git a/patches/server/0088-Cache-ominous-banner-item.patch b/patches/server/0089-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0088-Cache-ominous-banner-item.patch rename to patches/server/0089-Cache-ominous-banner-item.patch diff --git a/patches/server/0089-Precompute-piston-shapes.patch b/patches/server/0090-Precompute-piston-shapes.patch similarity index 100% rename from patches/server/0089-Precompute-piston-shapes.patch rename to patches/server/0090-Precompute-piston-shapes.patch diff --git a/patches/server/0090-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0091-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0090-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0091-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0091-Cache-world-generator-sea-level.patch b/patches/server/0092-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0091-Cache-world-generator-sea-level.patch rename to patches/server/0092-Cache-world-generator-sea-level.patch diff --git a/patches/server/0092-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0093-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0092-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0093-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0093-Store-mob-counts-in-an-array.patch b/patches/server/0094-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0093-Store-mob-counts-in-an-array.patch rename to patches/server/0094-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0094-Use-linked-map-for-entity-trackers.patch b/patches/server/0095-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0094-Use-linked-map-for-entity-trackers.patch rename to patches/server/0095-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0095-Optimize-noise-generation.patch b/patches/server/0096-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0095-Optimize-noise-generation.patch rename to patches/server/0096-Optimize-noise-generation.patch diff --git a/patches/server/0096-Optimize-sheep-offspring-color.patch b/patches/server/0097-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0096-Optimize-sheep-offspring-color.patch rename to patches/server/0097-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0097-Ignore-durability-change-equipment-updates.patch b/patches/server/0098-Ignore-durability-change-equipment-updates.patch similarity index 100% rename from patches/server/0097-Ignore-durability-change-equipment-updates.patch rename to patches/server/0098-Ignore-durability-change-equipment-updates.patch diff --git a/patches/server/0098-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0099-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0098-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0099-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0099-Skip-cloning-advancement-criteria.patch b/patches/server/0100-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0099-Skip-cloning-advancement-criteria.patch rename to patches/server/0100-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0100-Reduce-block-destruction-packet-allocations.patch b/patches/server/0101-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0100-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0101-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0101-Send-set-head-rotation-packets-only-for-living-entit.patch b/patches/server/0102-Send-set-head-rotation-packets-only-for-living-entit.patch similarity index 100% rename from patches/server/0101-Send-set-head-rotation-packets-only-for-living-entit.patch rename to patches/server/0102-Send-set-head-rotation-packets-only-for-living-entit.patch diff --git a/patches/server/0102-Player-canSee-by-entity-UUID.patch b/patches/server/0103-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0102-Player-canSee-by-entity-UUID.patch rename to patches/server/0103-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0103-Spread-out-sending-all-player-info.patch b/patches/server/0104-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0103-Spread-out-sending-all-player-info.patch rename to patches/server/0104-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0104-Optimize-player-list-for-sending-player-info.patch b/patches/server/0105-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0104-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0105-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0105-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0106-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0105-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0106-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0106-Send-multiple-keep-alive-packets.patch b/patches/server/0107-Send-multiple-keep-alive-packets.patch similarity index 96% rename from patches/server/0106-Send-multiple-keep-alive-packets.patch rename to patches/server/0107-Send-multiple-keep-alive-packets.patch index cdfe046..29e4a6b 100644 --- a/patches/server/0106-Send-multiple-keep-alive-packets.patch +++ b/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; diff --git a/patches/server/0107-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0108-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0107-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0108-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0108-CraftBukkit-UUID-to-world-map.patch b/patches/server/0109-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0108-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0109-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0109-Specific-interval-TPS-API.patch b/patches/server/0110-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0109-Specific-interval-TPS-API.patch rename to patches/server/0110-Specific-interval-TPS-API.patch diff --git a/patches/server/0110-5-second-TPS-average.patch b/patches/server/0111-5-second-TPS-average.patch similarity index 100% rename from patches/server/0110-5-second-TPS-average.patch rename to patches/server/0111-5-second-TPS-average.patch diff --git a/patches/server/0111-Measure-last-tick-time.patch b/patches/server/0112-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0111-Measure-last-tick-time.patch rename to patches/server/0112-Measure-last-tick-time.patch diff --git a/patches/server/0112-Last-tick-time-API.patch b/patches/server/0113-Last-tick-time-API.patch similarity index 100% rename from patches/server/0112-Last-tick-time-API.patch rename to patches/server/0113-Last-tick-time-API.patch diff --git a/patches/server/0113-Show-last-tick-time-in-tps-command.patch b/patches/server/0114-Show-last-tick-time-in-tps-command.patch similarity index 97% rename from patches/server/0113-Show-last-tick-time-in-tps-command.patch rename to patches/server/0114-Show-last-tick-time-in-tps-command.patch index 735ee88..cd9a41a 100644 --- a/patches/server/0113-Show-last-tick-time-in-tps-command.patch +++ b/patches/server/0114-Show-last-tick-time-in-tps-command.patch @@ -23,11 +23,11 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index c2960564ae266dce00f10178c4182f4a5338a161..1225c6197293b04ddb18462d7d2ee0caf7834a76 100644 +index ca37994763c45767d2def1b88768d44863a4b8c2..47b036b6194020ad775077d661063329b3491ca6 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -@@ -83,6 +83,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart { - +@@ -69,6 +69,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart { + } + // Gale start - YAPFA - last tick time - in TPS command @@ -40,7 +40,7 @@ index c2960564ae266dce00f10178c4182f4a5338a161..1225c6197293b04ddb18462d7d2ee0ca + } - } + public LogToConsole logToConsole; diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java index 29e27dd3c8908956f2708a3562e69e4f35b26249..b42b31cd33232a99befd8334bc24b8ae8b021ccb 100644 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java diff --git a/patches/server/0114-Increase-time-statistics-in-intervals.patch b/patches/server/0115-Increase-time-statistics-in-intervals.patch similarity index 98% rename from patches/server/0114-Increase-time-statistics-in-intervals.patch rename to patches/server/0115-Increase-time-statistics-in-intervals.patch index 19ec6ef..f6feb8d 100644 --- a/patches/server/0114-Increase-time-statistics-in-intervals.patch +++ b/patches/server/0115-Increase-time-statistics-in-intervals.patch @@ -87,7 +87,7 @@ index 68247b9daf710c71f84e1fae9d91efed151d39aa..92b30f5293e80e078d8a1a740d22367e int i = 29999999; diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 1225c6197293b04ddb18462d7d2ee0caf7834a76..5b2b861292c638c28a92c894fb0959493e8f7b99 100644 +index 47b036b6194020ad775077d661063329b3491ca6..0ca7e72e9ee7fd266ff3a8364de3a97ef7da3c08 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -27,7 +27,29 @@ public class GaleGlobalConfiguration extends ConfigurationPart { diff --git a/patches/server/0115-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0116-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0115-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0116-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0116-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0117-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0116-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0117-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0117-Reduce-RandomSource-instances.patch b/patches/server/0118-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0117-Reduce-RandomSource-instances.patch rename to patches/server/0118-Reduce-RandomSource-instances.patch diff --git a/patches/server/0118-Server-thread-priority-environment-variable.patch b/patches/server/0119-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0118-Server-thread-priority-environment-variable.patch rename to patches/server/0119-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0119-Thread-safety-annotations.patch b/patches/server/0120-Thread-safety-annotations.patch similarity index 100% rename from patches/server/0119-Thread-safety-annotations.patch rename to patches/server/0120-Thread-safety-annotations.patch diff --git a/patches/server/0120-CPU-cores-estimation.patch b/patches/server/0121-CPU-cores-estimation.patch similarity index 97% rename from patches/server/0120-CPU-cores-estimation.patch rename to patches/server/0121-CPU-cores-estimation.patch index 4c69e2c..2330e76 100644 --- a/patches/server/0120-CPU-cores-estimation.patch +++ b/patches/server/0121-CPU-cores-estimation.patch @@ -45,10 +45,10 @@ index b9a799997e3475117ab91d7f3edb5f2f243a9f6b..e23fdd5ba09b50b7eef0ca4f36c54807 import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.MarkedYAMLException; diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 5b2b861292c638c28a92c894fb0959493e8f7b99..23e49bcea2aa7c0625cbee99535094d5a5f7045b 100644 +index 0ca7e72e9ee7fd266ff3a8364de3a97ef7da3c08..88177eced0473e121964db48228a808aed058e6e 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -@@ -70,6 +70,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { +@@ -110,6 +110,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization diff --git a/patches/server/0121-Mutex-utility.patch b/patches/server/0122-Mutex-utility.patch similarity index 100% rename from patches/server/0121-Mutex-utility.patch rename to patches/server/0122-Mutex-utility.patch diff --git a/patches/server/0122-Paired-lock-and-condition-utility.patch b/patches/server/0123-Paired-lock-and-condition-utility.patch similarity index 100% rename from patches/server/0122-Paired-lock-and-condition-utility.patch rename to patches/server/0123-Paired-lock-and-condition-utility.patch diff --git a/patches/server/0123-Unterminable-executor-utility.patch b/patches/server/0124-Unterminable-executor-utility.patch similarity index 100% rename from patches/server/0123-Unterminable-executor-utility.patch rename to patches/server/0124-Unterminable-executor-utility.patch diff --git a/patches/server/0124-FIFO-concurrent-queue-utility.patch b/patches/server/0125-FIFO-concurrent-queue-utility.patch similarity index 100% rename from patches/server/0124-FIFO-concurrent-queue-utility.patch rename to patches/server/0125-FIFO-concurrent-queue-utility.patch diff --git a/patches/server/0125-Base-thread-pools.patch b/patches/server/0126-Base-thread-pools.patch similarity index 99% rename from patches/server/0125-Base-thread-pools.patch rename to patches/server/0126-Base-thread-pools.patch index 9fff5c9..ef4af1e 100644 --- a/patches/server/0125-Base-thread-pools.patch +++ b/patches/server/0126-Base-thread-pools.patch @@ -1899,7 +1899,7 @@ index 69acbab61a79c24312359a63086f9353d740113f..49ace73d901b6f55545bb21a93d026a0 } } catch (Exception ex) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 23e49bcea2aa7c0625cbee99535094d5a5f7045b..fccfcb9401b9a1347e71959db8635d2dac22fde2 100644 +index 88177eced0473e121964db48228a808aed058e6e..6d978ea10bc1aa4bbf3efd19faaf3f8b50002426 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -2,11 +2,14 @@ @@ -2140,7 +2140,7 @@ index 23e49bcea2aa7c0625cbee99535094d5a5f7045b..fccfcb9401b9a1347e71959db8635d2d + } - public LogToConsole logToConsole; + public Misc misc; diff --git a/src/main/java/org/galemc/gale/executor/AbstractBlockableEventLoop.java b/src/main/java/org/galemc/gale/executor/AbstractBlockableEventLoop.java new file mode 100644 index 0000000000000000000000000000000000000000..e73bf57a9777488dc00efe671cee955e6fb108a1 diff --git a/patches/server/0126-Non-blocking-PooledObjects.patch b/patches/server/0127-Non-blocking-PooledObjects.patch similarity index 100% rename from patches/server/0126-Non-blocking-PooledObjects.patch rename to patches/server/0127-Non-blocking-PooledObjects.patch