diff --git a/README.md b/README.md index c92f9c5..5fc205c 100644 --- a/README.md +++ b/README.md @@ -64,4 +64,5 @@ Binaries are licensed under GPL-3.0. ## TODO check Simpler ShapelessRecipe comparison for vanilla patch -check fix MC-26304 (needs tryParse? or just parse or withDefaultNamespace) \ No newline at end of file +check fix MC-26304 (needs tryParse? or just parse or withDefaultNamespace) +check Cache CubeVoxelShape shape array (crash) \ No newline at end of file diff --git a/patches/server/0080-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0079-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0080-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0079-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0081-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0080-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0081-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0080-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0082-Check-frozen-ticks-before-landing-block.patch b/patches/server/0081-Check-frozen-ticks-before-landing-block.patch similarity index 95% rename from patches/server/0082-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0081-Check-frozen-ticks-before-landing-block.patch index 9f01f69..025fb1b 100644 --- a/patches/server/0082-Check-frozen-ticks-before-landing-block.patch +++ b/patches/server/0081-Check-frozen-ticks-before-landing-block.patch @@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c24ee33a3c57c8380aa6f0ad7f60baf42b98f1ab..7bdf29e3f71aa995a3125176ef4e62c7a6d4d8fe 100644 +index e70d2a9005f1ba5d6bdd08a70c8de99295759018..41c213db8320331577801a46b469c77fd504c2f9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -565,11 +565,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0083-Faster-chunk-serialization.patch b/patches/server/0082-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0083-Faster-chunk-serialization.patch rename to patches/server/0082-Faster-chunk-serialization.patch diff --git a/patches/server/0084-Update-boss-bar-within-tick.patch b/patches/server/0083-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0084-Update-boss-bar-within-tick.patch rename to patches/server/0083-Update-boss-bar-within-tick.patch diff --git a/patches/server/0085-Cache-world-generator-sea-level.patch b/patches/server/0084-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0085-Cache-world-generator-sea-level.patch rename to patches/server/0084-Cache-world-generator-sea-level.patch diff --git a/patches/server/0086-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0085-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0086-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0085-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0087-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0086-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0087-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0086-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0088-Store-mob-counts-in-an-array.patch b/patches/server/0087-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0088-Store-mob-counts-in-an-array.patch rename to patches/server/0087-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0089-Use-linked-map-for-entity-trackers.patch b/patches/server/0088-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0089-Use-linked-map-for-entity-trackers.patch rename to patches/server/0088-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0090-Optimize-noise-generation.patch b/patches/server/0089-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0090-Optimize-noise-generation.patch rename to patches/server/0089-Optimize-noise-generation.patch diff --git a/patches/server/0091-Optimize-sheep-offspring-color.patch b/patches/server/0090-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0091-Optimize-sheep-offspring-color.patch rename to patches/server/0090-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0091-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0091-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0093-Skip-cloning-advancement-criteria.patch b/patches/server/0092-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0093-Skip-cloning-advancement-criteria.patch rename to patches/server/0092-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0094-Reduce-block-destruction-packet-allocations.patch b/patches/server/0093-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0094-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0093-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0095-Spread-out-sending-all-player-info.patch b/patches/server/0094-Spread-out-sending-all-player-info.patch similarity index 99% rename from patches/server/0095-Spread-out-sending-all-player-info.patch rename to patches/server/0094-Spread-out-sending-all-player-info.patch index 521b934..75d013a 100644 --- a/patches/server/0095-Spread-out-sending-all-player-info.patch +++ b/patches/server/0094-Spread-out-sending-all-player-info.patch @@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index fa4ca096dfd3afe8868b76a8576f0f2882f139ca..44990dfc60126bf6bb88679dfbebb09d3ca1473a 100644 +index 7ebe9f2842b76c2a12d8316916d22ff17a45b3ac..6afadb847906050566f0eeb8ba5ad5c539d0c9b7 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -13,6 +13,8 @@ import java.net.SocketAddress; diff --git a/patches/server/0096-Optimize-player-list-for-sending-player-info.patch b/patches/server/0095-Optimize-player-list-for-sending-player-info.patch similarity index 97% rename from patches/server/0096-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0095-Optimize-player-list-for-sending-player-info.patch index 6ee6252..4899b98 100644 --- a/patches/server/0096-Optimize-player-list-for-sending-player-info.patch +++ b/patches/server/0095-Optimize-player-list-for-sending-player-info.patch @@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 44990dfc60126bf6bb88679dfbebb09d3ca1473a..98efc69c911dd7cdce6c945d1bfebbefc0bbd154 100644 +index 6afadb847906050566f0eeb8ba5ad5c539d0c9b7..16718cec74f7166b00177c8a73fd4d7a30213388 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1018,14 +1018,18 @@ public abstract class PlayerList { diff --git a/patches/server/0097-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0096-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0097-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0096-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0098-Send-multiple-keep-alive-packets.patch b/patches/server/0097-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0098-Send-multiple-keep-alive-packets.patch rename to patches/server/0097-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0099-Make-slow-login-timeout-configurable.patch b/patches/server/0098-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0099-Make-slow-login-timeout-configurable.patch rename to patches/server/0098-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0100-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0099-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 100% rename from patches/server/0100-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0099-Load-portal-destination-chunk-before-entity-teleport.patch diff --git a/patches/server/0101-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0100-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0101-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0100-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0102-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0101-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0102-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0101-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0103-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0102-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 100% rename from patches/server/0103-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0102-Broadcast-crit-animations-as-the-entity-being-critte.patch diff --git a/patches/server/0104-Ignore-null-legacy-structure-data.patch b/patches/server/0103-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0104-Ignore-null-legacy-structure-data.patch rename to patches/server/0103-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0105-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0104-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0105-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0104-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0106-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0105-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0106-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0105-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0107-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0106-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 94% rename from patches/server/0107-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0106-Do-not-place-player-in-world-if-kicked-before-being-.patch index 9f38198..f74f341 100644 --- a/patches/server/0107-Do-not-place-player-in-world-if-kicked-before-being-.patch +++ b/patches/server/0106-Do-not-place-player-in-world-if-kicked-before-being-.patch @@ -14,7 +14,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 98efc69c911dd7cdce6c945d1bfebbefc0bbd154..5b8687da643ec355d7c0218f763e6f77223c4246 100644 +index 16718cec74f7166b00177c8a73fd4d7a30213388..90191fb36306454fa9741992967eb3d0af6dc584 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -275,6 +275,13 @@ public abstract class PlayerList { diff --git a/patches/server/0108-CraftBukkit-UUID-to-world-map.patch b/patches/server/0107-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0108-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0107-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0109-Global-EULA-file.patch b/patches/server/0108-Global-EULA-file.patch similarity index 100% rename from patches/server/0109-Global-EULA-file.patch rename to patches/server/0108-Global-EULA-file.patch diff --git a/patches/server/0110-Specific-interval-TPS-API.patch b/patches/server/0109-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0110-Specific-interval-TPS-API.patch rename to patches/server/0109-Specific-interval-TPS-API.patch diff --git a/patches/server/0111-5-second-TPS-average.patch b/patches/server/0110-5-second-TPS-average.patch similarity index 100% rename from patches/server/0111-5-second-TPS-average.patch rename to patches/server/0110-5-second-TPS-average.patch diff --git a/patches/server/0112-Measure-last-tick-time.patch b/patches/server/0111-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0112-Measure-last-tick-time.patch rename to patches/server/0111-Measure-last-tick-time.patch diff --git a/patches/server/0113-Last-tick-time-API.patch b/patches/server/0112-Last-tick-time-API.patch similarity index 100% rename from patches/server/0113-Last-tick-time-API.patch rename to patches/server/0112-Last-tick-time-API.patch diff --git a/patches/server/0114-Show-last-tick-time-in-tps-command.patch b/patches/server/0113-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0114-Show-last-tick-time-in-tps-command.patch rename to patches/server/0113-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0115-Increase-time-statistics-in-intervals.patch b/patches/server/0114-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0115-Increase-time-statistics-in-intervals.patch rename to patches/server/0114-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0116-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0115-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0116-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0115-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0117-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0116-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0117-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0116-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0118-Optimize-matching-item-checks.patch b/patches/server/0117-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0118-Optimize-matching-item-checks.patch rename to patches/server/0117-Optimize-matching-item-checks.patch diff --git a/patches/server/0119-Pre-compute-VarLong-sizes.patch b/patches/server/0118-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0119-Pre-compute-VarLong-sizes.patch rename to patches/server/0118-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0120-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0119-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from patches/server/0120-Optimize-VarInt-write-and-VarLong-write.patch rename to patches/server/0119-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/patches/server/0121-Reduce-RandomSource-instances.patch b/patches/server/0120-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0121-Reduce-RandomSource-instances.patch rename to patches/server/0120-Reduce-RandomSource-instances.patch diff --git a/patches/server/0122-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0121-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch similarity index 95% rename from patches/server/0122-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch rename to patches/server/0121-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch index 01011a1..1b91296 100644 --- a/patches/server/0122-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch +++ b/patches/server/0121-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch @@ -18,7 +18,7 @@ this patch is focused around the sensors used for ai delete the line of sight cache less often and use a faster nearby comparison diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 93f9905bbb47d89c746957f4e3e75e13322e2a5e..5c99f85777f8ab02428a3c5c9afc90dee6d4347e 100644 +index 60493d257489affb2e622d9c7193e1f8e7fad412..620f59c9563d7215ee04176eaa74872918f011d6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1029,10 +1029,9 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0123-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0122-Initialize-line-of-sight-cache-with-low-capacity.patch similarity index 100% rename from patches/server/0123-Initialize-line-of-sight-cache-with-low-capacity.patch rename to patches/server/0122-Initialize-line-of-sight-cache-with-low-capacity.patch diff --git a/patches/server/0124-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0123-Reduce-line-of-sight-updates-and-cache-lookups.patch similarity index 100% rename from patches/server/0124-Reduce-line-of-sight-updates-and-cache-lookups.patch rename to patches/server/0123-Reduce-line-of-sight-updates-and-cache-lookups.patch diff --git a/patches/server/0125-Server-thread-priority-environment-variable.patch b/patches/server/0124-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0125-Server-thread-priority-environment-variable.patch rename to patches/server/0124-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0126-Virtual-thread-support.patch b/patches/server/0125-Virtual-thread-support.patch similarity index 100% rename from patches/server/0126-Virtual-thread-support.patch rename to patches/server/0125-Virtual-thread-support.patch diff --git a/patches/server/0079-Cache-CubeVoxelShape-shape-array.patch b/patches/work/server/0079-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0079-Cache-CubeVoxelShape-shape-array.patch rename to patches/work/server/0079-Cache-CubeVoxelShape-shape-array.patch