Reimplement the changes to the entity rendering in the custom renderers so their animations n stuff isn't b0rked anymore. (todo: do properly later)

This commit is contained in:
Bernhard Bonigl committed 2014-10-10 17:52:17 +02:00
1 parent 28f16ac76c
commit 17593a3909
5 files changed
+20 -3

No files matched your search

@@ -96,9 +96,6 @@ public class FlexibleToolRenderer implements IItemRenderer {
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
if(type != ItemRenderType.ENTITY) {
GL11.glTranslatef(0.5f, 0.5f, 0);
GL11.glScalef(0.5f, 0.5f, 0.5f);
specialAnimation(type, item);
}
else
@@ -21,6 +21,9 @@ public class BowRenderer extends FlexibleToolRenderer {
protected void specialAnimation(ItemRenderType type, ItemStack item) {
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
GL11.glTranslatef(0.5f, 0.5f, 0);
GL11.glScalef(0.5f, 0.5f, 0.5f);
if(type == ItemRenderType.EQUIPPED)
{
//GL11.glTranslatef(0.0F, 0.125F, 0.3125F);
@@ -111,5 +114,7 @@ public class BowRenderer extends FlexibleToolRenderer {
GL11.glScalef(2.3f, 2.3f, 1.0f);
else if(item.getItem() == TinkerWeaponry.shortbow)
GL11.glScalef(1.7f, 1.7f, 1.0f);
GL11.glTranslatef(-0.5f, -0.5f, 0f);
}
}
@@ -19,6 +19,9 @@ public class CrossbowRenderer extends FlexibleToolRenderer {
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
Crossbow crossbow = (Crossbow)item.getItem();
GL11.glTranslatef(0.5f, 0.5f, 0);
GL11.glScalef(0.5f, 0.5f, 0.5f);
GL11.glScalef(1.5f, 1.5f, 1.5f);
if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
@@ -69,5 +72,7 @@ public class CrossbowRenderer extends FlexibleToolRenderer {
GL11.glTranslatef(0.25f, 0, 0);
GL11.glRotatef(45.0F, 0.0F, 0.0F, 1.0F);
}
GL11.glTranslatef(-0.5f, -0.5f, 0f);
}
}
@@ -10,6 +10,9 @@ public class JavelinRenderer extends AmmoItemRenderer {
@Override
protected void specialAnimation(ItemRenderType type, ItemStack item) {
GL11.glTranslatef(0.5f, 0.5f, 0);
GL11.glScalef(0.5f, 0.5f, 0.5f);
float progress = ((IWindup)item.getItem()).getWindupProgress(item, Minecraft.getMinecraft().thePlayer); // 0.5 while not winding
if(type == ItemRenderType.EQUIPPED)
@@ -21,5 +24,7 @@ public class JavelinRenderer extends AmmoItemRenderer {
if(type == ItemRenderType.EQUIPPED_FIRST_PERSON)
GL11.glTranslatef(0, progress * 0.4f, 0);
GL11.glRotatef(45, 0, 0, 1);
GL11.glTranslatef(-0.5f, -0.5f, 0f);
}
}
@@ -15,6 +15,9 @@ public class ThrowingKnifeRenderer extends AmmoItemRenderer {
@Override
protected void specialAnimation(ItemRenderType type, ItemStack item) {
GL11.glTranslatef(0.5f, 0.5f, 0);
GL11.glScalef(0.5f, 0.5f, 0.5f);
float progress = ((IWindup)item.getItem()).getWindupProgress(item, mc.thePlayer);
if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
@@ -65,5 +68,7 @@ public class ThrowingKnifeRenderer extends AmmoItemRenderer {
if(type == ItemRenderType.EQUIPPED)
GL11.glRotatef(-180, 0, 0, 1);
GL11.glTranslatef(-0.5f, -0.5f, 0f);
}
}