Fix belt, cloak, terrasteel will renders

This commit is contained in:
Vincent Lee committed 2020-04-02 13:58:33 -05:00
1 parent 8984cecb89
commit 54cdb17809
5 files changed
+25 -26

No files matched your search

@@ -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<AbstractClientPlayerEntity, PlayerModel<AbstractClientPlayerEntity>> {
public LayerTerraHelmet(IEntityRenderer<AbstractClientPlayerEntity, PlayerModel<AbstractClientPlayerEntity>> 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();
}
}
}
}
@@ -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) {
@@ -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();
}
@@ -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);
}
@@ -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);