Skip to content

Item datacomponent api #10845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
Owen1212055 merged 66 commits into from
Nov 18, 2024
Merged

Item datacomponent api #10845

Owen1212055 merged 66 commits into from
Nov 18, 2024

Conversation

@Owen1212055
Copy link
Member

@Owen1212055 Owen1212055 commented Jun 2, 2024 •
edited by Machine-Maker
Loading 

- [x] re-implement methods on ItemStack to use the data component API (hasEnchant, setEnchant, etc.)
- [x] decide what types actually need builders. Wrappers for a simple int like CustomModelData or MapId don't need separate builders
- [ ] javadocs for everything (all methods on all data component value objects)
- [ ] https://github.com/PaperMC/Paper/pull/10852
- [ ] ensure "DataComponent" name is consistent
- [x] ~~LockCode should it require a lock code be set?~~ later, got more complicated
- [x] MapDecorations expose full map? -- Yes
- [x] ~~ItemArmorTrim or just add tooltip to existing ArmorTrim~~ ItemArmorTrim
- [ ] provide empty constants where appropriate via static methods?
- [x] expose the concept of "filtered" for both book types? --Yes
- [x] ~~`minecraft:custom_data`, expose or not? Just that one, not the other entity/block CustomData ones~~ no
- [ ] provide a mutable way to change already existing complex component like ItemEnchantments.Mutable?
name primitive? Implemented?
custom_data
max_stack_size
max_damage
damage
unbreakable
custom_name
item_name
item_model
lore
rarity
enchantments
can_place_on
can_break
attribute_modifiers
custom_model_data
hide_additional_tooltip
hide_tooltip
repair_cost
creative_slot_lock
enchantment_glint_override
intangible_projectile
food
consumable
use_remainder
use_cooldown
damage_resistant
tool
enchantable
equippable
repairable
glider
tooltip_style
death_protection
stored_enchantments
dyed_color
map_color
map_id
map_decorations
map_post_processing
bundle_contents
potion_contents
suspicious_stew_effects
writable_book_content
written_book_content
trim
debug_stick_state
entity_data
bucket_entity_data
block_entity_data
instrument
ominous_bottle_amplifier
jukebox_playable
recipes
lodestone_tracker
firework_explosion
fireworks
profile
note_block_sound
banner_patterns
base_color
pot_decorations
container
block_state
  • (partially)
bees
lock
container_loot

@Owen1212055 Owen1212055 requested a review from a team as a code owner June 2, 2024 18:41
@Owen1212055 Owen1212055 mentioned this pull request Jun 2, 2024
Closed
masmc05
masmc05 reviewed Jun 2, 2024
View reviewed changes
kennytv
kennytv reviewed Jun 3, 2024
View reviewed changes
@Machine-Maker Machine-Maker force-pushed the item-datacomponent-api branch from ab97e06 to 08c01fb Compare June 3, 2024 19:00
@Machine-Maker Machine-Maker changed the base branch from master to feature/ItemStack-proxy June 3, 2024 19:09
@Machine-Maker Machine-Maker force-pushed the feature/ItemStack-proxy branch 7 times, most recently from 5f8b360 to 55fb24b Compare June 17, 2024 17:48
Base automatically changed from feature/ItemStack-proxy to dev/1.21 June 17, 2024 19:12
@kennytv kennytv changed the base branch from dev/1.21 to master June 17, 2024 19:25
@Owen1212055 Owen1212055 force-pushed the item-datacomponent-api branch from 8a23207 to 4414a61 Compare June 17, 2024 19:55
kennytv
kennytv reviewed Jun 22, 2024
View reviewed changes
@Owen1212055 Owen1212055 force-pushed the item-datacomponent-api branch from 72b87a5 to 363d994 Compare August 10, 2024 03:28
@Machine-Maker Machine-Maker force-pushed the item-datacomponent-api branch from 4b3318d to 699e8f5 Compare August 11, 2024 01:35
@chicoferreira chicoferreira mentioned this pull request Aug 14, 2024
Open
@Protonull Protonull mentioned this pull request Aug 23, 2024
Closed
@Owen1212055 Owen1212055 force-pushed the item-datacomponent-api branch from f45b2b4 to 1dbf76c Compare October 31, 2024 17:35
@Owen1212055 Owen1212055 force-pushed the item-datacomponent-api branch from f3e2ae9 to cd2af33 Compare November 13, 2024 19:24
kennytv
kennytv reviewed Nov 17, 2024
View reviewed changes
patches/api/0496-WIP-DataComponent-API.patch Outdated
new file mode 100644
index 0000000000000000000000000000000000000000..54e1a383c4eeb595417ea6e9e4e9527a8ffd9a99
--- /dev/null
+++ b/src/main/java/io/papermc/paper/util/Filtered.java
Copy link
Member

