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

Model Loading API v1 #3145

Merged
merged 28 commits into from
Jul 18, 2023
Merged

Model Loading API v1 #3145

merged 28 commits into from
Jul 18, 2023

Commits on Jul 15, 2023

  1. Model Loading API v1

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    177b15d View commit details
    Browse the repository at this point in the history

  2. Update module lifecycle

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    b953a2f View commit details
    Browse the repository at this point in the history

  3. Remove test dependencies

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    efac33b View commit details
    Browse the repository at this point in the history

  4. Add events to override and wrap models 

    * Remove ModelLoaderInstance.finish()

It harms optimization mods that implement dynamic model loading

* Add model loading observation events

Useful for wrapping models, modifying models, etc

* Move mutable parameter out of context record to avoid withModel

* Spotless

* Renames

* Add event phases, restructure modifier interfaces to be under shared parent class

* Clean up test mod, use ForwardingBakedModel instead of hacks

* Phase javadoc

* Remove null check for loader in ModelLoaderInstance, can't occur
anymore after removing finish()

* More javadoc

* More tests
    @embeddedt @Technici4n
    embeddedt authored and Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    91ab1fc View commit details
    Browse the repository at this point in the history

  5. A few post-merge tweaks

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    d0b83de View commit details
    Browse the repository at this point in the history

  6. Fix model wrapping test and use event phases

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    117198a View commit details
    Browse the repository at this point in the history

  7. Context interfaces, ModelResolver class, event renames

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    8471da4 View commit details
    Browse the repository at this point in the history

  8. Implementation clean up (#2)

    @PepperCode1 @Technici4n
    PepperCode1 authored and Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    5197009 View commit details
    Browse the repository at this point in the history

  9. Address PR comments

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    833d269 View commit details
    Browse the repository at this point in the history

  10. Add ModelLoader to resolver context and remove allocations

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    4a574a3 View commit details
    Browse the repository at this point in the history

  11. identifiers -> ids

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    448c35f View commit details
    Browse the repository at this point in the history

  12. Fix nested model loading issues

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    bda86cb View commit details
    Browse the repository at this point in the history

  13. Fix nested model modifier context, add non-extendable annotations

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    27fb23d View commit details
    Browse the repository at this point in the history

  14. Add preparable model loading plugins draft

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    1070100 View commit details
    Browse the repository at this point in the history

  15. Add off-thread loading test, remove direct ResourceManager access

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    bb156a6 View commit details
    Browse the repository at this point in the history

  16. Add draft of block state resolver

    @PepperCode1 @Technici4n
    PepperCode1 authored and Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    e86729a View commit details
    Browse the repository at this point in the history

  17. A bit of cleanup

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    b2ff9ed View commit details
    Browse the repository at this point in the history

  18. Further work on block state resolution

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    4a13dd1 View commit details
    Browse the repository at this point in the history

  19. Add test for blockstate resolution

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    12724f1 View commit details
    Browse the repository at this point in the history

  20. Improve implementation, API, test mod (#3)

    @PepperCode1 @Technici4n
    PepperCode1 authored and Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    1014443 View commit details
    Browse the repository at this point in the history

  21. Item model, javadoc, and v0 bridge improvements

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    d72470d View commit details
    Browse the repository at this point in the history

  22. Improve legacy variant provider handling

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    d1c33d8 View commit details
    Browse the repository at this point in the history

  23. WrapperUnbakedModel -> DelegatingUnbakedModel

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    8651bad View commit details
    Browse the repository at this point in the history

  24. Tweaks for modern fix

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    087dffc View commit details
    Browse the repository at this point in the history

  25. Improve documentation

    @PepperCode1 @Technici4n
    PepperCode1 authored and Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    130cd79 View commit details
    Browse the repository at this point in the history

  26. Address review comments

    @Technici4n
    Technici4n committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    aed670e View commit details
    Browse the repository at this point in the history

  27. Apply suggestions from code review 

    Co-authored-by: Juuz <[email protected]>
    @Technici4n @Juuxel
    Technici4n and Juuxel authored Jul 15, 2023
    Configuration menu
    Copy the full SHA
    5e4e6d7 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. Update fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabri… 

    …c/impl/client/model/loading/ModelLoadingEventDispatcher.java

Co-authored-by: Juuz <[email protected]>
    @Technici4n @Juuxel
    Technici4n and Juuxel authored Jul 16, 2023
    Configuration menu
    Copy the full SHA
    65dc088 View commit details
    Browse the repository at this point in the history