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.

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

Add support for 1.21.1 #198

Merged
merged 12 commits into from
Sep 8, 2024
Merged

Add support for 1.21.1 #198

merged 12 commits into from
Sep 8, 2024

Conversation

Gilly7CE
Copy link
Owner

@Gilly7CE Gilly7CE commented Sep 3, 2024

This PR introduces a support change for Minecraft (MC) 1.21.1. This directly bumps main from 1.20.4 to 1.21.1 so it includes fixes to 1.20.5 & 1.20.6 breaking changes. A PR to update the 1.20.x branch to 1.20.6 will be done separately.

Full list of changes:

  • Update Gradle to 8.10 and Loom to 1.7-Snapshot
  • Update MC support to 1.21.1
  • Fix breaking change to BlockBreakingSpeedRatioCalculator following enchantment code changes in MC
  • Replace EndFrameBlock_EyeToggleMixin with EnderEyeItem_EyeToggleMixin following removal of deprecated methods in Block code
  • Fix mixin definitions following MC code changes
  • Replace mixins for flower pots with single mixin and introduce functional approach to dealing with which rule to implement
  • Replace PlayerEntity_PortalSpectactorDelayMixin with NetherPortalBlock_PortalBlockMixin following portal interaction changes
  • Refactor spectator portal rule code to not use networking sync between server and client but two mixins for server and client which executes the same logic, like in vanilla. Networking changes in 1.20.5 caused a breaking change here and it would be too complicated to keep around for a single use case. The new implementation is likely more future proof.

@Gilly7CE
Copy link
Owner Author

Gilly7CE commented Sep 3, 2024

Keeping in draft until pipeline issue is fixed and I've tested all rules affected by breaking changes

@Gilly7CE Gilly7CE force-pushed the mcversion-gilly7ce-197-support-1.21 branch from c29864b to 07976b5 Compare September 3, 2024 21:07
@Gilly7CE
Copy link
Owner Author

Gilly7CE commented Sep 3, 2024

Keeping in draft until pipeline issue is fixed and I've tested all rules affected by breaking changes

Fixed one issue to do with instant mining where the game crashed

Two rules to fix:

  • replaceFlowerInPot
  • alwaysPickFlowersFromPot
  • dropAllXpOnDeath

@Gilly7CE Gilly7CE linked an issue Sep 3, 2024 that may be closed by this pull request
4 tasks
@Gilly7CE Gilly7CE force-pushed the mcversion-gilly7ce-197-support-1.21 branch from 07976b5 to 7e38532 Compare September 4, 2024 19:43
@Gilly7CE
Copy link
Owner Author

Gilly7CE commented Sep 4, 2024

Keeping in draft until pipeline issue is fixed and I've tested all rules affected by breaking changes

Fixed one issue to do with instant mining where the game crashed

Two rules to fix:

  • replaceFlowerInPot
  • alwaysPickFlowersFromPot
  • dropAllXpOnDeath

These rules have now been fixed. Introduced a single mixin for the flower pot rules to manage the order instead of using mixin shifts. This will be more stable.

@Gilly7CE Gilly7CE marked this pull request as ready for review September 4, 2024 19:54
@Gilly7CE Gilly7CE requested review from connorslade, DH12043 and Haaaaaaaa615 and removed request for Haaaaaaaa615 September 4, 2024 19:54
Copy link
Collaborator

@connorslade connorslade left a comment

Choose a reason for hiding this comment

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

Looks like just DropAllXpOnPlayerDeath needs to be fixed.

@Gilly7CE Gilly7CE removed the request for review from DH12043 September 7, 2024 10:54
… remove methods and to not used repeated code
…_PortalSpectatorDelayMixin due to portal interaction changes
… mixin

Fixes broken code due to a 1.20.5 change with networking. The networking
code was too complicated for a single use case and the client and server
players would always execute the same movement code regardless so the
rule could be implemented this way perfectly fine.
@Gilly7CE Gilly7CE force-pushed the mcversion-gilly7ce-197-support-1.21 branch from 99f2776 to 4db5106 Compare September 7, 2024 12:37
@Gilly7CE Gilly7CE enabled auto-merge September 7, 2024 12:39
@Gilly7CE Gilly7CE requested a review from connorslade September 7, 2024 12:39
@Gilly7CE Gilly7CE added the mcversion Update/support for a Minecraft version label Sep 7, 2024
Copy link
Collaborator

@connorslade connorslade left a comment

Choose a reason for hiding this comment

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

👍

@Gilly7CE Gilly7CE merged commit d1c2fa9 into main Sep 8, 2024
1 check passed
@Gilly7CE Gilly7CE deleted the mcversion-gilly7ce-197-support-1.21 branch September 8, 2024 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mcversion Update/support for a Minecraft version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[RELEASE] - Support 1.20.6 and 1.21
2 participants