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 Loader support for quilt.mod.json5 #329

Merged
merged 1 commit into from
Oct 13, 2024

Conversation

EnnuiL
Copy link
Contributor

@EnnuiL EnnuiL commented Jul 3, 2023

Creating this PR as a draft until support on Quilt Loom's side is worked on, but so far? I believe the Loader-side support is solid! Reviews are appreciated

The benefits of JSON5 will be great for developers

@EnnuiL
Copy link
Contributor Author

EnnuiL commented Jul 4, 2023

Work on Quilt Loom has been pushed as quilt-loom#36!

@EnnuiL EnnuiL marked this pull request as ready for review July 4, 2023 00:36
@EnnuiL
Copy link
Contributor Author

EnnuiL commented Jul 4, 2023

As a note, I've noticed that Quilt Parsers hasn't been relocated properly; I went ahead and fixed that

@EnnuiL
Copy link
Contributor Author

EnnuiL commented Jul 9, 2023

I went ahead and expanded the QMJ5 handling by having the Loader error out if a QMJ is also found, which prevents from further deviation from its intended purpose;
The funny thing was that with that, I managed to catch an issue where mods with duplicate metadata were being iterated through twice! And this extended to mods containing both a QMJ and a FMJ! I do wonder if it could be done in a more effective way though;
anyway, here's the screenshot!
A Quilt Loader error message that says "A coexistence of 'quilt.mod.json' and 'quilt.mod.json5' has been detected. These metadata files cannot coexist with each other due to their conflicting purposes!"

@EnnuiL EnnuiL changed the title Add support for quilt.mod.json5 Add Loader support for quilt.mod.json5 Jul 10, 2023
@EnnuiL
Copy link
Contributor Author

EnnuiL commented Jul 12, 2023

In order to prevent trouble (although with some trouble being caused as a side-effect), I've made the QMJ5 support opt-in, so the build system has to explicitly ask for it in order for things to work;
This may make migrating from a QMJ workspace to a QMJ5 one more difficult though, so I'll have to tackle that issue myself somehow
A Quilt Loader error message explaining that it can't read 'quilt.mod.json5' files without its support being enabled

@EnnuiL
Copy link
Contributor Author

EnnuiL commented Jul 12, 2023

Update: by using the Fabric DLI system, a migration from an already-existing QMJ workspace to a QMJ5 one should be smooth

@EnnuiL
Copy link
Contributor Author

EnnuiL commented Jul 12, 2023

Update: by using the Fabric DLI system, a migration from an already-existing QMJ workspace to a QMJ5 one should be smooth

Tackled by quilt-loom#37

@EnnuiL EnnuiL reopened this Oct 7, 2024
@EnnuiL
Copy link
Contributor Author

EnnuiL commented Oct 7, 2024

oh boy, here we go;
Rebased to QLoader 0.26.4, see quilt-loom#53 for new companion PR

@TheGlitch76 TheGlitch76 requested a review from AlexIIL October 7, 2024 17:43
@ix0rai ix0rai added the enhancement new feature or improvement label Oct 8, 2024
@AlexIIL
Copy link
Contributor

AlexIIL commented Oct 13, 2024

I'm sorry for taking this long - and thanks for updating this!

@AlexIIL AlexIIL merged commit c9c6070 into QuiltMC:develop Oct 13, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement new feature or improvement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants