From 556e11a6838bd73e9e2890701d6c97038f6c0307 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Fri, 20 Sep 2024 09:47:32 -0400 Subject: [PATCH] Fix compile errors --- .../dev/engine_room/flywheel/lib/internal/FlwLibLink.java | 2 +- .../dev/engine_room/flywheel/lib/model/part/MeshTree.java | 2 +- .../java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java | 4 ++-- .../engine_room/flywheel/impl/mixin/ModelPartAccessor.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java b/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java index 9a112c07d..33106ff5b 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java @@ -21,7 +21,7 @@ public interface FlwLibLink { Map getModelPartChildren(ModelPart part); - void compileModelPart(ModelPart part, PoseStack.Pose pose, VertexConsumer consumer, int light, int overlay, float red, float green, float blue, float alpha); + void compileModelPart(ModelPart part, PoseStack.Pose pose, VertexConsumer consumer, int light, int overlay, int color); Deque getPoseStack(PoseStack stack); } diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/MeshTree.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/MeshTree.java index 98c10fc0c..ec508d470 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/MeshTree.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/MeshTree.java @@ -74,7 +74,7 @@ public final class MeshTree { } VertexWriter vertexWriter = objects.vertexWriter; - FlwLibLink.INSTANCE.compileModelPart(modelPart, IDENTITY_POSE, vertexWriter, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F); + FlwLibLink.INSTANCE.compileModelPart(modelPart, IDENTITY_POSE, vertexWriter, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, 0xFFFFFFFF); MemoryBlock data = vertexWriter.copyDataAndReset(); VertexView vertexView = new PosTexNormalVertexView(); diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java index 47fffeeb6..cd9c4dd8e 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java @@ -32,8 +32,8 @@ public class FlwLibLinkImpl implements FlwLibLink { } @Override - public void compileModelPart(ModelPart part, PoseStack.Pose pose, VertexConsumer consumer, int light, int overlay, float red, float green, float blue, float alpha) { - ((ModelPartAccessor) (Object) part).flywheel$compile(pose, consumer, light, overlay, red, green, blue, alpha); + public void compileModelPart(ModelPart part, PoseStack.Pose pose, VertexConsumer consumer, int light, int overlay, int color) { + ((ModelPartAccessor) (Object) part).flywheel$compile(pose, consumer, light, overlay, color); } @Override diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ModelPartAccessor.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ModelPartAccessor.java index 274e7a829..3beb76388 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ModelPartAccessor.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ModelPartAccessor.java @@ -17,5 +17,5 @@ public interface ModelPartAccessor { Map flywheel$children(); @Invoker("compile") - void flywheel$compile(PoseStack.Pose pose, VertexConsumer vertexConsumer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha); + void flywheel$compile(PoseStack.Pose pose, VertexConsumer buffer, int packedLight, int packedOverlay, int color); }