Fix all outstanding auxiliary renders.

close #49 until the next time renders break
This commit is contained in:
yrsegal committed 2016-06-10 16:56:39 -04:00
1 parent 6afc33c57b
commit 491452ac7b
4 files changed
+247 -231

No files matched your search

@@ -35,27 +35,58 @@ public interface IBaubleRender {
/**
* A few helper methods for the render.
*/
public static class Helper {
final class Helper {
/**
* Rotates the render for a bauble correctly if the player is sneaking.
* Use for renders under {@link RenderType#BODY}.
*/
public static void rotateIfSneaking(EntityPlayer player) {
if(player.isSneaking())
applySneakingRotation();
}
/**
* Rotates the render for a bauble correctly for a sneaking player.
* Use for renders under {@link RenderType#BODY}.
*/
public static void applySneakingRotation() {
GlStateManager.translate(0F, 0.2F, 0F);
GlStateManager.rotate(90F / (float) Math.PI, 1.0F, 0.0F, 0.0F);
}
/**
* Shifts the render for a bauble correctly to the head, including sneaking rotation.
* Use for renders under {@link RenderType#HEAD}.
*/
public static void translateToHeadLevel(EntityPlayer player) {
GlStateManager.translate(0, -player.getDefaultEyeHeight(), 0);
if (player.isSneaking())
GlStateManager.translate(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 under {@link RenderType#HEAD}, and usually after calling {@link Helper#translateToHeadLevel(EntityPlayer)}.
*/
public static void translateToFace() {
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.rotate(180F, 1F, 0F, 0F);
GlStateManager.translate(0f, -1.6f, -0.35f);
}
/**
* Shifts the render for a bauble correctly to the chest.
* Use for renders under {@link RenderType#BODY}, and usually after calling {@link Helper#rotateIfSneaking(EntityPlayer)}.
*/
public static void translateToChest() {
GlStateManager.rotate(180F, 1F, 0F, 0F);
GlStateManager.translate(0F, -0.3F, 0.0825F);
}
}
public static enum RenderType {
enum RenderType {
/**
* Render Type for the player's body, translations apply on the player's rotation.
* Sneaking is not handled and should be done during the render.
@@ -2,10 +2,10 @@
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
*
* File Created @ [Feb 22, 2015, 2:01:01 PM (GMT)]
*/
package vazkii.botania.common.item.equipment.bauble;
@@ -44,8 +44,19 @@ import java.util.List;
public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
private enum Variants {
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
}
private static final int SUBTYPES = 32;
private final ItemStack renderStack;
private ItemStack renderStack;
public ItemBaubleCosmetic() {
super(LibItemNames.COSMETIC);
@@ -85,243 +96,214 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
@Override
public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) {
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
if(type == RenderType.HEAD) {
renderStack = stack;
if (stack.getItemDamage() >= 32 || stack.getItemDamage() < 0) return;
Variants variant = Variants.values()[stack.getItemDamage()];
if (type == RenderType.HEAD) {
Helper.translateToHeadLevel(player);
switch(stack.getItemDamage()) {
case 2:
faceTranslate();
GlStateManager.translate(0F, 0F, 0.045F);
renderIcon(2);
break;
case 4:
faceTranslate();
GlStateManager.translate(0F, 0F, 0.045F);
renderIcon(4);
break;
case 5:
faceTranslate();
scale(0.35F);
GlStateManager.translate(-0.3F, 0.2F, -0.5F);
renderIcon(5);
break;
case 6:
faceTranslate();
scale(0.45F);
GlStateManager.translate(0.2F, 0.2F, -0.4F);
renderIcon(6);
break;
case 7:
faceTranslate();
scale(0.9F);
GlStateManager.translate(0F, -0.4F, -0.42F);
renderIcon(7);
break;
case 8:
faceTranslate();
GlStateManager.rotate(-90F, 0F, 0F, 1F);
GlStateManager.translate(0F, 0.1F, -0.2F);
renderIcon(8);
break;
case 9:
faceTranslate();
GlStateManager.rotate(-90F, 0F, 0F, 1F);
GlStateManager.translate(0F, 0.1F, -0.1F);
renderIcon(9);
GlStateManager.translate(0F, -0.45F, 0F);
renderIcon(9);
break;
case 10:
faceTranslate();
GlStateManager.rotate(-90F, 0F, 0F, 1F);
scale(0.6F);
GlStateManager.translate(0F, 0.25F, -0.4F);
Helper.translateToFace();
switch (variant) {
case RED_GLASSES:
GlStateManager.translate(0F, 0.01F, 0.045F);
renderItem();
break;
case ENGINEER_GOGGLES:
GlStateManager.translate(0F, 0.01F, 0.045F);
renderItem();
break;
case EYEPATCH:
scale(0.35F);
GlStateManager.translate(-0.3F, 0.4F, 0.1F);
renderItem();
break;
case WICKED_EYEPATCH:
scale(0.45F);
GlStateManager.translate(0.2F, 0.2F, -0.4F);
renderItem();
break;
case RED_RIBBONS:
scale(0.9F);
GlStateManager.translate(0F, 0.4F, 0.42F);
renderItem();
break;
case PINK_FLOWER_BUD:
GlStateManager.rotate(-90F, 0F, 1F, 0F);
GlStateManager.translate(0.4F, 0.1F, 0.2F);
renderItem();
break;
case POLKA_DOTTED_BOWS:
GlStateManager.rotate(-90F, 0F, 1F, 0F);
GlStateManager.translate(0.4F, 0.3F, 0.2F);
renderItem();
GlStateManager.translate(0F, 0F, -0.525F);
renderItem();
break;
case BLUE_BUTTERFLY:
GlStateManager.rotate(-90F, 0F, 0F, 1F);
renderItem();
GlStateManager.translate(0F, 0.25F, -0.4F);
GlStateManager.pushMatrix();
GlStateManager.translate(-0.2F, 0.15F, 0F);
GlStateManager.rotate(-45F, 0F, 0F, 1F);
renderIcon(10);
GlStateManager.popMatrix();
GlStateManager.pushMatrix();
GlStateManager.translate(-0.2F, 0.15F, 0F);
GlStateManager.rotate(-45F, 0F, 0F, 1F);
renderItem();
GlStateManager.popMatrix();
GlStateManager.translate(0.15F, 0.3F, 0F);
GlStateManager.rotate(-135F, 0F, 0F, 1F);
renderIcon(10);
break;
case 11:
faceTranslate();
scale(0.6F);
GlStateManager.translate(0F, 0F, -0.55F);
renderIcon(11);
break;
case 15:
faceTranslate();
GlStateManager.translate(-0.01F, 0F, 0.05F);
renderIcon(15);
break;
case 17:
faceTranslate();
scale(0.35F);
GlStateManager.translate(0.25F, 0.2F, -0.60F);
renderIcon(17);
break;
case 18:
faceTranslate();
scale(0.75F);
GlStateManager.rotate(-90F, 0F, 0F, 1F);
GlStateManager.translate(-0.2F, -0.15F, -0.5F);
renderIcon(18);
break;
case 19:
faceTranslate();
scale(0.6F);
GlStateManager.translate(0F, 0F, -0.5F);
renderIcon(19);
break;
case 20:
faceTranslate();
scale(0.25F);
GlStateManager.translate(-0.7F, 0.3F, -1.5F);
renderIcon(20);
GlStateManager.translate(1.4F, 0F, 0F);
renderIcon(20);
break;
case 22:
faceTranslate();
renderIcon(22);
break;
case 23:
faceTranslate();
renderIcon(23);
break;
case 24:
faceTranslate();
scale(0.8F);
GlStateManager.translate(0F, -0.1F, -0.5F);
renderIcon(24);
break;
case 25:
faceTranslate();
GlStateManager.translate(0F, 0F, 0.04F);
renderIcon(25);
break;
case 26:
faceTranslate();
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GlStateManager.color(1F, 1F, 1F, 0.7F);
renderIcon(26);
break;
case 27:
faceTranslate();
scale(0.90F);
GlStateManager.translate(0F, 0F, 0.09F);
renderIcon(27);
break;
case 28:
faceTranslate();
scale(0.25F);
GlStateManager.translate(-0.4F, 0.4F, -1.1F);
renderIcon(28);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.775F, -0.4F, 0.04F);
renderIcon(28);
break;
case 30:
faceTranslate();
renderIcon(30);
break;
case 31:
faceTranslate();
scale(0.8F);
GlStateManager.translate(0F, -0.3F, -0.75F);
renderIcon(31);
break;
GlStateManager.translate(0.15F, 0.3F, 0F);
GlStateManager.rotate(-135F, 0F, 0F, 1F);
renderItem();
break;
case CAT_EARS:
GlStateManager.translate(0F, 0.25F, 0.25F);
renderItem();
break;
case GOOGLY_EYES:
GlStateManager.rotate(180F, 0F, 1F, 0F);
GlStateManager.scale(1.5F, 1.5F, 1F);
GlStateManager.translate(0F, -0.05F, -0.15F);
renderItem();
break;
case CLOCK_EYE:
scale(0.5F);
GlStateManager.translate(0.25F, 0.2F, 0.1F);
renderItem();
break;
case UNICORN_HORN:
scale(0.75F);
GlStateManager.rotate(-90F, 0F, 1F, 0F);
GlStateManager.translate(0.1F, 0.4F, -0.0625F);
renderItem();
break;
case DEVIL_HORNS:
GlStateManager.translate(0F, 0.2F, 0.25F);
renderItem();
break;
case HYPER_PLUS:
scale(0.3125F);
GlStateManager.translate(-0.7F, 1.5F, 0.3F);
renderItem();
GlStateManager.translate(1.4F, 0F, 0F);
renderItem();
break;
case ANCIENT_MASK:
scale(1.25F);
GlStateManager.translate(0F, 0.025F, 0.01F);
renderItem();
break;
case EERIE_MASK:
GlStateManager.translate(0F, 0.05F, 0F);
renderItem();
break;
case ALIEN_ANTENNA:
scale(0.8F);
GlStateManager.rotate(180F, 0F, 1F, 0F);
GlStateManager.translate(0F, 0.5F, -0.85F);
renderItem();
break;
case ANAGLYPH_GLASSES:
scale(1.25F);
GlStateManager.translate(0F, -0.025F, 0F);
renderItem();
break;
case ORANGE_SHADES:
GlStateManager.translate(0F, 0.04F, 0F);
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GlStateManager.color(1F, 1F, 1F, 0.7F);
renderItem();
break;
case GROUCHO_GLASSES:
scale(0.90F);
GlStateManager.translate(0F, -0.035F, 0F);
renderItem();
break;
case THICK_EYEBROWS:
scale(0.35F);
GlStateManager.translate(-0.4F, 0.6F, 0.2F);
renderItem();
GlStateManager.rotate(180F, 0F, 1F, 0F);
GlStateManager.translate(-0.775F, 0.2F, 0F);
renderItem();
break;
case TINY_POTATO_MASK:
scale(1.25F);
GlStateManager.translate(0F, 0.025F, 0F);
renderItem();
break;
case QUESTGIVER_MARK:
scale(0.8F);
GlStateManager.translate(0F, 0.75F, 0.3F);
renderItem();
break;
}
} else {
Helper.rotateIfSneaking(player);
switch(stack.getItemDamage()) {
case 0:
chestTranslate();
renderIcon(0);
break;
case 1:
chestTranslate();
GlStateManager.translate(0F, 0F, 0.2F);
renderIcon(1);
break;
case 3:
chestTranslate();
GlStateManager.translate(0F, 0F, 0.15F);
renderIcon(3);
break;
case 12:
chestTranslate();
scale(0.225F);
GlStateManager.translate(-0.725F, 0.45F, -0.6F);
renderIcon(12);
break;
case 13:
chestTranslate();
GlStateManager.rotate(-90F, 0F, 0F, 1F);
GlStateManager.translate(0.33F, -0.15F, 0.55F);
renderIcon(13);
break;
case 14:
chestTranslate();
scale(0.9F);
GlStateManager.translate(0.45F, 0.05F, -0.1F);
renderIcon(14);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(0.9F, -0.25F, 0F);
renderKamuiBlack();
break;
case 16:
chestTranslate();
scale(0.225F);
GlStateManager.translate(0.725F, 0.45F, -0.6F);
renderIcon(16);
break;
case 21:
chestTranslate();
scale(0.5F);
GlStateManager.translate(0F, 0.15F, 0.32F);
renderIcon(21);
break;
case 29:
chestTranslate();
GlStateManager.translate(0.05F, -0.25F, 0.25F);
GlStateManager.rotate(8F, 0F, 1F, 0F);
renderIcon(29);
break;
Helper.translateToChest();
switch (variant) {
case BLACK_BOWTIE:
renderItem();
break;
case BLACK_TIE:
GlStateManager.translate(0F, -0.15F, 0F);
renderItem();
break;
case PUFFY_SCARF:
GlStateManager.translate(0F, -0.15F, 0F);
renderItem();
break;
case WITCH_PIN:
scale(0.35F);
GlStateManager.translate(-0.35F, 0.35F, 0.15F);
renderItem();
break;
case DEVIL_TAIL:
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(0.25F, -0.4F, -0.055F);
renderItem();
break;
case KAMUI_EYE: // DON'T LOSE YOUR WAAAAAAAAY
scale(0.9F);
GlStateManager.translate(0.45F, 0.2F, -0.1F);
renderItem();
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(180F, 1F, 0F, 0F);
GlStateManager.translate(0.9F, -0.225F, -0.18F);
renderKamuiBlack();
break;
case FOUR_LEAF_CLOVER:
scale(0.35F);
GlStateManager.translate(-0.35F, 0.35F, 0.15F);
renderItem();
break;
case BOTANIST_EMBLEM:
scale(0.5F);
GlStateManager.translate(0.2F, 0.125F, 0.05F);
renderItem();
break;
case LUSITANIC_SHIELD:
GlStateManager.rotate(180F, 0F, 1F, 0F);
GlStateManager.translate(0.035F, -0.2F, 0.175F);
GlStateManager.rotate(8F, 0F, 0F, 1F);
renderItem();
break;
}
}
}
public void faceTranslate() {
GlStateManager.rotate(-90F, 0F, 1F, 0F);
GlStateManager.rotate(-90F, 1F, 0F, 0F);
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.translate(0F, 0.10F, 1.45F);
}
public void chestTranslate() {
GlStateManager.translate(0F, 0.5F, 0F);
GlStateManager.rotate(-90F, 1F, 0F, 0F);
}
public void scale(float f) {
GlStateManager.scale(f, f, f);
}
@SuppressWarnings("deprecation")
public void renderIcon(int i) {
public void renderItem() {
GlStateManager.pushMatrix();
renderStack.setItemDamage(i);
Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9
Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
GlStateManager.popMatrix();
}
public void renderKamuiBlack() {
renderStack.setItemDamage(14);
// Modified copy of RenderItem.renderItem(stack, transformtype)
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
@@ -334,7 +316,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
GlStateManager.enableBlend();
GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
GlStateManager.pushMatrix();
model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, false); // todo 1.9
model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(model, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, false);
GlStateManager.translate(-0.5F, -0.1F, -0.4F);
this.renderModel(model, renderStack, 0xFF00004C);
@@ -69,13 +69,14 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender {
boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null;
Helper.translateToHeadLevel(player);
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.translate(-0.35F, 1.1F, 0);
GlStateManager.rotate(-90F, 0F, 1F, 0F);
GlStateManager.scale(2.2F, 2.2F, 2.2F); // TODO 1.8 could use further refinement
GlStateManager.translate(0, 0.425F, 0.425);
GlStateManager.scale(1.625F, 1.625F, 1.625F);
GlStateManager.rotate(-80F, 1F, 0F, 0F);
if(armor) {
GlStateManager.scale(1.1F, 1.1F, 1.1F);
}
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
}
}
}
@@ -52,12 +52,14 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) {
if(type == RenderType.HEAD) {
boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null;
Helper.translateToHeadLevel(player);
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
Helper.translateToHeadLevel(player);
Helper.translateToFace();
GlStateManager.rotate(180F, 0F, 1F, 0F);
GlStateManager.scale(0.5F, 0.5F, 0.5F);
GlStateManager.rotate(90, 0, 0, 1); // todo 1.8 could use some further refinement
GlStateManager.translate(2.88F, armor ? -0.75F : -0.63F, 0.62F);
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(this), ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND); // todo 1.9
GlStateManager.translate(0.32F, 0.125F, armor ? -0.13F : -0.25F);
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
}
}