diff --git a/PATCHES.md b/PATCHES.md index 562990af9..fb8d75f4d 100644 --- a/PATCHES.md +++ b/PATCHES.md @@ -20,7 +20,6 @@ This is an overview over all patches that are currently used. | server | Add GameProfileLookupEvent | tr7zw | | | api | Add GameProfileLookupEvent | tr7zw | | | server | Add IntelliJ IDEA runnable | Zoe | | -| server | Add JsonList save timings | Ivan Pekov | | | server | Add NBT API as a first-class lib | tr7zw | | | api | Add NBT API as a first-class lib | tr7zw | | | server | Add StructureGenerateEvent | Nahuel | Mariell Hoversholm | diff --git a/patches/server/0022-Add-JsonList-save-timings.patch b/patches/server/0022-Add-JsonList-save-timings.patch deleted file mode 100644 index 36d069b8f..000000000 --- a/patches/server/0022-Add-JsonList-save-timings.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ivan Pekov -Date: Fri, 2 Oct 2020 17:48:01 +0300 -Subject: [PATCH] Add JsonList save timings - - -diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index 68ab5ccb2fcfe1de0503c9336572f28e11832b2d..d8c1a8dd867437443494ac169569139e25c9a635 100644 ---- a/src/main/java/co/aikar/timings/MinecraftTimings.java -+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java -@@ -149,4 +149,6 @@ public final class MinecraftTimings { - public static Timing getCommandFunctionTiming(CustomFunction function) { - return Timings.ofSafe("Command Function - " + function.getMinecraftKey().toString()); - } -+ -+ public static Timing getJsonListTiming(String className) { return Timings.ofSafe("Save JsonList ( " + className + " )"); } // Yatopia - } -diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 1fc0139cb9694ddea41f57d95774c3b47e8530c5..a674140b61547841a1a6060e9f36aa14d0a86ff9 100644 ---- a/src/main/java/net/minecraft/server/JsonList.java -+++ b/src/main/java/net/minecraft/server/JsonList.java -@@ -44,9 +44,11 @@ public abstract class JsonList> { - return null; - } - }; -+ private final co.aikar.timings.Timing saveTiming; // Yatopia - - public JsonList(File file) { - this.c = file; -+ saveTiming = co.aikar.timings.MinecraftTimings.getJsonListTiming(getClass().getSimpleName()); // Yatopia - } - - public File b() { -@@ -146,6 +148,9 @@ public abstract class JsonList> { - } - - public void save() throws IOException { -+ // Yatopia start -+ saveTiming.startTiming(); -+ try { // Yatopia end - this.removeStaleEntries(); // Paper - remove expired values before saving - JsonArray jsonarray = new JsonArray(); - -@@ -177,6 +182,9 @@ public abstract class JsonList> { - } - - } -+ } finally { // Yatopia start -+ saveTiming.stopTiming(); -+ } // Yatopia end - - } - diff --git a/patches/server/0023-lithium-DataTrackerMixin.patch b/patches/server/0022-lithium-DataTrackerMixin.patch similarity index 100% rename from patches/server/0023-lithium-DataTrackerMixin.patch rename to patches/server/0022-lithium-DataTrackerMixin.patch diff --git a/patches/server/0024-Fix-lead-fall-dmg-config.patch b/patches/server/0023-Fix-lead-fall-dmg-config.patch similarity index 100% rename from patches/server/0024-Fix-lead-fall-dmg-config.patch rename to patches/server/0023-Fix-lead-fall-dmg-config.patch diff --git a/patches/server/0025-Optimize-some-stuff-in-WorldServer-ticking.patch b/patches/server/0024-Optimize-some-stuff-in-WorldServer-ticking.patch similarity index 100% rename from patches/server/0025-Optimize-some-stuff-in-WorldServer-ticking.patch rename to patches/server/0024-Optimize-some-stuff-in-WorldServer-ticking.patch diff --git a/patches/server/0026-Optimize-BehaviorController.patch b/patches/server/0025-Optimize-BehaviorController.patch similarity index 100% rename from patches/server/0026-Optimize-BehaviorController.patch rename to patches/server/0025-Optimize-BehaviorController.patch diff --git a/patches/server/0027-Add-timings-for-Pathfinder.patch b/patches/server/0026-Add-timings-for-Pathfinder.patch similarity index 96% rename from patches/server/0027-Add-timings-for-Pathfinder.patch rename to patches/server/0026-Add-timings-for-Pathfinder.patch index a208067b1..f1bab786d 100644 --- a/patches/server/0027-Add-timings-for-Pathfinder.patch +++ b/patches/server/0026-Add-timings-for-Pathfinder.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add timings for Pathfinder diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index d8c1a8dd867437443494ac169569139e25c9a635..0efdddc12247ed4aa6acce118c707090270bee39 100644 +index 68ab5ccb2fcfe1de0503c9336572f28e11832b2d..4d4c25cb328b0ca2e16d3c823214aca5854e4deb 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -54,6 +54,8 @@ public final class MinecraftTimings { diff --git a/patches/server/0028-Highly-optimize-VillagePlace-filtering.patch b/patches/server/0027-Highly-optimize-VillagePlace-filtering.patch similarity index 100% rename from patches/server/0028-Highly-optimize-VillagePlace-filtering.patch rename to patches/server/0027-Highly-optimize-VillagePlace-filtering.patch diff --git a/patches/server/0029-Optimise-portals.patch b/patches/server/0028-Optimise-portals.patch similarity index 100% rename from patches/server/0029-Optimise-portals.patch rename to patches/server/0028-Optimise-portals.patch diff --git a/patches/server/0030-Nuke-streams-off-BlockPosition.patch b/patches/server/0029-Nuke-streams-off-BlockPosition.patch similarity index 100% rename from patches/server/0030-Nuke-streams-off-BlockPosition.patch rename to patches/server/0029-Nuke-streams-off-BlockPosition.patch diff --git a/patches/server/0031-Nuke-streams-off-SectionPosition.patch b/patches/server/0030-Nuke-streams-off-SectionPosition.patch similarity index 100% rename from patches/server/0031-Nuke-streams-off-SectionPosition.patch rename to patches/server/0030-Nuke-streams-off-SectionPosition.patch diff --git a/patches/server/0032-Stop-wasting-resources-on-JsonList-get.patch b/patches/server/0031-Stop-wasting-resources-on-JsonList-get.patch similarity index 94% rename from patches/server/0032-Stop-wasting-resources-on-JsonList-get.patch rename to patches/server/0031-Stop-wasting-resources-on-JsonList-get.patch index f0341d103..491f11f05 100644 --- a/patches/server/0032-Stop-wasting-resources-on-JsonList-get.patch +++ b/patches/server/0031-Stop-wasting-resources-on-JsonList-get.patch @@ -14,10 +14,10 @@ Our changes are the following: triggers removing of all stale entries. diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index a674140b61547841a1a6060e9f36aa14d0a86ff9..99580abac1ff30c784b6792d69c9d4cad12c1b1f 100644 +index 1fc0139cb9694ddea41f57d95774c3b47e8530c5..d683e3e509cc21d007d3e32f68235cfad007d0d0 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java -@@ -71,9 +71,13 @@ public abstract class JsonList> { +@@ -69,9 +69,13 @@ public abstract class JsonList> { // Paper start // this.g(); // return (V) this.d.get(this.a(k0)); // CraftBukkit - fix decompile error @@ -31,7 +31,7 @@ index a674140b61547841a1a6060e9f36aa14d0a86ff9..99580abac1ff30c784b6792d69c9d4ca // Paper end } -@@ -154,12 +158,22 @@ public abstract class JsonList> { +@@ -149,12 +153,22 @@ public abstract class JsonList> { this.removeStaleEntries(); // Paper - remove expired values before saving JsonArray jsonarray = new JsonArray(); diff --git a/patches/server/0033-Fix-LightEngineThreaded-memory-leak.patch b/patches/server/0032-Fix-LightEngineThreaded-memory-leak.patch similarity index 100% rename from patches/server/0033-Fix-LightEngineThreaded-memory-leak.patch rename to patches/server/0032-Fix-LightEngineThreaded-memory-leak.patch diff --git a/patches/server/0034-Respect-PlayerKickEvent-leaveMessage.patch b/patches/server/0033-Respect-PlayerKickEvent-leaveMessage.patch similarity index 100% rename from patches/server/0034-Respect-PlayerKickEvent-leaveMessage.patch rename to patches/server/0033-Respect-PlayerKickEvent-leaveMessage.patch diff --git a/patches/server/0035-Shutdown-Bootstrap-thread-pool.patch b/patches/server/0034-Shutdown-Bootstrap-thread-pool.patch similarity index 100% rename from patches/server/0035-Shutdown-Bootstrap-thread-pool.patch rename to patches/server/0034-Shutdown-Bootstrap-thread-pool.patch diff --git a/patches/server/0036-Optimize-Villagers.patch b/patches/server/0035-Optimize-Villagers.patch similarity index 100% rename from patches/server/0036-Optimize-Villagers.patch rename to patches/server/0035-Optimize-Villagers.patch diff --git a/patches/server/0037-Optimize-whitelist-command-for-multiple-additions-re.patch b/patches/server/0036-Optimize-whitelist-command-for-multiple-additions-re.patch similarity index 97% rename from patches/server/0037-Optimize-whitelist-command-for-multiple-additions-re.patch rename to patches/server/0036-Optimize-whitelist-command-for-multiple-additions-re.patch index 9eab7e22f..1fc16f832 100644 --- a/patches/server/0037-Optimize-whitelist-command-for-multiple-additions-re.patch +++ b/patches/server/0036-Optimize-whitelist-command-for-multiple-additions-re.patch @@ -139,10 +139,10 @@ index 81f7d5bc581b42289a79121da15868999ab9feef..7ee038e24cf696b7a32c5c67d4b0dd46 public float b(EntityPose entitypose, EntitySize entitysize) { switch (entitypose) { diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 99580abac1ff30c784b6792d69c9d4cad12c1b1f..1daeb9571663a128a749c735a70f6e92603ffeda 100644 +index d683e3e509cc21d007d3e32f68235cfad007d0d0..83109fb0ad57eef2b24b5c3cb5875535e0a8e67f 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java -@@ -66,6 +66,20 @@ public abstract class JsonList> { +@@ -64,6 +64,20 @@ public abstract class JsonList> { } @@ -163,7 +163,7 @@ index 99580abac1ff30c784b6792d69c9d4cad12c1b1f..1daeb9571663a128a749c735a70f6e92 @Nullable public V get(K k0) { // Paper start -@@ -96,6 +110,20 @@ public abstract class JsonList> { +@@ -94,6 +108,20 @@ public abstract class JsonList> { this.remove(jsonlistentry.getKey()); } diff --git a/patches/server/0038-PlayerAttackEntityEvent.patch b/patches/server/0037-PlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0038-PlayerAttackEntityEvent.patch rename to patches/server/0037-PlayerAttackEntityEvent.patch diff --git a/patches/server/0039-Ensure-pools-create-daemon-threads.patch b/patches/server/0038-Ensure-pools-create-daemon-threads.patch similarity index 100% rename from patches/server/0039-Ensure-pools-create-daemon-threads.patch rename to patches/server/0038-Ensure-pools-create-daemon-threads.patch diff --git a/patches/server/0040-Add-IntelliJ-IDEA-runnable.patch b/patches/server/0039-Add-IntelliJ-IDEA-runnable.patch similarity index 100% rename from patches/server/0040-Add-IntelliJ-IDEA-runnable.patch rename to patches/server/0039-Add-IntelliJ-IDEA-runnable.patch diff --git a/patches/server/0041-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch b/patches/server/0040-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch similarity index 100% rename from patches/server/0041-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch rename to patches/server/0040-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch diff --git a/patches/server/0042-Add-nspt-command.patch b/patches/server/0041-Add-nspt-command.patch similarity index 100% rename from patches/server/0042-Add-nspt-command.patch rename to patches/server/0041-Add-nspt-command.patch diff --git a/patches/server/0043-Configurable-flight-checks.patch b/patches/server/0042-Configurable-flight-checks.patch similarity index 100% rename from patches/server/0043-Configurable-flight-checks.patch rename to patches/server/0042-Configurable-flight-checks.patch diff --git a/patches/server/0044-Heavily-optimize-recipe-lookups-in-CraftingManager.patch b/patches/server/0043-Heavily-optimize-recipe-lookups-in-CraftingManager.patch similarity index 100% rename from patches/server/0044-Heavily-optimize-recipe-lookups-in-CraftingManager.patch rename to patches/server/0043-Heavily-optimize-recipe-lookups-in-CraftingManager.patch diff --git a/patches/server/0045-Optimize-advancement-loading.patch b/patches/server/0044-Optimize-advancement-loading.patch similarity index 100% rename from patches/server/0045-Optimize-advancement-loading.patch rename to patches/server/0044-Optimize-advancement-loading.patch diff --git a/patches/server/0046-lithium-PerlinNoiseSamplerMixin.patch b/patches/server/0045-lithium-PerlinNoiseSamplerMixin.patch similarity index 100% rename from patches/server/0046-lithium-PerlinNoiseSamplerMixin.patch rename to patches/server/0045-lithium-PerlinNoiseSamplerMixin.patch diff --git a/patches/server/0047-lithium-VoronoiBiomeAccessTypeMixin.patch b/patches/server/0046-lithium-VoronoiBiomeAccessTypeMixin.patch similarity index 100% rename from patches/server/0047-lithium-VoronoiBiomeAccessTypeMixin.patch rename to patches/server/0046-lithium-VoronoiBiomeAccessTypeMixin.patch diff --git a/patches/server/0048-lithium-NoiseChunkGeneratorMixin.patch b/patches/server/0047-lithium-NoiseChunkGeneratorMixin.patch similarity index 100% rename from patches/server/0048-lithium-NoiseChunkGeneratorMixin.patch rename to patches/server/0047-lithium-NoiseChunkGeneratorMixin.patch diff --git a/patches/server/0049-lithium-reduce-allocations.patch b/patches/server/0048-lithium-reduce-allocations.patch similarity index 100% rename from patches/server/0049-lithium-reduce-allocations.patch rename to patches/server/0048-lithium-reduce-allocations.patch diff --git a/patches/server/0050-Smarter-statistics-ticking.patch b/patches/server/0049-Smarter-statistics-ticking.patch similarity index 100% rename from patches/server/0050-Smarter-statistics-ticking.patch rename to patches/server/0049-Smarter-statistics-ticking.patch diff --git a/patches/server/0051-Configurable-criterion-triggers.patch b/patches/server/0050-Configurable-criterion-triggers.patch similarity index 100% rename from patches/server/0051-Configurable-criterion-triggers.patch rename to patches/server/0050-Configurable-criterion-triggers.patch diff --git a/patches/server/0052-Configurable-BlockPhysicsEvent.patch b/patches/server/0051-Configurable-BlockPhysicsEvent.patch similarity index 100% rename from patches/server/0052-Configurable-BlockPhysicsEvent.patch rename to patches/server/0051-Configurable-BlockPhysicsEvent.patch diff --git a/patches/server/0053-Custom-Locale-Support.patch b/patches/server/0052-Custom-Locale-Support.patch similarity index 100% rename from patches/server/0053-Custom-Locale-Support.patch rename to patches/server/0052-Custom-Locale-Support.patch diff --git a/patches/server/0054-Configurable-movement-checks.patch b/patches/server/0053-Configurable-movement-checks.patch similarity index 100% rename from patches/server/0054-Configurable-movement-checks.patch rename to patches/server/0053-Configurable-movement-checks.patch diff --git a/patches/server/0055-Configurable-enchanting-table-tick.patch b/patches/server/0054-Configurable-enchanting-table-tick.patch similarity index 100% rename from patches/server/0055-Configurable-enchanting-table-tick.patch rename to patches/server/0054-Configurable-enchanting-table-tick.patch diff --git a/patches/server/0056-PaperPR-Fix-username-connecting-with-no-texture-bein.patch b/patches/server/0055-PaperPR-Fix-username-connecting-with-no-texture-bein.patch similarity index 100% rename from patches/server/0056-PaperPR-Fix-username-connecting-with-no-texture-bein.patch rename to patches/server/0055-PaperPR-Fix-username-connecting-with-no-texture-bein.patch diff --git a/patches/server/0057-Optimised-hallowen-checker.patch b/patches/server/0056-Optimised-hallowen-checker.patch similarity index 100% rename from patches/server/0057-Optimised-hallowen-checker.patch rename to patches/server/0056-Optimised-hallowen-checker.patch diff --git a/patches/server/0058-Smol-entity-optimisations.patch b/patches/server/0057-Smol-entity-optimisations.patch similarity index 100% rename from patches/server/0058-Smol-entity-optimisations.patch rename to patches/server/0057-Smol-entity-optimisations.patch diff --git a/patches/server/0059-add-config-for-logging-login-location.patch b/patches/server/0058-add-config-for-logging-login-location.patch similarity index 100% rename from patches/server/0059-add-config-for-logging-login-location.patch rename to patches/server/0058-add-config-for-logging-login-location.patch diff --git a/patches/server/0060-Port-hydrogen.patch b/patches/server/0059-Port-hydrogen.patch similarity index 100% rename from patches/server/0060-Port-hydrogen.patch rename to patches/server/0059-Port-hydrogen.patch diff --git a/patches/server/0061-Preload-ProtocolLib-EnumWrappers.patch b/patches/server/0060-Preload-ProtocolLib-EnumWrappers.patch similarity index 100% rename from patches/server/0061-Preload-ProtocolLib-EnumWrappers.patch rename to patches/server/0060-Preload-ProtocolLib-EnumWrappers.patch diff --git a/patches/server/0062-lithium-cache-chunk-gen-sea-level.patch b/patches/server/0061-lithium-cache-chunk-gen-sea-level.patch similarity index 100% rename from patches/server/0062-lithium-cache-chunk-gen-sea-level.patch rename to patches/server/0061-lithium-cache-chunk-gen-sea-level.patch diff --git a/patches/server/0063-New-nbt-cache.patch b/patches/server/0062-New-nbt-cache.patch similarity index 100% rename from patches/server/0063-New-nbt-cache.patch rename to patches/server/0062-New-nbt-cache.patch diff --git a/patches/server/0064-Suspected-plugins-report.patch b/patches/server/0063-Suspected-plugins-report.patch similarity index 100% rename from patches/server/0064-Suspected-plugins-report.patch rename to patches/server/0063-Suspected-plugins-report.patch