From 9fd7dad64be7976510714b8216e262fb8b489d27 Mon Sep 17 00:00:00 2001 From: tartaric_acid Date: Sat, 6 Jan 2024 22:49:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=97=E5=B8=9C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/MaidBannerModel.java | 21 ++++++++++++++----- .../geckolayer/GeckoLayerMaidBanner.java | 4 ++-- .../entity/layer/LayerMaidBanner.java | 4 ++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/MaidBannerModel.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/MaidBannerModel.java index b55e0d622..6309e4db0 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/MaidBannerModel.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/model/MaidBannerModel.java @@ -24,11 +24,22 @@ public MaidBannerModel(ModelPart root) { public static LayerDefinition createBodyLayer() { MeshDefinition meshdefinition = new MeshDefinition(); PartDefinition partdefinition = meshdefinition.getRoot(); - PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(34, 49).addBox(-1.0F, -68.0F, 10.0F, 2.0F, 2.0F, 13.0F, new CubeDeformation(0.05F)) - .texOffs(34, 49).addBox(-1.0F, -68.0F, -3.0F, 2.0F, 2.0F, 13.0F, new CubeDeformation(0.05F)) - .texOffs(56, 0).addBox(-1.0F, -35.0F, -1.0F, 2.0F, 35.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(56, 0).addBox(-1.0F, -70.0F, -1.0F, 2.0F, 35.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); - PartDefinition banner = partdefinition.addOrReplaceChild("banner", CubeListBuilder.create().texOffs(0, 0).addBox(1.0F, -66.0F, -1.0F, 20.0F, 40.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, -1.5708F, 0.0F)); + + PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(34, 49).addBox(-1.0F, -68.0F, 10.0F, 2.0F, 2.0F, 13.0F, new CubeDeformation(0.1F)) + .texOffs(34, 49).addBox(-1.0F, -68.0F, -3.0F, 2.0F, 2.0F, 13.0F, new CubeDeformation(0.1F)) + .texOffs(56, 0).addBox(-1.0F, -35.0F, -1.0F, 2.0F, 35.0F, 2.0F, new CubeDeformation(0.05F)) + .texOffs(56, 0).addBox(-1.0F, -70.0F, -1.0F, 2.0F, 35.0F, 2.0F, new CubeDeformation(0.05F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + + PartDefinition bone = main.addOrReplaceChild("bone", CubeListBuilder.create().texOffs(56, 0).addBox(-1.0F, -26.0F, 1.0F, 2.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(56, 0).addBox(-1.0F, -46.0F, 1.0F, 2.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(56, 0).addBox(-1.0F, -36.0F, 1.0F, 2.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(56, 0).addBox(-1.0F, -56.0F, 1.0F, 2.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + + PartDefinition bone2 = main.addOrReplaceChild("bone2", CubeListBuilder.create().texOffs(56, 0).addBox(-1.0F, -66.0F, 6.0F, 2.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(56, 0).addBox(-1.0F, -66.0F, 16.0F, 2.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + + PartDefinition banner = partdefinition.addOrReplaceChild("banner", CubeListBuilder.create().texOffs(0, 0).addBox(2.0F, -65.0F, -0.5F, 20.0F, 40.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, -1.5708F, 0.0F)); + return LayerDefinition.create(meshdefinition, 64, 64); } diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/entity/geckolayer/GeckoLayerMaidBanner.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/entity/geckolayer/GeckoLayerMaidBanner.java index ffb198c1d..22571a58b 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/entity/geckolayer/GeckoLayerMaidBanner.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/entity/geckolayer/GeckoLayerMaidBanner.java @@ -51,8 +51,8 @@ public void render(PoseStack matrixStack, MultiBufferSource bufferIn, int packed if (geoModel != null && !geoModel.backpackBones.isEmpty()) { matrixStack.pushPose(); translateToBackpack(matrixStack, geoModel); - matrixStack.translate(0, -1.5, 0); - matrixStack.scale(0.7F, 0.7F, 0.7F); + matrixStack.translate(0, -1.5, 0.02); + matrixStack.scale(0.65F, 0.65F, 0.65F); matrixStack.mulPose(Axis.XN.rotationDegrees(5)); VertexConsumer buffer = bufferIn.getBuffer(RenderType.entityTranslucent(TEXTURE)); bannerModel.renderToBuffer(matrixStack, buffer, packedLightIn, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/entity/layer/LayerMaidBanner.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/entity/layer/LayerMaidBanner.java index 4578a265f..5534af798 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/entity/layer/LayerMaidBanner.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/client/renderer/entity/layer/LayerMaidBanner.java @@ -46,8 +46,8 @@ public void render(PoseStack matrixStack, MultiBufferSource bufferIn, int packed return; } matrixStack.pushPose(); - matrixStack.translate(0, 0.25, 0); - matrixStack.scale(0.7F, 0.7F, 0.7F); + matrixStack.translate(0, 0.5, 0.025); + matrixStack.scale(0.5F, 0.5F, 0.5F); matrixStack.mulPose(Axis.XN.rotationDegrees(5)); VertexConsumer buffer = bufferIn.getBuffer(RenderType.entityTranslucent(TEXTURE)); bannerModel.renderToBuffer(matrixStack, buffer, packedLightIn, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F);