granny
69742b8bcd
Merge branch 'ver/1.21.5' into ver/1.21.6
2025-06-13 22:30:22 -07:00
granny
849bc79cac
register test subcommands used for debugging, closes #1675
2025-06-13 22:06:35 -07:00
granny
452bb319db
port PaperMC/Paper#12654, closes #1665
2025-06-13 21:53:25 -07:00
granny
293e28a048
use empty registryaccess where context is not needed, closes #1676
2025-06-13 19:21:39 -07:00
granny
25d39e94ed
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@8c313fb3 properly override removePassenger for happy ghast
PaperMC/Paper@87d0fdd8 happy ghast is a vehicle
PaperMC/Paper@a38aeef6 fix indices for horse inventories getItem
PaperMC/Paper@96d739c1 rename RegistryFreezeEvent to RegistryComposeEvent
PaperMC/Paper@1102e7b8 fix Equippable#shearSound
PaperMC/Paper@f961ed57 update to rc1
PaperMC/Paper@c3467554 bump built-in datapack version
2025-06-12 16:34:46 -07:00
granny
b1d412fb40
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@ba7fb23d Finish moving over to Holderable (#12646 )
2025-06-10 17:39:23 -07:00
granny
5cd1961a65
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@7e68259c attribute modifier display
PaperMC/Paper@8d5be7ed port some generator fixes
PaperMC/Paper@569c3231 update to pre4
2025-06-10 17:11:18 -07:00
granny
7c6502dc13
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@94f29035 Do not blow up accessing unregistered memories from API (Fixes #12618 ) (#12639 )
PaperMC/Paper@03efecf0 Do not fire PlayerDropItemEvent for /give command
PaperMC/Paper@3527ccdf feat: expose updateDemand and restock on Villager (#12608 )
PaperMC/Paper@320f25cb fix sponge-absorb deleting chest content (#12647 )
2025-06-08 12:55:55 -07:00
granny
c39c270a37
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@73d218c1 Improve command permission lookups
PaperMC/Paper@7c2ffd5e Prune the api version suffix
PaperMC/Paper@c609d6dc Remove SERVER_ONLY command flag functionality
PaperMC/Paper@3594d24a Properly send over SADDLE and BODY equipment items to PlayerInventory
PaperMC/Paper@720e63ff Remove craft flying
PaperMC/Paper@1e441025 Removed inlined art api
PaperMC/Paper@adb5aefc Add api for shear equippable logic
PaperMC/Paper@4604c5f2 Change ordering on YamlSanitizationTest
PaperMC/Paper@c986ce54 Fix V4307 ordering issues
PaperMC/Paper@48e94e8c fix sponge absorb resetting block entity data of waterlogged blocks
PaperMC/Paper@c5fc0dc8 support block state mutation of already placed block entity in BlockStateListPopulator
2025-06-08 12:06:00 -07:00
granny
8dfb6bda48
comment out the custom task for now
2025-06-08 11:29:01 -07:00
granny
eb0ba67d83
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@4eda045b Backport fix for MC-296337 (Fixes #12617 ) (#12619 )
PaperMC/Paper@7ebc94c2 Add Registry#getTagValues (#12603 )
PaperMC/Paper@e87320d5 Fix UOE when using generateTree with pale oak (#12616 )
2025-06-06 19:30:41 -07:00
granny
389c2d7b16
Merge branch 'ver/1.21.5' into ver/1.21.6
2025-06-05 21:58:39 -07:00
granny
916df1a858
use the correct item reference for retrieving components, closes #1668
2025-06-05 21:18:05 -07:00
granny
4cd43bb79b
fix tests
2025-06-05 20:06:03 -07:00
granny
e40ada42af
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@921c5f93 Do not send update packets for saddle/body slots
PaperMC/Paper@f00d9bce Second part of diff
PaperMC/Paper@24cd24c8 Optimise CraftWorld#getLoadedChunks
PaperMC/Paper@73c536da add new UI sound category
PaperMC/Paper@a8df9346 Run generators
PaperMC/Paper@77d1c233 Remove useless comments and FQN in source
PaperMC/Paper@26a82545 fix some NPEs
PaperMC/Paper@774c40e7 Update CraftWorld#getForceLoadedChunks to avoid using getChunkAt
2025-06-05 19:50:36 -07:00
granny
80872f173f
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@ec548f93 1.21.6-pre3
PaperMC/Paper@66272e6a Bump server compile memory
PaperMC/Paper@a4e0777a Build updates
PaperMC/Paper@b81bb102 Add new attributes for 1.21.6
PaperMC/Paper@39ff9ed2 Pass hand to entity unleash event
PaperMC/Paper@f8bde6e1 Resend leash state
2025-06-04 16:26:06 -07:00
granny
2a46cfc530
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@20e9fe8e Fix javadocs in DriedGhast
PaperMC/Paper@1366eaa5 Readd dropped hunk
PaperMC/Paper@4b6fae10 1.21.6-pre2
PaperMC/Paper@5cfd6383 Fix compile issues
PaperMC/Paper@18924de7 run generator
PaperMC/Paper@fbc139e0 some fixes
PaperMC/Paper@0c3879ac track block for lava/conduit damage
PaperMC/Paper@767e99c9 Moonrise attempt
PaperMC/Paper@b15c51ce Rest of feature patches
PaperMC/Paper@c136222e Moonrise compile fixes and changes
PaperMC/Paper@52880cec Fix LayeredCauldronBlock event call
PaperMC/Paper@4fa21c21 Update Moonrise to 1.21.6-pre2
PaperMC/Paper@cb705c41 Add DataConverter patch
PaperMC/Paper@87b3d8ba Replace deprecated Thread#getId usage with Thread#threadId
PaperMC/Paper@5b362692 Add MCUtil#toLocation from Folia
PaperMC/Paper@b2f3c2c9 Move over to non discarding reporter
PaperMC/Paper@4c4ddfcc Update ItemType
2025-06-03 22:14:04 -07:00
granny
1505068927
add happy ghast config options
2025-06-01 19:34:17 -07:00
granny
bd773d449d
fix color codes in sign preview
2025-06-01 19:00:13 -07:00
granny
99c1ff6999
use AT for setting method as public
2025-06-01 18:43:16 -07:00
granny
9f6cbee8e0
it compiles \o/
2025-06-01 17:27:04 -07:00
granny
503c6f4641
all feature patches applied?? that was too easy...
2025-06-01 14:58:44 -07:00
granny
89ee2e0c0f
apply the rest of the minecraft file patches \o/
2025-06-01 14:33:08 -07:00
granny
994dd4f476
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@4a903d81 Readd dropped diff
PaperMC/Paper@4fe0ac24 Some more comments
PaperMC/Paper@19a36413 Last per file patches
PaperMC/Paper@e49b5e88 Fix compile issues:
PaperMC/Paper@1b30919a Fix
PaperMC/Paper@df964545 Fixup whatever happened here
PaperMC/Paper@5933bd5b TrialSpawner compile fixes
PaperMC/Paper@20136f71 Some initial adoption of ValueInput/Output
PaperMC/Paper@a1bfc19a Some more compilation issues
PaperMC/Paper@d16b93e6 Generator
PaperMC/Paper@c34fb5f8 Test fixes
PaperMC/Paper@f3bad8c8 Prepare work on feature patches
PaperMC/Paper@ed3b39e9 14 first feature patches
PaperMC/Paper@ff05a2df Hacky EAR 2.0 fixes
2025-06-01 13:17:21 -07:00
granny
cfd1e070a2
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@ca8da0e3 Commands
PaperMC/Paper@e0437448 /net/minecraft/world/entity/decoration/
PaperMC/Paper@d251511d net\minecraft\worldntity\projectile\
PaperMC/Paper@62c4dda5 /net/minecraft/world/entity/monster
PaperMC/Paper@4a821685 ServerPlayer, ServerLevel, ServerEntity
PaperMC/Paper@6d71abd2 Other random classes
PaperMC/Paper@f44197c4 net/minecraft/world/entity/item
PaperMC/Paper@2f152e01 Fix some compile errors
PaperMC/Paper@92ece7b6 Fix dropped diff
PaperMC/Paper@8c974745 readd dropped ack diff
2025-05-30 19:51:17 -07:00
granny
3ba90894b1
convert applied source patches to file patch format
2025-05-30 19:45:10 -07:00
granny
5d3463aaa0
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@6f315356 Add MCUtil#toLocation from Folia
PaperMC/Paper@2ba1675c Replace deprecated Thread#getId usage with Thread#threadId
2025-05-29 21:34:39 -07:00
granny
312725553b
minor cleanup
2025-05-28 20:30:03 -07:00
granny
4ff982a4c9
apply the minecraft source files that we can rn
2025-05-28 20:20:54 -07:00
granny
aa20c1ccf6
paper server patches \o/
2025-05-28 20:00:01 -07:00
granny
95952b3056
api patches \o/
2025-05-28 19:56:58 -07:00
granny
2c139d3b7a
move patches to unapplied directories
2025-05-28 19:29:00 -07:00
granny
59d7a40b38
convert file patches to git patches
2025-05-28 19:23:02 -07:00
granny
42286249e5
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@f303a076 fix: Don't hardcode checks for translation registries (#12571 )
PaperMC/Paper@87349c31 Fix CombatTracker stale on death (#12562 )
PaperMC/Paper@b70bca6b Revert "fix: Don't hardcode checks for translation registries (#12571 )"
PaperMC/Paper@3efaf477 Add API for client-side signs (#11903 )
PaperMC/Paper@a3909f54 [ci/skip] Fix bad format for jd @link (#12581 )
PaperMC/Paper@7774243d Add plugin details to zip file errors (#12580 )
PaperMC/Paper@220b57ad Fixs and Improvements for EndermanEscapeEvent (#12570 )
PaperMC/Paper@b8fe22c9 Do not call EntityRemoveEvent during worldgen (#12588 )
PaperMC/Paper@ee3b4053 Replace spigot check with generation check
PaperMC/Paper@84ee4249 Add Map filled event (#12574 )
PaperMC/Paper@b9d6ba24 Expose more data for MusicInstrument (#12415 )
PaperMC/Paper@a033e3b9 Fix ancient player custom name converter
2025-05-25 15:18:38 -07:00
granny
1dd9bd0ca4
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@fa360aa8 Add some missing annotations and an incorrect one (#12204 )
PaperMC/Paper@113b18ee Update paperweight and Gradle wrapper (#12573 )
2025-05-20 21:13:53 -07:00
granny
09f547de09
add mob-griefing-override config options ( #1661 )
2025-05-18 15:49:56 -07:00
granny
3de2fc7d2f
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@c000b352 fix(bukkit-brig-forwarding-map): Invert isEmpty method (#12555 )
PaperMC/Paper@28d7df75 Backport HeroesOfTheVillage datafixer fix
PaperMC/Paper@f1dbed07 Implement BlocksAttack DamageReduction and ItemDamage (#12538 )
PaperMC/Paper@cc38032b Deprecate TeleportCause CHORUS_FRUIT for CONSUMABLE_EFFECT (#12546 )
PaperMC/Paper@35878677 [ci/skip] Fix format and mentions for ItemDamageFunction (#12560 )
PaperMC/Paper@7171d299 [ci/skip] Mention CAN_PLACE/CAN_BREAK component in ItemMeta (#12559 )
PaperMC/Paper@6f73e62e Add getPickItemStack (#12552 )
PaperMC/Paper@ce0fa4c4 Replace old version command with brigadier equivalent (#12502 )
2025-05-18 15:03:30 -07:00
granny
e4e9cfdf29
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@d683970d Add FishHookStateChangeEvent (#12165 )
PaperMC/Paper@369ad170 Cached tag parser for itemstack reading (#12547 )
PaperMC/Paper@841d6342 Fix ItemStack#addUnsafeEnchantment ignored for missing enchantment component (#12549 )
2025-05-17 18:47:05 -07:00
granny
603c7557ba
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@358e72ec Remove simplify remote item matching stuff for now
PaperMC/Paper@04ffca0b Also remove CraftPlayer methods
2025-05-09 19:43:32 -07:00
granny
9d0aa8ebde
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@42a2a6c2 Supports the ability for commands to be registered internally (#12520 )
PaperMC/Paper@753cff7c Improvements for Dump paper commands (#12512 )
PaperMC/Paper@e2da5d2f Registry API for supported Mob Variants (#12417 )
PaperMC/Paper@ab0253fe Expand PlayerDeathEvent API (#12221 )
PaperMC/Paper@cbcf75a5 Update visual fire handling with TriState support (#12303 )
PaperMC/Paper@6c3964d2 Properly save level data async (#12530 )
PaperMC/Paper@d2ad2e66 Add missing EntityLookup#getAllMapped from Moonrise
2025-05-08 22:08:56 -07:00
granny
a9fe4f2597
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@bc3d946f Normalizes CraftEntity#toString/getHandle (#12170 )
PaperMC/Paper@0e9b94d5 Fix ItemStack amount issues with Chat Components (#12216 )
PaperMC/Paper@835b9559 Add a method on InventoryView to get the MenuType (#12193 )
PaperMC/Paper@c9411bfb Fix min ItemStack amount check for asHoverEvent (#12505 )
PaperMC/Paper@1acf3b38 Infer block entity data in brigadier blockstate argument (#12197 )
PaperMC/Paper@b9b3cd65 Use components instead of ChatColor in more places (#12507 )
PaperMC/Paper@ec421715 Add missing spaces back (#12508 )
PaperMC/Paper@51345a1c Correct nullable fall location type
PaperMC/Paper@93246a07 Fix errors when loading raid files without a PDC
PaperMC/Paper@cb3ffd0b Don't store empty PDCs on raids
PaperMC/Paper@d637ae85 Fix NoSuchElementException in EntityTransformEvent for slimes (#12510 )
PaperMC/Paper@10742373 Pass correct draw strength for EntityShootBowEvent (#12308 )
PaperMC/Paper@825685f8 Add PlayerPickBlockEvent and PlayerPickEntityEvent (#12425 )
PaperMC/Paper@2bd84f6f Expand PotionMeta Api to allow getting effective potion colour and effects (#12390 )
PaperMC/Paper@6f1f5b67 Fix ArmorStand items for canceled EntityDeathEvent (#12288 )
PaperMC/Paper@88a3a870 Configurable xp orb merge group count (#12503 )
PaperMC/Paper@53d1d04e Disable Item Obfuscation for entity related stacks (#12297 )
PaperMC/Paper@c98cd658 Add configuration interface to expose certain config values (#12273 )
2025-05-03 20:47:01 -07:00
granny
3156e44696
check damage value of tool correctly
2025-05-03 20:32:02 -07:00
granny
5c1a983514
fix issue with shift-right-click-repairs-mending-points
...
properly consume XP when a tool is at 1 durability and `shift-right-click-repairs-mending-points` is set to 1.
Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com >
2025-05-03 20:12:19 -07:00
granny
6f5bbae51b
[ci skip] move some code around
2025-05-03 18:13:58 -07:00
granny
c2f485914e
[ci skip] only set default world config values once
...
this stops migrated values under "default" from being overwritten when migrating world-specific config values
2025-05-03 17:16:06 -07:00
linaTetris
93011bc195
Add configuration setting to re-add End void rings ( #1656 )
...
Co-authored-by: granny <granny@purpurmc.org >
2025-05-03 16:32:59 -07:00
granny
8c77678e81
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@9e873f50 Fix inconsistencies between offline/online spawn position getter (#11960 )
PaperMC/Paper@fc0c3717 Fix handling of resultant crafting container from craftItemResult (#12307 )
PaperMC/Paper@a7a76c8f Add methods for Armadillo (#12031 )
PaperMC/Paper@a74400d9 Update adventure to 4.21.0 (#12499 )
PaperMC/Paper@1e930763 Fix ipv6 loopback addresses being able to get connection throttled (#12155 )
PaperMC/Paper@646b80ca Fix unnecessary map data saves (#12296 )
PaperMC/Paper@e663f999 Add combat tracker API (#11853 )
PaperMC/Paper@cd4fe5b7 [ci/skip] Drop non-applicable ATs (#12498 )
PaperMC/Paper@5acfdd6a Fix save/load NaN Entity Motion (#12269 )
PaperMC/Paper@2754d7c3 Add Throw EntityChangeBlockEvent for BrushableBlockEntity#brush (#12133 )
PaperMC/Paper@567f63ae Parity for respawn events (#11792 )
2025-04-30 17:35:04 -07:00
granny
4fdf1d117c
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@a211ac2e Remove unused warning (#12478 )
PaperMC/Paper@ae512811 Add isSuffocating to Block and BlockState (#12445 )
PaperMC/Paper@3409e2d7 Mace was not included in the ENCHANTABLE MaterialSetTag (#12476 )
PaperMC/Paper@1cfc96bc Add keyStream() API to registries (#12479 )
PaperMC/Paper@3222985e [ci/skip] Rebuild patches
PaperMC/Paper@deaccd2c [ci/skip] Add file reference url to help.yml (#12481 )
PaperMC/Paper@f86b4352 Add vault change state event (#12069 )
PaperMC/Paper@3e3b42cd Update player chat session sync (#12382 )
PaperMC/Paper@f8fa4f6f Add method to retrieve FishHook (#12310 )
PaperMC/Paper@b9d3147d Use correct placed block position for sound (#12410 )
PaperMC/Paper@952338b3 [ci/skip] Add missing exception docs to Player#listPlayer (#12488 )
PaperMC/Paper@1db37853 [ci/skip] improve javadoc for off-hand swaps through getHotbarButton (#12489 )
PaperMC/Paper@d1810f24 Allow Server#getDefaultGameMode before worlds are initialized (#12490 )
PaperMC/Paper@02d20ff7 Fix NPE in Server#getMap before worlds are loaded (#12492 )
2025-04-28 18:07:23 -07:00
granny
6cc78b6308
Updated Upstream (Paper)
...
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@04b91129 Update projects dependents GitHub Action (#12436 )
PaperMC/Paper@def0532f Fix writing headers and update to be more papery (#12459 )
PaperMC/Paper@d22644aa Expand cooldown API (#12435 )
PaperMC/Paper@df429932 Fix floating warning log when the kick event is canceled (#12374 )
PaperMC/Paper@a820bdae [ci/skip] Some javadoc fixes
PaperMC/Paper@55f20209 Fix CCE in LingeringPotionSplashEvent (#12463 )
2025-04-23 15:32:47 -07:00
granny
96f5b04492
drop void damage height/damage migration
2025-04-23 15:22:55 -07:00
