Adjust bauble rendering so it doesn't look as broken

...until you sneak or trapdoor yourself or swim.
This commit is contained in:
Hubry committed 2019-11-30 00:26:53 +01:00
1 parent 3e8f508bf2
commit 6ca60d507d
10 files changed
+189 -188

No files matched your search

@@ -2,7 +2,6 @@ package vazkii.botania.api.item;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.entity.LivingEntity;
import net.minecraft.util.math.MathHelper;
/**
* A few helper methods for the render.
@@ -13,7 +12,7 @@ public final class AccessoryRenderHelper {
* Rotates the render for a bauble correctly if the player is sneaking.
*/
public static void rotateIfSneaking(LivingEntity player) {
if(player.isSneaking())
if(player.shouldRenderSneaking())
applySneakingRotation();
}
@@ -28,15 +27,24 @@ public final class AccessoryRenderHelper {
/**
* Shifts the render for a bauble correctly to the head, including sneaking rotation.
*/
public static void translateToHeadLevel(LivingEntity player) {
public static void translateToHeadLevel(LivingEntity player, float partialTicks) {
float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * partialTicks;
float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * partialTicks;
float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * partialTicks;
GlStateManager.rotatef(yawOffset, 0, -1, 0);
GlStateManager.rotatef(yaw - 270, 0, 1, 0);
GlStateManager.rotatef(pitch, 0, 0, 1);
GlStateManager.translatef(0, -player.getEyeHeight(), 0);
if (player.isSneaking())
GlStateManager.translatef(0.25F * MathHelper.sin(player.rotationPitch * (float) Math.PI / 180), 0.25F * MathHelper.cos(player.rotationPitch * (float) Math.PI / 180), 0F);
// if (player.shouldRenderSneaking()) TODO Sneaking needs a different adjustment now
// GlStateManager.translatef(0.25F * MathHelper.sin(player.rotationPitch * (float) Math.PI / 180), 0.25F * MathHelper.cos(player.rotationPitch * (float) Math.PI / 180), 0F);
}
/**
* Shifts the render for a bauble correctly to the face.
* Use for renders after calling {@link AccessoryRenderHelper#translateToHeadLevel(LivingEntity)}.
* Use for renders after calling {@link AccessoryRenderHelper#translateToHeadLevel(LivingEntity, float)}.
*/
public static void translateToFace() {
GlStateManager.rotatef(90F, 0F, 1F, 0F);
@@ -87,7 +87,7 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
name = name.toLowerCase();
if(player.isWearing(PlayerModelPart.CAPE) && flowerMap.containsKey(name))
renderFlower(player, flowerMap.get(name));
renderFlower(player, flowerMap.get(name), partialTicks);
GlStateManager.popMatrix();
}
@@ -144,9 +144,9 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
}
@SuppressWarnings("deprecation")
private static void renderFlower(PlayerEntity player, ItemStack flower) {
private static void renderFlower(PlayerEntity player, ItemStack flower, float partialTicks) {
GlStateManager.pushMatrix();
AccessoryRenderHelper.translateToHeadLevel(player);
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
GlStateManager.rotatef(180, 0, 0, 1);
GlStateManager.translated(0, -0.85, 0);
@@ -15,18 +15,10 @@ public class LayerTerraHelmet extends LayerRenderer<AbstractClientPlayerEntity,
@Override
public void render(AbstractClientPlayerEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * partialTicks;
float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * partialTicks;
float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * partialTicks;
GlStateManager.pushMatrix();
GlStateManager.rotatef(yawOffset, 0, -1, 0);
GlStateManager.rotatef(yaw - 270, 0, 1, 0);
GlStateManager.rotatef(pitch, 0, 0, 1);
ItemStack helm = player.inventory.armorItemInSlot(3);
if(!helm.isEmpty() && helm.getItem() instanceof ItemTerrasteelHelm)
ItemTerrasteelHelm.renderOnPlayer(helm, player);
ItemTerrasteelHelm.renderOnPlayer(helm, player, partialTicks);
GlStateManager.popMatrix();
}
@@ -97,14 +97,14 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc
}
@OnlyIn(Dist.CLIENT)
public static void renderOnPlayer(ItemStack stack, PlayerEntity player) {
public static void renderOnPlayer(ItemStack stack, PlayerEntity player, float partialTicks) {
if(hasAnyWill(stack) && !((ItemTerrasteelArmor) stack.getItem()).hasPhantomInk(stack)) {
GlStateManager.pushMatrix();
float f = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMinU();
float f1 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMaxU();
float f2 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMinV();
float f3 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMaxV();
AccessoryRenderHelper.translateToHeadLevel(player);
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
GlStateManager.rotatef(90F, 0F, 1F, 0F);
GlStateManager.rotatef(180F, 1F, 0F, 0F);
@@ -39,14 +39,24 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
public enum Variant {
BLACK_BOWTIE, BLACK_TIE, RED_GLASSES, PUFFY_SCARF,
ENGINEER_GOGGLES, EYEPATCH, WICKED_EYEPATCH, RED_RIBBONS,
PINK_FLOWER_BUD, POLKA_DOTTED_BOWS, BLUE_BUTTERFLY, CAT_EARS,
WITCH_PIN, DEVIL_TAIL, KAMUI_EYE, GOOGLY_EYES,
FOUR_LEAF_CLOVER, CLOCK_EYE, UNICORN_HORN, DEVIL_HORNS,
HYPER_PLUS, BOTANIST_EMBLEM, ANCIENT_MASK, EERIE_MASK,
ALIEN_ANTENNA, ANAGLYPH_GLASSES, ORANGE_SHADES, GROUCHO_GLASSES,
THICK_EYEBROWS, LUSITANIC_SHIELD, TINY_POTATO_MASK, QUESTGIVER_MARK,
THINKING_HAND
ENGINEER_GOGGLES(true), EYEPATCH(true), WICKED_EYEPATCH(true), RED_RIBBONS(true),
PINK_FLOWER_BUD(true), POLKA_DOTTED_BOWS(true), BLUE_BUTTERFLY(true), CAT_EARS(true),
WITCH_PIN, DEVIL_TAIL, KAMUI_EYE, GOOGLY_EYES(true),
FOUR_LEAF_CLOVER, CLOCK_EYE(true), UNICORN_HORN(true), DEVIL_HORNS(true),
HYPER_PLUS(true), BOTANIST_EMBLEM, ANCIENT_MASK(true), EERIE_MASK(true),
ALIEN_ANTENNA(true), ANAGLYPH_GLASSES(true), ORANGE_SHADES(true), GROUCHO_GLASSES(true),
THICK_EYEBROWS(true), LUSITANIC_SHIELD, TINY_POTATO_MASK(true), QUESTGIVER_MARK(true),
THINKING_HAND(true);
private final boolean isHead;
Variant(boolean isHead) {
this.isHead = isHead;
}
Variant() {
this(false);
}
}
private final Variant variant;
@@ -74,150 +84,149 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
Variant variant = ((ItemBaubleCosmetic) stack.getItem()).variant;
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
AccessoryRenderHelper.translateToHeadLevel(player);
AccessoryRenderHelper.translateToFace();
AccessoryRenderHelper.defaultTransforms();
switch (variant) {
case RED_GLASSES:
scale(1.25F);
GlStateManager.translatef(0F, -0.085F, 0.045F);
renderItem(stack);
break;
case ENGINEER_GOGGLES:
scale(1.25F);
GlStateManager.translatef(0F, -0.085F, 0.045F);
renderItem(stack);
break;
case EYEPATCH:
scale(0.55F);
GlStateManager.translatef(-0.45F, -0.25F, 0F);
renderItem(stack);
break;
case WICKED_EYEPATCH:
scale(0.55F);
GlStateManager.translatef(0.45F, -0.25F, 0F);
renderItem(stack);
break;
case RED_RIBBONS:
scale(0.9F);
GlStateManager.translatef(0F, 0.75F, 1F);
renderItem(stack);
break;
case PINK_FLOWER_BUD:
GlStateManager.rotatef(-90F, 0F, 1F, 0F);
GlStateManager.translatef(0.4F, 0.6F, 0.45F);
renderItem(stack);
break;
case POLKA_DOTTED_BOWS:
GlStateManager.rotatef(-90F, 0F, 1F, 0F);
GlStateManager.translatef(0.65F, 0.3F, 0.5F);
renderItem(stack);
GlStateManager.translatef(0F, 0F, -1F);
renderItem(stack);
break;
case BLUE_BUTTERFLY:
GlStateManager.translatef(-0.75F, 0.1F, 1F);
GlStateManager.pushMatrix();
GlStateManager.rotatef(45F, 0F, 1F, 0F);
renderItem(stack);
GlStateManager.popMatrix();
if(variant.isHead) {
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToFace();
AccessoryRenderHelper.defaultTransforms();
switch (variant) {
case RED_GLASSES:
case ENGINEER_GOGGLES:
scale(1.25F);
GlStateManager.translatef(0F, -0.085F, 0.045F);
renderItem(stack);
break;
case EYEPATCH:
scale(0.55F);
GlStateManager.translatef(-0.45F, -0.25F, 0F);
renderItem(stack);
break;
case WICKED_EYEPATCH:
scale(0.55F);
GlStateManager.translatef(0.45F, -0.25F, 0F);
renderItem(stack);
break;
case RED_RIBBONS:
scale(0.9F);
GlStateManager.translatef(0F, 0.75F, 1F);
renderItem(stack);
break;
case PINK_FLOWER_BUD:
GlStateManager.rotatef(-90F, 0F, 1F, 0F);
GlStateManager.translatef(0.4F, 0.6F, 0.45F);
renderItem(stack);
break;
case POLKA_DOTTED_BOWS:
GlStateManager.rotatef(-90F, 0F, 1F, 0F);
GlStateManager.translatef(0.65F, 0.3F, 0.5F);
renderItem(stack);
GlStateManager.translatef(0F, 0F, -1F);
renderItem(stack);
break;
case BLUE_BUTTERFLY:
GlStateManager.translatef(-0.75F, 0.1F, 1F);
GlStateManager.pushMatrix();
GlStateManager.rotatef(45F, 0F, 1F, 0F);
renderItem(stack);
GlStateManager.popMatrix();
GlStateManager.translatef(0F, 0F, -0.75F);
GlStateManager.rotatef(-45F, 0F, 1F, 0F);
renderItem(stack);
break;
case CAT_EARS:
GlStateManager.translatef(0F, 0.25F, 0.25F);
renderItem(stack);
break;
case GOOGLY_EYES:
GlStateManager.rotatef(180F, 0F, 1F, 0F);
GlStateManager.scalef(1.5F, 1.5F, 1F);
GlStateManager.translatef(0F, -0.05F, 0F);
renderItem(stack);
break;
case CLOCK_EYE:
scale(0.75F);
GlStateManager.translatef(-0.25F, -0.1F, 0F);
GlStateManager.rotatef(180F, 0F, 0F, 1F);
renderItem(stack);
break;
case UNICORN_HORN:
scale(1.25F);
GlStateManager.rotatef(-90F, 0F, 1F, 0F);
GlStateManager.translatef(0F, 0.4F, 0F);
renderItem(stack);
break;
case DEVIL_HORNS:
GlStateManager.translatef(0F, 0.2F, 0.25F);
renderItem(stack);
break;
case HYPER_PLUS:
scale(0.35F);
GlStateManager.translatef(-0.7F, 1F, -0.5F);
renderItem(stack);
GlStateManager.translatef(1.45F, 0F, 0F);
renderItem(stack);
break;
case ANCIENT_MASK:
scale(1.25F);
GlStateManager.translatef(0F, 0.025F, 0.01F);
renderItem(stack);
break;
case EERIE_MASK:
renderItem(stack);
break;
case ALIEN_ANTENNA:
scale(0.9F);
GlStateManager.rotatef(180F, 0F, 1F, 0F);
GlStateManager.translatef(0F, 0.75F, -1F);
renderItem(stack);
break;
case ANAGLYPH_GLASSES:
scale(1.25F);
GlStateManager.translatef(0F, -0.025F, 0F);
renderItem(stack);
break;
case ORANGE_SHADES:
scale(1.25f);
GlStateManager.translatef(0F, 0.04F, 0F);
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GlStateManager.color4f(1F, 1F, 1F, 0.7F);
renderItem(stack);
break;
case GROUCHO_GLASSES:
scale(1.5F);
GlStateManager.translatef(0F, -0.2125F, 0F);
renderItem(stack);
break;
case THICK_EYEBROWS:
scale(0.5F);
GlStateManager.translatef(-0.4F, 0.05F, 0F);
renderItem(stack);
GlStateManager.rotatef(180F, 0F, 1F, 0F);
GlStateManager.translatef(-0.775F, 0F, 0F);
renderItem(stack);
break;
case TINY_POTATO_MASK:
scale(1.25F);
GlStateManager.translatef(0F, 0.025F, 0F);
renderItem(stack);
break;
case QUESTGIVER_MARK:
scale(0.8F);
GlStateManager.translatef(0F, 1F, 0.3F);
renderItem(stack);
break;
case THINKING_HAND:
scale(0.9f);
GlStateManager.translatef(0.2F, -0.5F, 0F);
GlStateManager.scalef(-1, 1, 1);
GlStateManager.rotatef(15F, 0F, 0F, 1F);
renderItem(stack);
break;
default: {
// body cosmetics
GlStateManager.translatef(0F, 0F, -0.75F);
GlStateManager.rotatef(-45F, 0F, 1F, 0F);
renderItem(stack);
break;
case CAT_EARS:
GlStateManager.translatef(0F, 0.25F, 0.25F);
renderItem(stack);
break;
case GOOGLY_EYES:
GlStateManager.rotatef(180F, 0F, 1F, 0F);
GlStateManager.scalef(1.5F, 1.5F, 1F);
GlStateManager.translatef(0F, -0.05F, 0F);
renderItem(stack);
break;
case CLOCK_EYE:
scale(0.75F);
GlStateManager.translatef(-0.25F, -0.1F, 0F);
GlStateManager.rotatef(180F, 0F, 0F, 1F);
renderItem(stack);
break;
case UNICORN_HORN:
scale(1.25F);
GlStateManager.rotatef(-90F, 0F, 1F, 0F);
GlStateManager.translatef(0F, 0.4F, 0F);
renderItem(stack);
break;
case DEVIL_HORNS:
GlStateManager.translatef(0F, 0.2F, 0.25F);
renderItem(stack);
break;
case HYPER_PLUS:
scale(0.35F);
GlStateManager.translatef(-0.7F, 1F, -0.5F);
renderItem(stack);
GlStateManager.translatef(1.45F, 0F, 0F);
renderItem(stack);
break;
case ANCIENT_MASK:
scale(1.25F);
GlStateManager.translatef(0F, 0.025F, 0.01F);
renderItem(stack);
break;
case EERIE_MASK:
renderItem(stack);
break;
case ALIEN_ANTENNA:
scale(0.9F);
GlStateManager.rotatef(180F, 0F, 1F, 0F);
GlStateManager.translatef(0F, 0.75F, -1F);
renderItem(stack);
break;
case ANAGLYPH_GLASSES:
scale(1.25F);
GlStateManager.translatef(0F, -0.025F, 0F);
renderItem(stack);
break;
case ORANGE_SHADES:
scale(1.25f);
GlStateManager.translatef(0F, 0.04F, 0F);
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GlStateManager.color4f(1F, 1F, 1F, 0.7F);
renderItem(stack);
break;
case GROUCHO_GLASSES:
scale(1.5F);
GlStateManager.translatef(0F, -0.2125F, 0F);
renderItem(stack);
break;
case THICK_EYEBROWS:
scale(0.5F);
GlStateManager.translatef(-0.4F, 0.05F, 0F);
renderItem(stack);
GlStateManager.rotatef(180F, 0F, 1F, 0F);
GlStateManager.translatef(-0.775F, 0F, 0F);
renderItem(stack);
break;
case TINY_POTATO_MASK:
scale(1.25F);
GlStateManager.translatef(0F, 0.025F, 0F);
renderItem(stack);
break;
case QUESTGIVER_MARK:
scale(0.8F);
GlStateManager.translatef(0F, 1F, 0.3F);
renderItem(stack);
break;
case THINKING_HAND:
scale(0.9f);
GlStateManager.translatef(0.2F, -0.5F, 0F);
GlStateManager.scalef(-1, 1, 1);
GlStateManager.rotatef(15F, 0F, 0F, 1F);
renderItem(stack);
break;
default:
break;
}
} else { // body cosmetics
AccessoryRenderHelper.rotateIfSneaking(player);
AccessoryRenderHelper.translateToChest();
AccessoryRenderHelper.defaultTransforms();
@@ -227,9 +236,6 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
renderItem(stack);
break;
case BLACK_TIE:
GlStateManager.translatef(0F, -0.15F, 0F);
renderItem(stack);
break;
case PUFFY_SCARF:
GlStateManager.translatef(0F, -0.15F, 0F);
renderItem(stack);
@@ -273,7 +279,6 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
break;
}
}
}
}
public static void scale(float f) {
@@ -318,8 +323,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
BufferBuilder worldrenderer = tessellator.getBuffer();
worldrenderer.begin(7, DefaultVertexFormats.ITEM);
for (Direction enumfacing : Direction.values())
{
for(Direction enumfacing : Direction.values()) {
renderQuads(worldrenderer, model.getQuads(null, enumfacing, random), color, stack);
}
@@ -328,18 +332,15 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
}
// Copy of RenderItem.renderQuads
private static void renderQuads(BufferBuilder renderer, List<BakedQuad> quads, int color, ItemStack stack)
{
private static void renderQuads(BufferBuilder renderer, List<BakedQuad> quads, int color, ItemStack stack) {
boolean flag = color == -1 && !stack.isEmpty();
int i = 0;
for (int j = quads.size(); i < j; ++i)
{
for(int j = quads.size(); i < j; ++i) {
BakedQuad bakedquad = quads.get(i);
int k = color;
if (flag && bakedquad.hasTintIndex())
{
if(flag && bakedquad.hasTintIndex()) {
k = Minecraft.getInstance().getItemColors().getColor(stack, bakedquad.getTintIndex());
k = k | -16777216;
}
@@ -96,7 +96,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
AccessoryRenderHelper.translateToHeadLevel(player);
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
GlStateManager.scaled(0.8, 0.8, 0.8);
GlStateManager.rotatef(-90, 0, 1, 0);
@@ -442,7 +442,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
Minecraft.getInstance().textureManager.bindTexture(textureHalo);
if(player != null)
AccessoryRenderHelper.translateToHeadLevel(player);
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
GlStateManager.translatef(0, 1.5F, 0);
GlStateManager.rotatef(30, 1, 0, -1);
GlStateManager.translatef(-0.1F, -0.5F, -0.1F);
@@ -61,7 +61,7 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem {
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
GlStateManager.pushMatrix();
AccessoryRenderHelper.translateToHeadLevel(player);
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToFace();
AccessoryRenderHelper.defaultTransforms();
GlStateManager.rotatef(-90F, 0F, 1F, 0F);
@@ -77,7 +77,7 @@ public class ItemItemFinder extends ItemBauble {
float f2 = gemIcon.getMinV();
float f3 = gemIcon.getMaxV();
boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty();
AccessoryRenderHelper.translateToHeadLevel(living);
AccessoryRenderHelper.translateToHeadLevel(living, partialTicks);
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
GlStateManager.rotatef(90F, 0F, 1F, 0F);
GlStateManager.rotatef(180F, 1F, 0F, 0F);
@@ -52,7 +52,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty();
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
AccessoryRenderHelper.translateToHeadLevel(player);
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToFace();
AccessoryRenderHelper.defaultTransforms();
GlStateManager.rotatef(180F, 0F, 1F, 0F);