From 54cdb1780978cf3202fff0e51b8dfd6be91cc017 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 2 Apr 2020 13:58:33 -0500 Subject: [PATCH] Fix belt, cloak, terrasteel will renders --- .../client/core/handler/LayerTerraHelmet.java | 22 +++++++++++++++++-- .../armor/terrasteel/ItemTerrasteelHelm.java | 19 +--------------- .../item/equipment/bauble/ItemHolyCloak.java | 2 -- .../equipment/bauble/ItemKnockbackBelt.java | 5 +++-- .../item/equipment/bauble/ItemTravelBelt.java | 3 +-- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java b/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java index 6b0591d36..648da8b7d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java +++ b/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java @@ -10,26 +10,44 @@ package vazkii.botania.client.core.handler; import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; +import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.entity.IEntityRenderer; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.entity.model.PlayerModel; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; +import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelArmor; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; +import javax.annotation.Nonnull; + public class LayerTerraHelmet extends LayerRenderer> { public LayerTerraHelmet(IEntityRenderer> renderer) { super(renderer); } @Override - public void render(MatrixStack ms, IRenderTypeBuffer buffers, int light, AbstractClientPlayerEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void render(@Nonnull MatrixStack ms, @Nonnull IRenderTypeBuffer buffers, int light, AbstractClientPlayerEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { ItemStack helm = player.getItemStackFromSlot(EquipmentSlotType.HEAD); if (!helm.isEmpty() && helm.getItem() instanceof ItemTerrasteelHelm) { - ItemTerrasteelHelm.renderOnPlayer(ms, buffers, light, helm, player, partialTicks); + if (ItemTerrasteelHelm.hasAnyWill(helm) && !((ItemTerrasteelArmor) helm.getItem()).hasPhantomInk(helm)) { + ms.push(); + getEntityModel().bipedHead.rotate(ms); + ms.translate(-0.2, -0.15, -0.3); + ms.scale(0.4F, -0.4F, -0.4F); + IBakedModel model = MiscellaneousIcons.INSTANCE.terrasteelHelmWillModel; + 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/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 5cbbf457b..1015f16ec 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -96,7 +96,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc } } - private static boolean hasAnyWill(ItemStack stack) { + public static boolean hasAnyWill(ItemStack stack) { for (AncientWillType type : AncientWillType.values()) { if (hasAncientWill_(stack, type)) { return true; @@ -106,23 +106,6 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc return false; } - @OnlyIn(Dist.CLIENT) - public static void renderOnPlayer(MatrixStack ms, IRenderTypeBuffer buffers, int light, ItemStack stack, PlayerEntity player, float partialTicks) { - if (hasAnyWill(stack) && !((ItemTerrasteelArmor) stack.getItem()).hasPhantomInk(stack)) { - ms.push(); - AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); - ms.translate(-0.26F, -1.45F, -0.39F); - ms.scale(0.5F, 0.5F, 0.5F); - IBakedModel model = MiscellaneousIcons.INSTANCE.terrasteelHelmWillModel; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); - ms.pop(); - } - } - private void onEntityAttacked(LivingHurtEvent event) { Entity attacker = event.getSource().getImmediateSource(); if (attacker instanceof PlayerEntity) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 0a1e68943..577a2dd63 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -84,8 +84,6 @@ public class ItemHolyCloak extends ItemBauble { boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); ms.translate(0F, armor ? -0.07F : -0.01F, 0F); - float s = 1F / 16F; - ms.scale(s, s, s); if (model == null) { model = new ModelCloak(); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index dfc03ffea..8e8132ea9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -24,6 +24,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.lib.LibResources; @@ -46,11 +47,11 @@ public class ItemKnockbackBelt 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) { + AccessoryRenderHelper.rotateIfSneaking(ms, living); ms.translate(0F, 0.2F, 0F); - float s = 1.05F / 16F; + float s = 0.85F; ms.scale(s, s, s); - if (model == null) { model = new BipedModel(1.0F); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 1e5a9af31..992f3f5c6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -149,10 +149,9 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem { @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); - ms.translate(0F, 0.2F, 0F); - float s = 1.05F / 16F; + float s = 0.85F; ms.scale(s, s, s); if (model == null) { model = new BipedModel(1F);