From 7b66fdddff40a914ce47146ff5c8ba49920b27e2 Mon Sep 17 00:00:00 2001 From: Martijn Muijsers Date: Fri, 23 Dec 2022 22:54:36 +0100 Subject: [PATCH] Optimize sheep offspring color --- .../0095-Optimize-sheep-offspring-color.patch | 137 ++++++++++++++++++ ...durability-change-equipment-updates.patch} | 8 +- ...es-on-entities-with-fire-resistance.patch} | 4 +- ...8-Skip-cloning-advancement-criteria.patch} | 0 ...lock-destruction-packet-allocations.patch} | 0 ...> 0100-Player-canSee-by-entity-UUID.patch} | 0 ...-Spread-out-sending-all-player-info.patch} | 0 ...player-list-for-sending-player-info.patch} | 0 ...dSendEvent-if-there-are-no-listener.patch} | 0 ...04-Send-multiple-keep-alive-packets.patch} | 0 ...random-strolling-into-non-ticking-c.patch} | 4 +- ...h => 0106-Specific-interval-TPS-API.patch} | 0 ....patch => 0107-5-second-TPS-average.patch} | 0 ...atch => 0108-Measure-last-tick-time.patch} | 0 ...PI.patch => 0109-Last-tick-time-API.patch} | 0 ...-Show-last-tick-time-in-tps-command.patch} | 0 ...crease-time-statistics-in-intervals.patch} | 0 ...eck-has-physics-before-same-vehicle.patch} | 0 ...ible-planar-movement-multiplication.patch} | 0 ... 0114-Reduce-RandomSource-instances.patch} | 0 ...hread-priority-environment-variable.patch} | 0 ...h => 0116-Thread-safety-annotations.patch} | 0 ....patch => 0117-CPU-cores-estimation.patch} | 0 ...utility.patch => 0118-Mutex-utility.patch} | 0 ...9-Paired-lock-and-condition-utility.patch} | 0 ... 0120-Unterminable-executor-utility.patch} | 0 ... 0121-FIFO-concurrent-queue-utility.patch} | 0 ...ols.patch => 0122-Base-thread-pools.patch} | 0 ... => 0123-Non-blocking-PooledObjects.patch} | 0 29 files changed, 145 insertions(+), 8 deletions(-) create mode 100644 patches/server/0095-Optimize-sheep-offspring-color.patch rename patches/server/{0095-Ignore-durability-change-equipment-updates.patch => 0096-Ignore-durability-change-equipment-updates.patch} (92%) rename patches/server/{0096-Hide-flames-on-entities-with-fire-resistance.patch => 0097-Hide-flames-on-entities-with-fire-resistance.patch} (94%) rename patches/server/{0097-Skip-cloning-advancement-criteria.patch => 0098-Skip-cloning-advancement-criteria.patch} (100%) rename patches/server/{0098-Reduce-block-destruction-packet-allocations.patch => 0099-Reduce-block-destruction-packet-allocations.patch} (100%) rename patches/server/{0099-Player-canSee-by-entity-UUID.patch => 0100-Player-canSee-by-entity-UUID.patch} (100%) rename patches/server/{0100-Spread-out-sending-all-player-info.patch => 0101-Spread-out-sending-all-player-info.patch} (100%) rename patches/server/{0101-Optimize-player-list-for-sending-player-info.patch => 0102-Optimize-player-list-for-sending-player-info.patch} (100%) rename patches/server/{0102-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch => 0103-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch} (100%) rename patches/server/{0103-Send-multiple-keep-alive-packets.patch => 0104-Send-multiple-keep-alive-packets.patch} (100%) rename patches/server/{0104-Prevent-entities-random-strolling-into-non-ticking-c.patch => 0105-Prevent-entities-random-strolling-into-non-ticking-c.patch} (94%) rename patches/server/{0105-Specific-interval-TPS-API.patch => 0106-Specific-interval-TPS-API.patch} (100%) rename patches/server/{0106-5-second-TPS-average.patch => 0107-5-second-TPS-average.patch} (100%) rename patches/server/{0107-Measure-last-tick-time.patch => 0108-Measure-last-tick-time.patch} (100%) rename patches/server/{0108-Last-tick-time-API.patch => 0109-Last-tick-time-API.patch} (100%) rename patches/server/{0109-Show-last-tick-time-in-tps-command.patch => 0110-Show-last-tick-time-in-tps-command.patch} (100%) rename patches/server/{0110-Increase-time-statistics-in-intervals.patch => 0111-Increase-time-statistics-in-intervals.patch} (100%) rename patches/server/{0111-For-collision-check-has-physics-before-same-vehicle.patch => 0112-For-collision-check-has-physics-before-same-vehicle.patch} (100%) rename patches/server/{0112-Skip-negligible-planar-movement-multiplication.patch => 0113-Skip-negligible-planar-movement-multiplication.patch} (100%) rename patches/server/{0113-Reduce-RandomSource-instances.patch => 0114-Reduce-RandomSource-instances.patch} (100%) rename patches/server/{0114-Server-thread-priority-environment-variable.patch => 0115-Server-thread-priority-environment-variable.patch} (100%) rename patches/server/{0115-Thread-safety-annotations.patch => 0116-Thread-safety-annotations.patch} (100%) rename patches/server/{0116-CPU-cores-estimation.patch => 0117-CPU-cores-estimation.patch} (100%) rename patches/server/{0117-Mutex-utility.patch => 0118-Mutex-utility.patch} (100%) rename patches/server/{0118-Paired-lock-and-condition-utility.patch => 0119-Paired-lock-and-condition-utility.patch} (100%) rename patches/server/{0119-Unterminable-executor-utility.patch => 0120-Unterminable-executor-utility.patch} (100%) rename patches/server/{0120-FIFO-concurrent-queue-utility.patch => 0121-FIFO-concurrent-queue-utility.patch} (100%) rename patches/server/{0121-Base-thread-pools.patch => 0122-Base-thread-pools.patch} (100%) rename patches/server/{0122-Non-blocking-PooledObjects.patch => 0123-Non-blocking-PooledObjects.patch} (100%) diff --git a/patches/server/0095-Optimize-sheep-offspring-color.patch b/patches/server/0095-Optimize-sheep-offspring-color.patch new file mode 100644 index 0000000..dd175c9 --- /dev/null +++ b/patches/server/0095-Optimize-sheep-offspring-color.patch @@ -0,0 +1,137 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Fri, 23 Dec 2022 22:47:38 +0100 +Subject: [PATCH] Optimize sheep offspring color + +License: MIT (https://opensource.org/licenses/MIT) +Gale - https://galemc.org + +This patch is based on the following mixins and classes: +* "carpetfixes/helpers/Utils.java" +* "carpetfixes/mixins/optimizations/SheepEntity_childColorMixin.java" +By: fxmorin <28154542+fxmorin@users.noreply.github.com> +As part of: carpet-fixes (https://github.com/fxmorin/carpet-fixes) +Licensed under: MIT (https://opensource.org/licenses/MIT) + +* carpet-fixes description * + +The game determines the child sheep's color by getting a wool block from the parents, putting them in a crafting +recipe, getting the output wool and getting the color from that. +I don't know in what world we would consider a data-driven method with that much overhead as a smart idea. Instead, +we used a prebaked list of all the possible colors and combinations, however this means that you can't use a +datapack to change it. + +* carpet-fixes copyright * + +MIT License + +Copyright (c) 2020 Fx Morin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +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/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java +index efac4395fdb79a78fbb18a0f828b1a3c90b102fe..ef70179f71eb3f63f707d990bfc4d55101c28c4d 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java ++++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java +@@ -391,7 +391,59 @@ public class Sheep extends Animal implements Shearable { + return super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt); + } + ++ // Gale start - carpet-fixes - optimize sheep offspring color ++ private static DyeColor properDye(DyeColor firstColor, DyeColor secondColor) { ++ if (firstColor.equals(secondColor)) return firstColor; ++ switch(firstColor) { ++ case WHITE -> { ++ switch(secondColor) { ++ case BLUE -> {return DyeColor.LIGHT_BLUE;} ++ case GRAY -> {return DyeColor.LIGHT_GRAY;} ++ case BLACK -> {return DyeColor.GRAY;} ++ case GREEN -> {return DyeColor.LIME;} ++ case RED -> {return DyeColor.PINK;} ++ } ++ } ++ case BLUE -> { ++ switch(secondColor) { ++ case WHITE -> {return DyeColor.LIGHT_BLUE;} ++ case GREEN -> {return DyeColor.CYAN;} ++ case RED -> {return DyeColor.PURPLE;} ++ } ++ } ++ case RED -> { ++ switch(secondColor) { ++ case YELLOW -> {return DyeColor.ORANGE;} ++ case WHITE -> {return DyeColor.PINK;} ++ case BLUE -> {return DyeColor.PURPLE;} ++ } ++ } ++ case GREEN -> { ++ switch(secondColor) { ++ case BLUE -> {return DyeColor.CYAN;} ++ case WHITE -> {return DyeColor.LIME;} ++ } ++ } ++ case YELLOW -> {if (secondColor.equals(DyeColor.RED)) return DyeColor.ORANGE;} ++ case PURPLE -> {if (secondColor.equals(DyeColor.PINK)) return DyeColor.MAGENTA;} ++ case PINK -> {if (secondColor.equals(DyeColor.PURPLE)) return DyeColor.MAGENTA;} ++ case GRAY -> {if (secondColor.equals(DyeColor.WHITE)) return DyeColor.LIGHT_GRAY;} ++ case BLACK -> {if (secondColor.equals(DyeColor.WHITE)) return DyeColor.GRAY;} ++ } ++ return null; ++ } ++ // Gale end - carpet-fixes - optimize sheep offspring color ++ + private DyeColor getOffspringColor(Animal firstParent, Animal secondParent) { ++ // Gale start - carpet-fixes - optimize sheep offspring color ++ if (firstParent.level != null && firstParent.level.galeConfig().smallOptimizations.useOptimizedSheepOffspringColor) { ++ DyeColor firstColor = ((Sheep)firstParent).getColor(); ++ DyeColor secondColor = ((Sheep)secondParent).getColor(); ++ DyeColor col = properDye(firstColor,secondColor); ++ if (col == null) col = this.level.random.nextBoolean() ? firstColor : secondColor; ++ return col; ++ } ++ // Gale end - carpet-fixes - optimize sheep offspring color + DyeColor enumcolor = ((Sheep) firstParent).getColor(); + DyeColor enumcolor1 = ((Sheep) secondParent).getColor(); + CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1); +diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +index 24a6e2ef5472936f478b759e79197442490e3ada..b480d492d411d33393ac1b2f41bd4d62d232c568 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +@@ -33,6 +33,21 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public SmallOptimizations smallOptimizations; + public class SmallOptimizations extends ConfigurationPart { + ++ // Gale start - carpet-fixes - optimize sheep offspring color ++ /** ++ * Whether to use a (much) faster way to choose a color when a new baby sheep is born. ++ * The color chosen is exactly the same as vanilla. ++ * However, in vanilla, it is possible to change the new color by ++ * changing the crafting recipe for combining dyes using a data pack. ++ * If this is set to true, any such crafting recipe changes will be ignored. ++ * ++ */ ++ public boolean useOptimizedSheepOffspringColor = true; ++ // Gale end - carpet-fixes - optimize sheep offspring color ++ + // Gale start - Airplane - reduce projectile chunk loading + public MaxProjectileChunkLoads maxProjectileChunkLoads; + public class MaxProjectileChunkLoads extends ConfigurationPart { diff --git a/patches/server/0095-Ignore-durability-change-equipment-updates.patch b/patches/server/0096-Ignore-durability-change-equipment-updates.patch similarity index 92% rename from patches/server/0095-Ignore-durability-change-equipment-updates.patch rename to patches/server/0096-Ignore-durability-change-equipment-updates.patch index 37599f3..9804fad 100644 --- a/patches/server/0095-Ignore-durability-change-equipment-updates.patch +++ b/patches/server/0096-Ignore-durability-change-equipment-updates.patch @@ -53,12 +53,12 @@ index 8fd080110ed4efaf6cb3a2561b32ed66ff8c78f0..b1a01ef0090718923aff4365d8e93c77 return stack.is(otherStack.getItem()) && ItemStack.tagMatches(stack, otherStack); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 24a6e2ef5472936f478b759e79197442490e3ada..6f6aa43685584517d3ea05fac1297c696eeea07d 100644 +index b480d492d411d33393ac1b2f41bd4d62d232c568..ce94f9a5bc826ce33ee63581ab864b04a8b4526e 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -33,6 +33,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public SmallOptimizations smallOptimizations; - public class SmallOptimizations extends ConfigurationPart { +@@ -48,6 +48,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public boolean useOptimizedSheepOffspringColor = true; + // Gale end - carpet-fixes - optimize sheep offspring color + public boolean processFullEquipmentChangeIfOnlyDurabilityChanged = false; // Gale - Slice - ignore durability change equipment updates + diff --git a/patches/server/0096-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0097-Hide-flames-on-entities-with-fire-resistance.patch similarity index 94% rename from patches/server/0096-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0097-Hide-flames-on-entities-with-fire-resistance.patch index 2219701..7f62a5c 100644 --- a/patches/server/0096-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0097-Hide-flames-on-entities-with-fire-resistance.patch @@ -31,10 +31,10 @@ index 92c9ccf9a05fe54b5c7e5a72da5498115a6d5bd9..d05e5b9b4dec0779489856dab5e50b53 this.firstTick = false; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 6f6aa43685584517d3ea05fac1297c696eeea07d..cf6f75c6c0c88cc0153e25980ba9bf8a915af3b5 100644 +index ce94f9a5bc826ce33ee63581ab864b04a8b4526e..3274742f667c9b0bec5f1bf8d03b2fd3165eb807 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -248,6 +248,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -263,6 +263,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable diff --git a/patches/server/0097-Skip-cloning-advancement-criteria.patch b/patches/server/0098-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0097-Skip-cloning-advancement-criteria.patch rename to patches/server/0098-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0098-Reduce-block-destruction-packet-allocations.patch b/patches/server/0099-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0098-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0099-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0099-Player-canSee-by-entity-UUID.patch b/patches/server/0100-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0099-Player-canSee-by-entity-UUID.patch rename to patches/server/0100-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0100-Spread-out-sending-all-player-info.patch b/patches/server/0101-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0100-Spread-out-sending-all-player-info.patch rename to patches/server/0101-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0101-Optimize-player-list-for-sending-player-info.patch b/patches/server/0102-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0101-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0102-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0102-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0103-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0102-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0103-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0103-Send-multiple-keep-alive-packets.patch b/patches/server/0104-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0103-Send-multiple-keep-alive-packets.patch rename to patches/server/0104-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0104-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0105-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 94% rename from patches/server/0104-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0105-Prevent-entities-random-strolling-into-non-ticking-c.patch index 476020c..e81e0df 100644 --- a/patches/server/0104-Prevent-entities-random-strolling-into-non-ticking-c.patch +++ b/patches/server/0105-Prevent-entities-random-strolling-into-non-ticking-c.patch @@ -36,10 +36,10 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..29c7f53a4fa88a77c4076a6294e689e4 } else { this.wantedX = vec3.x; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index cf6f75c6c0c88cc0153e25980ba9bf8a915af3b5..e2d6f0e479268e1fadfee4a73281360cf9406760 100644 +index 3274742f667c9b0bec5f1bf8d03b2fd3165eb807..c77ccc1e91756223bc8ced2d7648464dc33aa892 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -247,6 +247,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -262,6 +262,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public class GameplayMechanics extends ConfigurationPart { public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks diff --git a/patches/server/0105-Specific-interval-TPS-API.patch b/patches/server/0106-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0105-Specific-interval-TPS-API.patch rename to patches/server/0106-Specific-interval-TPS-API.patch diff --git a/patches/server/0106-5-second-TPS-average.patch b/patches/server/0107-5-second-TPS-average.patch similarity index 100% rename from patches/server/0106-5-second-TPS-average.patch rename to patches/server/0107-5-second-TPS-average.patch diff --git a/patches/server/0107-Measure-last-tick-time.patch b/patches/server/0108-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0107-Measure-last-tick-time.patch rename to patches/server/0108-Measure-last-tick-time.patch diff --git a/patches/server/0108-Last-tick-time-API.patch b/patches/server/0109-Last-tick-time-API.patch similarity index 100% rename from patches/server/0108-Last-tick-time-API.patch rename to patches/server/0109-Last-tick-time-API.patch diff --git a/patches/server/0109-Show-last-tick-time-in-tps-command.patch b/patches/server/0110-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0109-Show-last-tick-time-in-tps-command.patch rename to patches/server/0110-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0110-Increase-time-statistics-in-intervals.patch b/patches/server/0111-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0110-Increase-time-statistics-in-intervals.patch rename to patches/server/0111-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0111-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0112-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0111-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0112-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0112-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0113-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0112-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0113-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0113-Reduce-RandomSource-instances.patch b/patches/server/0114-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0113-Reduce-RandomSource-instances.patch rename to patches/server/0114-Reduce-RandomSource-instances.patch diff --git a/patches/server/0114-Server-thread-priority-environment-variable.patch b/patches/server/0115-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0114-Server-thread-priority-environment-variable.patch rename to patches/server/0115-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0115-Thread-safety-annotations.patch b/patches/server/0116-Thread-safety-annotations.patch similarity index 100% rename from patches/server/0115-Thread-safety-annotations.patch rename to patches/server/0116-Thread-safety-annotations.patch diff --git a/patches/server/0116-CPU-cores-estimation.patch b/patches/server/0117-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0116-CPU-cores-estimation.patch rename to patches/server/0117-CPU-cores-estimation.patch diff --git a/patches/server/0117-Mutex-utility.patch b/patches/server/0118-Mutex-utility.patch similarity index 100% rename from patches/server/0117-Mutex-utility.patch rename to patches/server/0118-Mutex-utility.patch diff --git a/patches/server/0118-Paired-lock-and-condition-utility.patch b/patches/server/0119-Paired-lock-and-condition-utility.patch similarity index 100% rename from patches/server/0118-Paired-lock-and-condition-utility.patch rename to patches/server/0119-Paired-lock-and-condition-utility.patch diff --git a/patches/server/0119-Unterminable-executor-utility.patch b/patches/server/0120-Unterminable-executor-utility.patch similarity index 100% rename from patches/server/0119-Unterminable-executor-utility.patch rename to patches/server/0120-Unterminable-executor-utility.patch diff --git a/patches/server/0120-FIFO-concurrent-queue-utility.patch b/patches/server/0121-FIFO-concurrent-queue-utility.patch similarity index 100% rename from patches/server/0120-FIFO-concurrent-queue-utility.patch rename to patches/server/0121-FIFO-concurrent-queue-utility.patch diff --git a/patches/server/0121-Base-thread-pools.patch b/patches/server/0122-Base-thread-pools.patch similarity index 100% rename from patches/server/0121-Base-thread-pools.patch rename to patches/server/0122-Base-thread-pools.patch diff --git a/patches/server/0122-Non-blocking-PooledObjects.patch b/patches/server/0123-Non-blocking-PooledObjects.patch similarity index 100% rename from patches/server/0122-Non-blocking-PooledObjects.patch rename to patches/server/0123-Non-blocking-PooledObjects.patch