Data driven models and animations #145

OroArmor · 2022-06-25T21:16:11Z

TODO:

Documentation
Mixin clean ups
~~Don't use regex for model layer parsing~~

OroArmor · 2022-08-02T19:42:05Z

@FoundationGames this PR uses code from JsonEM. On discord, you said it was fine for me to use the code. I am asking here for a more visible record. I still need to update the licenses for said files.

FoundationGames

I approve the merging of any code within this pull request that has been borrowed from JsonEM.

...odels/src/main/java/org/quiltmc/qsl/rendering/entity_models/mixin/ModelPartDataAccessor.java

build-logic/src/main/groovy/qsl.module.gradle

...els/src/main/java/org/quiltmc/qsl/rendering/entity_models/impl/DynamicEntityModelLoader.java

Platymemo

Lots of super little nitpicks but it looks great!

...ntity_models/src/main/java/org/quiltmc/qsl/rendering/entity_models/api/AnimationManager.java

...endering/entity_models/src/main/java/org/quiltmc/qsl/rendering/entity_models/api/Codecs.java

...els/src/main/java/org/quiltmc/qsl/rendering/entity_models/impl/DynamicEntityModelLoader.java

...ls/src/main/java/org/quiltmc/qsl/rendering/entity_models/impl/LazyTypeUnboundedMapCodec.java

...in/java/org/quiltmc/qsl/rendering/entity_models/mixin/EntityRendererFactoryContextMixin.java

EnnuiL

So far, so great! I only have style nitpicks for now, and I'd appreciate if you did a pass through the code with Checkstyle;
Considering the majorness of this PR, I'll want to experiment with it on practice later

...ty_models/src/main/java/org/quiltmc/qsl/rendering/entity_models/api/HasAnimationManager.java

library/rendering/entity_models/src/main/resources/quilt_entity_models.mixins.json

...ng/entity_models/src/main/java/org/quiltmc/qsl/rendering/entity_models/api/package-info.java

Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

EnnuiL

CI's broken due to missing headers; Fix CI, and I'll re-review again :P

…braries into data-driven-models

OroArmor · 2023-01-03T03:06:33Z

Note. This pr will break geckolib, so maybe we should figure something out before killing that mod

EnnuiL

This PR now makes more sense to me!

...main/java/org/quiltmc/qsl/rendering/entity_models/api/animation/AnimationInterpolations.java

EnnuiL · 2023-06-08T23:47:36Z

library/rendering/entity_models/src/main/resources/assets/quilt_entity_models/icon.png

You'll need to copy the icon again! I had ran oxipng through everything :p

EnnuiL · 2023-06-08T23:49:30Z

...els/src/main/java/org/quiltmc/qsl/rendering/entity_models/mixin/ModelCuboidDataAccessor.java

