diff --git a/patches/work/server/0095-Optimize-villager-data-storage.patch b/patches/server/0089-Optimize-villager-data-storage.patch similarity index 97% rename from patches/work/server/0095-Optimize-villager-data-storage.patch rename to patches/server/0089-Optimize-villager-data-storage.patch index 58d1e11..6c87ae4 100644 --- a/patches/work/server/0095-Optimize-villager-data-storage.patch +++ b/patches/server/0089-Optimize-villager-data-storage.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java -index 2c6388d892d0b58ba1800b795418fc9541c3b94c..46e1233036b16cf593c46b9d4ccbbdab4db3a53b 100644 +index 5db5ba026462ca642dcee718af732f80fadabef5..cd380ceb40d38acc7eef289ded11259388becabd 100644 --- a/src/main/java/net/minecraft/world/Container.java +++ b/src/main/java/net/minecraft/world/Container.java -@@ -130,6 +130,20 @@ public interface Container extends Clearable { +@@ -71,6 +71,20 @@ public interface Container extends Clearable { }); } @@ -210,7 +210,7 @@ index 1595568f3140a62b0f2236644ac2da11db12af05..ce8851c2cacfd3145b1e2c11443140a0 } else { brain.eraseMemory(MemoryModuleType.SECONDARY_JOB_SITE); diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 64ec94ba2b2ce3884f56c95464384fbc1d29e36c..de41f5b57cb4220daf312cc8724cc32d3dd6f7a6 100644 +index ba49442ed0b7c05c50dbc2a640f5759e391902f2..71a3eadd2f1e00fa066dbfe9918d749d43435a18 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -90,6 +90,7 @@ import net.minecraft.world.item.trading.MerchantOffers; @@ -232,7 +232,7 @@ index 64ec94ba2b2ce3884f56c95464384fbc1d29e36c..de41f5b57cb4220daf312cc8724cc32d private static final int MAX_GOSSIP_TOPICS = 10; private static final int GOSSIP_COOLDOWN = 1200; private static final int GOSSIP_DECAY_INTERVAL = 24000; -@@ -908,7 +910,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -910,7 +912,28 @@ public class Villager extends AbstractVillager implements ReputationEventHandler public boolean wantsToPickUp(ItemStack stack) { Item item = stack.getItem(); @@ -263,7 +263,7 @@ index 64ec94ba2b2ce3884f56c95464384fbc1d29e36c..de41f5b57cb4220daf312cc8724cc32d public boolean hasExcessFood() { diff --git a/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java b/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java -index 1316f4475802e17039800cc6128e1b065328beb7..3821c02187ad04b20cdf1e719a0deeabbf91007d 100644 +index 8734ab1bd8299bbf43906d81a349c2a13e0981a7..018b577aecf612e4a4e98cbd7d9292955d04693c 100644 --- a/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java +++ b/src/main/java/net/minecraft/world/entity/npc/VillagerProfession.java @@ -1,8 +1,6 @@ @@ -341,7 +341,7 @@ index 1316f4475802e17039800cc6128e1b065328beb7..3821c02187ad04b20cdf1e719a0deeab ) { return Registry.register( BuiltInRegistries.VILLAGER_PROFESSION, - new ResourceLocation(id), + ResourceLocation.withDefaultNamespace(id), - new VillagerProfession(id, heldWorkstation, acquirableWorkstation, gatherableItems, secondaryJobSites, workSound) + new VillagerProfession(id, heldWorkstation, acquirableWorkstation, gatherableItems != null && gatherableItems.length == 0 ? null : gatherableItems, secondaryJobSite, workSound) ); diff --git a/patches/server/0089-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0090-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0089-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0090-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0090-Store-mob-counts-in-an-array.patch b/patches/server/0091-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0090-Store-mob-counts-in-an-array.patch rename to patches/server/0091-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0091-Use-linked-map-for-entity-trackers.patch b/patches/server/0092-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0091-Use-linked-map-for-entity-trackers.patch rename to patches/server/0092-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0092-Optimize-noise-generation.patch b/patches/server/0093-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0092-Optimize-noise-generation.patch rename to patches/server/0093-Optimize-noise-generation.patch diff --git a/patches/server/0093-Optimize-sheep-offspring-color.patch b/patches/server/0094-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0093-Optimize-sheep-offspring-color.patch rename to patches/server/0094-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0094-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0095-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0094-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0095-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0095-Skip-cloning-advancement-criteria.patch b/patches/server/0096-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0095-Skip-cloning-advancement-criteria.patch rename to patches/server/0096-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0096-Reduce-block-destruction-packet-allocations.patch b/patches/server/0097-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0096-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0097-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0097-Spread-out-sending-all-player-info.patch b/patches/server/0098-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0097-Spread-out-sending-all-player-info.patch rename to patches/server/0098-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0098-Optimize-player-list-for-sending-player-info.patch b/patches/server/0099-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0098-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0099-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0099-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0100-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0099-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0100-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0100-Send-multiple-keep-alive-packets.patch b/patches/server/0101-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0100-Send-multiple-keep-alive-packets.patch rename to patches/server/0101-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0101-Make-slow-login-timeout-configurable.patch b/patches/server/0102-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0101-Make-slow-login-timeout-configurable.patch rename to patches/server/0102-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0102-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0103-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 100% rename from patches/server/0102-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0103-Load-portal-destination-chunk-before-entity-teleport.patch diff --git a/patches/server/0103-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0104-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0103-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0104-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0104-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0105-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0104-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0105-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0105-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0106-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 100% rename from patches/server/0105-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0106-Broadcast-crit-animations-as-the-entity-being-critte.patch diff --git a/patches/server/0106-Ignore-null-legacy-structure-data.patch b/patches/server/0107-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0106-Ignore-null-legacy-structure-data.patch rename to patches/server/0107-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0107-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0107-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0108-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0109-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0108-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0109-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0109-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0110-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0109-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0110-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0110-CraftBukkit-UUID-to-world-map.patch b/patches/server/0111-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0110-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0111-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0111-Global-EULA-file.patch b/patches/server/0112-Global-EULA-file.patch similarity index 100% rename from patches/server/0111-Global-EULA-file.patch rename to patches/server/0112-Global-EULA-file.patch diff --git a/patches/server/0112-Specific-interval-TPS-API.patch b/patches/server/0113-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0112-Specific-interval-TPS-API.patch rename to patches/server/0113-Specific-interval-TPS-API.patch diff --git a/patches/server/0113-5-second-TPS-average.patch b/patches/server/0114-5-second-TPS-average.patch similarity index 100% rename from patches/server/0113-5-second-TPS-average.patch rename to patches/server/0114-5-second-TPS-average.patch diff --git a/patches/server/0114-Measure-last-tick-time.patch b/patches/server/0115-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0114-Measure-last-tick-time.patch rename to patches/server/0115-Measure-last-tick-time.patch diff --git a/patches/server/0115-Last-tick-time-API.patch b/patches/server/0116-Last-tick-time-API.patch similarity index 100% rename from patches/server/0115-Last-tick-time-API.patch rename to patches/server/0116-Last-tick-time-API.patch diff --git a/patches/server/0116-Show-last-tick-time-in-tps-command.patch b/patches/server/0117-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0116-Show-last-tick-time-in-tps-command.patch rename to patches/server/0117-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0117-Increase-time-statistics-in-intervals.patch b/patches/server/0118-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0117-Increase-time-statistics-in-intervals.patch rename to patches/server/0118-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0118-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0119-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0118-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0119-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0119-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0120-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0119-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0120-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0120-Optimize-matching-item-checks.patch b/patches/server/0121-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0120-Optimize-matching-item-checks.patch rename to patches/server/0121-Optimize-matching-item-checks.patch diff --git a/patches/server/0121-Pre-compute-VarLong-sizes.patch b/patches/server/0122-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0121-Pre-compute-VarLong-sizes.patch rename to patches/server/0122-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0122-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0123-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from patches/server/0122-Optimize-VarInt-write-and-VarLong-write.patch rename to patches/server/0123-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/patches/server/0123-Reduce-RandomSource-instances.patch b/patches/server/0124-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0123-Reduce-RandomSource-instances.patch rename to patches/server/0124-Reduce-RandomSource-instances.patch diff --git a/patches/server/0124-Add-xor-shift-random.patch b/patches/server/0125-Add-xor-shift-random.patch similarity index 100% rename from patches/server/0124-Add-xor-shift-random.patch rename to patches/server/0125-Add-xor-shift-random.patch diff --git a/patches/server/0125-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0126-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch similarity index 100% rename from patches/server/0125-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch rename to patches/server/0126-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch diff --git a/patches/server/0126-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0127-Initialize-line-of-sight-cache-with-low-capacity.patch similarity index 100% rename from patches/server/0126-Initialize-line-of-sight-cache-with-low-capacity.patch rename to patches/server/0127-Initialize-line-of-sight-cache-with-low-capacity.patch diff --git a/patches/server/0127-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0128-Reduce-line-of-sight-updates-and-cache-lookups.patch similarity index 100% rename from patches/server/0127-Reduce-line-of-sight-updates-and-cache-lookups.patch rename to patches/server/0128-Reduce-line-of-sight-updates-and-cache-lookups.patch diff --git a/patches/server/0128-Server-thread-priority-environment-variable.patch b/patches/server/0129-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0128-Server-thread-priority-environment-variable.patch rename to patches/server/0129-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0129-Virtual-thread-support.patch b/patches/server/0130-Virtual-thread-support.patch similarity index 100% rename from patches/server/0129-Virtual-thread-support.patch rename to patches/server/0130-Virtual-thread-support.patch