Skip to content
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

Expand Projectile API #5731

Merged
merged 1 commit into from
Mar 11, 2022
Merged

Expand Projectile API #5731

merged 1 commit into from
Mar 11, 2022

Conversation

Owen1212055
Copy link
Member

@Owen1212055 Owen1212055 commented May 26, 2021 •
edited
Loading

This PR adds some Firework & ThrownPotion API additions.

See https://canary.discord.com/channels/289587909051416579/925530366192779286/934884182671392779 for more relevant conversation

8mb.video-ynq-h9nXwJOS.mp4

Essentially this adds a way to modify the itemstack of a firework/thrown potion whilst being able to still add potion/firework effects using meta methods.

CraftFirework also cached a firework item, which could be inaccurate if you modify the firework via ingame commands. So, I remove that field and instead use the itemstack that is directly stored in the firework entity.

@Owen1212055 Owen1212055 requested review from a team as code owners May 26, 2021 23:52
Proximyst
Proximyst approved these changes May 27, 2021
View reviewed changes
Copy link
Contributor

@Proximyst Proximyst left a comment

Choose a reason for hiding this comment

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

Greatest change to date

Spigot-API-Patches/0306-Expose-firework-item-directly-manually-setting-fligh.patch Outdated Show resolved Hide resolved
@Owen1212055
Copy link
Member Author

Adjusted annotation + method names and documentation accordingly.

@Owen1212055
Copy link
Member Author

Updated to 1.17

@Owen1212055
Copy link
Member Author

rebased

@Owen1212055
Copy link
Member Author

done

@stale
Copy link

stale bot commented Sep 25, 2021

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@Machine-Maker Machine-Maker added the status: accepted Disputed bug is accepted as valid or Feature accepted as desired to be added. label Sep 25, 2021
@stale stale bot removed the resolution: stale label Sep 25, 2021
@Owen1212055
Copy link
Member Author

Rebased + Changes made

@Owen1212055
Copy link
Member Author

Rebased

@Owen1212055
Copy link
Member Author

Updated

@Owen1212055 Owen1212055 changed the title Expand Firework API Expand Projectile API Jan 23, 2022
@Owen1212055
Copy link
Member Author

Owen1212055 commented Jan 23, 2022 •
edited
Loading

Updated, and rebased (can the tag be removed plz?)
Edit: Missing some paper comments, will fix!

@kennytv kennytv linked an issue Feb 2, 2022 that may be closed by this pull request
Ability to modify life/lifetime of a firework entity #7433
Closed
kennytv
kennytv approved these changes Mar 11, 2022
View reviewed changes
Copy link
Member

@kennytv kennytv left a comment

Choose a reason for hiding this comment

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

var is disgusting, but

@kennytv kennytv merged commit 1790528 into PaperMC:master Mar 11, 2022
@Owen1212055 Owen1212055 deleted the expose-firework-item branch March 12, 2022 03:27
@AsP3X AsP3X mentioned this pull request Mar 15, 2022
Merged
AsP3X added a commit to AsP3X/papermc that referenced this pull request Mar 15, 2022
@AsP3X
Merge pull request #13 from AsP3X/development
e637e67 
TASK: updated to latest build [#250] #13
Version update to the latest PaperMC build:

- [#250] [[a5be178](PaperMC/Paper@a5be178)] Use correct toX/Y/Z in player move packet handling
- [#249] [[c8e49cc](PaperMC/Paper@c8e49cc)] Add get/set wait time for fish hooks. ([#5595](PaperMC/Paper#5595))
- [#248] 
  | - [[1ce3555](PaperMC/Paper@1ce3555)] [ci-skip] Fix typo in feature request issue template ([#7593](PaperMC/Paper#7593))
  | - [[b65b48f](PaperMC/Paper@b65b48f)] [ci skip] Update gradle wrapper
- [#247] [[1358d1e](PaperMC/Paper@1358d1e)] Updated Upstream (CraftBukkit/Spigot) ([#7580](PaperMC/Paper#7580))
- [#246] [[ab03538](PaperMC/Paper@ab03538)] Fix colors in some console messages
- [#245] [[87927e1](PaperMC/Paper@87927e1)] Fix CreativeCategory API ([#7586](PaperMC/Paper#7586))
- [#244] [[bfa33d9](PaperMC/Paper@bfa33d9)] Various improvements to console color formatting ([#7560](PaperMC/Paper#7560))
- [#243] [[dc96bba](PaperMC/Paper@dc96bba)] Ensure the item sent isn't air ([#7584](PaperMC/Paper#7584))
- [#242] [[aab1f8a](PaperMC/Paper@aab1f8a)] Fix swamp hut cat generation deadlock
- [#241] [[ea1efef](PaperMC/Paper@ea1efef)] Remove Patches ([#7541](PaperMC/Paper#7541))
- [#240] [[1790528](PaperMC/Paper@1790528)] More projectile API ([#5731](PaperMC/Paper#5731))
- [#239] [[d714682](PaperMC/Paper@d714682)] Add more entity api ([#7564](PaperMC/Paper#7564))
- [#238] [[657d163](PaperMC/Paper@657d163)] Prevent despawned navigators being readded ([#7574](PaperMC/Paper#7574))
- [#237]
  | - [[b55ba19](PaperMC/Paper@b55ba19)] Update README for new docs ([#7561](PaperMC/Paper#7561))
  | - [[4423e12](PaperMC/Paper@4423e12)] Update docs link in paper.yml ([#7562](PaperMC/Paper#7562))
  | - [[7a21333](PaperMC/Paper@7a21333)] Fix setting the view distance to 32 ([#7503](PaperMC/Paper#7503))
- [#236] [[718fab1](PaperMC/Paper@718fab1)] Add CPU name and JVM vendor info in timings ([#7490](PaperMC/Paper#7490))
- [#235] [[e0b3f3f](PaperMC/Paper@e0b3f3f)] Adventure 4.10.1
- [#234] [[c34fb09](PaperMC/Paper@c34fb09)] Add ghast api ([#7554](PaperMC/Paper#7554))
- [#233] [[d9bf5e7](PaperMC/Paper@d9bf5e7)] Add method to set noclip on arrows ([#7263](PaperMC/Paper#7263))
- [#232] [[7b9c30f](PaperMC/Paper@7b9c30f)] Fix scoreboard objective name length limit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@electronicboy electronicboy electronicboy approved these changes

@Machine-Maker Machine-Maker Machine-Maker approved these changes

@Proximyst Proximyst Proximyst approved these changes

@kennytv kennytv kennytv approved these changes

Assignees
No one assigned
Labels
status: accepted Disputed bug is accepted as valid or Feature accepted as desired to be added.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Ability to modify life/lifetime of a firework entity
5 participants
@Owen1212055 @electronicboy @Machine-Maker @Proximyst @kennytv