+
+	@Invoker("<init>")
+	static ModelCuboidData create(@Nullable String string, float f, float g, float h, float i, float j, float k, float l, float m, Dilation dilation, boolean bl, float n, float o, Set<Direction> directions) {
+		throw new AssertionError("Mixin injection failed.");


Suggested change

throw new AssertionError("Mixin injection failed.");

throw new IllegalStateException("Mixin injection failed.");

EnnuiL · 2023-06-08T23:49:55Z

...els/src/main/java/org/quiltmc/qsl/rendering/entity_models/mixin/ModelCuboidDataAccessor.java

+	Set<Direction> directions();
+
+	@Invoker("<init>")
+	static ModelCuboidData create(@Nullable String string, float f, float g, float h, float i, float j, float k, float l, float m, Dilation dilation, boolean bl, float n, float o, Set<Direction> directions) {


I do wonder if this method has arg names now

EnnuiL · 2023-06-08T23:50:24Z

...odels/src/main/java/org/quiltmc/qsl/rendering/entity_models/api/animation/AnimationType.java

+public record AnimationType(Codec<Animation> codec) {
+}


Suggested change

public record AnimationType(Codec<Animation> codec) {

}

public record AnimationType(Codec<Animation> codec) {}

Started 👀

6c9a5b7

OroArmor added new: module A pull request which adds a new module new: library A pull request which adds a new library. t: new api This adds a new API. s: not working This pull request has been tested and confirmed as not working for now. labels Jun 25, 2022

OroArmor added 2 commits June 27, 2022 19:05

Animation Loading

e80477e

Animation Loading works + Model Codec start

8e5a39c

OroArmor added s: wip This pull request is being worked on. and removed s: not working This pull request has been tested and confirmed as not working for now. labels Jul 3, 2022

OroArmor added 2 commits July 30, 2022 00:25

Merge remote-tracking branch 'quilt/1.19' into data-driven-models

95c2300

Finish Models + Get ready for review

4de9e95

OroArmor marked this pull request as ready for review July 30, 2022 08:19

OroArmor requested a review from a team as a code owner July 30, 2022 08:19

OroArmor added the test label Jul 30, 2022

FoundationGames reviewed Aug 2, 2022

View reviewed changes

...odels/src/main/java/org/quiltmc/qsl/rendering/entity_models/mixin/ModelPartDataAccessor.java Outdated Show resolved Hide resolved

OroArmor added 2 commits August 5, 2022 19:11

Merge remote-tracking branch 'quilt/1.19' into data-driven-models

00fe716

Entity Models load correctly + license properly

d9a6923

EnnuiL reviewed Aug 6, 2022

View reviewed changes

build-logic/src/main/groovy/qsl.module.gradle Outdated Show resolved Hide resolved

oliviathevampire reviewed Aug 6, 2022

View reviewed changes

...els/src/main/java/org/quiltmc/qsl/rendering/entity_models/impl/DynamicEntityModelLoader.java Outdated Show resolved Hide resolved

TheGlitch76 marked this pull request as draft August 22, 2022 22:04

TheGlitch76 removed the test label Aug 28, 2022

Merge remote-tracking branch 'quilt/1.19' into data-driven-models

9977f7e

OroArmor marked this pull request as ready for review September 23, 2022 18:55

Documentation + Cleanup

7600a62

Platymemo approved these changes Sep 27, 2022

View reviewed changes

OroArmor added 2 commits September 28, 2022 14:14

Fix some issues

38f44a0

Merge branch '1.19' into data-driven-models

08bd2b9

OroArmor added s: tested This pull request has been tested and confirmed as working. and removed s: wip This pull request is being worked on. labels Sep 28, 2022

EnnuiL suggested changes Sep 30, 2022

View reviewed changes

OroArmor and others added 2 commits December 17, 2022 13:43

Apply suggestions from code review

cf1552c

Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

Merge branch '1.19' into data-driven-models

bd43d24

OroArmor changed the base branch from 1.19 to 1.19.3 December 17, 2022 21:59

OroArmor added 2 commits December 17, 2022 13:59

Merge branch '1.19.3' into data-driven-models

42fc6f0

Refactor system to allow multiple loaders

96a6aab

EnnuiL suggested changes Jan 2, 2023

View reviewed changes

OroArmor added 2 commits January 2, 2023 18:57

Merge branch '1.19.3' of https://github.com/QuiltMC/quilt-standard-li…

452f800

…braries into data-driven-models

maybe working?

03903b9

OroArmor requested review from EnnuiL and LambdAurora February 4, 2023 03:54

OroArmor added 2 commits June 6, 2023 21:31

Merge remote-tracking branch 'quilt/1.20' into data-driven-models

4140a3b

Update to 1.20

7e43a07

OroArmor changed the base branch from 1.19.3 to 1.20 June 8, 2023 23:25

EnnuiL suggested changes Jun 8, 2023

View reviewed changes

	throw new AssertionError("Mixin injection failed.");
	throw new IllegalStateException("Mixin injection failed.");

	public record AnimationType(Codec<Animation> codec) {
	}
	public record AnimationType(Codec<Animation> codec) {}

Uh oh!

Data driven models and animations #145

Are you sure you want to change the base?

Data driven models and animations #145

Uh oh!

Conversation

OroArmor commented Jun 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

OroArmor commented Aug 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FoundationGames left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Platymemo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

EnnuiL left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

EnnuiL left a comment

Choose a reason for hiding this comment

Uh oh!

OroArmor commented Jan 3, 2023

Uh oh!

EnnuiL left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

EnnuiL Jun 8, 2023

Choose a reason for hiding this comment

Uh oh!

EnnuiL Jun 8, 2023

Choose a reason for hiding this comment

Uh oh!

EnnuiL Jun 8, 2023

Choose a reason for hiding this comment

Uh oh!

EnnuiL Jun 8, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

OroArmor commented Jun 25, 2022 •

edited

Loading

OroArmor commented Aug 2, 2022 •

edited

Loading