@kennytv kennytv Nov 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Util doesn't feel like the right package for this. It's not a general utility, it's a Minecraft type

@lynxplay lynxplay force-pushed the item-datacomponent-api branch 2 times, most recently from db51a8a to 3e6d2ad Compare November 18, 2024 16:21
Lulu13022002 and others added 25 commits November 18, 2024 14:50
@Lulu13022002 @Owen1212055
another change
2070844
@Owen1212055
Add ItemStack#matchesWithoutData, Remove most singletons, implement s…
389d948 
…uggestions, fix tests
@Owen1212055
Readd wrappers
bcfbdac
@Machine-Maker @Owen1212055
add tons of javadocs
8ff2401
@Machine-Maker @Owen1212055
add one toBuilder method for food
2bd5eee
@Owen1212055
Update Data component api
eaddf6a
@Machine-Maker @Owen1212055
switch api to jspecify
032bb38
@Lulu13022002 @Owen1212055
add some preconditions
9184543 
and fix PotionContents customName
@Lulu13022002 @Owen1212055
generate typed keys and fix test
cbbc12d
@Lulu13022002 @Owen1212055
re-implement matchesWithoutData
2ac4023 
fixes some issues when the current item doesn't have any component on the patch
@Owen1212055
Update Data component api
8122d5e
@lynxplay @Owen1212055
Add javadocs and text fixes
bc985c1
@Owen1212055
Implement suggested changes
22a2857
@Machine-Maker @Owen1212055
more api changes
d802e95
@Machine-Maker @Owen1212055
more server cleanup
cbbace1
@Machine-Maker @Owen1212055
more cleanup
3dcd22c
@lynxplay @Owen1212055
Some more cleanup
59e0f4b
@lynxplay @Owen1212055
Add missing experimental annotations
330057a
@Owen1212055
Undo diffs
ed7c913
@Owen1212055
Move to adventure
224a864
@Owen1212055
Move patches around
0daaacd
@Owen1212055
Update
22790e0
@Lulu13022002 @Owen1212055
move diff
1ff855b
@lynxplay @Owen1212055
Rename patches
d67588d
@lynxplay @Owen1212055
Lost lynx diff
dd9d6ad
@Owen1212055 Owen1212055 force-pushed the item-datacomponent-api branch from f0399cc to dd9d6ad Compare November 18, 2024 19:51
lynxplay
lynxplay approved these changes Nov 18, 2024
View reviewed changes
Copy link
Contributor

@lynxplay lynxplay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved under the expectations that more javadocs and toBuilder methods will follow in a upcoming PR.

@Owen1212055 Owen1212055 merged commit de6173b into master Nov 18, 2024
5 checks passed
@Owen1212055 Owen1212055 deleted the item-datacomponent-api branch November 18, 2024 20:09
@TheBentoBox
Copy link

TheBentoBox commented Nov 19, 2024

Just saw this in the latest Paper build, just wanted to say huge thanks for the work here. Was hoping for something exactly like this from upstream but as usual the Paper team/contributors pull through 😎 Kudos

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Machine-Maker Machine-Maker Machine-Maker left review comments

@kennytv kennytv kennytv left review comments

@lynxplay lynxplay lynxplay approved these changes

+1 more reviewer

@masmc05 masmc05 masmc05 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

Paper PR Queue
Status: Merged

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@Owen1212055 @TheBentoBox @Machine-Maker @kennytv @lynxplay @masmc05 @kashike @Boy0000 @Lulu13022002