diff --git a/patches/server/0004-Modify-Metrics.patch b/patches/server/0004-Modify-Metrics.patch new file mode 100644 index 0000000..965536e --- /dev/null +++ b/patches/server/0004-Modify-Metrics.patch @@ -0,0 +1,66 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: 404Setup <153366651+404Setup@users.noreply.github.com> +Date: Sun, 20 Oct 2024 10:27:18 +0800 +Subject: [PATCH] Modify Metrics + + +diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java +index 22c9c5ef26229c57fb27776b5a49cc77dcdbe545..3419beaf9ce891fe63aa186e61acd43931c005e2 100644 +--- a/src/main/java/com/destroystokyo/paper/Metrics.java ++++ b/src/main/java/com/destroystokyo/paper/Metrics.java +@@ -1,5 +1,7 @@ + package com.destroystokyo.paper; + ++import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; ++import it.unimi.dsi.fastutil.objects.ObjectArrayList; + import net.minecraft.server.MinecraftServer; + import org.bukkit.Bukkit; + import org.bukkit.configuration.file.YamlConfiguration; +@@ -35,7 +37,7 @@ public class Metrics { + + // Executor service for requests + // We use an executor service because the Bukkit scheduler is affected by server lags +- private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); ++ private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1, one.tranic.vine.util.AnyThread.getFactory()); + + // The version of this bStats class + public static final int B_STATS_VERSION = 1; +@@ -56,7 +58,7 @@ public class Metrics { + private final String serverUUID; + + // A list with all custom charts +- private final List charts = new ArrayList<>(); ++ private final List charts = new ObjectArrayList<>(); + + /** + * Class constructor. +@@ -606,9 +608,9 @@ public class Metrics { + metrics.addCustomChart(new Metrics.SimplePie("vine_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // ShreddedPaper // Vine + + metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { +- Map> map = new HashMap<>(); ++ Map> map = new Object2ObjectOpenHashMap<>(); + String javaVersion = System.getProperty("java.version"); +- Map entry = new HashMap<>(); ++ Map entry = new Object2ObjectOpenHashMap<>(); + entry.put(javaVersion, 1); + + // http://openjdk.java.net/jeps/223 +@@ -637,7 +639,7 @@ public class Metrics { + })); + + metrics.addCustomChart(new Metrics.DrilldownPie("legacy_plugins", () -> { +- Map> map = new HashMap<>(); ++ Map> map = new Object2ObjectOpenHashMap<>(); + + // count legacy plugins + int legacy = 0; +@@ -648,7 +650,7 @@ public class Metrics { + } + + // insert real value as lower dimension +- Map entry = new HashMap<>(); ++ Map entry = new Object2ObjectOpenHashMap<>(); + entry.put(String.valueOf(legacy), 1); + + // create buckets as higher dimension diff --git a/patches/server/0004-VineLogger.patch b/patches/server/0005-VineLogger.patch similarity index 100% rename from patches/server/0004-VineLogger.patch rename to patches/server/0005-VineLogger.patch diff --git a/patches/server/0005-Reflect-utils.patch b/patches/server/0006-Reflect-utils.patch similarity index 100% rename from patches/server/0005-Reflect-utils.patch rename to patches/server/0006-Reflect-utils.patch diff --git a/patches/server/0006-Command-Utils.patch b/patches/server/0007-Command-Utils.patch similarity index 100% rename from patches/server/0006-Command-Utils.patch rename to patches/server/0007-Command-Utils.patch diff --git a/patches/server/0007-Vine-Config-Util.patch b/patches/server/0008-Vine-Config-Util.patch similarity index 100% rename from patches/server/0007-Vine-Config-Util.patch rename to patches/server/0008-Vine-Config-Util.patch diff --git a/patches/server/0008-Vine-Config-Fix.patch b/patches/server/0009-Vine-Config-Fix.patch similarity index 100% rename from patches/server/0008-Vine-Config-Fix.patch rename to patches/server/0009-Vine-Config-Fix.patch diff --git a/patches/server/0009-Vine-Config-Feature.patch b/patches/server/0010-Vine-Config-Feature.patch similarity index 100% rename from patches/server/0009-Vine-Config-Feature.patch rename to patches/server/0010-Vine-Config-Feature.patch diff --git a/patches/server/0010-Vine-Config-Optimize.patch b/patches/server/0011-Vine-Config-Optimize.patch similarity index 100% rename from patches/server/0010-Vine-Config-Optimize.patch rename to patches/server/0011-Vine-Config-Optimize.patch diff --git a/patches/server/0011-Config-command.patch b/patches/server/0012-Config-command.patch similarity index 100% rename from patches/server/0011-Config-command.patch rename to patches/server/0012-Config-command.patch diff --git a/patches/server/0012-Preload-Utils.patch b/patches/server/0013-Preload-Utils.patch similarity index 100% rename from patches/server/0012-Preload-Utils.patch rename to patches/server/0013-Preload-Utils.patch diff --git a/patches/server/0013-Add-vine-and-shreddedpaper-configuration-files-to-sp.patch b/patches/server/0014-Add-vine-and-shreddedpaper-configuration-files-to-sp.patch similarity index 100% rename from patches/server/0013-Add-vine-and-shreddedpaper-configuration-files-to-sp.patch rename to patches/server/0014-Add-vine-and-shreddedpaper-configuration-files-to-sp.patch diff --git a/patches/server/0014-Fix-console-freeze.patch b/patches/server/0015-Fix-console-freeze.patch similarity index 100% rename from patches/server/0014-Fix-console-freeze.patch rename to patches/server/0015-Fix-console-freeze.patch diff --git a/patches/server/0015-AnyThread-Utils.patch b/patches/server/0016-AnyThread-Utils.patch similarity index 100% rename from patches/server/0015-AnyThread-Utils.patch rename to patches/server/0016-AnyThread-Utils.patch diff --git a/patches/server/0016-EventManager.patch b/patches/server/0017-EventManager.patch similarity index 100% rename from patches/server/0016-EventManager.patch rename to patches/server/0017-EventManager.patch diff --git a/patches/server/0017-PermissionManager.patch b/patches/server/0018-PermissionManager.patch similarity index 100% rename from patches/server/0017-PermissionManager.patch rename to patches/server/0018-PermissionManager.patch diff --git a/patches/server/0018-ThreadInfoCommand.patch b/patches/server/0019-ThreadInfoCommand.patch similarity index 100% rename from patches/server/0018-ThreadInfoCommand.patch rename to patches/server/0019-ThreadInfoCommand.patch diff --git a/patches/server/0019-Nbt-Utils.patch b/patches/server/0020-Nbt-Utils.patch similarity index 100% rename from patches/server/0019-Nbt-Utils.patch rename to patches/server/0020-Nbt-Utils.patch diff --git a/patches/server/0020-Virtual-threads-1.0.patch b/patches/server/0021-Virtual-threads-1.0.patch similarity index 97% rename from patches/server/0020-Virtual-threads-1.0.patch rename to patches/server/0021-Virtual-threads-1.0.patch index 2347186..b958d4e 100644 --- a/patches/server/0020-Virtual-threads-1.0.patch +++ b/patches/server/0021-Virtual-threads-1.0.patch @@ -4,19 +4,6 @@ Date: Thu, 15 Aug 2024 21:42:18 +0800 Subject: [PATCH] Virtual threads 1.0 -diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 22c9c5ef26229c57fb27776b5a49cc77dcdbe545..d6ae8b61dd33da919fd81a11032bfe187d8caa6c 100644 ---- a/src/main/java/com/destroystokyo/paper/Metrics.java -+++ b/src/main/java/com/destroystokyo/paper/Metrics.java -@@ -35,7 +35,7 @@ public class Metrics { - - // Executor service for requests - // We use an executor service because the Bukkit scheduler is affected by server lags -- private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); -+ private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1, one.tranic.vine.util.AnyThread.getFactory()); - - // The version of this bStats class - public static final int B_STATS_VERSION = 1; diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilServicesKeyInfo.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilServicesKeyInfo.java index 5dbaf7689363719501d9b41f9537ebd4677e32a6..370c98f9f74876ad62c1b412a79cf986f9adb441 100644 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilServicesKeyInfo.java diff --git a/patches/server/0021-Virtual-Thread-2.0-Beta.patch b/patches/server/0022-Virtual-Thread-2.0-Beta.patch similarity index 100% rename from patches/server/0021-Virtual-Thread-2.0-Beta.patch rename to patches/server/0022-Virtual-Thread-2.0-Beta.patch diff --git a/patches/server/0022-SectorFile.patch b/patches/server/0023-SectorFile.patch similarity index 100% rename from patches/server/0022-SectorFile.patch rename to patches/server/0023-SectorFile.patch diff --git a/patches/server/0023-Linear.patch b/patches/server/0024-Linear.patch similarity index 100% rename from patches/server/0023-Linear.patch rename to patches/server/0024-Linear.patch diff --git a/patches/server/0024-BossBarTask.patch b/patches/server/0025-BossBarTask.patch similarity index 100% rename from patches/server/0024-BossBarTask.patch rename to patches/server/0025-BossBarTask.patch diff --git a/patches/server/0025-GUI-Theme.patch b/patches/server/0026-GUI-Theme.patch similarity index 100% rename from patches/server/0025-GUI-Theme.patch rename to patches/server/0026-GUI-Theme.patch diff --git a/patches/server/0026-GLOBAL_SOUND-is-disabled-by-default.patch b/patches/server/0027-GLOBAL_SOUND-is-disabled-by-default.patch similarity index 100% rename from patches/server/0026-GLOBAL_SOUND-is-disabled-by-default.patch rename to patches/server/0027-GLOBAL_SOUND-is-disabled-by-default.patch diff --git a/patches/server/0027-Don-t-allocate-too-many-threads-at-the-default.patch b/patches/server/0028-Don-t-allocate-too-many-threads-at-the-default.patch similarity index 100% rename from patches/server/0027-Don-t-allocate-too-many-threads-at-the-default.patch rename to patches/server/0028-Don-t-allocate-too-many-threads-at-the-default.patch diff --git a/patches/server/0028-The-anvil-becomes-a-drop-at-Y0.patch b/patches/server/0029-The-anvil-becomes-a-drop-at-Y0.patch similarity index 100% rename from patches/server/0028-The-anvil-becomes-a-drop-at-Y0.patch rename to patches/server/0029-The-anvil-becomes-a-drop-at-Y0.patch diff --git a/patches/server/0029-Don-t-save-FireworkRocket-Entity.patch b/patches/server/0030-Don-t-save-FireworkRocket-Entity.patch similarity index 100% rename from patches/server/0029-Don-t-save-FireworkRocket-Entity.patch rename to patches/server/0030-Don-t-save-FireworkRocket-Entity.patch diff --git a/patches/server/0030-Disable-respawn-ceiling.patch b/patches/server/0031-Disable-respawn-ceiling.patch similarity index 100% rename from patches/server/0030-Disable-respawn-ceiling.patch rename to patches/server/0031-Disable-respawn-ceiling.patch diff --git a/patches/server/0031-Store-gamerules-in-fastutil-hashmap.patch b/patches/server/0032-Store-gamerules-in-fastutil-hashmap.patch similarity index 100% rename from patches/server/0031-Store-gamerules-in-fastutil-hashmap.patch rename to patches/server/0032-Store-gamerules-in-fastutil-hashmap.patch diff --git a/patches/server/0032-disable-spark.patch b/patches/server/0033-disable-spark.patch similarity index 100% rename from patches/server/0032-disable-spark.patch rename to patches/server/0033-disable-spark.patch diff --git a/patches/server/0033-SIMD-support-range-adjustment.patch b/patches/server/0034-SIMD-support-range-adjustment.patch similarity index 100% rename from patches/server/0033-SIMD-support-range-adjustment.patch rename to patches/server/0034-SIMD-support-range-adjustment.patch diff --git a/patches/server/0034-Skip-empty-events.patch b/patches/server/0035-Skip-empty-events.patch similarity index 100% rename from patches/server/0034-Skip-empty-events.patch rename to patches/server/0035-Skip-empty-events.patch diff --git a/patches/server/0035-Leaf-Fix-MC-119417.patch b/patches/server/0036-Leaf-Fix-MC-119417.patch similarity index 100% rename from patches/server/0035-Leaf-Fix-MC-119417.patch rename to patches/server/0036-Leaf-Fix-MC-119417.patch diff --git a/patches/server/0036-Leaf-Fix-MC-266334.patch b/patches/server/0037-Leaf-Fix-MC-266334.patch similarity index 100% rename from patches/server/0036-Leaf-Fix-MC-266334.patch rename to patches/server/0037-Leaf-Fix-MC-266334.patch diff --git a/patches/server/0037-Leaf-Fix-MC-200418.patch b/patches/server/0038-Leaf-Fix-MC-200418.patch similarity index 100% rename from patches/server/0037-Leaf-Fix-MC-200418.patch rename to patches/server/0038-Leaf-Fix-MC-200418.patch diff --git a/patches/server/0038-Leaf-Fix-MC-183518.patch b/patches/server/0039-Leaf-Fix-MC-183518.patch similarity index 100% rename from patches/server/0038-Leaf-Fix-MC-183518.patch rename to patches/server/0039-Leaf-Fix-MC-183518.patch diff --git a/patches/server/0039-Leaf-Fix-sprint-glitch.patch b/patches/server/0040-Leaf-Fix-sprint-glitch.patch similarity index 100% rename from patches/server/0039-Leaf-Fix-sprint-glitch.patch rename to patches/server/0040-Leaf-Fix-sprint-glitch.patch diff --git a/patches/server/0040-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch b/patches/server/0041-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch similarity index 100% rename from patches/server/0040-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch rename to patches/server/0041-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch diff --git a/patches/server/0041-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch b/patches/server/0042-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch similarity index 100% rename from patches/server/0041-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch rename to patches/server/0042-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch diff --git a/patches/server/0042-Leaf-Don-t-save-falling-block-entity.patch b/patches/server/0043-Leaf-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0042-Leaf-Don-t-save-falling-block-entity.patch rename to patches/server/0043-Leaf-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0043-Leaf-Don-t-save-primed-tnt-entity.patch b/patches/server/0044-Leaf-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0043-Leaf-Don-t-save-primed-tnt-entity.patch rename to patches/server/0044-Leaf-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0044-Leaf-Optimize-Minecart-collisions.patch b/patches/server/0045-Leaf-Optimize-Minecart-collisions.patch similarity index 100% rename from patches/server/0044-Leaf-Optimize-Minecart-collisions.patch rename to patches/server/0045-Leaf-Optimize-Minecart-collisions.patch diff --git a/patches/server/0045-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch b/patches/server/0046-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch similarity index 100% rename from patches/server/0045-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch rename to patches/server/0046-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch diff --git a/patches/server/0046-Leaf-Cache-player-profileResult.patch b/patches/server/0047-Leaf-Cache-player-profileResult.patch similarity index 100% rename from patches/server/0046-Leaf-Cache-player-profileResult.patch rename to patches/server/0047-Leaf-Cache-player-profileResult.patch diff --git a/patches/server/0047-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch b/patches/server/0048-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch similarity index 100% rename from patches/server/0047-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch rename to patches/server/0048-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch diff --git a/patches/server/0048-Leaves-Zero-tick-plants.patch b/patches/server/0049-Leaves-Zero-tick-plants.patch similarity index 100% rename from patches/server/0048-Leaves-Zero-tick-plants.patch rename to patches/server/0049-Leaves-Zero-tick-plants.patch diff --git a/patches/server/0049-Leaves-Entity-Utils.patch b/patches/server/0050-Leaves-Entity-Utils.patch similarity index 100% rename from patches/server/0049-Leaves-Entity-Utils.patch rename to patches/server/0050-Leaves-Entity-Utils.patch diff --git a/patches/server/0050-Leaves-Return-nether-portal-fix.patch b/patches/server/0051-Leaves-Return-nether-portal-fix.patch similarity index 100% rename from patches/server/0050-Leaves-Return-nether-portal-fix.patch rename to patches/server/0051-Leaves-Return-nether-portal-fix.patch diff --git a/patches/server/0051-Leaves-Vanilla-hopper.patch b/patches/server/0052-Leaves-Vanilla-hopper.patch similarity index 100% rename from patches/server/0051-Leaves-Vanilla-hopper.patch rename to patches/server/0052-Leaves-Vanilla-hopper.patch diff --git a/patches/server/0052-Leaves-Raider-die-skip-self-raid-check.patch b/patches/server/0053-Leaves-Raider-die-skip-self-raid-check.patch similarity index 100% rename from patches/server/0052-Leaves-Raider-die-skip-self-raid-check.patch rename to patches/server/0053-Leaves-Raider-die-skip-self-raid-check.patch diff --git a/patches/server/0053-Leaves-Fix-villagers-dont-release-memory.patch b/patches/server/0054-Leaves-Fix-villagers-dont-release-memory.patch similarity index 100% rename from patches/server/0053-Leaves-Fix-villagers-dont-release-memory.patch rename to patches/server/0054-Leaves-Fix-villagers-dont-release-memory.patch diff --git a/patches/server/0054-Leaves-Fix-falling-block-s-block-location.patch b/patches/server/0055-Leaves-Fix-falling-block-s-block-location.patch similarity index 100% rename from patches/server/0054-Leaves-Fix-falling-block-s-block-location.patch rename to patches/server/0055-Leaves-Fix-falling-block-s-block-location.patch diff --git a/patches/server/0055-Pufferfish-Optimize-entity-coordinate-key.patch b/patches/server/0056-Pufferfish-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0055-Pufferfish-Optimize-entity-coordinate-key.patch rename to patches/server/0056-Pufferfish-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0056-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0057-Pufferfish-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0056-Pufferfish-Improve-container-checking-with-a-bitset.patch rename to patches/server/0057-Pufferfish-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0057-Mobtimizations-RePathing-optimization.patch b/patches/server/0058-Mobtimizations-RePathing-optimization.patch similarity index 100% rename from patches/server/0057-Mobtimizations-RePathing-optimization.patch rename to patches/server/0058-Mobtimizations-RePathing-optimization.patch diff --git a/patches/server/0058-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch b/patches/server/0059-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch similarity index 100% rename from patches/server/0058-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch rename to patches/server/0059-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch diff --git a/patches/server/0059-Divine-Implement-Secure-Seed.patch b/patches/server/0060-Divine-Implement-Secure-Seed.patch similarity index 100% rename from patches/server/0059-Divine-Implement-Secure-Seed.patch rename to patches/server/0060-Divine-Implement-Secure-Seed.patch diff --git a/patches/server/0060-Divine-Fix-MC-31819.patch b/patches/server/0061-Divine-Fix-MC-31819.patch similarity index 100% rename from patches/server/0060-Divine-Fix-MC-31819.patch rename to patches/server/0061-Divine-Fix-MC-31819.patch diff --git a/patches/server/0061-Divine-Fix-MC-172801.patch b/patches/server/0062-Divine-Fix-MC-172801.patch similarity index 100% rename from patches/server/0061-Divine-Fix-MC-172801.patch rename to patches/server/0062-Divine-Fix-MC-172801.patch diff --git a/patches/server/0062-Divine-Fix-MC-2025.patch b/patches/server/0063-Divine-Fix-MC-2025.patch similarity index 100% rename from patches/server/0062-Divine-Fix-MC-2025.patch rename to patches/server/0063-Divine-Fix-MC-2025.patch diff --git a/patches/server/0063-Divine-C2ME-reduce_allocs.patch b/patches/server/0064-Divine-C2ME-reduce_allocs.patch similarity index 100% rename from patches/server/0063-Divine-C2ME-reduce_allocs.patch rename to patches/server/0064-Divine-C2ME-reduce_allocs.patch diff --git a/patches/server/0064-Divine-C2ME-opts-math.patch b/patches/server/0065-Divine-C2ME-opts-math.patch similarity index 100% rename from patches/server/0064-Divine-C2ME-opts-math.patch rename to patches/server/0065-Divine-C2ME-opts-math.patch diff --git a/patches/server/0065-Divine-Fix-MC-7569.patch b/patches/server/0066-Divine-Fix-MC-7569.patch similarity index 100% rename from patches/server/0065-Divine-Fix-MC-7569.patch rename to patches/server/0066-Divine-Fix-MC-7569.patch diff --git a/patches/server/0066-Divine-lithium-math.sine_lut.patch b/patches/server/0067-Divine-lithium-math.sine_lut.patch similarity index 100% rename from patches/server/0066-Divine-lithium-math.sine_lut.patch rename to patches/server/0067-Divine-lithium-math.sine_lut.patch diff --git a/patches/server/0067-Divine-lithium-cached_hashcode.patch b/patches/server/0068-Divine-lithium-cached_hashcode.patch similarity index 100% rename from patches/server/0067-Divine-lithium-cached_hashcode.patch rename to patches/server/0068-Divine-lithium-cached_hashcode.patch diff --git a/patches/server/0068-Divine-Fix-MC-93826.patch b/patches/server/0069-Divine-Fix-MC-93826.patch similarity index 100% rename from patches/server/0068-Divine-Fix-MC-93826.patch rename to patches/server/0069-Divine-Fix-MC-93826.patch diff --git a/patches/server/0069-Divine-Fix-MC-110386.patch b/patches/server/0070-Divine-Fix-MC-110386.patch similarity index 100% rename from patches/server/0069-Divine-Fix-MC-110386.patch rename to patches/server/0070-Divine-Fix-MC-110386.patch diff --git a/patches/server/0070-Divine-Fix-MC-98160-and-MC-105103.patch b/patches/server/0071-Divine-Fix-MC-98160-and-MC-105103.patch similarity index 100% rename from patches/server/0070-Divine-Fix-MC-98160-and-MC-105103.patch rename to patches/server/0071-Divine-Fix-MC-98160-and-MC-105103.patch diff --git a/patches/server/0071-Divine-Fix-MC-93018.patch b/patches/server/0072-Divine-Fix-MC-93018.patch similarity index 100% rename from patches/server/0071-Divine-Fix-MC-93018.patch rename to patches/server/0072-Divine-Fix-MC-93018.patch diff --git a/patches/server/0072-Divine-Fix-MC-65198.patch b/patches/server/0073-Divine-Fix-MC-65198.patch similarity index 100% rename from patches/server/0072-Divine-Fix-MC-65198.patch rename to patches/server/0073-Divine-Fix-MC-65198.patch diff --git a/patches/server/0073-Divine-Fix-MC-167242.patch b/patches/server/0074-Divine-Fix-MC-167242.patch similarity index 100% rename from patches/server/0073-Divine-Fix-MC-167242.patch rename to patches/server/0074-Divine-Fix-MC-167242.patch diff --git a/patches/server/0074-Canvas-Dont-load-chunks-to-spawn-phantoms.patch b/patches/server/0075-Canvas-Dont-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0074-Canvas-Dont-load-chunks-to-spawn-phantoms.patch rename to patches/server/0075-Canvas-Dont-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0075-Canvas-Optimize-Math.round-and-Math.hypot.patch b/patches/server/0076-Canvas-Optimize-Math.round-and-Math.hypot.patch similarity index 100% rename from patches/server/0075-Canvas-Optimize-Math.round-and-Math.hypot.patch rename to patches/server/0076-Canvas-Optimize-Math.round-and-Math.hypot.patch diff --git a/patches/server/0076-Canvas-Entity-Goal-Optimizations.patch b/patches/server/0077-Canvas-Entity-Goal-Optimizations.patch similarity index 100% rename from patches/server/0076-Canvas-Entity-Goal-Optimizations.patch rename to patches/server/0077-Canvas-Entity-Goal-Optimizations.patch diff --git a/patches/server/0077-Canvas-Optimize-Entity-Pathfinding.patch b/patches/server/0078-Canvas-Optimize-Entity-Pathfinding.patch similarity index 100% rename from patches/server/0077-Canvas-Optimize-Entity-Pathfinding.patch rename to patches/server/0078-Canvas-Optimize-Entity-Pathfinding.patch diff --git a/patches/server/0078-CarpetFix-incorrectBounceLogicFix.patch b/patches/server/0079-CarpetFix-incorrectBounceLogicFix.patch similarity index 100% rename from patches/server/0078-CarpetFix-incorrectBounceLogicFix.patch rename to patches/server/0079-CarpetFix-incorrectBounceLogicFix.patch diff --git a/patches/server/0079-CarpetFix-explosionBreaksItemFrameInWaterFix.patch b/patches/server/0080-CarpetFix-explosionBreaksItemFrameInWaterFix.patch similarity index 100% rename from patches/server/0079-CarpetFix-explosionBreaksItemFrameInWaterFix.patch rename to patches/server/0080-CarpetFix-explosionBreaksItemFrameInWaterFix.patch diff --git a/patches/server/0080-CarpetFix-Use-optimized-RecipeManager.patch b/patches/server/0081-CarpetFix-Use-optimized-RecipeManager.patch similarity index 100% rename from patches/server/0080-CarpetFix-Use-optimized-RecipeManager.patch rename to patches/server/0081-CarpetFix-Use-optimized-RecipeManager.patch diff --git a/patches/server/0081-CarpetFix-Optimized-getBiome-method.patch b/patches/server/0082-CarpetFix-Optimized-getBiome-method.patch similarity index 100% rename from patches/server/0081-CarpetFix-Optimized-getBiome-method.patch rename to patches/server/0082-CarpetFix-Optimized-getBiome-method.patch diff --git a/patches/server/0082-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch b/patches/server/0083-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch similarity index 100% rename from patches/server/0082-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch rename to patches/server/0083-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch diff --git a/patches/server/0083-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0084-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0083-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0084-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0084-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch b/patches/server/0085-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch similarity index 100% rename from patches/server/0084-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch rename to patches/server/0085-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch diff --git a/patches/server/0085-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch b/patches/server/0086-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch similarity index 100% rename from patches/server/0085-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch rename to patches/server/0086-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch diff --git a/patches/server/0086-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch b/patches/server/0087-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch similarity index 100% rename from patches/server/0086-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch rename to patches/server/0087-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch diff --git a/patches/server/0087-Gale-Use-platform-math-functions.patch b/patches/server/0088-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0087-Gale-Use-platform-math-functions.patch rename to patches/server/0088-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0088-Gale-Faster-floating-point-positive-modulo.patch b/patches/server/0089-Gale-Faster-floating-point-positive-modulo.patch similarity index 100% rename from patches/server/0088-Gale-Faster-floating-point-positive-modulo.patch rename to patches/server/0089-Gale-Faster-floating-point-positive-modulo.patch diff --git a/patches/server/0089-Gale-Specific-interval-TPS-API.patch b/patches/server/0090-Gale-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0089-Gale-Specific-interval-TPS-API.patch rename to patches/server/0090-Gale-Specific-interval-TPS-API.patch diff --git a/patches/server/0090-Gale-Reduce-block-destruction-packet-allocations.patch b/patches/server/0091-Gale-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0090-Gale-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0091-Gale-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0091-Gale-Optimize-matching-item-checks.patch b/patches/server/0092-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0091-Gale-Optimize-matching-item-checks.patch rename to patches/server/0092-Gale-Optimize-matching-item-checks.patch diff --git a/patches/server/0092-Gale-Store-mob-counts-in-an-array.patch b/patches/server/0093-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0092-Gale-Store-mob-counts-in-an-array.patch rename to patches/server/0093-Gale-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0093-Gale-For-collision-check-has-physics-before-same-veh.patch b/patches/server/0094-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 100% rename from patches/server/0093-Gale-For-collision-check-has-physics-before-same-veh.patch rename to patches/server/0094-Gale-For-collision-check-has-physics-before-same-veh.patch diff --git a/patches/server/0094-Gale-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0095-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0094-Gale-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0095-Gale-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0095-Gale-Pre-compute-VarLong-sizes.patch b/patches/server/0096-Gale-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0095-Gale-Pre-compute-VarLong-sizes.patch rename to patches/server/0096-Gale-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0096-Gale-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0097-Gale-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from patches/server/0096-Gale-Optimize-VarInt-write-and-VarLong-write.patch rename to patches/server/0097-Gale-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/patches/server/0097-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0098-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0097-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0098-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0098-Gale-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0099-Gale-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0098-Gale-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0099-Gale-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0099-MemoryLeakFix-Biome.patch b/patches/server/0100-MemoryLeakFix-Biome.patch similarity index 100% rename from patches/server/0099-MemoryLeakFix-Biome.patch rename to patches/server/0100-MemoryLeakFix-Biome.patch diff --git a/patches/server/0100-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch b/patches/server/0101-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch similarity index 100% rename from patches/server/0100-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch rename to patches/server/0101-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch diff --git a/patches/server/0101-Paper-Update-Alternate-Current-to-v1.9.patch b/patches/server/0102-Paper-Update-Alternate-Current-to-v1.9.patch similarity index 100% rename from patches/server/0101-Paper-Update-Alternate-Current-to-v1.9.patch rename to patches/server/0102-Paper-Update-Alternate-Current-to-v1.9.patch diff --git a/patches/server/0102-Paper-PR-Update-Velocity-natives.patch b/patches/server/0103-Paper-PR-Update-Velocity-natives.patch similarity index 100% rename from patches/server/0102-Paper-PR-Update-Velocity-natives.patch rename to patches/server/0103-Paper-PR-Update-Velocity-natives.patch diff --git a/patches/server/0103-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0104-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch similarity index 100% rename from patches/server/0103-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch rename to patches/server/0104-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch diff --git a/patches/server/0104-Paper-PR-Change-condition-check-order-of-entity-trac.patch b/patches/server/0105-Paper-PR-Change-condition-check-order-of-entity-trac.patch similarity index 100% rename from patches/server/0104-Paper-PR-Change-condition-check-order-of-entity-trac.patch rename to patches/server/0105-Paper-PR-Change-condition-check-order-of-entity-trac.patch diff --git a/patches/server/0105-Paper-PR-Fix-fetching-biomes-during-world-generation.patch b/patches/server/0106-Paper-PR-Fix-fetching-biomes-during-world-generation.patch similarity index 100% rename from patches/server/0105-Paper-PR-Fix-fetching-biomes-during-world-generation.patch rename to patches/server/0106-Paper-PR-Fix-fetching-biomes-during-world-generation.patch diff --git a/patches/server/0106-PaperPR-Skip-AI-during-inactive-ticks-for-non-aware-.patch b/patches/server/0107-PaperPR-Skip-AI-during-inactive-ticks-for-non-aware-.patch similarity index 100% rename from patches/server/0106-PaperPR-Skip-AI-during-inactive-ticks-for-non-aware-.patch rename to patches/server/0107-PaperPR-Skip-AI-during-inactive-ticks-for-non-aware-.patch diff --git a/patches/server/0107-lithium-precompute-shape-arrays.patch b/patches/server/0108-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0107-lithium-precompute-shape-arrays.patch rename to patches/server/0108-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0108-lithium-fast-powder-snow-check.patch b/patches/server/0109-lithium-fast-powder-snow-check.patch similarity index 100% rename from patches/server/0108-lithium-fast-powder-snow-check.patch rename to patches/server/0109-lithium-fast-powder-snow-check.patch diff --git a/patches/server/0109-lithium-ai.raid.patch b/patches/server/0110-lithium-ai.raid.patch similarity index 100% rename from patches/server/0109-lithium-ai.raid.patch rename to patches/server/0110-lithium-ai.raid.patch diff --git a/patches/server/0110-vmp-TypeFilterableList.patch b/patches/server/0111-vmp-TypeFilterableList.patch similarity index 100% rename from patches/server/0110-vmp-TypeFilterableList.patch rename to patches/server/0111-vmp-TypeFilterableList.patch diff --git a/patches/server/0111-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0112-vmp-skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0111-vmp-skip-entity-move-if-movement-is-zero.patch rename to patches/server/0112-vmp-skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0112-Slice-Improve-map-saving-performance.patch b/patches/server/0113-Slice-Improve-map-saving-performance.patch similarity index 100% rename from patches/server/0112-Slice-Improve-map-saving-performance.patch rename to patches/server/0113-Slice-Improve-map-saving-performance.patch diff --git a/patches/server/0113-Slice-noEntityCollisions-for-Entity.patch b/patches/server/0114-Slice-noEntityCollisions-for-Entity.patch similarity index 100% rename from patches/server/0113-Slice-noEntityCollisions-for-Entity.patch rename to patches/server/0114-Slice-noEntityCollisions-for-Entity.patch diff --git a/patches/server/0114-Slice-Allow-inventory-clicks-in-Spectator.patch b/patches/server/0115-Slice-Allow-inventory-clicks-in-Spectator.patch similarity index 100% rename from patches/server/0114-Slice-Allow-inventory-clicks-in-Spectator.patch rename to patches/server/0115-Slice-Allow-inventory-clicks-in-Spectator.patch diff --git a/patches/server/0115-Slice-Disable-sending-Entity-Movement-Packets.patch b/patches/server/0116-Slice-Disable-sending-Entity-Movement-Packets.patch similarity index 100% rename from patches/server/0115-Slice-Disable-sending-Entity-Movement-Packets.patch rename to patches/server/0116-Slice-Disable-sending-Entity-Movement-Packets.patch diff --git a/patches/server/0116-Akarin-Save-Json-list-asynchronously.patch b/patches/server/0117-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from patches/server/0116-Akarin-Save-Json-list-asynchronously.patch rename to patches/server/0117-Akarin-Save-Json-list-asynchronously.patch diff --git a/patches/server/0117-Airplane-Remove-stream-in-PoiCompetitorScan.patch b/patches/server/0118-Airplane-Remove-stream-in-PoiCompetitorScan.patch similarity index 100% rename from patches/server/0117-Airplane-Remove-stream-in-PoiCompetitorScan.patch rename to patches/server/0118-Airplane-Remove-stream-in-PoiCompetitorScan.patch diff --git a/patches/server/0118-ScalableLux-Upstream-Starlight-Fix.patch b/patches/server/0119-ScalableLux-Upstream-Starlight-Fix.patch similarity index 100% rename from patches/server/0118-ScalableLux-Upstream-Starlight-Fix.patch rename to patches/server/0119-ScalableLux-Upstream-Starlight-Fix.patch diff --git a/patches/server/0119-Kiterino-New-liquid-physics.patch b/patches/server/0120-Kiterino-New-liquid-physics.patch similarity index 100% rename from patches/server/0119-Kiterino-New-liquid-physics.patch rename to patches/server/0120-Kiterino-New-liquid-physics.patch