Commit Graph

3492 Commits

Author SHA1 Message Date
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
7f5c4036f7 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1410a22b Fix passengers sending when riding players
PaperMC/Paper@767868dd Fix some components (#12457)
PaperMC/Paper@9cddf136 Fix portal create event block list (#12373)
PaperMC/Paper@a112d370 Fix horse_variant and tropical_fish_pattern (#12472)
2025-04-28 18:04:49 -07:00
Nebojsa Majic
4ce97c1d06 [ci skip] Update occurences of version numbers to 1.21.5 (#1658) 2025-04-28 11:22:12 -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
granny
bdeba761ac Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5f0b8292 Re-add chunk position check to regionfile recalculation patch
2025-04-19 15:18:52 -07:00
granny
f2f682fb48 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a55345f9 Add support for deserializing manually deserialized items, also add caller note
PaperMC/Paper@2948eb29 Mitigate an issue when loading a spigot config with null spam exclusion entries
PaperMC/Paper@6c2b0378 Use correct saved data key for maps
PaperMC/Paper@89cdcba5 [ci/skip] Replace wiki mention for BlockType#isOccluding (#12446)
2025-04-18 16:42:41 -07:00
granny
8b5044e007 [ci skip] add idea project icon 2025-04-14 16:25:44 -07:00
granny
c3870bda5a Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4511edb8 [ci/skip] Don't promote checking enchantment by legacy lore (#12421)
PaperMC/Paper@8f62e0fb Correctly order getArmorContents
PaperMC/Paper@652cea57 Allow `getAsString()`-ing non-persistent entities (#12424)
PaperMC/Paper@de64e704 Update spark
PaperMC/Paper@1b889688 Add Entity#isTrackedBy (#12332)
PaperMC/Paper@8ff94c63 Update a bunch of dependencies
PaperMC/Paper@79036210 Remove json-simple imports from API, keep it as implementation in server
PaperMC/Paper@dcb755ac Update log4j jd link
PaperMC/Paper@91bfb6fb Fix freeze locked (#12434)
PaperMC/Paper@121a7bf4 Make GameRule a FeatureDependant (#12429)
PaperMC/Paper@7d5695d7 Improve ItemMeta#hasCustomModelData compatibility (#12414)
PaperMC/Paper@de410d13 Fix reobf mappings regression in GameRules.Type (#12437)
PaperMC/Paper@33e8928f Add support for bonus chest configuration in WorldCreator (#12344)
PaperMC/Paper@723b511f Clone exit location passed to teleport event (#12354)
PaperMC/Paper@ed322043 Clone blockpos in InsideBlockEffectApplier record
PaperMC/Paper@6b4ad082 Add PlayerRespawnEvent#isMissingRespawnBlock (#12422)
PaperMC/Paper@c0bd5688 Add logic for Human canUseEquipmentSlot (#12433)
2025-04-14 16:14:39 -07:00
granny
f8450874da Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@07679026 CraftBlock - fix applyBoneMeal false result (#12407)
PaperMC/Paper@f00727c5 1.21.5
PaperMC/Paper@8eede4bb Fix AbstractHorse get/setSaddle
PaperMC/Paper@93b6829e Also fix AbstractHorse getSize and isEmpty
PaperMC/Paper@f517267c Add passthrough for air serialization
2025-04-12 22:23:25 -07:00
granny
f5a9280b2f Merge branch 'ver/1.21.4' into ver/1.21.5 2025-04-12 22:03:17 -07:00
granny
751d8388ab fix color signs not working properly 2025-04-12 21:47:34 -07:00
granny
ba521eb66d read & write spawn data properly for placing spawners option 2025-04-12 21:47:09 -07:00
granny
51aafbc731 Final 1.21.4 Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@07679026 CraftBlock - fix applyBoneMeal false result (#12407)
2025-04-12 16:27:49 -07:00
Josh
d4af79471c Add configurable smooth snow accumulation (#1651) 2025-04-12 15:20:22 -07:00
Dreeam
96f0ee1ea3 Add check for max growth age special case (#1652) 2025-04-12 13:33:24 -07:00
Pedro
c5bb590f88 [ci skip] Mention API Checks for CONTRIBUTING.md 2025-04-11 15:26:58 -07:00
granny
ecd0d7030c Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@212dfc94 Correctly track raw data reader index for antixray
PaperMC/Paper@cb0676a4 Commodore for Potions and Cows
PaperMC/Paper@62256c51 add missed cow diff
2025-04-09 16:54:14 -07:00
granny
0311dfcdae Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0cf73158 Bump to adventure 4.20.0 (#12391)
PaperMC/Paper@e8eba887 Merge remote-tracking branch 'origin/main' into update/1.21.5
2025-04-07 13:51:30 -07:00
granny
6be184ec7c Merge branch 'ver/1.21.4' into ver/1.21.5 2025-04-07 13:45:27 -07:00
granny
65b1288b31 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0cf73158 Bump to adventure 4.20.0 (#12391)
2025-04-07 13:44:48 -07:00
granny
8c2936263c [ci skip] ignore deprecation or removal warnings 2025-04-07 13:29:40 -07:00
granny
d6ac530c68 [ci skip] ignore deprecation or removal warnings 2025-04-07 13:29:01 -07:00
granny
54283ad076 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@cc0f25cb Apply more feature patches
PaperMC/Paper@e7b684ed fix
PaperMC/Paper@71ccae07 Revert "move block data/state impl"
PaperMC/Paper@7612b5d0 Add identifier comparator for Plugin tickets
PaperMC/Paper@35b466e3 Add support for getting data components from entities
PaperMC/Paper@9f50f858 patch
PaperMC/Paper@42623c4b no patch
2025-04-05 20:54:04 -07:00
granny
b81ab42440 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@cdad49b7 Do not mark plugin tickets as forced; keep correct ticket types
PaperMC/Paper@a1c4fc96 Add generic ticket identifier
PaperMC/Paper@745881bb Update Moonrise common for 1.21.5
PaperMC/Paper@e9d00eb6 Apply Moonrise patch
PaperMC/Paper@ef0f0d10 Copy Moonrise 1.21.5 update over
2025-04-01 22:26:42 -07:00
granny
aa0bf38f14 Merge branch 'ver/1.21.4' into ver/1.21.5 2025-03-31 14:42:01 -07:00
granny
81d1d39d86 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9b1798d6 Simplify custom payload handling (#12347)
PaperMC/Paper@db8c646d Merge remote-tracking branch 'origin/main' into update/1.21.5
2025-03-31 14:39:47 -07:00
granny
75c3c008c3 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@41a094cf move block data/state impl
PaperMC/Paper@6b26b219 remove hardcoded durability from material
2025-03-30 15:23:16 -07:00
granny
7b360b0c86 use world context for registry access 2025-03-29 17:05:55 -07:00
granny
10fe084ea9 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2552abf0 fix message mutation in PlayerSetSpawnEvent
PaperMC/Paper@ae99e24f fix deprecated bungee chat api methods
PaperMC/Paper@dca4aab8 add util methods to CraftChatMessage
PaperMC/Paper@87c9d9b0 be more lenient on url parsing for legacy format
PaperMC/Paper@4a9bd2e3 Correctly clear items in PlayerDeathEvent
PaperMC/Paper@a70f7745 fix unsaveable launched trident
2025-03-29 16:16:47 -07:00
granny
3c01f7c1b7 set the proper generated directory 2025-03-27 17:16:25 -07:00
granny
9249a2ca46 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9b1798d6 Simplify custom payload handling (#12347)
2025-03-27 17:01:24 -07:00
granny
4907125796 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@fa0dd15d add missed nullability annotations
PaperMC/Paper@b6d70a9c Generators
PaperMC/Paper@b92137c1 load the PDC for new block entities
PaperMC/Paper@06a26ec2 update legacy test
PaperMC/Paper@c4f0b2b0 update more test
PaperMC/Paper@77382fcb fix unbreakable shields
PaperMC/Paper@9e08de6e Re-add old SmithingTrimRecipe constructors
PaperMC/Paper@d2afd149 Bump some more numbers to 1.21.5
PaperMC/Paper@cf1455e5 Ignore private methods in MaterialReroutingTest
PaperMC/Paper@ce91a8ca Move out unapplied feature patches
2025-03-27 16:40:56 -07:00
granny
73e0e17b6d make it compile \o/ 2025-03-27 16:27:24 -07:00
granny
f1e732aa3a forgot this one 2025-03-25 22:22:03 -07:00
granny
110b3a7813 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@dfc38843 deprecate bubble column methods
PaperMC/Paper@480b2ed0 use more specific codecs in click event actions
PaperMC/Paper@e21bf450 fix chunk-gc plugin ticket config
PaperMC/Paper@32fef5d2 do the fix in Ticket record getter instead
PaperMC/Paper@0d8dad65 Quick cursory update of ItemStackDataComponentTest
PaperMC/Paper@0f1f084b Update ItemStackDataComponentEqualsTest
PaperMC/Paper@34dfd5e8 add perm for test command, fix some tests
PaperMC/Paper@740abe1a Update CraftSmithingTransformRecipe
PaperMC/Paper@de93fda5 Merge branch 'update/1.21.5' of github.com:PaperMC/Paper into update/1.21.5
PaperMC/Paper@c02ad46d Update SmithingTripRecipe
PaperMC/Paper@0a5ea70a Also bundle mc source change from last commit
PaperMC/Paper@e7534177 Some marginal work on DataComponents
PaperMC/Paper@db35db76 Implement legacy custom biome
PaperMC/Paper@18b06e38 Implement plugin tickets
PaperMC/Paper@c7b22702 Implement custom legacy biome
PaperMC/Paper@77f07c89 Call drop events for dropping items
PaperMC/Paper@eac69a96 Pray my thesis is better than this
PaperMC/Paper@c5231f91 Update to 1.21.5
PaperMC/Paper@a3f71b0f update some magic values
PaperMC/Paper@704cc38c Add some missing adapters
PaperMC/Paper@536b9b4b fix some more tests
PaperMC/Paper@985ebcfe Quick handling for ChickenVariant data component, remove dupe
PaperMC/Paper@39eafa2a implement wolf sound variants
PaperMC/Paper@c78f5631 make class node tests have a display name
PaperMC/Paper@3be8a83c Allow picking items from inventory
PaperMC/Paper@95beb8c0 register wolf sound variant
2025-03-25 22:20:43 -07:00
granny
9dc9fd34cd apply feature patches 2025-03-25 22:02:04 -07:00
granny
48131f7f20 update nms file patches 2025-03-24 22:23:34 -07:00
granny
cb8448ffe7 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@102c8bbc Add config for updating equipment on player actions (#12275)
PaperMC/Paper@f0388e2f Call EntityPushedByEntityAttackEvent for Mace AoE (#12257)
PaperMC/Paper@c37b890c More deferred requireNonNull message creation
PaperMC/Paper@310f5229 Add unsupported config option and internal API to simplify remote item matching
PaperMC/Paper@6ea42025 Send all attributes on respawn (#12274)
PaperMC/Paper@2d3a1385 [ci/skip] Refine recipe management API documentation. (#12287)
PaperMC/Paper@aaaeb4e1 [ci/skip] Make compilation logs actually readable (#12276)
PaperMC/Paper@bb1beda6 feat: add event to wind charge explode (#12248)
PaperMC/Paper@9f004614 Update a whole lot of deprecated annotations
PaperMC/Paper@72f13f8b [ci/skip] Mention API Checks for CONTRIBUTING.md (#12315)
PaperMC/Paper@7cc6cb50 Check for trailing input in ItemFactory#createItemStack (#12312)
PaperMC/Paper@f49d18df Add get/set customName to Skull block (#12302)
PaperMC/Paper@894631f0 Make advancement ordering predictable (#12292)
PaperMC/Paper@2aad131e Add config option for command spam whitelist
PaperMC/Paper@bb3b7e69 Fix annotation mistakes
PaperMC/Paper@058455e4 InventoryView QOL open method (#12282)
PaperMC/Paper@f2258582 Fix firework entity not being removed when FireworkExplodeEvent is cancelled (#12268)
PaperMC/Paper@7819df10 Add getHeight method to ChunkData (#12311)
PaperMC/Paper@37b9ca1f Add flush parameter to World#save (#12330)
PaperMC/Paper@515e12ca Check if BUNDLE_CONTENTS is present in InventoryClickEvent (#12321)
PaperMC/Paper@5a6ab97b Add config to remove player as vehicle restriction in /ride (#12327)
PaperMC/Paper@c467df95 Add ItemStack#copyDataFrom (#12224)
PaperMC/Paper@78af68b6 fix some ticket related decompile errors
PaperMC/Paper@ce3ede47 Server now says yes to movement
PaperMC/Paper@eafb6c29 Merge remote-tracking branch 'up/main' into update/1.21.5
PaperMC/Paper@5ef8349e Merge remote-tracking branch 'up/update/1.21.5' into update/1.21.5
PaperMC/Paper@1111f183 Update remote item matching option
PaperMC/Paper@58554542 Fix oopsie
PaperMC/Paper@b8078d38 Update to 1.21.5-rc2
PaperMC/Paper@a776d7a9 update entity effect
PaperMC/Paper@67cc0e5f bump built-in datapack version
PaperMC/Paper@28daa6ce update adventure codecs, fixes click and hover events
PaperMC/Paper@e50bb66a make Phantom#anchorPoint nullable
2025-03-24 13:48:10 -07:00
granny
c8d8532712 Merge branch 'ver/1.21.4' into ver/1.21.5 2025-03-24 10:49:26 -07:00
granny
75efb975ce Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@bb3b7e69 Fix annotation mistakes
PaperMC/Paper@058455e4 InventoryView QOL open method (#12282)
PaperMC/Paper@f2258582 Fix firework entity not being removed when FireworkExplodeEvent is cancelled (#12268)
PaperMC/Paper@7819df10 Add getHeight method to ChunkData (#12311)
PaperMC/Paper@37b9ca1f Add flush parameter to World#save (#12330)
PaperMC/Paper@515e12ca Check if BUNDLE_CONTENTS is present in InventoryClickEvent (#12321)
PaperMC/Paper@5a6ab97b Add config to remove player as vehicle restriction in /ride (#12327)
PaperMC/Paper@c467df95 Add ItemStack#copyDataFrom (#12224)
2025-03-23 17:35:00 -07:00
granny
848bc8d234 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@6670dc71 update to rc1
PaperMC/Paper@07845f21 more compile fixes
PaperMC/Paper@0366bb6d fix octahedral group patch
PaperMC/Paper@70452b54 Initial draft for tracking affected block pos
PaperMC/Paper@93872b22 Reduce diff for inside block tracker
PaperMC/Paper@92abbc6c Deprecate Raid#getId for removal
2025-03-23 17:27:52 -07:00
granny
ca56b414b2 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2aad131e Add config option for command spam whitelist
2025-03-23 12:48:06 -07:00
granny
f5091f2fab Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@cab3010a Update a whole lot of deprecated annotations
PaperMC/Paper@6aad8807 compile fixes and equipOnInteract
PaperMC/Paper@c1f5409d Some progress
PaperMC/Paper@91a38cdb Finish more item data component API
PaperMC/Paper@d8afce2e Split thrown potion
PaperMC/Paper@46d21c11 cleanup events
PaperMC/Paper@46e7c750 fix legacy serialization with equipOnInteract and add preconditions
2025-03-23 12:40:33 -07:00
granny
a76ef64526 Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f2e7f442 simplify
2025-03-22 14:55:46 -07:00
granny
bc8c597baa Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2d3a1385 [ci/skip] Refine recipe management API documentation. (#12287)
PaperMC/Paper@aaaeb4e1 [ci/skip] Make compilation logs actually readable (#12276)
PaperMC/Paper@bb1beda6 feat: add event to wind charge explode (#12248)
PaperMC/Paper@9f004614 Update a whole lot of deprecated annotations
PaperMC/Paper@72f13f8b [ci/skip] Mention API Checks for CONTRIBUTING.md (#12315)
PaperMC/Paper@7cc6cb50 Check for trailing input in ItemFactory#createItemStack (#12312)
PaperMC/Paper@f49d18df Add get/set customName to Skull block (#12302)
PaperMC/Paper@894631f0 Make advancement ordering predictable (#12292)
2025-03-21 22:41:19 -07:00