diff --git a/patches/server/0083-Ignore-terminal-provider-warning.patch b/patches/removed/server/0083-Ignore-terminal-provider-warning.patch similarity index 88% rename from patches/server/0083-Ignore-terminal-provider-warning.patch rename to patches/removed/server/0083-Ignore-terminal-provider-warning.patch index c0d74bf22..600ba4ab4 100644 --- a/patches/server/0083-Ignore-terminal-provider-warning.patch +++ b/patches/removed/server/0083-Ignore-terminal-provider-warning.patch @@ -3,6 +3,8 @@ From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Thu, 2 May 2024 20:21:29 -0400 Subject: [PATCH] Ignore terminal provider warning +Removed since Leaf 1.21.1, since ported jline update from Paper 1.21.3 +don't need deprected jansi anymore diff --git a/src/main/java/org/dreeam/leaf/LeafBootstrap.java b/src/main/java/org/dreeam/leaf/LeafBootstrap.java index 316654051b80ac0fd62cf3b7a0e1b91010ec24b7..9a9bd633c6ed1b2231d36ef7a285a1f1463ccee4 100644 diff --git a/patches/server/0084-Fix-console-freeze-above-JAVA-22.patch b/patches/removed/server/0084-Fix-console-freeze-above-JAVA-22.patch similarity index 89% rename from patches/server/0084-Fix-console-freeze-above-JAVA-22.patch rename to patches/removed/server/0084-Fix-console-freeze-above-JAVA-22.patch index 338c1a64f..076615d75 100644 --- a/patches/server/0084-Fix-console-freeze-above-JAVA-22.patch +++ b/patches/removed/server/0084-Fix-console-freeze-above-JAVA-22.patch @@ -3,6 +3,9 @@ From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sat, 4 May 2024 02:46:17 -0400 Subject: [PATCH] Fix console freeze above JAVA 22 +Removed since Leaf 1.21.1, since ported jline update from Paper 1.21.3 +Console input command seems work soomthly on Java 22+ + Revert to old console provider, Fix https://github.com/PaperMC/Paper/issues/10405 Solution refers to https://inside.java/2023/07/31/quality-heads-up diff --git a/patches/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch b/patches/removed/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch similarity index 91% rename from patches/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch rename to patches/removed/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch index bde3f295b..6f95ecdb6 100644 --- a/patches/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch +++ b/patches/removed/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch @@ -3,6 +3,9 @@ From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Thu, 27 Jun 2024 01:13:07 +0800 Subject: [PATCH] Fix console output display on Pterodactyl panel +Removed since Leaf 1.21.1, since ported jline update from Paper 1.21.3 +No need to add flags `-Dterminal.jline=false` and `-Dterminal.ansi=true` + Fixed console display issue when the terminal used xterm, should work on Pterodactyl, MCSManager and kind of panel software diff --git a/src/main/java/org/dreeam/leaf/LeafBootstrap.java b/src/main/java/org/dreeam/leaf/LeafBootstrap.java diff --git a/patches/server/0086-Faster-Random-Generator.patch b/patches/server/0083-Faster-Random-Generator.patch similarity index 100% rename from patches/server/0086-Faster-Random-Generator.patch rename to patches/server/0083-Faster-Random-Generator.patch diff --git a/patches/server/0087-Don-t-save-primed-tnt-entity.patch b/patches/server/0084-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0087-Don-t-save-primed-tnt-entity.patch rename to patches/server/0084-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0088-Don-t-save-falling-block-entity.patch b/patches/server/0085-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0088-Don-t-save-falling-block-entity.patch rename to patches/server/0085-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0089-Configurable-connection-message.patch b/patches/server/0086-Configurable-connection-message.patch similarity index 100% rename from patches/server/0089-Configurable-connection-message.patch rename to patches/server/0086-Configurable-connection-message.patch diff --git a/patches/server/0090-Configurable-unknown-command-message.patch b/patches/server/0087-Configurable-unknown-command-message.patch similarity index 100% rename from patches/server/0090-Configurable-unknown-command-message.patch rename to patches/server/0087-Configurable-unknown-command-message.patch diff --git a/patches/server/0091-Airplane-Remove-stream-in-PoiCompetitorScan.patch b/patches/server/0088-Airplane-Remove-stream-in-PoiCompetitorScan.patch similarity index 100% rename from patches/server/0091-Airplane-Remove-stream-in-PoiCompetitorScan.patch rename to patches/server/0088-Airplane-Remove-stream-in-PoiCompetitorScan.patch diff --git a/patches/server/0092-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/patches/server/0089-Remove-stream-in-BlockBehaviour-cache-blockstate.patch similarity index 100% rename from patches/server/0092-Remove-stream-in-BlockBehaviour-cache-blockstate.patch rename to patches/server/0089-Remove-stream-in-BlockBehaviour-cache-blockstate.patch diff --git a/patches/server/0093-Remove-stream-in-RecipeManager-getRecipeFor.patch b/patches/server/0090-Remove-stream-in-RecipeManager-getRecipeFor.patch similarity index 100% rename from patches/server/0093-Remove-stream-in-RecipeManager-getRecipeFor.patch rename to patches/server/0090-Remove-stream-in-RecipeManager-getRecipeFor.patch diff --git a/patches/server/0094-Remove-stream-in-entity-visible-effects-filter.patch b/patches/server/0091-Remove-stream-in-entity-visible-effects-filter.patch similarity index 100% rename from patches/server/0094-Remove-stream-in-entity-visible-effects-filter.patch rename to patches/server/0091-Remove-stream-in-entity-visible-effects-filter.patch diff --git a/patches/server/0095-Remove-stream-and-double-iteration-in-enough-deep-sl.patch b/patches/server/0092-Remove-stream-and-double-iteration-in-enough-deep-sl.patch similarity index 100% rename from patches/server/0095-Remove-stream-and-double-iteration-in-enough-deep-sl.patch rename to patches/server/0092-Remove-stream-and-double-iteration-in-enough-deep-sl.patch diff --git a/patches/server/0096-Remove-stream-in-trial-spawner-ticking.patch b/patches/server/0093-Remove-stream-in-trial-spawner-ticking.patch similarity index 100% rename from patches/server/0096-Remove-stream-in-trial-spawner-ticking.patch rename to patches/server/0093-Remove-stream-in-trial-spawner-ticking.patch diff --git a/patches/server/0097-Remove-stream-in-Brain.patch b/patches/server/0094-Remove-stream-in-Brain.patch similarity index 100% rename from patches/server/0097-Remove-stream-in-Brain.patch rename to patches/server/0094-Remove-stream-in-Brain.patch diff --git a/patches/server/0098-Remove-stream-in-BehaviorUtils.patch b/patches/server/0095-Remove-stream-in-BehaviorUtils.patch similarity index 100% rename from patches/server/0098-Remove-stream-in-BehaviorUtils.patch rename to patches/server/0095-Remove-stream-in-BehaviorUtils.patch diff --git a/patches/server/0099-Remove-stream-in-YieldJobSite.patch b/patches/server/0096-Remove-stream-in-YieldJobSite.patch similarity index 100% rename from patches/server/0099-Remove-stream-in-YieldJobSite.patch rename to patches/server/0096-Remove-stream-in-YieldJobSite.patch diff --git a/patches/server/0100-Remove-stream-in-PlayerSensor.patch b/patches/server/0097-Remove-stream-in-PlayerSensor.patch similarity index 100% rename from patches/server/0100-Remove-stream-in-PlayerSensor.patch rename to patches/server/0097-Remove-stream-in-PlayerSensor.patch diff --git a/patches/server/0101-Remove-stream-in-GolemSensor.patch b/patches/server/0098-Remove-stream-in-GolemSensor.patch similarity index 100% rename from patches/server/0101-Remove-stream-in-GolemSensor.patch rename to patches/server/0098-Remove-stream-in-GolemSensor.patch diff --git a/patches/server/0102-Remove-stream-in-GateBehavior.patch b/patches/server/0099-Remove-stream-in-GateBehavior.patch similarity index 100% rename from patches/server/0102-Remove-stream-in-GateBehavior.patch rename to patches/server/0099-Remove-stream-in-GateBehavior.patch diff --git a/patches/server/0103-Remove-stream-in-updateFluidOnEyes.patch b/patches/server/0100-Remove-stream-in-updateFluidOnEyes.patch similarity index 100% rename from patches/server/0103-Remove-stream-in-updateFluidOnEyes.patch rename to patches/server/0100-Remove-stream-in-updateFluidOnEyes.patch diff --git a/patches/server/0104-Remove-stream-in-matchingSlot.patch b/patches/server/0101-Remove-stream-in-matchingSlot.patch similarity index 100% rename from patches/server/0104-Remove-stream-in-matchingSlot.patch rename to patches/server/0101-Remove-stream-in-matchingSlot.patch diff --git a/patches/server/0105-Replace-Entity-active-effects-map-with-optimized-col.patch b/patches/server/0102-Replace-Entity-active-effects-map-with-optimized-col.patch similarity index 100% rename from patches/server/0105-Replace-Entity-active-effects-map-with-optimized-col.patch rename to patches/server/0102-Replace-Entity-active-effects-map-with-optimized-col.patch diff --git a/patches/server/0106-Replace-criterion-map-with-optimized-collection.patch b/patches/server/0103-Replace-criterion-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0106-Replace-criterion-map-with-optimized-collection.patch rename to patches/server/0103-Replace-criterion-map-with-optimized-collection.patch diff --git a/patches/server/0107-Replace-world-map-with-optimized-collection.patch b/patches/server/0104-Replace-world-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0107-Replace-world-map-with-optimized-collection.patch rename to patches/server/0104-Replace-world-map-with-optimized-collection.patch diff --git a/patches/server/0108-Replace-brain-maps-with-optimized-collection.patch b/patches/server/0105-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from patches/server/0108-Replace-brain-maps-with-optimized-collection.patch rename to patches/server/0105-Replace-brain-maps-with-optimized-collection.patch diff --git a/patches/server/0109-Reduce-worldgen-allocations.patch b/patches/server/0106-Reduce-worldgen-allocations.patch similarity index 100% rename from patches/server/0109-Reduce-worldgen-allocations.patch rename to patches/server/0106-Reduce-worldgen-allocations.patch diff --git a/patches/server/0110-Use-caffeine-cache-kickPermission-instead-of-using-g.patch b/patches/server/0107-Use-caffeine-cache-kickPermission-instead-of-using-g.patch similarity index 100% rename from patches/server/0110-Use-caffeine-cache-kickPermission-instead-of-using-g.patch rename to patches/server/0107-Use-caffeine-cache-kickPermission-instead-of-using-g.patch diff --git a/patches/server/0111-Do-not-place-player-if-the-server-is-full.patch b/patches/server/0108-Do-not-place-player-if-the-server-is-full.patch similarity index 100% rename from patches/server/0111-Do-not-place-player-if-the-server-is-full.patch rename to patches/server/0108-Do-not-place-player-if-the-server-is-full.patch diff --git a/patches/server/0112-Fix-MC-65198.patch b/patches/server/0109-Fix-MC-65198.patch similarity index 100% rename from patches/server/0112-Fix-MC-65198.patch rename to patches/server/0109-Fix-MC-65198.patch diff --git a/patches/server/0113-Fix-MC-183518.patch b/patches/server/0110-Fix-MC-183518.patch similarity index 100% rename from patches/server/0113-Fix-MC-183518.patch rename to patches/server/0110-Fix-MC-183518.patch diff --git a/patches/server/0114-Fix-MC-200418.patch b/patches/server/0111-Fix-MC-200418.patch similarity index 100% rename from patches/server/0114-Fix-MC-200418.patch rename to patches/server/0111-Fix-MC-200418.patch diff --git a/patches/server/0115-Fix-MC-119417.patch b/patches/server/0112-Fix-MC-119417.patch similarity index 100% rename from patches/server/0115-Fix-MC-119417.patch rename to patches/server/0112-Fix-MC-119417.patch diff --git a/patches/server/0116-Fix-MC-223153.patch b/patches/server/0113-Fix-MC-223153.patch similarity index 100% rename from patches/server/0116-Fix-MC-223153.patch rename to patches/server/0113-Fix-MC-223153.patch diff --git a/patches/server/0117-Fix-MC-177381.patch b/patches/server/0114-Fix-MC-177381.patch similarity index 100% rename from patches/server/0117-Fix-MC-177381.patch rename to patches/server/0114-Fix-MC-177381.patch diff --git a/patches/server/0118-Fix-MC-150224.patch b/patches/server/0115-Fix-MC-150224.patch similarity index 100% rename from patches/server/0118-Fix-MC-150224.patch rename to patches/server/0115-Fix-MC-150224.patch diff --git a/patches/server/0119-Optimize-LeavesProtocolManager-init-protocol.patch b/patches/server/0116-Optimize-LeavesProtocolManager-init-protocol.patch similarity index 100% rename from patches/server/0119-Optimize-LeavesProtocolManager-init-protocol.patch rename to patches/server/0116-Optimize-LeavesProtocolManager-init-protocol.patch diff --git a/patches/server/0120-Cache-CraftEntityType-minecraftToBukkit-convert.patch b/patches/server/0117-Cache-CraftEntityType-minecraftToBukkit-convert.patch similarity index 100% rename from patches/server/0120-Cache-CraftEntityType-minecraftToBukkit-convert.patch rename to patches/server/0117-Cache-CraftEntityType-minecraftToBukkit-convert.patch diff --git a/patches/server/0121-Configurable-player-knockback-zombie.patch b/patches/server/0118-Configurable-player-knockback-zombie.patch similarity index 100% rename from patches/server/0121-Configurable-player-knockback-zombie.patch rename to patches/server/0118-Configurable-player-knockback-zombie.patch diff --git a/patches/server/0122-Hide-specified-item-components-to-clients.patch b/patches/server/0119-Hide-specified-item-components-to-clients.patch similarity index 100% rename from patches/server/0122-Hide-specified-item-components-to-clients.patch rename to patches/server/0119-Hide-specified-item-components-to-clients.patch diff --git a/patches/server/0123-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/patches/server/0120-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch similarity index 100% rename from patches/server/0123-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch rename to patches/server/0120-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch diff --git a/patches/server/0124-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0121-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch similarity index 100% rename from patches/server/0124-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch rename to patches/server/0121-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch diff --git a/patches/server/0125-Paper-PR-Throttle-failed-spawn-attempts.patch b/patches/server/0122-Paper-PR-Throttle-failed-spawn-attempts.patch similarity index 100% rename from patches/server/0125-Paper-PR-Throttle-failed-spawn-attempts.patch rename to patches/server/0122-Paper-PR-Throttle-failed-spawn-attempts.patch diff --git a/patches/server/0126-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/patches/server/0123-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch similarity index 100% rename from patches/server/0126-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch rename to patches/server/0123-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch diff --git a/patches/server/0127-PaperPR-Fix-some-beacon-event-issues.patch b/patches/server/0124-PaperPR-Fix-some-beacon-event-issues.patch similarity index 100% rename from patches/server/0127-PaperPR-Fix-some-beacon-event-issues.patch rename to patches/server/0124-PaperPR-Fix-some-beacon-event-issues.patch diff --git a/patches/server/0128-Paper-Improve-performance-of-RecipeManager-removeRec.patch b/patches/server/0125-Paper-Improve-performance-of-RecipeManager-removeRec.patch similarity index 100% rename from patches/server/0128-Paper-Improve-performance-of-RecipeManager-removeRec.patch rename to patches/server/0125-Paper-Improve-performance-of-RecipeManager-removeRec.patch diff --git a/patches/server/0129-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch b/patches/server/0126-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch similarity index 57% rename from patches/server/0129-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch rename to patches/server/0126-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch index 348bf34db..558113871 100644 --- a/patches/server/0129-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch +++ b/patches/server/0126-Paper-Fix-move-to-jline-terminal-ffm-on-java-22-and-.patch @@ -9,7 +9,8 @@ Original project: https://github.com/PaperMC/Paper Paper pull request: https://github.com/PaperMC/Paper/pull/11631 Ported from Paper 1.21.3 -Also see Leaf's Fix-console-freeze-above-JAVA-22.patch +And added terminal color fix on Windows +We assume that the Windows supports truecolor, even if the environment variables TERM and COLORTERM are null ffm requires 1) native access allowed (the jdk cracks down on undocumented native access in 22) and 2) reverting the default console back to java.base, so the internal jline doesnt take over @@ -27,3 +28,15 @@ index 068ec805a51764fbe22b91578797e553a7bca1f8..572af93c43a66e6ae17b4aee219a87c5 implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file /* +diff --git a/src/main/java/org/dreeam/leaf/LeafBootstrap.java b/src/main/java/org/dreeam/leaf/LeafBootstrap.java +index 316654051b80ac0fd62cf3b7a0e1b91010ec24b7..ff0ef887b892caa1451b5781d95f5505cfa2e413 100644 +--- a/src/main/java/org/dreeam/leaf/LeafBootstrap.java ++++ b/src/main/java/org/dreeam/leaf/LeafBootstrap.java +@@ -12,5 +12,7 @@ public class LeafBootstrap { + } + + private static void runPreBootTasks() { ++ if (org.jline.utils.OSUtils.IS_WINDOWS) System.setProperty("net.kyori.ansi.colorLevel", "truecolor"); // Leaf - Fix terminal color on Windows by assuming the Windows always supports true color ++ if (org.galemc.gale.virtualthread.VirtualThreadService.getJavaMajorVersion() == 22) System.setProperty("jdk.console", "java.base"); // Leaf - Fix terminal input freeze on Java 22, higher Java version looks like fine + } + } diff --git a/patches/server/0130-Dont-send-useless-entity-packets.patch b/patches/server/0127-Dont-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0130-Dont-send-useless-entity-packets.patch rename to patches/server/0127-Dont-send-useless-entity-packets.patch diff --git a/patches/server/0131-Don-t-spawn-if-lastSpawnState-is-null.patch b/patches/server/0128-Don-t-spawn-if-lastSpawnState-is-null.patch similarity index 100% rename from patches/server/0131-Don-t-spawn-if-lastSpawnState-is-null.patch rename to patches/server/0128-Don-t-spawn-if-lastSpawnState-is-null.patch diff --git a/patches/server/0132-Multithreaded-Tracker.patch b/patches/server/0129-Multithreaded-Tracker.patch similarity index 100% rename from patches/server/0132-Multithreaded-Tracker.patch rename to patches/server/0129-Multithreaded-Tracker.patch diff --git a/patches/server/0133-Nitori-Async-playerdata-Save.patch b/patches/server/0130-Nitori-Async-playerdata-Save.patch similarity index 100% rename from patches/server/0133-Nitori-Async-playerdata-Save.patch rename to patches/server/0130-Nitori-Async-playerdata-Save.patch diff --git a/patches/server/0134-Change-max-stack-count.patch b/patches/server/0131-Change-max-stack-count.patch similarity index 100% rename from patches/server/0134-Change-max-stack-count.patch rename to patches/server/0131-Change-max-stack-count.patch diff --git a/patches/server/0135-Reduce-object-complexity-to-make-block-isValid-calls.patch b/patches/server/0132-Reduce-object-complexity-to-make-block-isValid-calls.patch similarity index 100% rename from patches/server/0135-Reduce-object-complexity-to-make-block-isValid-calls.patch rename to patches/server/0132-Reduce-object-complexity-to-make-block-isValid-calls.patch diff --git a/patches/server/0136-Optimize-nearby-alive-players-for-spawning.patch b/patches/server/0133-Optimize-nearby-alive-players-for-spawning.patch similarity index 100% rename from patches/server/0136-Optimize-nearby-alive-players-for-spawning.patch rename to patches/server/0133-Optimize-nearby-alive-players-for-spawning.patch diff --git a/patches/server/0137-Cache-blockstate-cache.patch b/patches/server/0134-Cache-blockstate-cache.patch similarity index 100% rename from patches/server/0137-Cache-blockstate-cache.patch rename to patches/server/0134-Cache-blockstate-cache.patch diff --git a/patches/server/0138-Asynchronous-locator.patch b/patches/server/0135-Asynchronous-locator.patch similarity index 100% rename from patches/server/0138-Asynchronous-locator.patch rename to patches/server/0135-Asynchronous-locator.patch diff --git a/patches/server/0139-Smart-sort-entities-in-NearestLivingEntitySensor.patch b/patches/server/0136-Smart-sort-entities-in-NearestLivingEntitySensor.patch similarity index 100% rename from patches/server/0139-Smart-sort-entities-in-NearestLivingEntitySensor.patch rename to patches/server/0136-Smart-sort-entities-in-NearestLivingEntitySensor.patch diff --git a/patches/server/0140-Further-reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0137-Further-reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from patches/server/0140-Further-reduce-memory-footprint-of-CompoundTag.patch rename to patches/server/0137-Further-reduce-memory-footprint-of-CompoundTag.patch diff --git a/patches/server/0141-Optimize-Entity-distanceToSqr.patch b/patches/server/0138-Optimize-Entity-distanceToSqr.patch similarity index 97% rename from patches/server/0141-Optimize-Entity-distanceToSqr.patch rename to patches/server/0138-Optimize-Entity-distanceToSqr.patch index d50a6a699..dba28a919 100644 --- a/patches/server/0141-Optimize-Entity-distanceToSqr.patch +++ b/patches/server/0138-Optimize-Entity-distanceToSqr.patch @@ -69,7 +69,7 @@ index c4965b7582edfdf97cac82c1472f8fcc1a880a6b..d55560a12be8846db7c0969f5e72f3d7 public void playerTouch(Player player) {} diff --git a/src/main/java/org/dreeam/leaf/LeafBootstrap.java b/src/main/java/org/dreeam/leaf/LeafBootstrap.java -index 2f5122a61af183d6a4c20a175122c228b6e9fc48..9055727c16659ae43eb5424f0aa61e419f53483e 100644 +index 0052062cdfcb7672bec177c3d3788f7b1a56d3e5..fbfcb237996674c26d2eff0075c1aa8a447ad2a4 100644 --- a/src/main/java/org/dreeam/leaf/LeafBootstrap.java +++ b/src/main/java/org/dreeam/leaf/LeafBootstrap.java @@ -4,6 +4,7 @@ import io.papermc.paper.PaperBootstrap; diff --git a/patches/server/0142-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch b/patches/server/0139-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch similarity index 100% rename from patches/server/0142-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch rename to patches/server/0139-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch diff --git a/patches/server/0143-EMC-Default-don-t-use-blockstate-snapshots.patch b/patches/server/0140-EMC-Default-don-t-use-blockstate-snapshots.patch similarity index 100% rename from patches/server/0143-EMC-Default-don-t-use-blockstate-snapshots.patch rename to patches/server/0140-EMC-Default-don-t-use-blockstate-snapshots.patch diff --git a/patches/server/0144-Cache-tile-entity-position.patch b/patches/server/0141-Cache-tile-entity-position.patch similarity index 100% rename from patches/server/0144-Cache-tile-entity-position.patch rename to patches/server/0141-Cache-tile-entity-position.patch diff --git a/patches/server/0145-TT20-Lag-compensation.patch b/patches/server/0142-TT20-Lag-compensation.patch similarity index 100% rename from patches/server/0145-TT20-Lag-compensation.patch rename to patches/server/0142-TT20-Lag-compensation.patch diff --git a/patches/server/0146-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch b/patches/server/0143-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch similarity index 100% rename from patches/server/0146-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch rename to patches/server/0143-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch diff --git a/patches/server/0147-C2ME-Reduce-Allocations.patch b/patches/server/0144-C2ME-Reduce-Allocations.patch similarity index 100% rename from patches/server/0147-C2ME-Reduce-Allocations.patch rename to patches/server/0144-C2ME-Reduce-Allocations.patch diff --git a/patches/server/0148-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/patches/server/0145-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch similarity index 100% rename from patches/server/0148-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch rename to patches/server/0145-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch diff --git a/patches/server/0149-Lithium-fast-util.patch b/patches/server/0146-Lithium-fast-util.patch similarity index 100% rename from patches/server/0149-Lithium-fast-util.patch rename to patches/server/0146-Lithium-fast-util.patch diff --git a/patches/server/0150-Lithium-CompactSineLUT.patch b/patches/server/0147-Lithium-CompactSineLUT.patch similarity index 100% rename from patches/server/0150-Lithium-CompactSineLUT.patch rename to patches/server/0147-Lithium-CompactSineLUT.patch diff --git a/patches/server/0151-Lithium-IterateOutwardsCache.patch b/patches/server/0148-Lithium-IterateOutwardsCache.patch similarity index 100% rename from patches/server/0151-Lithium-IterateOutwardsCache.patch rename to patches/server/0148-Lithium-IterateOutwardsCache.patch diff --git a/patches/server/0152-Lithium-HashedList.patch b/patches/server/0149-Lithium-HashedList.patch similarity index 100% rename from patches/server/0152-Lithium-HashedList.patch rename to patches/server/0149-Lithium-HashedList.patch diff --git a/patches/server/0153-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch b/patches/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch similarity index 100% rename from patches/server/0153-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch rename to patches/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch diff --git a/patches/server/0154-Better-inline-world-height.patch b/patches/server/0151-Better-inline-world-height.patch similarity index 100% rename from patches/server/0154-Better-inline-world-height.patch rename to patches/server/0151-Better-inline-world-height.patch diff --git a/patches/server/0155-Smooth-teleport-config.patch b/patches/server/0152-Smooth-teleport-config.patch similarity index 100% rename from patches/server/0155-Smooth-teleport-config.patch rename to patches/server/0152-Smooth-teleport-config.patch diff --git a/patches/server/0155-Use-faster-and-thread-safe-ban-list-date-format-pars.patch b/patches/server/0153-Use-faster-and-thread-safe-ban-list-date-format-pars.patch similarity index 100% rename from patches/server/0155-Use-faster-and-thread-safe-ban-list-date-format-pars.patch rename to patches/server/0153-Use-faster-and-thread-safe-ban-list-date-format-pars.patch diff --git a/patches/server/0156-Collect-then-startEachNonRunningBehavior-in-Brain.patch b/patches/server/0154-Collect-then-startEachNonRunningBehavior-in-Brain.patch similarity index 100% rename from patches/server/0156-Collect-then-startEachNonRunningBehavior-in-Brain.patch rename to patches/server/0154-Collect-then-startEachNonRunningBehavior-in-Brain.patch diff --git a/patches/server/0157-Lithium-equipment-tracking.patch b/patches/server/0155-Lithium-equipment-tracking.patch similarity index 100% rename from patches/server/0157-Lithium-equipment-tracking.patch rename to patches/server/0155-Lithium-equipment-tracking.patch diff --git a/patches/server/0158-Faster-CraftServer-getworlds-list-creation.patch b/patches/server/0156-Faster-CraftServer-getworlds-list-creation.patch similarity index 100% rename from patches/server/0158-Faster-CraftServer-getworlds-list-creation.patch rename to patches/server/0156-Faster-CraftServer-getworlds-list-creation.patch diff --git a/patches/server/0159-C2ME-Optimize-world-gen-math.patch b/patches/server/0157-C2ME-Optimize-world-gen-math.patch similarity index 100% rename from patches/server/0159-C2ME-Optimize-world-gen-math.patch rename to patches/server/0157-C2ME-Optimize-world-gen-math.patch diff --git a/patches/server/0160-Cache-chunk-key.patch b/patches/server/0158-Cache-chunk-key.patch similarity index 100% rename from patches/server/0160-Cache-chunk-key.patch rename to patches/server/0158-Cache-chunk-key.patch diff --git a/patches/server/0161-Cache-random-tick-block-status.patch b/patches/server/0159-Cache-random-tick-block-status.patch similarity index 100% rename from patches/server/0161-Cache-random-tick-block-status.patch rename to patches/server/0159-Cache-random-tick-block-status.patch diff --git a/patches/server/0162-Simplify-canHoldFluid-condition-logic.patch b/patches/server/0160-Simplify-canHoldFluid-condition-logic.patch similarity index 100% rename from patches/server/0162-Simplify-canHoldFluid-condition-logic.patch rename to patches/server/0160-Simplify-canHoldFluid-condition-logic.patch