Skip to content

Conversation

@nicholasveronico
Copy link
Collaborator

@nicholasveronico nicholasveronico commented Dec 23, 2024

This PR fixes the last issues with 1.21.4. In PaperMC's dev builds, starting from build 20, their "hard-fork" is implemented. I don't foresee this causing any issues unless they mess up mappings since they are no longer a fork of Spigot. After testing on 1.21.4, I noticed a few protocol changes overlooked in the previous release. Below is a summary of those fixes.

Class mappings:

  • src/main/resources/mappings.json: Updated the mapping for ParticleParamTargetColor to TrailParticleOption and added a new version-specific mapping for version 1.21.4 and above.

Packet constructors:

@nicholasveronico nicholasveronico merged commit b71aadb into master Dec 23, 2024
2 checks passed
@nicholasveronico nicholasveronico deleted the fix/1.21.4 branch December 23, 2024 02:41
github-actions bot pushed a commit that referenced this pull request Dec 23, 2024
## [1.3.1](v1.3.0...v1.3.1) (2024-12-23)

### Bug Fixes

* Account for final 1.21.4 protocol changes ([#6](#6)) ([b71aadb](b71aadb))
@github-actions
Copy link

🎉 This PR is included in version 1.3.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@GeorgeV220
Copy link
Owner

@nicholasveronico Thank you for your work on this PR! I have a few questions regarding the changes.

Does the mapping change from ParticleParamTargetColor to TrailParticleOption work correctly in 1.19? If I recall, this change was required in 1.19, but if it was renamed or modified in 1.20.4, then it might be better to introduce TrailParticleOption as a new mapping. Additionally, we should adjust the maximum version for ParticleParamTargetColor to reflect where it was removed or renamed.

Please let me know if I’ve misunderstood something.

@nicholasveronico
Copy link
Collaborator Author

nicholasveronico commented Dec 23, 2024

@nicholasveronico Thank you for your work on this PR! I have a few questions regarding the changes.

Does the mapping change from ParticleParamTargetColor to TrailParticleOption work correctly in 1.19? If I recall, this change was required in 1.19, but if it was renamed or modified in 1.20.4, then it might be better to introduce TrailParticleOption as a new mapping. Additionally, we should adjust the maximum version for ParticleParamTargetColor to reflect where it was removed or renamed.

Please let me know if I’ve misunderstood something.

Hey @GeorgeV220, no problem! The mapping ParticleParamTargetColor / TrailParticleOption was created in the last PR, with the introduction of that new particle data for ParticleEffect.TRAIL in 1.21.3. The rename was for better understanding and consistency, to match the Bukkit naming of the classes. In 1.21.3, the class was named TargetColorOption, explaining the TargetColor portion of the mapping name. Thought it would be better off using the latest name TrailParticleOption for the mapping name instead.

I had originally named it ParticleParamTargetColor due to the rest of the existing particle option class mappings being prefixed with ParticleParam, even though they are not particle parameters. This is something I am looking to address in a future PR, likely in the new year. The original code is pretty messy and really requires a clean up. Due to this, I don't think it's necessary to separate them and include a max version, as the name difference between 21.3 and 21.4 is already addressed in the mapping itself.

Edit: I see where the confusion came from. The mapping should have a min value of 21.3 instead of 19. I can adjust that.

Merry Christmas!

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants