From c7585c3c2c270f80ae8b818e91c158998f85143c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 29 Mar 2020 13:10:15 -0500 Subject: [PATCH] Fix a ton of accessory renders. Remaining: tiaras, cloaks, belts, cosmetics --- .../item/equipment/bauble/ItemBloodPendant.java | 7 +++---- .../item/equipment/bauble/ItemCloudPendant.java | 9 ++++----- .../item/equipment/bauble/ItemDivaCharm.java | 10 ++++------ .../item/equipment/bauble/ItemGoddessCharm.java | 7 +++---- .../item/equipment/bauble/ItemIcePendant.java | 9 ++++----- .../item/equipment/bauble/ItemItemFinder.java | 10 ++++------ .../item/equipment/bauble/ItemLavaPendant.java | 10 ++++------ .../common/item/equipment/bauble/ItemMonocle.java | 11 +++-------- .../equipment/bauble/ItemSuperLavaPendant.java | 10 ++++------ .../item/equipment/bauble/ItemThirdEye.java | 15 +++++++-------- .../item/equipment/bauble/ItemTinyPlanet.java | 5 +++-- 11 files changed, 43 insertions(+), 60 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 42ae7b1fb..460b84f93 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -117,11 +117,10 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - AccessoryRenderHelper.rotateIfSneaking(ms, player); boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); - ms.translate(-0.26F, -0.4F, armor ? 0.2F : 0.15F); - ms.scale(0.5F, 0.5F, 0.5F); + layer.getEntityModel().bipedBody.rotate(ms); + ms.translate(-0.25, 0.4, armor ? 0.05 : 0.12); + ms.scale(0.5F, -0.5F, -0.5F); IBakedModel model = MiscellaneousIcons.INSTANCE.bloodPendantChain; IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java index 0ccf191eb..f4a06996e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java @@ -68,16 +68,15 @@ public class ItemCloudPendant extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - AccessoryRenderHelper.rotateIfSneaking(ms, player); boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); - ms.translate(-0.2F, -0.3F, armor ? 0.2F : 0.15F); - ms.scale(0.5F, 0.5F, 0.5F); + layer.getEntityModel().bipedBody.rotate(ms); + ms.translate(-0.3, 0.4, armor ? 0.05 : 0.12); + ms.scale(0.5F, -0.5F, -0.5F); IBakedModel model = stack.getItem() == ModItems.superCloudPendant ? MiscellaneousIcons.INSTANCE.nimbusGem : MiscellaneousIcons.INSTANCE.cirrusGem; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index cad176971..f7791838d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -102,11 +102,9 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks); - ms.scale(0.8F, 0.8F, 0.8F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90)); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); - ms.translate(0.1625, -1.625, 0.40); - Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND, light, OverlayTexture.DEFAULT_UV, ms, buffers); + layer.getEntityModel().bipedHead.rotate(ms); + ms.translate(0.15, -0.42, -0.35); + ms.scale(0.4F, -0.4F, -0.4F); + Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.DEFAULT_UV, ms, buffers); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java index a7df42b94..87b437712 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -64,11 +64,10 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem { @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks); - AccessoryRenderHelper.translateToFace(ms); - AccessoryRenderHelper.defaultTransforms(ms); + layer.getEntityModel().bipedHead.rotate(ms); + ms.translate(0.275, -0.4, 0); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); - ms.translate(0.5F, 0.2F, 0.45F); + ms.scale(0.55F, -0.55F, -0.55F); Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.DEFAULT_UV, ms, buffers); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index eff3fb026..12130d165 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -71,13 +71,12 @@ public class ItemIcePendant extends ItemBauble { @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); - ms.translate(-0.36F, -0.3F, armor ? 0.2F : 0.15F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(-45F)); - ms.scale(0.5F, 0.5F, 0.5F); + layer.getEntityModel().bipedBody.rotate(ms); + ms.translate(-0.25, 0.5, armor ? 0.05 : 0.12); + ms.scale(0.5F, -0.5F, -0.5F); IBakedModel model = MiscellaneousIcons.INSTANCE.snowflakePendantGem; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 92e48b87c..cc890328b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -79,14 +79,12 @@ public class ItemItemFinder extends ItemBauble { @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty(); - AccessoryRenderHelper.translateToHeadLevel(ms, living, partialTicks); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); - ms.translate(-0.4F, -1.4F, armor ? -0.3F : -0.25F); - ms.scale(0.75F, 0.75F, 0.75F); + layer.getEntityModel().bipedHead.rotate(ms); + ms.translate(-0.35, -0.2, armor ? 0.05 : 0.1); + ms.scale(0.75F, -0.75F, -0.75F); IBakedModel model = MiscellaneousIcons.INSTANCE.itemFinderGem; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 6d9915f4a..d42137abc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -43,14 +43,12 @@ public class ItemLavaPendant extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - AccessoryRenderHelper.rotateIfSneaking(ms, player); boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - ms.scale(0.5F, 0.5F, 0.5F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180)); - ms.translate(-0.5, -0.90, armor ? -0.4 : -0.25); - + layer.getEntityModel().bipedBody.rotate(ms); + ms.translate(-0.25, 0.5, armor ? 0.05 : 0.12); + ms.scale(0.5F, -0.5F, -0.5F); IBakedModel model = MiscellaneousIcons.INSTANCE.pyroclastGem; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index 2b783459a..ac76ff529 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -51,14 +51,9 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty(); - - AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks); - AccessoryRenderHelper.translateToFace(ms); - AccessoryRenderHelper.defaultTransforms(ms); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); - ms.scale(0.5F, 0.5F, 0.5F); - ms.translate(0.5F, -0.2F, armor ? 0.12F : 0F); + layer.getEntityModel().bipedHead.rotate(ms); + ms.translate(0.15, -0.2, -0.25); + ms.scale(0.3F, -0.3F, -0.3F); Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.DEFAULT_UV, ms, buffers); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index 3983efb27..70add9b02 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -54,14 +54,12 @@ public class ItemSuperLavaPendant extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - AccessoryRenderHelper.rotateIfSneaking(ms, player); boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - ms.scale(0.5F, 0.5F, 0.5F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180)); - ms.translate(-0.5, -0.90, armor ? -0.4 : -0.25); - + layer.getEntityModel().bipedBody.rotate(ms); + ms.translate(-0.25, 0.5, armor ? 0.05 : 0.12); + ms.scale(0.5F, -0.5F, -0.5F); IBakedModel model = MiscellaneousIcons.INSTANCE.crimsonGem; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java index eaffaf608..0ece5668a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java @@ -68,32 +68,31 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem { @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180)); - ms.translate(-0.3, -0.6, armor ? -0.18 : -0.12); - ms.scale(0.6F, 0.6F, 0.6F); for (int i = 0; i < 3; i++) { ms.push(); + layer.getEntityModel().bipedBody.rotate(ms); + switch (i) { case 0: break; case 1: - float scale1 = 0.75F; - - ms.translate(0.15, 0.15, -0.05); double time = ClientTickHandler.total * 0.12; double dist = 0.05; ms.translate(Math.sin(time) * dist, Math.cos(time * 0.5) * dist, 0); - ms.scale(scale1, scale1, scale1); + ms.scale(0.75F, 0.75F, 1F); + ms.translate(0, 0.1, -0.025); break; case 2: ms.translate(0, 0, -0.05); break; } + ms.translate(-0.3, 0.6, armor ? 0.10 : 0.15); + ms.scale(0.6F, -0.6F, -0.6F); IBakedModel model = MiscellaneousIcons.INSTANCE.thirdEyeLayers[i]; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); ms.pop(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 4276e3c4b..3a5e99879 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -52,8 +52,9 @@ public class ItemTinyPlanet extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - ms.scale(0.5F, 0.5F, 0.5F); - ms.translate(0, -1.5F, 0.5F); + layer.getEntityModel().bipedHead.rotate(ms); + ms.translate(-0.25, -0.4, 0); + ms.scale(0.5F, -0.5F, -0.5F); Minecraft.getInstance().getBlockRendererDispatcher().renderBlockAsEntity(ModBlocks.tinyPlanet.getDefaultState(), ms, buffers, light, OverlayTexture.DEFAULT_UV); }