From 84281325a7b95c8a7b54249e1b449dc643d8ca9d Mon Sep 17 00:00:00 2001 From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com> Date: Wed, 2 Jul 2025 20:48:56 -0700 Subject: [PATCH] Be prepared for minecraft server patches --- .../features => }/0001-Build-changes.patch | 0 ...002-Leaves-Server-Config-And-Command.patch | 0 .../features => }/0003-Leaves-Utils.patch | 0 .../0004-Leaves-Protocol-Core.patch | 0 ...5-Configurable-trading-with-the-void.patch | 0 ...nowball-and-egg-can-knockback-player.patch | 0 .../0007-Leaves-Fakeplayer.patch | 0 ...hears-in-dispenser-can-unlimited-use.patch | 0 .../0009-Redstone-Shears-Wrench.patch | 0 ...Add-isShrink-to-EntityResurrectEvent.patch | 0 .../0011-Movable-Budding-Amethyst.patch | 0 .../unapplied/0012-Bytebuf-API.patch | 55 ---- .../0012-Spectator-dont-get-Advancement.patch | 0 .../unapplied/0013-Leaves-plugin.patch | 262 ------------------ ...ick-can-change-ArmorStand-arm-status.patch | 0 .../0014-Configurable-MC-59471.patch | 0 .../0014-Fix-SculkCatalyst-exp-skip.patch | 35 --- .../unapplied/0015-Leaves-Config-API.patch | 22 -- .../features => }/0015-No-chat-sign.patch | 0 ...016-Dont-send-useless-entity-packets.patch | 0 .../0017-Optimize-suffocation.patch | 0 ...check-for-spooky-season-once-an-hour.patch | 0 ...19-Config-to-disable-method-profiler.patch | 0 ...oal-selector-during-inactive-ticking.patch | 0 .../0021-Reduce-entity-allocations.patch | 0 ...022-Remove-lambda-from-ticking-guard.patch | 0 ...-Cache-climbing-check-for-activation.patch | 0 .../0024-Reduce-chunk-loading-lookups.patch | 0 ...025-InstantBlockUpdater-Reintroduced.patch | 0 ...ndom-flatten-triangular-distribution.patch | 0 .../features => }/0027-BBOR-Protocol.patch | 0 .../0028-PCA-sync-protocol.patch | 0 ...Alternative-block-placement-Protocol.patch | 0 .../features => }/0030-Jade-Protocol.patch | 0 .../0031-Player-operation-limiter.patch | 0 .../features => }/0032-Renewable-Elytra.patch | 0 .../0033-MC-Technical-Survival-Mode.patch | 0 .../0034-Stackable-ShulkerBoxes.patch | 0 .../0035-Return-nether-portal-fix.patch | 0 .../0036-Leaves-Extra-Yggdrasil-Service.patch | 0 .../0037-Configurable-vanilla-random.patch | 0 .../0038-Catch-update-suppression-crash.patch | 0 .../0039-Bedrock-break-list.patch | 0 .../0040-Fix-trapdoor-feature.patch | 0 ...e-distance-check-for-UseItemOnPacket.patch | 0 .../0042-No-feather-falling-trample.patch | 0 .../0043-Disable-packet-limit.patch | 0 .../0044-Syncmatica-Protocol.patch | 0 .../0045-Shared-villager-discounts.patch | 0 .../0046-Redstone-ignore-upwards-update.patch | 0 ...7-Disable-check-out-of-order-command.patch | 0 .../0048-Despawn-enderman-with-block.patch | 0 .../0049-Optimized-dragon-respawn.patch | 0 .../0050-Creative-fly-no-clip.patch | 0 .../0051-Shave-snow-layers.patch | 0 ...052-Elytra-aeronautics-no-chunk-load.patch | 0 .../0053-Cache-ignite-odds.patch | 0 .../features => }/0054-Lava-riptide.patch | 0 .../0055-No-block-update-command.patch | 0 ...0056-Raider-die-skip-self-raid-check.patch | 0 .../0057-Container-open-passthrough.patch | 0 ...Dont-respond-ping-before-start-fully.patch | 0 .../0059-Faster-chunk-serialization.patch | 0 ...-Skip-secondary-POI-sensor-if-absent.patch | 0 .../0061-Store-mob-counts-in-an-array.patch | 0 .../0062-Optimize-noise-generation.patch | 0 .../0063-Optimize-sun-burn-tick.patch | 0 ...d-Optional-allocation-in-EntityBased.patch | 0 ...signableFrom-call-in-ClassInstanceMu.patch | 0 .../0066-Optimized-CubePointRange.patch | 0 ...ck-frozen-ticks-before-landing-block.patch | 0 ...Skip-entity-move-if-movement-is-zero.patch | 0 ...69-Skip-cloning-advancement-criteria.patch | 0 ...70-Fix-villagers-dont-release-memory.patch | 0 .../0071-Avoid-anvil-too-expensive.patch | 0 .../features => }/0072-Bow-infinity-fix.patch | 0 .../features => }/0073-Zero-tick-plants.patch | 0 .../features => }/0074-Replay-Mod-API.patch | 0 .../0075-Leaves-I18n-support.patch | 0 ...craft-hopper-not-work-without-player.patch | 0 .../features => }/0077-RNG-Fishing.patch | 0 .../0078-Wool-Hopper-Counter.patch | 0 .../0079-Spider-jockeys-drop-gapples.patch | 0 .../features => }/0080-Force-Void-Trade.patch | 0 .../0081-Villager-infinite-discounts.patch | 0 .../0082-CCE-update-suppression.patch | 0 ...83-Disable-offline-warn-if-use-proxy.patch | 0 ...or-stand-cant-kill-by-mob-projectile.patch | 0 .../0085-Make-Item-tick-vanilla.patch | 0 .../0086-Copper-Bulb-1-gt-delay.patch | 0 .../0087-Crafter-1-gt-delay.patch | 0 .../0088-More-Region-Format-Support.patch | 0 .../0089-No-TNT-place-update.patch | 0 .../features => }/0090-Servux-Protocol.patch | 0 ...ked-hopper-no-longer-send-NC-updates.patch | 0 .../0092-Renewable-deepslate.patch | 0 .../0093-Renewable-sponges.patch | 0 .../features => }/0094-Renewable-coral.patch | 0 .../features => }/0095-Vanilla-hopper.patch | 0 .../0096-Old-hopper-suckin-behavior.patch | 0 ...7-Fix-falling-block-s-block-location.patch | 0 .../features => }/0098-Bytebuf-API.patch | 0 .../0099-Allow-grindstone-overstacking.patch | 0 .../0100-Configurable-MC-67.patch | 0 ...le-end-gateway-portal-entity-ticking.patch | 0 ...sable-crystal-portal-proximity-check.patch | 0 ...able-LivingEntity-aiStep-alive-check.patch | 0 ...104-Fix-FallingBlockEntity-Duplicate.patch | 0 .../0105-Old-Block-remove-behaviour.patch | 0 .../0106-Revert-raid-changes.patch | 0 ...07-Allow-anvil-destroy-item-entities.patch | 0 ...0108-Configurable-collision-behavior.patch | 0 .../0109-Disable-vault-blacklist.patch | 0 ...0110-Fix-EntityPortalExitEvent-logic.patch | 0 .../0111-Fix-CraftPortalEvent-logic.patch | 0 .../0112-Xaero-Map-Protocol.patch | 0 ...gible-planar-movement-multiplication.patch | 0 .../0114-Skippable-raid-height-check.patch | 0 .../0115-Support-REI-protocol.patch | 0 .../0116-Vanilla-player-display-name.patch | 0 .../0117-Fix-SculkCatalyst-exp-skip.patch | 0 ...118-Vanilla-creative-pickup-behavior.patch | 0 .../0119-Vanilla-portal-handle.patch | 0 .../0120-Fix-chunk-reload-detector.patch | 0 ...-not-reset-placed-block-on-exception.patch | 0 ...lock-entity-and-entity-crash-at-Leve.patch | 0 .../0123-Tripwire-behavior-modifier.patch | 0 .../0124-Old-nether-portal-collision.patch | 0 .../0125-Spawn-invulnerable-time.patch | 0 .../0126-Old-zombie-reinforcement.patch | 0 .../0127-Sound-update-suppression.patch | 0 ...0128-Old-zombie-piglin-drop-behavior.patch | 0 .../0129-Fast-exp-orb-absorb.patch | 0 .../0130-Vanilla-Fluid-Pushing.patch | 0 .../0131-Configurable-item-damage-check.patch | 0 ...-Old-Throwable-Projectile-tick-order.patch | 0 136 files changed, 374 deletions(-) rename leaves-server/unapplied/{minecraft-patches/features => }/0001-Build-changes.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0002-Leaves-Server-Config-And-Command.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0003-Leaves-Utils.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0004-Leaves-Protocol-Core.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0005-Configurable-trading-with-the-void.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0006-Make-snowball-and-egg-can-knockback-player.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0007-Leaves-Fakeplayer.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0008-Make-shears-in-dispenser-can-unlimited-use.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0009-Redstone-Shears-Wrench.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0010-Add-isShrink-to-EntityResurrectEvent.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0011-Movable-Budding-Amethyst.patch (100%) delete mode 100644 leaves-server/unapplied/0012-Bytebuf-API.patch rename leaves-server/unapplied/{minecraft-patches/features => }/0012-Spectator-dont-get-Advancement.patch (100%) delete mode 100644 leaves-server/unapplied/0013-Leaves-plugin.patch rename leaves-server/unapplied/{minecraft-patches/features => }/0013-Stick-can-change-ArmorStand-arm-status.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0014-Configurable-MC-59471.patch (100%) delete mode 100644 leaves-server/unapplied/0014-Fix-SculkCatalyst-exp-skip.patch delete mode 100644 leaves-server/unapplied/0015-Leaves-Config-API.patch rename leaves-server/unapplied/{minecraft-patches/features => }/0015-No-chat-sign.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0016-Dont-send-useless-entity-packets.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0017-Optimize-suffocation.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0018-Only-check-for-spooky-season-once-an-hour.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0019-Config-to-disable-method-profiler.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0020-Throttle-goal-selector-during-inactive-ticking.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0021-Reduce-entity-allocations.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0022-Remove-lambda-from-ticking-guard.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0023-Cache-climbing-check-for-activation.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0024-Reduce-chunk-loading-lookups.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0025-InstantBlockUpdater-Reintroduced.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0026-Random-flatten-triangular-distribution.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0027-BBOR-Protocol.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0028-PCA-sync-protocol.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0029-Alternative-block-placement-Protocol.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0030-Jade-Protocol.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0031-Player-operation-limiter.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0032-Renewable-Elytra.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0033-MC-Technical-Survival-Mode.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0034-Stackable-ShulkerBoxes.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0035-Return-nether-portal-fix.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0036-Leaves-Extra-Yggdrasil-Service.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0037-Configurable-vanilla-random.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0038-Catch-update-suppression-crash.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0039-Bedrock-break-list.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0040-Fix-trapdoor-feature.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0041-Disable-distance-check-for-UseItemOnPacket.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0042-No-feather-falling-trample.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0043-Disable-packet-limit.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0044-Syncmatica-Protocol.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0045-Shared-villager-discounts.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0046-Redstone-ignore-upwards-update.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0047-Disable-check-out-of-order-command.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0048-Despawn-enderman-with-block.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0049-Optimized-dragon-respawn.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0050-Creative-fly-no-clip.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0051-Shave-snow-layers.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0052-Elytra-aeronautics-no-chunk-load.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0053-Cache-ignite-odds.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0054-Lava-riptide.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0055-No-block-update-command.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0056-Raider-die-skip-self-raid-check.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0057-Container-open-passthrough.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0058-Dont-respond-ping-before-start-fully.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0059-Faster-chunk-serialization.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0060-Skip-secondary-POI-sensor-if-absent.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0061-Store-mob-counts-in-an-array.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0062-Optimize-noise-generation.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0063-Optimize-sun-burn-tick.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0066-Optimized-CubePointRange.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0067-Check-frozen-ticks-before-landing-block.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0068-Skip-entity-move-if-movement-is-zero.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0069-Skip-cloning-advancement-criteria.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0070-Fix-villagers-dont-release-memory.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0071-Avoid-anvil-too-expensive.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0072-Bow-infinity-fix.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0073-Zero-tick-plants.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0074-Replay-Mod-API.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0075-Leaves-I18n-support.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0076-Fix-minecraft-hopper-not-work-without-player.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0077-RNG-Fishing.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0078-Wool-Hopper-Counter.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0079-Spider-jockeys-drop-gapples.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0080-Force-Void-Trade.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0081-Villager-infinite-discounts.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0082-CCE-update-suppression.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0083-Disable-offline-warn-if-use-proxy.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0084-Armor-stand-cant-kill-by-mob-projectile.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0085-Make-Item-tick-vanilla.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0086-Copper-Bulb-1-gt-delay.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0087-Crafter-1-gt-delay.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0088-More-Region-Format-Support.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0089-No-TNT-place-update.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0090-Servux-Protocol.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0091-Placing-locked-hopper-no-longer-send-NC-updates.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0092-Renewable-deepslate.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0093-Renewable-sponges.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0094-Renewable-coral.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0095-Vanilla-hopper.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0096-Old-hopper-suckin-behavior.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0097-Fix-falling-block-s-block-location.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0098-Bytebuf-API.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0099-Allow-grindstone-overstacking.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0100-Configurable-MC-67.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0101-Disable-end-gateway-portal-entity-ticking.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0102-Disable-crystal-portal-proximity-check.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0103-Can-disable-LivingEntity-aiStep-alive-check.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0104-Fix-FallingBlockEntity-Duplicate.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0105-Old-Block-remove-behaviour.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0106-Revert-raid-changes.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0107-Allow-anvil-destroy-item-entities.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0108-Configurable-collision-behavior.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0109-Disable-vault-blacklist.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0110-Fix-EntityPortalExitEvent-logic.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0111-Fix-CraftPortalEvent-logic.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0112-Xaero-Map-Protocol.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0113-Skip-negligible-planar-movement-multiplication.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0114-Skippable-raid-height-check.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0115-Support-REI-protocol.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0116-Vanilla-player-display-name.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0117-Fix-SculkCatalyst-exp-skip.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0118-Vanilla-creative-pickup-behavior.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0119-Vanilla-portal-handle.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0120-Fix-chunk-reload-detector.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0121-Do-not-reset-placed-block-on-exception.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0123-Tripwire-behavior-modifier.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0124-Old-nether-portal-collision.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0125-Spawn-invulnerable-time.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0126-Old-zombie-reinforcement.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0127-Sound-update-suppression.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0128-Old-zombie-piglin-drop-behavior.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0129-Fast-exp-orb-absorb.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0130-Vanilla-Fluid-Pushing.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0131-Configurable-item-damage-check.patch (100%) rename leaves-server/unapplied/{minecraft-patches/features => }/0132-Old-Throwable-Projectile-tick-order.patch (100%) diff --git a/leaves-server/unapplied/minecraft-patches/features/0001-Build-changes.patch b/leaves-server/unapplied/0001-Build-changes.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0001-Build-changes.patch rename to leaves-server/unapplied/0001-Build-changes.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0002-Leaves-Server-Config-And-Command.patch b/leaves-server/unapplied/0002-Leaves-Server-Config-And-Command.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0002-Leaves-Server-Config-And-Command.patch rename to leaves-server/unapplied/0002-Leaves-Server-Config-And-Command.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0003-Leaves-Utils.patch b/leaves-server/unapplied/0003-Leaves-Utils.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0003-Leaves-Utils.patch rename to leaves-server/unapplied/0003-Leaves-Utils.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0004-Leaves-Protocol-Core.patch b/leaves-server/unapplied/0004-Leaves-Protocol-Core.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0004-Leaves-Protocol-Core.patch rename to leaves-server/unapplied/0004-Leaves-Protocol-Core.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0005-Configurable-trading-with-the-void.patch b/leaves-server/unapplied/0005-Configurable-trading-with-the-void.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0005-Configurable-trading-with-the-void.patch rename to leaves-server/unapplied/0005-Configurable-trading-with-the-void.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0006-Make-snowball-and-egg-can-knockback-player.patch b/leaves-server/unapplied/0006-Make-snowball-and-egg-can-knockback-player.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0006-Make-snowball-and-egg-can-knockback-player.patch rename to leaves-server/unapplied/0006-Make-snowball-and-egg-can-knockback-player.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0007-Leaves-Fakeplayer.patch b/leaves-server/unapplied/0007-Leaves-Fakeplayer.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0007-Leaves-Fakeplayer.patch rename to leaves-server/unapplied/0007-Leaves-Fakeplayer.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0008-Make-shears-in-dispenser-can-unlimited-use.patch b/leaves-server/unapplied/0008-Make-shears-in-dispenser-can-unlimited-use.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0008-Make-shears-in-dispenser-can-unlimited-use.patch rename to leaves-server/unapplied/0008-Make-shears-in-dispenser-can-unlimited-use.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0009-Redstone-Shears-Wrench.patch b/leaves-server/unapplied/0009-Redstone-Shears-Wrench.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0009-Redstone-Shears-Wrench.patch rename to leaves-server/unapplied/0009-Redstone-Shears-Wrench.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0010-Add-isShrink-to-EntityResurrectEvent.patch b/leaves-server/unapplied/0010-Add-isShrink-to-EntityResurrectEvent.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0010-Add-isShrink-to-EntityResurrectEvent.patch rename to leaves-server/unapplied/0010-Add-isShrink-to-EntityResurrectEvent.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0011-Movable-Budding-Amethyst.patch b/leaves-server/unapplied/0011-Movable-Budding-Amethyst.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0011-Movable-Budding-Amethyst.patch rename to leaves-server/unapplied/0011-Movable-Budding-Amethyst.patch diff --git a/leaves-server/unapplied/0012-Bytebuf-API.patch b/leaves-server/unapplied/0012-Bytebuf-API.patch deleted file mode 100644 index 4cbacb50..00000000 --- a/leaves-server/unapplied/0012-Bytebuf-API.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com> -Date: Thu, 6 Feb 2025 00:14:23 +0800 -Subject: [PATCH] Bytebuf API - - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b6c8536c143b9ff64e7a7cb7016d113e7f766fb1..eb49cf958cbbd1d53f0bb4556ade8bc407ae7a20 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -318,6 +318,7 @@ public final class CraftServer implements Server { - private final ServerConfiguration serverConfig = new PaperServerConfiguration(); - private final org.leavesmc.leaves.entity.CraftBotManager botManager; // Leaves - private final org.leavesmc.leaves.entity.CraftPhotographerManager photographerManager = new org.leavesmc.leaves.entity.CraftPhotographerManager(); // Leaves -+ private final org.leavesmc.leaves.bytebuf.internal.InternalBytebufHandler internalBytebufHandler = new org.leavesmc.leaves.bytebuf.internal.InternalBytebufHandler(); // Leaves - - // Paper start - Folia region threading API - private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler(); -@@ -3226,4 +3227,15 @@ public final class CraftServer implements Server { - return photographerManager; - } - // Leaves end - replay mod api -+ -+ // Leaves start - Bytebuf API -+ @Override -+ public org.leavesmc.leaves.bytebuf.BytebufManager getBytebufManager() { -+ return internalBytebufHandler.getManager(); -+ } -+ -+ public org.leavesmc.leaves.bytebuf.internal.InternalBytebufHandler getBytebufHandler() { -+ return internalBytebufHandler; -+ } -+ // Leaves end - Bytebuf API - } -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e09e9daadb9f8d8230d72f50ab34bffd1c5c3ecd..32b866b5327634af3c5fdf80d80839e219789b21 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3576,4 +3576,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - public void setDeathScreenScore(final int score) { - getHandle().setScore(score); - } -+ -+ // Leaves start - Bytebuf API -+ @Override -+ public void sendPacket(org.leavesmc.leaves.bytebuf.packet.Packet packet) { -+ this.server.getBytebufHandler().applyPacketToPlayer(this.getHandle(), packet); -+ } -+ -+ @Override -+ public void sendPacket(org.leavesmc.leaves.bytebuf.Bytebuf bytebuf, org.leavesmc.leaves.bytebuf.packet.PacketType type) { -+ this.server.getBytebufHandler().applyPacketToPlayer(this.getHandle(), new org.leavesmc.leaves.bytebuf.packet.Packet(type, bytebuf)); -+ } -+ // Leaves end - Bytebuf API - } diff --git a/leaves-server/unapplied/minecraft-patches/features/0012-Spectator-dont-get-Advancement.patch b/leaves-server/unapplied/0012-Spectator-dont-get-Advancement.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0012-Spectator-dont-get-Advancement.patch rename to leaves-server/unapplied/0012-Spectator-dont-get-Advancement.patch diff --git a/leaves-server/unapplied/0013-Leaves-plugin.patch b/leaves-server/unapplied/0013-Leaves-plugin.patch deleted file mode 100644 index 818b409d..00000000 --- a/leaves-server/unapplied/0013-Leaves-plugin.patch +++ /dev/null @@ -1,262 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MC_XiaoHei -Date: Mon, 22 Jul 2024 09:05:56 +0000 -Subject: [PATCH] Leaves plugin - -This patch is licensed under the MIT license. - -diff --git a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java -index 41c95f00b4b2bea6d31f85e268c33d7f6184823e..a9154645554379d80b43171562f6f64a01ed3792 100644 ---- a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java -+++ b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java -@@ -172,28 +172,41 @@ public class PaperPluginsCommand extends BukkitCommand { - - final TreeMap> paperPlugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); - final TreeMap> spigotPlugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); -+ // Leaves start - leaves plugin -+ final TreeMap> leavesPlugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); - - for (final PluginProvider provider : LaunchEntryPointHandler.INSTANCE.get(Entrypoint.PLUGIN).getRegisteredProviders()) { - final PluginMeta configuration = provider.getMeta(); - - if (provider instanceof SpigotPluginProvider) { - spigotPlugins.put(configuration.getDisplayName(), provider); -+ } else if (provider instanceof PaperPluginParent.LeavesServerPluginProvider) { -+ leavesPlugins.put(configuration.getDisplayName(), provider); - } else if (provider instanceof PaperPluginParent.PaperServerPluginProvider) { - paperPlugins.put(configuration.getDisplayName(), provider); - } - } - -+ final int sizeLeavesPlugins = leavesPlugins.size(); - final int sizePaperPlugins = paperPlugins.size(); - final int sizeSpigotPlugins = spigotPlugins.size(); -- final int sizePlugins = sizePaperPlugins + sizeSpigotPlugins; -- final boolean hasAllPluginTypes = (sizePaperPlugins > 0 && sizeSpigotPlugins > 0); -+ final int sizePlugins = sizePaperPlugins + sizeSpigotPlugins + sizeLeavesPlugins; -+ final boolean showSize = (sizePaperPlugins > 0 && sizeSpigotPlugins > 0) || (sizePaperPlugins > 0 && sizeLeavesPlugins > 0) || (sizeSpigotPlugins > 0 && sizeLeavesPlugins > 0); - - final Component infoMessage = Component.text().append(INFO_ICON_SERVER_PLUGIN).append(Component.text("Server Plugins (%s):".formatted(sizePlugins), NamedTextColor.WHITE)).build(); - - sender.sendMessage(infoMessage); - -+ if (!leavesPlugins.isEmpty()) { -+ sender.sendMessage(header("Leaves Plugins", 0x37D1AB, sizeLeavesPlugins, showSize)); -+ } -+ -+ for (final Component component : formatProviders(leavesPlugins)) { -+ sender.sendMessage(component); -+ } -+ - if (!paperPlugins.isEmpty()) { -- sender.sendMessage(header("Paper Plugins", 0x0288D1, sizePaperPlugins, hasAllPluginTypes)); -+ sender.sendMessage(header("Paper Plugins", 0x0288D1, sizePaperPlugins, showSize)); - } - - for (final Component component : formatProviders(paperPlugins)) { -@@ -201,8 +214,9 @@ public class PaperPluginsCommand extends BukkitCommand { - } - - if (!spigotPlugins.isEmpty()) { -- sender.sendMessage(header("Bukkit Plugins", 0xED8106, sizeSpigotPlugins, hasAllPluginTypes)); -+ sender.sendMessage(header("Bukkit Plugins", 0xED8106, sizeSpigotPlugins, showSize)); - } -+ // Leaves end - leaves plugin - - for (final Component component : formatProviders(spigotPlugins)) { - sender.sendMessage(component); -diff --git a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java -index 70413fddd23ca1165cb5090cce4fddcb1bbca93f..2cdf32d5f08b575cf0fe755634242ddb05b59774 100644 ---- a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java -+++ b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java -@@ -117,19 +117,30 @@ public class PluginInitializerManager { - java.util.List files = ((java.util.List) optionSet.valuesOf("add-plugin")).stream().map(File::toPath).toList(); - io.papermc.paper.plugin.util.EntrypointUtil.registerProvidersFromSource(io.papermc.paper.plugin.provider.source.PluginFlagProviderSource.INSTANCE, files); - -+ // Leaves start - leaves plugin -+ final Set leavesPluginNames = new TreeSet<>(); - final Set paperPluginNames = new TreeSet<>(); - final Set legacyPluginNames = new TreeSet<>(); - LaunchEntryPointHandler.INSTANCE.getStorage().forEach((entrypoint, providerStorage) -> { - providerStorage.getRegisteredProviders().forEach(provider -> { - if (provider instanceof final SpigotPluginProvider legacy) { - legacyPluginNames.add(String.format("%s (%s)", legacy.getMeta().getName(), legacy.getMeta().getVersion())); -+ } else if (provider instanceof final PaperPluginParent.LeavesServerPluginProvider leaves) { -+ leavesPluginNames.add(String.format("%s (%s)", provider.getMeta().getName(), provider.getMeta().getVersion())); - } else if (provider instanceof final PaperPluginParent.PaperServerPluginProvider paper) { - paperPluginNames.add(String.format("%s (%s)", provider.getMeta().getName(), provider.getMeta().getVersion())); - } - }); - }); -- final int total = paperPluginNames.size() + legacyPluginNames.size(); -+ final int total = leavesPluginNames.size() + paperPluginNames.size() + legacyPluginNames.size(); - LOGGER.info("Initialized {} plugin{}", total, total == 1 ? "" : "s"); -+ if (!leavesPluginNames.isEmpty()) { -+ if (LOGGER.isDebugEnabled()) { -+ LOGGER.info("Leaves plugins ({}):\n - {}", leavesPluginNames.size(), String.join("\n - ", leavesPluginNames)); -+ } else { -+ LOGGER.info("Leaves plugins ({}):\n - {}", leavesPluginNames.size(), String.join(", ", leavesPluginNames)); -+ } -+ } // Leaves end - leaves plugin - if (!paperPluginNames.isEmpty()) { - if (LOGGER.isDebugEnabled()) { - LOGGER.info("Paper plugins ({}):\n - {}", paperPluginNames.size(), String.join("\n - ", paperPluginNames)); -diff --git a/src/main/java/io/papermc/paper/plugin/provider/configuration/LegacyPaperMeta.java b/src/main/java/io/papermc/paper/plugin/provider/configuration/LegacyPaperMeta.java -index 8cd649c977172f6b757d68565fcbb9eb8ae100a3..c18a94af99c827d73c31279e324e15ec8217a31d 100644 ---- a/src/main/java/io/papermc/paper/plugin/provider/configuration/LegacyPaperMeta.java -+++ b/src/main/java/io/papermc/paper/plugin/provider/configuration/LegacyPaperMeta.java -@@ -18,7 +18,7 @@ import java.util.List; - import java.util.Map; - import java.util.Set; - --class LegacyPaperMeta { -+public class LegacyPaperMeta { - - - private static final TypeToken>> TYPE_TOKEN = new TypeToken<>() { -@@ -28,6 +28,12 @@ class LegacyPaperMeta { - ConfigurationTransformation.chain(notVersioned()).apply(node); - } - -+ // Leaves start - leaves plugin -+ public static void migrate(org.spongepowered.configurate.ConfigurationNode node) throws ConfigurateException { -+ ConfigurationTransformation.chain(notVersioned()).apply(node); -+ } -+ // Leaves end - leaves plugin -+ - private static ConfigurationTransformation notVersioned() { - return ConfigurationTransformation.builder() - .addAction(NodePath.path(), (path, value) -> { -diff --git a/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java b/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java -index d3b3a8baca013909fa9c6204d964d7d7efeb2719..753fdb9782ee6b4cb8e232ebfdd52dea5d9e2a66 100644 ---- a/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java -+++ b/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java -@@ -55,7 +55,7 @@ public class PaperPluginMeta implements PluginMeta { - @Required - private String version; - private String description; -- private List authors = List.of(); -+ protected List authors = List.of(); // Leaves - leaves plugin - private List contributors = List.of(); - private String website; - private String prefix; -diff --git a/src/main/java/io/papermc/paper/plugin/provider/type/PluginFileType.java b/src/main/java/io/papermc/paper/plugin/provider/type/PluginFileType.java -index 8d0da6e46d4eb5eb05c3144510c4ef083559d0ec..331a4e98699f65adfad275bde923c0f57ef4dd18 100644 ---- a/src/main/java/io/papermc/paper/plugin/provider/type/PluginFileType.java -+++ b/src/main/java/io/papermc/paper/plugin/provider/type/PluginFileType.java -@@ -23,6 +23,7 @@ import java.util.jar.JarFile; - public abstract class PluginFileType { - - public static final String PAPER_PLUGIN_YML = "paper-plugin.yml"; -+ public static final String LEAVES_PLUGIN_JSON = "leaves-plugin.json"; // Leaves - leaves plugin - private static final List CONFIG_TYPES = new ArrayList<>(); - - public static final PluginFileType PAPER = new PluginFileType<>(PAPER_PLUGIN_YML, PaperPluginParent.FACTORY) { -@@ -43,8 +44,21 @@ public abstract class PluginFileType { - entrypointHandler.register(Entrypoint.PLUGIN, provider); - } - }; -+ // Leaves start - leaves plugin -+ public static final PluginFileType LEAVES = new PluginFileType<>(LEAVES_PLUGIN_JSON, PaperPluginParent.LEAVES_FACTORY) { -+ @Override -+ protected void register(EntrypointHandler entrypointHandler, PaperPluginParent parent) { -+ PaperPluginParent.LeavesBootstrapProvider bootstrapPluginProvider = null; -+ if (parent.shouldCreateBootstrap()) { -+ bootstrapPluginProvider = parent.createLeavesBootstrapProvider(); -+ entrypointHandler.register(Entrypoint.BOOTSTRAPPER, bootstrapPluginProvider); -+ } -+ entrypointHandler.register(Entrypoint.PLUGIN, parent.createLeavesPluginProvider(bootstrapPluginProvider)); -+ } -+ }; - -- private static final List> VALUES = List.of(PAPER, SPIGOT); -+ private static final List> VALUES = List.of(LEAVES, PAPER, SPIGOT); -+ // Leaves end - leaves plugin - - private final String config; - private final PluginTypeFactory factory; -diff --git a/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperPluginParent.java b/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperPluginParent.java -index 55a6898e95704cddafda1ca5dc0951c7102fe10b..283f046c6f34c83f01e1ca1d80cbd7cc35a2b7d2 100644 ---- a/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperPluginParent.java -+++ b/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperPluginParent.java -@@ -27,6 +27,7 @@ import java.util.jar.JarFile; - public class PaperPluginParent { - - public static final PluginTypeFactory FACTORY = new PaperPluginProviderFactory(); -+ public static final PluginTypeFactory LEAVES_FACTORY = new org.leavesmc.leaves.plugin.provider.LeavesPluginProviderFactory(); // Leaves - leaves plugin - private final Path path; - private final JarFile jarFile; - private final PaperPluginMeta description; -@@ -51,6 +52,32 @@ public class PaperPluginParent { - return new PaperBootstrapProvider(); - } - -+ // Leaves start - leaves plugin -+ public LeavesBootstrapProvider createLeavesBootstrapProvider() { -+ return new io.papermc.paper.plugin.provider.type.paper.PaperPluginParent.LeavesBootstrapProvider(); -+ } -+ public LeavesServerPluginProvider createLeavesPluginProvider(LeavesBootstrapProvider provider) { -+ return new LeavesServerPluginProvider(provider); -+ } -+ -+ public class LeavesBootstrapProvider extends PaperBootstrapProvider { -+ @Override -+ public org.leavesmc.leaves.plugin.provider.configuration.LeavesPluginMeta getMeta() { -+ return (org.leavesmc.leaves.plugin.provider.configuration.LeavesPluginMeta) super.getMeta(); -+ } -+ } -+ -+ public class LeavesServerPluginProvider extends PaperServerPluginProvider { -+ LeavesServerPluginProvider(PaperPluginParent.LeavesBootstrapProvider bootstrapProvider) { -+ super(bootstrapProvider); -+ } -+ @Override -+ public org.leavesmc.leaves.plugin.provider.configuration.LeavesPluginMeta getMeta() { -+ return (org.leavesmc.leaves.plugin.provider.configuration.LeavesPluginMeta) super.getMeta(); -+ } -+ } -+ // Leaves end - leaves plugin -+ - public PaperServerPluginProvider createPluginProvider(PaperBootstrapProvider provider) { - return new PaperServerPluginProvider(provider); - } -diff --git a/src/main/java/io/papermc/paper/plugin/storage/SimpleProviderStorage.java b/src/main/java/io/papermc/paper/plugin/storage/SimpleProviderStorage.java -index 26422904751647a061397ce978bba752149003cd..884ed63dab16acca83fe8f421762f2561400b1fb 100644 ---- a/src/main/java/io/papermc/paper/plugin/storage/SimpleProviderStorage.java -+++ b/src/main/java/io/papermc/paper/plugin/storage/SimpleProviderStorage.java -@@ -26,6 +26,16 @@ public abstract class SimpleProviderStorage implements ProviderStorage { - - @Override - public void register(PluginProvider provider) { -+ // Leaves start - leaves plugin -+ if (provider instanceof final io.papermc.paper.plugin.provider.type.paper.PaperPluginParent.LeavesServerPluginProvider leaves) { -+ org.leavesmc.leaves.plugin.provider.configuration.LeavesPluginMeta meta = leaves.getMeta(); -+ java.util.List unavailableFeatures = meta.getFeatures().getRequired().stream().filter(feature -> !org.leavesmc.leaves.plugin.ServerFeatureManager.INSTANCE.isFeatureAvailable(feature)).toList(); -+ if (!unavailableFeatures.isEmpty()) { -+ LOGGER.warn("The plugin {} ({}) requires some unavailable feature(s) {}. The plugin has been skipped.", meta.getName(), meta.getVersion(), unavailableFeatures); -+ return; -+ } -+ } -+ // Leaves end - leaves plugin - this.providers.add(provider); - } - -diff --git a/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java b/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java -index fbad4a2242aa1ab910b2e2ae4cce973ff63fda84..89d4fa952d072dd6e071dc9eef51f4050f7e750e 100644 ---- a/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java -+++ b/src/main/java/io/papermc/paper/pluginremap/PluginRemapper.java -@@ -337,7 +337,13 @@ public final class PluginRemapper { - } - index.skip(inputFile); - return CompletableFuture.completedFuture(inputFile); -- } -+ } else if (ns == null && Files.exists(fs.getPath(PluginFileType.LEAVES_PLUGIN_JSON))) { // Leaves start - leaves plugin -+ if (DEBUG_LOGGING) { -+ LOGGER.info("Plugin '{}' is a Leaves plugin with no namespace specified.", inputFile); -+ } -+ index.skip(inputFile); -+ return CompletableFuture.completedFuture(inputFile); -+ } // Leaves end - leaves plugin - } - } catch (final IOException ex) { - return CompletableFuture.failedFuture(new RuntimeException("Failed to open plugin jar " + inputFile, ex)); diff --git a/leaves-server/unapplied/minecraft-patches/features/0013-Stick-can-change-ArmorStand-arm-status.patch b/leaves-server/unapplied/0013-Stick-can-change-ArmorStand-arm-status.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0013-Stick-can-change-ArmorStand-arm-status.patch rename to leaves-server/unapplied/0013-Stick-can-change-ArmorStand-arm-status.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0014-Configurable-MC-59471.patch b/leaves-server/unapplied/0014-Configurable-MC-59471.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0014-Configurable-MC-59471.patch rename to leaves-server/unapplied/0014-Configurable-MC-59471.patch diff --git a/leaves-server/unapplied/0014-Fix-SculkCatalyst-exp-skip.patch b/leaves-server/unapplied/0014-Fix-SculkCatalyst-exp-skip.patch deleted file mode 100644 index 493379ad..00000000 --- a/leaves-server/unapplied/0014-Fix-SculkCatalyst-exp-skip.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: violetc <58360096+s-yh-china@users.noreply.github.com> -Date: Sun, 6 Apr 2025 10:42:46 +0800 -Subject: [PATCH] Fix SculkCatalyst exp skip - - -diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 03778c286144d8f04147f37aa59fb73fcc584833..daea37a117101a9f3b463e87bfc8f0f9db394aca 100644 ---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -851,7 +851,7 @@ public class CraftEventFactory { - CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity(); - CraftDamageSource bukkitDamageSource = new CraftDamageSource(damageSource); - CraftWorld world = (CraftWorld) entity.getWorld(); -- EntityDeathEvent event = new EntityDeathEvent(entity, bukkitDamageSource, new io.papermc.paper.util.TransformingRandomAccessList<>(drops, Entity.DefaultDrop::stack, FROM_FUNCTION), victim.getExpReward(world.getHandle(), damageSource.getEntity())); // Paper - Restore vanilla drops behavior -+ EntityDeathEvent event = new EntityDeathEvent(entity, bukkitDamageSource, new io.papermc.paper.util.TransformingRandomAccessList<>(drops, Entity.DefaultDrop::stack, FROM_FUNCTION), victim.getExpReward(world.getHandle(), damageSource.getEntity()), victim.getExperienceReward(world.getHandle(), damageSource.getEntity())); // Paper - Restore vanilla drops behavior // Leaves - exp fix - populateFields(victim, event); // Paper - make cancellable - Bukkit.getServer().getPluginManager().callEvent(event); - -@@ -862,6 +862,7 @@ public class CraftEventFactory { - playDeathSound(victim, event, damageSource); - // Paper end - victim.expToDrop = event.getDroppedExp(); -+ victim.expToReward = event.getRewardExp(); // Leaves - exp fix - lootCheck.run(); // Paper - advancement triggers before destroying items - - // Paper start - Restore vanilla drops behavior -@@ -901,6 +902,7 @@ public class CraftEventFactory { - victim.newLevel = event.getNewLevel(); - victim.newTotalExp = event.getNewTotalExp(); - victim.expToDrop = event.getDroppedExp(); -+ victim.expToReward = event.getRewardExp(); // Leaves - exp fix - victim.newExp = event.getNewExp(); - - // Paper start - Restore vanilla drops behavior diff --git a/leaves-server/unapplied/0015-Leaves-Config-API.patch b/leaves-server/unapplied/0015-Leaves-Config-API.patch deleted file mode 100644 index 39743d72..00000000 --- a/leaves-server/unapplied/0015-Leaves-Config-API.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com> -Date: Sun, 18 May 2025 19:58:42 +0800 -Subject: [PATCH] Leaves Config API - - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index eb49cf958cbbd1d53f0bb4556ade8bc407ae7a20..6fbcde3248ec35d0188eea0e99922759d5f1d5cf 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3238,4 +3238,11 @@ public final class CraftServer implements Server { - return internalBytebufHandler; - } - // Leaves end - Bytebuf API -+ -+ // Leaves start - Config API -+ @Override -+ public org.leavesmc.leaves.config.LeavesConfigProvider getLeavesConfig() { -+ return org.leavesmc.leaves.config.InternalConfigProvider.INSTANCE; -+ } -+ // Leaves end - Config API - } diff --git a/leaves-server/unapplied/minecraft-patches/features/0015-No-chat-sign.patch b/leaves-server/unapplied/0015-No-chat-sign.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0015-No-chat-sign.patch rename to leaves-server/unapplied/0015-No-chat-sign.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0016-Dont-send-useless-entity-packets.patch b/leaves-server/unapplied/0016-Dont-send-useless-entity-packets.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0016-Dont-send-useless-entity-packets.patch rename to leaves-server/unapplied/0016-Dont-send-useless-entity-packets.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0017-Optimize-suffocation.patch b/leaves-server/unapplied/0017-Optimize-suffocation.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0017-Optimize-suffocation.patch rename to leaves-server/unapplied/0017-Optimize-suffocation.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0018-Only-check-for-spooky-season-once-an-hour.patch b/leaves-server/unapplied/0018-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0018-Only-check-for-spooky-season-once-an-hour.patch rename to leaves-server/unapplied/0018-Only-check-for-spooky-season-once-an-hour.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0019-Config-to-disable-method-profiler.patch b/leaves-server/unapplied/0019-Config-to-disable-method-profiler.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0019-Config-to-disable-method-profiler.patch rename to leaves-server/unapplied/0019-Config-to-disable-method-profiler.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0020-Throttle-goal-selector-during-inactive-ticking.patch b/leaves-server/unapplied/0020-Throttle-goal-selector-during-inactive-ticking.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0020-Throttle-goal-selector-during-inactive-ticking.patch rename to leaves-server/unapplied/0020-Throttle-goal-selector-during-inactive-ticking.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0021-Reduce-entity-allocations.patch b/leaves-server/unapplied/0021-Reduce-entity-allocations.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0021-Reduce-entity-allocations.patch rename to leaves-server/unapplied/0021-Reduce-entity-allocations.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0022-Remove-lambda-from-ticking-guard.patch b/leaves-server/unapplied/0022-Remove-lambda-from-ticking-guard.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0022-Remove-lambda-from-ticking-guard.patch rename to leaves-server/unapplied/0022-Remove-lambda-from-ticking-guard.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0023-Cache-climbing-check-for-activation.patch b/leaves-server/unapplied/0023-Cache-climbing-check-for-activation.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0023-Cache-climbing-check-for-activation.patch rename to leaves-server/unapplied/0023-Cache-climbing-check-for-activation.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0024-Reduce-chunk-loading-lookups.patch b/leaves-server/unapplied/0024-Reduce-chunk-loading-lookups.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0024-Reduce-chunk-loading-lookups.patch rename to leaves-server/unapplied/0024-Reduce-chunk-loading-lookups.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0025-InstantBlockUpdater-Reintroduced.patch b/leaves-server/unapplied/0025-InstantBlockUpdater-Reintroduced.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0025-InstantBlockUpdater-Reintroduced.patch rename to leaves-server/unapplied/0025-InstantBlockUpdater-Reintroduced.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0026-Random-flatten-triangular-distribution.patch b/leaves-server/unapplied/0026-Random-flatten-triangular-distribution.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0026-Random-flatten-triangular-distribution.patch rename to leaves-server/unapplied/0026-Random-flatten-triangular-distribution.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0027-BBOR-Protocol.patch b/leaves-server/unapplied/0027-BBOR-Protocol.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0027-BBOR-Protocol.patch rename to leaves-server/unapplied/0027-BBOR-Protocol.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0028-PCA-sync-protocol.patch b/leaves-server/unapplied/0028-PCA-sync-protocol.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0028-PCA-sync-protocol.patch rename to leaves-server/unapplied/0028-PCA-sync-protocol.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0029-Alternative-block-placement-Protocol.patch b/leaves-server/unapplied/0029-Alternative-block-placement-Protocol.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0029-Alternative-block-placement-Protocol.patch rename to leaves-server/unapplied/0029-Alternative-block-placement-Protocol.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0030-Jade-Protocol.patch b/leaves-server/unapplied/0030-Jade-Protocol.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0030-Jade-Protocol.patch rename to leaves-server/unapplied/0030-Jade-Protocol.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0031-Player-operation-limiter.patch b/leaves-server/unapplied/0031-Player-operation-limiter.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0031-Player-operation-limiter.patch rename to leaves-server/unapplied/0031-Player-operation-limiter.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0032-Renewable-Elytra.patch b/leaves-server/unapplied/0032-Renewable-Elytra.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0032-Renewable-Elytra.patch rename to leaves-server/unapplied/0032-Renewable-Elytra.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0033-MC-Technical-Survival-Mode.patch b/leaves-server/unapplied/0033-MC-Technical-Survival-Mode.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0033-MC-Technical-Survival-Mode.patch rename to leaves-server/unapplied/0033-MC-Technical-Survival-Mode.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0034-Stackable-ShulkerBoxes.patch b/leaves-server/unapplied/0034-Stackable-ShulkerBoxes.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0034-Stackable-ShulkerBoxes.patch rename to leaves-server/unapplied/0034-Stackable-ShulkerBoxes.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0035-Return-nether-portal-fix.patch b/leaves-server/unapplied/0035-Return-nether-portal-fix.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0035-Return-nether-portal-fix.patch rename to leaves-server/unapplied/0035-Return-nether-portal-fix.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0036-Leaves-Extra-Yggdrasil-Service.patch b/leaves-server/unapplied/0036-Leaves-Extra-Yggdrasil-Service.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0036-Leaves-Extra-Yggdrasil-Service.patch rename to leaves-server/unapplied/0036-Leaves-Extra-Yggdrasil-Service.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0037-Configurable-vanilla-random.patch b/leaves-server/unapplied/0037-Configurable-vanilla-random.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0037-Configurable-vanilla-random.patch rename to leaves-server/unapplied/0037-Configurable-vanilla-random.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0038-Catch-update-suppression-crash.patch b/leaves-server/unapplied/0038-Catch-update-suppression-crash.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0038-Catch-update-suppression-crash.patch rename to leaves-server/unapplied/0038-Catch-update-suppression-crash.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0039-Bedrock-break-list.patch b/leaves-server/unapplied/0039-Bedrock-break-list.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0039-Bedrock-break-list.patch rename to leaves-server/unapplied/0039-Bedrock-break-list.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0040-Fix-trapdoor-feature.patch b/leaves-server/unapplied/0040-Fix-trapdoor-feature.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0040-Fix-trapdoor-feature.patch rename to leaves-server/unapplied/0040-Fix-trapdoor-feature.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0041-Disable-distance-check-for-UseItemOnPacket.patch b/leaves-server/unapplied/0041-Disable-distance-check-for-UseItemOnPacket.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0041-Disable-distance-check-for-UseItemOnPacket.patch rename to leaves-server/unapplied/0041-Disable-distance-check-for-UseItemOnPacket.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0042-No-feather-falling-trample.patch b/leaves-server/unapplied/0042-No-feather-falling-trample.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0042-No-feather-falling-trample.patch rename to leaves-server/unapplied/0042-No-feather-falling-trample.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0043-Disable-packet-limit.patch b/leaves-server/unapplied/0043-Disable-packet-limit.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0043-Disable-packet-limit.patch rename to leaves-server/unapplied/0043-Disable-packet-limit.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0044-Syncmatica-Protocol.patch b/leaves-server/unapplied/0044-Syncmatica-Protocol.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0044-Syncmatica-Protocol.patch rename to leaves-server/unapplied/0044-Syncmatica-Protocol.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0045-Shared-villager-discounts.patch b/leaves-server/unapplied/0045-Shared-villager-discounts.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0045-Shared-villager-discounts.patch rename to leaves-server/unapplied/0045-Shared-villager-discounts.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0046-Redstone-ignore-upwards-update.patch b/leaves-server/unapplied/0046-Redstone-ignore-upwards-update.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0046-Redstone-ignore-upwards-update.patch rename to leaves-server/unapplied/0046-Redstone-ignore-upwards-update.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0047-Disable-check-out-of-order-command.patch b/leaves-server/unapplied/0047-Disable-check-out-of-order-command.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0047-Disable-check-out-of-order-command.patch rename to leaves-server/unapplied/0047-Disable-check-out-of-order-command.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0048-Despawn-enderman-with-block.patch b/leaves-server/unapplied/0048-Despawn-enderman-with-block.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0048-Despawn-enderman-with-block.patch rename to leaves-server/unapplied/0048-Despawn-enderman-with-block.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0049-Optimized-dragon-respawn.patch b/leaves-server/unapplied/0049-Optimized-dragon-respawn.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0049-Optimized-dragon-respawn.patch rename to leaves-server/unapplied/0049-Optimized-dragon-respawn.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0050-Creative-fly-no-clip.patch b/leaves-server/unapplied/0050-Creative-fly-no-clip.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0050-Creative-fly-no-clip.patch rename to leaves-server/unapplied/0050-Creative-fly-no-clip.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0051-Shave-snow-layers.patch b/leaves-server/unapplied/0051-Shave-snow-layers.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0051-Shave-snow-layers.patch rename to leaves-server/unapplied/0051-Shave-snow-layers.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0052-Elytra-aeronautics-no-chunk-load.patch b/leaves-server/unapplied/0052-Elytra-aeronautics-no-chunk-load.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0052-Elytra-aeronautics-no-chunk-load.patch rename to leaves-server/unapplied/0052-Elytra-aeronautics-no-chunk-load.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0053-Cache-ignite-odds.patch b/leaves-server/unapplied/0053-Cache-ignite-odds.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0053-Cache-ignite-odds.patch rename to leaves-server/unapplied/0053-Cache-ignite-odds.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0054-Lava-riptide.patch b/leaves-server/unapplied/0054-Lava-riptide.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0054-Lava-riptide.patch rename to leaves-server/unapplied/0054-Lava-riptide.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0055-No-block-update-command.patch b/leaves-server/unapplied/0055-No-block-update-command.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0055-No-block-update-command.patch rename to leaves-server/unapplied/0055-No-block-update-command.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0056-Raider-die-skip-self-raid-check.patch b/leaves-server/unapplied/0056-Raider-die-skip-self-raid-check.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0056-Raider-die-skip-self-raid-check.patch rename to leaves-server/unapplied/0056-Raider-die-skip-self-raid-check.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0057-Container-open-passthrough.patch b/leaves-server/unapplied/0057-Container-open-passthrough.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0057-Container-open-passthrough.patch rename to leaves-server/unapplied/0057-Container-open-passthrough.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0058-Dont-respond-ping-before-start-fully.patch b/leaves-server/unapplied/0058-Dont-respond-ping-before-start-fully.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0058-Dont-respond-ping-before-start-fully.patch rename to leaves-server/unapplied/0058-Dont-respond-ping-before-start-fully.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0059-Faster-chunk-serialization.patch b/leaves-server/unapplied/0059-Faster-chunk-serialization.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0059-Faster-chunk-serialization.patch rename to leaves-server/unapplied/0059-Faster-chunk-serialization.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0060-Skip-secondary-POI-sensor-if-absent.patch b/leaves-server/unapplied/0060-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0060-Skip-secondary-POI-sensor-if-absent.patch rename to leaves-server/unapplied/0060-Skip-secondary-POI-sensor-if-absent.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0061-Store-mob-counts-in-an-array.patch b/leaves-server/unapplied/0061-Store-mob-counts-in-an-array.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0061-Store-mob-counts-in-an-array.patch rename to leaves-server/unapplied/0061-Store-mob-counts-in-an-array.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0062-Optimize-noise-generation.patch b/leaves-server/unapplied/0062-Optimize-noise-generation.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0062-Optimize-noise-generation.patch rename to leaves-server/unapplied/0062-Optimize-noise-generation.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0063-Optimize-sun-burn-tick.patch b/leaves-server/unapplied/0063-Optimize-sun-burn-tick.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0063-Optimize-sun-burn-tick.patch rename to leaves-server/unapplied/0063-Optimize-sun-burn-tick.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/leaves-server/unapplied/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to leaves-server/unapplied/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/leaves-server/unapplied/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to leaves-server/unapplied/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0066-Optimized-CubePointRange.patch b/leaves-server/unapplied/0066-Optimized-CubePointRange.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0066-Optimized-CubePointRange.patch rename to leaves-server/unapplied/0066-Optimized-CubePointRange.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0067-Check-frozen-ticks-before-landing-block.patch b/leaves-server/unapplied/0067-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0067-Check-frozen-ticks-before-landing-block.patch rename to leaves-server/unapplied/0067-Check-frozen-ticks-before-landing-block.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0068-Skip-entity-move-if-movement-is-zero.patch b/leaves-server/unapplied/0068-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0068-Skip-entity-move-if-movement-is-zero.patch rename to leaves-server/unapplied/0068-Skip-entity-move-if-movement-is-zero.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0069-Skip-cloning-advancement-criteria.patch b/leaves-server/unapplied/0069-Skip-cloning-advancement-criteria.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0069-Skip-cloning-advancement-criteria.patch rename to leaves-server/unapplied/0069-Skip-cloning-advancement-criteria.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0070-Fix-villagers-dont-release-memory.patch b/leaves-server/unapplied/0070-Fix-villagers-dont-release-memory.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0070-Fix-villagers-dont-release-memory.patch rename to leaves-server/unapplied/0070-Fix-villagers-dont-release-memory.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0071-Avoid-anvil-too-expensive.patch b/leaves-server/unapplied/0071-Avoid-anvil-too-expensive.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0071-Avoid-anvil-too-expensive.patch rename to leaves-server/unapplied/0071-Avoid-anvil-too-expensive.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0072-Bow-infinity-fix.patch b/leaves-server/unapplied/0072-Bow-infinity-fix.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0072-Bow-infinity-fix.patch rename to leaves-server/unapplied/0072-Bow-infinity-fix.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0073-Zero-tick-plants.patch b/leaves-server/unapplied/0073-Zero-tick-plants.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0073-Zero-tick-plants.patch rename to leaves-server/unapplied/0073-Zero-tick-plants.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0074-Replay-Mod-API.patch b/leaves-server/unapplied/0074-Replay-Mod-API.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0074-Replay-Mod-API.patch rename to leaves-server/unapplied/0074-Replay-Mod-API.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0075-Leaves-I18n-support.patch b/leaves-server/unapplied/0075-Leaves-I18n-support.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0075-Leaves-I18n-support.patch rename to leaves-server/unapplied/0075-Leaves-I18n-support.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0076-Fix-minecraft-hopper-not-work-without-player.patch b/leaves-server/unapplied/0076-Fix-minecraft-hopper-not-work-without-player.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0076-Fix-minecraft-hopper-not-work-without-player.patch rename to leaves-server/unapplied/0076-Fix-minecraft-hopper-not-work-without-player.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0077-RNG-Fishing.patch b/leaves-server/unapplied/0077-RNG-Fishing.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0077-RNG-Fishing.patch rename to leaves-server/unapplied/0077-RNG-Fishing.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0078-Wool-Hopper-Counter.patch b/leaves-server/unapplied/0078-Wool-Hopper-Counter.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0078-Wool-Hopper-Counter.patch rename to leaves-server/unapplied/0078-Wool-Hopper-Counter.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0079-Spider-jockeys-drop-gapples.patch b/leaves-server/unapplied/0079-Spider-jockeys-drop-gapples.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0079-Spider-jockeys-drop-gapples.patch rename to leaves-server/unapplied/0079-Spider-jockeys-drop-gapples.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0080-Force-Void-Trade.patch b/leaves-server/unapplied/0080-Force-Void-Trade.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0080-Force-Void-Trade.patch rename to leaves-server/unapplied/0080-Force-Void-Trade.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0081-Villager-infinite-discounts.patch b/leaves-server/unapplied/0081-Villager-infinite-discounts.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0081-Villager-infinite-discounts.patch rename to leaves-server/unapplied/0081-Villager-infinite-discounts.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0082-CCE-update-suppression.patch b/leaves-server/unapplied/0082-CCE-update-suppression.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0082-CCE-update-suppression.patch rename to leaves-server/unapplied/0082-CCE-update-suppression.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0083-Disable-offline-warn-if-use-proxy.patch b/leaves-server/unapplied/0083-Disable-offline-warn-if-use-proxy.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0083-Disable-offline-warn-if-use-proxy.patch rename to leaves-server/unapplied/0083-Disable-offline-warn-if-use-proxy.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0084-Armor-stand-cant-kill-by-mob-projectile.patch b/leaves-server/unapplied/0084-Armor-stand-cant-kill-by-mob-projectile.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0084-Armor-stand-cant-kill-by-mob-projectile.patch rename to leaves-server/unapplied/0084-Armor-stand-cant-kill-by-mob-projectile.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0085-Make-Item-tick-vanilla.patch b/leaves-server/unapplied/0085-Make-Item-tick-vanilla.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0085-Make-Item-tick-vanilla.patch rename to leaves-server/unapplied/0085-Make-Item-tick-vanilla.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0086-Copper-Bulb-1-gt-delay.patch b/leaves-server/unapplied/0086-Copper-Bulb-1-gt-delay.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0086-Copper-Bulb-1-gt-delay.patch rename to leaves-server/unapplied/0086-Copper-Bulb-1-gt-delay.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0087-Crafter-1-gt-delay.patch b/leaves-server/unapplied/0087-Crafter-1-gt-delay.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0087-Crafter-1-gt-delay.patch rename to leaves-server/unapplied/0087-Crafter-1-gt-delay.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0088-More-Region-Format-Support.patch b/leaves-server/unapplied/0088-More-Region-Format-Support.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0088-More-Region-Format-Support.patch rename to leaves-server/unapplied/0088-More-Region-Format-Support.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0089-No-TNT-place-update.patch b/leaves-server/unapplied/0089-No-TNT-place-update.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0089-No-TNT-place-update.patch rename to leaves-server/unapplied/0089-No-TNT-place-update.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0090-Servux-Protocol.patch b/leaves-server/unapplied/0090-Servux-Protocol.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0090-Servux-Protocol.patch rename to leaves-server/unapplied/0090-Servux-Protocol.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0091-Placing-locked-hopper-no-longer-send-NC-updates.patch b/leaves-server/unapplied/0091-Placing-locked-hopper-no-longer-send-NC-updates.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0091-Placing-locked-hopper-no-longer-send-NC-updates.patch rename to leaves-server/unapplied/0091-Placing-locked-hopper-no-longer-send-NC-updates.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0092-Renewable-deepslate.patch b/leaves-server/unapplied/0092-Renewable-deepslate.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0092-Renewable-deepslate.patch rename to leaves-server/unapplied/0092-Renewable-deepslate.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0093-Renewable-sponges.patch b/leaves-server/unapplied/0093-Renewable-sponges.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0093-Renewable-sponges.patch rename to leaves-server/unapplied/0093-Renewable-sponges.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0094-Renewable-coral.patch b/leaves-server/unapplied/0094-Renewable-coral.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0094-Renewable-coral.patch rename to leaves-server/unapplied/0094-Renewable-coral.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0095-Vanilla-hopper.patch b/leaves-server/unapplied/0095-Vanilla-hopper.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0095-Vanilla-hopper.patch rename to leaves-server/unapplied/0095-Vanilla-hopper.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0096-Old-hopper-suckin-behavior.patch b/leaves-server/unapplied/0096-Old-hopper-suckin-behavior.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0096-Old-hopper-suckin-behavior.patch rename to leaves-server/unapplied/0096-Old-hopper-suckin-behavior.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0097-Fix-falling-block-s-block-location.patch b/leaves-server/unapplied/0097-Fix-falling-block-s-block-location.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0097-Fix-falling-block-s-block-location.patch rename to leaves-server/unapplied/0097-Fix-falling-block-s-block-location.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0098-Bytebuf-API.patch b/leaves-server/unapplied/0098-Bytebuf-API.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0098-Bytebuf-API.patch rename to leaves-server/unapplied/0098-Bytebuf-API.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0099-Allow-grindstone-overstacking.patch b/leaves-server/unapplied/0099-Allow-grindstone-overstacking.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0099-Allow-grindstone-overstacking.patch rename to leaves-server/unapplied/0099-Allow-grindstone-overstacking.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0100-Configurable-MC-67.patch b/leaves-server/unapplied/0100-Configurable-MC-67.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0100-Configurable-MC-67.patch rename to leaves-server/unapplied/0100-Configurable-MC-67.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0101-Disable-end-gateway-portal-entity-ticking.patch b/leaves-server/unapplied/0101-Disable-end-gateway-portal-entity-ticking.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0101-Disable-end-gateway-portal-entity-ticking.patch rename to leaves-server/unapplied/0101-Disable-end-gateway-portal-entity-ticking.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0102-Disable-crystal-portal-proximity-check.patch b/leaves-server/unapplied/0102-Disable-crystal-portal-proximity-check.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0102-Disable-crystal-portal-proximity-check.patch rename to leaves-server/unapplied/0102-Disable-crystal-portal-proximity-check.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0103-Can-disable-LivingEntity-aiStep-alive-check.patch b/leaves-server/unapplied/0103-Can-disable-LivingEntity-aiStep-alive-check.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0103-Can-disable-LivingEntity-aiStep-alive-check.patch rename to leaves-server/unapplied/0103-Can-disable-LivingEntity-aiStep-alive-check.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0104-Fix-FallingBlockEntity-Duplicate.patch b/leaves-server/unapplied/0104-Fix-FallingBlockEntity-Duplicate.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0104-Fix-FallingBlockEntity-Duplicate.patch rename to leaves-server/unapplied/0104-Fix-FallingBlockEntity-Duplicate.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0105-Old-Block-remove-behaviour.patch b/leaves-server/unapplied/0105-Old-Block-remove-behaviour.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0105-Old-Block-remove-behaviour.patch rename to leaves-server/unapplied/0105-Old-Block-remove-behaviour.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0106-Revert-raid-changes.patch b/leaves-server/unapplied/0106-Revert-raid-changes.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0106-Revert-raid-changes.patch rename to leaves-server/unapplied/0106-Revert-raid-changes.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0107-Allow-anvil-destroy-item-entities.patch b/leaves-server/unapplied/0107-Allow-anvil-destroy-item-entities.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0107-Allow-anvil-destroy-item-entities.patch rename to leaves-server/unapplied/0107-Allow-anvil-destroy-item-entities.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0108-Configurable-collision-behavior.patch b/leaves-server/unapplied/0108-Configurable-collision-behavior.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0108-Configurable-collision-behavior.patch rename to leaves-server/unapplied/0108-Configurable-collision-behavior.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0109-Disable-vault-blacklist.patch b/leaves-server/unapplied/0109-Disable-vault-blacklist.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0109-Disable-vault-blacklist.patch rename to leaves-server/unapplied/0109-Disable-vault-blacklist.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0110-Fix-EntityPortalExitEvent-logic.patch b/leaves-server/unapplied/0110-Fix-EntityPortalExitEvent-logic.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0110-Fix-EntityPortalExitEvent-logic.patch rename to leaves-server/unapplied/0110-Fix-EntityPortalExitEvent-logic.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0111-Fix-CraftPortalEvent-logic.patch b/leaves-server/unapplied/0111-Fix-CraftPortalEvent-logic.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0111-Fix-CraftPortalEvent-logic.patch rename to leaves-server/unapplied/0111-Fix-CraftPortalEvent-logic.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0112-Xaero-Map-Protocol.patch b/leaves-server/unapplied/0112-Xaero-Map-Protocol.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0112-Xaero-Map-Protocol.patch rename to leaves-server/unapplied/0112-Xaero-Map-Protocol.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0113-Skip-negligible-planar-movement-multiplication.patch b/leaves-server/unapplied/0113-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0113-Skip-negligible-planar-movement-multiplication.patch rename to leaves-server/unapplied/0113-Skip-negligible-planar-movement-multiplication.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0114-Skippable-raid-height-check.patch b/leaves-server/unapplied/0114-Skippable-raid-height-check.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0114-Skippable-raid-height-check.patch rename to leaves-server/unapplied/0114-Skippable-raid-height-check.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0115-Support-REI-protocol.patch b/leaves-server/unapplied/0115-Support-REI-protocol.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0115-Support-REI-protocol.patch rename to leaves-server/unapplied/0115-Support-REI-protocol.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0116-Vanilla-player-display-name.patch b/leaves-server/unapplied/0116-Vanilla-player-display-name.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0116-Vanilla-player-display-name.patch rename to leaves-server/unapplied/0116-Vanilla-player-display-name.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0117-Fix-SculkCatalyst-exp-skip.patch b/leaves-server/unapplied/0117-Fix-SculkCatalyst-exp-skip.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0117-Fix-SculkCatalyst-exp-skip.patch rename to leaves-server/unapplied/0117-Fix-SculkCatalyst-exp-skip.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0118-Vanilla-creative-pickup-behavior.patch b/leaves-server/unapplied/0118-Vanilla-creative-pickup-behavior.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0118-Vanilla-creative-pickup-behavior.patch rename to leaves-server/unapplied/0118-Vanilla-creative-pickup-behavior.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0119-Vanilla-portal-handle.patch b/leaves-server/unapplied/0119-Vanilla-portal-handle.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0119-Vanilla-portal-handle.patch rename to leaves-server/unapplied/0119-Vanilla-portal-handle.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0120-Fix-chunk-reload-detector.patch b/leaves-server/unapplied/0120-Fix-chunk-reload-detector.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0120-Fix-chunk-reload-detector.patch rename to leaves-server/unapplied/0120-Fix-chunk-reload-detector.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0121-Do-not-reset-placed-block-on-exception.patch b/leaves-server/unapplied/0121-Do-not-reset-placed-block-on-exception.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0121-Do-not-reset-placed-block-on-exception.patch rename to leaves-server/unapplied/0121-Do-not-reset-placed-block-on-exception.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch b/leaves-server/unapplied/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch rename to leaves-server/unapplied/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0123-Tripwire-behavior-modifier.patch b/leaves-server/unapplied/0123-Tripwire-behavior-modifier.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0123-Tripwire-behavior-modifier.patch rename to leaves-server/unapplied/0123-Tripwire-behavior-modifier.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0124-Old-nether-portal-collision.patch b/leaves-server/unapplied/0124-Old-nether-portal-collision.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0124-Old-nether-portal-collision.patch rename to leaves-server/unapplied/0124-Old-nether-portal-collision.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0125-Spawn-invulnerable-time.patch b/leaves-server/unapplied/0125-Spawn-invulnerable-time.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0125-Spawn-invulnerable-time.patch rename to leaves-server/unapplied/0125-Spawn-invulnerable-time.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0126-Old-zombie-reinforcement.patch b/leaves-server/unapplied/0126-Old-zombie-reinforcement.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0126-Old-zombie-reinforcement.patch rename to leaves-server/unapplied/0126-Old-zombie-reinforcement.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0127-Sound-update-suppression.patch b/leaves-server/unapplied/0127-Sound-update-suppression.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0127-Sound-update-suppression.patch rename to leaves-server/unapplied/0127-Sound-update-suppression.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0128-Old-zombie-piglin-drop-behavior.patch b/leaves-server/unapplied/0128-Old-zombie-piglin-drop-behavior.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0128-Old-zombie-piglin-drop-behavior.patch rename to leaves-server/unapplied/0128-Old-zombie-piglin-drop-behavior.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0129-Fast-exp-orb-absorb.patch b/leaves-server/unapplied/0129-Fast-exp-orb-absorb.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0129-Fast-exp-orb-absorb.patch rename to leaves-server/unapplied/0129-Fast-exp-orb-absorb.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0130-Vanilla-Fluid-Pushing.patch b/leaves-server/unapplied/0130-Vanilla-Fluid-Pushing.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0130-Vanilla-Fluid-Pushing.patch rename to leaves-server/unapplied/0130-Vanilla-Fluid-Pushing.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0131-Configurable-item-damage-check.patch b/leaves-server/unapplied/0131-Configurable-item-damage-check.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0131-Configurable-item-damage-check.patch rename to leaves-server/unapplied/0131-Configurable-item-damage-check.patch diff --git a/leaves-server/unapplied/minecraft-patches/features/0132-Old-Throwable-Projectile-tick-order.patch b/leaves-server/unapplied/0132-Old-Throwable-Projectile-tick-order.patch similarity index 100% rename from leaves-server/unapplied/minecraft-patches/features/0132-Old-Throwable-Projectile-tick-order.patch rename to leaves-server/unapplied/0132-Old-Throwable-Projectile-tick-order.patch