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

Sync with FLK 1.12.3, target MC 1.21 #100

Merged
merged 12 commits into from
Oct 11, 2024
Merged

Conversation

compasses-dev
Copy link

@compasses-dev compasses-dev commented Oct 2, 2024

Superscedes #98, original PR message will be embeded below...

  • Syncs with FLK 1.12.3 by embedding it.
  • Updates to QSL 1.21.1.
  • Removes the language adapter in favour of FLK's.
  • Applies the later suggestions by 770grappenmaker
  • Updates the gradle wrapper to latest (8.10.2).
  • Bumps the major version due to api surface breakage.

Main highlights :

  • item tooltip API now takes a DataComponentMap argument instead of an NbtCompound
  • some Brigadier DSL methods now take an additional context parameter
    • future refactors of the DSL could hide this parameter away inside a receiver object
  • some Brigadier classes are still unmapped
    Fixes Update for Kotlin 2.0.0 #96 and Update to 1.21 #97

@compasses-dev
Copy link
Author

compasses-dev commented Oct 3, 2024

Closing this in favour for work I've already done tonight to ship KT 2.0.20 since this PR does not actually target 1.21 QSL.

Converting this to a draft and updating FLK and KT since I had already done that before realising this code still depends on 1.20.4's QSL.

@compasses-dev compasses-dev reopened this Oct 3, 2024
@compasses-dev compasses-dev marked this pull request as draft October 3, 2024 18:40
@compasses-dev compasses-dev changed the title Sync with FLK 1.11.0, target MC 1.21 Sync with FLK 1.12.2, target MC 1.21 Oct 3, 2024
@compasses-dev
Copy link
Author

compasses-dev commented Oct 3, 2024

Requires testing of the bundling of FLK I did but otherwise should be good to go.

Oh and once that's tested I can remove the language adapter code from qkl core instead of just removing the reference.

@compasses-dev compasses-dev marked this pull request as ready for review October 4, 2024 14:22
Copy link
Member

@OroArmor OroArmor 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 you are defaulting to FLK for the language provider and just keeping the api?

@compasses-dev
Copy link
Author

Yeah that's the plan going forward, core would effectively be gone unless we want to bundle more libraries in the future.

@compasses-dev compasses-dev changed the title Sync with FLK 1.12.2, target MC 1.21 Sync with FLK 1.12.3, target MC 1.21 Oct 11, 2024
@compasses-dev
Copy link
Author

I believe this PR is ready to be merged, please also see and maybe adjust a little https://discord.com/channels/817576132726620200/1103987526349361192/1294387464848408757.

@OroArmor OroArmor merged commit e79adf8 into QuiltMC:main Oct 11, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update for Kotlin 2.0.0
4 participants