fix some rendering, icon, and forgedirection issues

This commit is contained in:
Progwml6 committed 2013-12-31 19:35:23 -05:00
1 parent c0599dc707
commit e187d8525b
25 files changed
+473 -469

No files matched your search

@@ -5,6 +5,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Vec3;
@@ -12,7 +13,6 @@ import net.minecraft.util.Vec3;
import org.lwjgl.opengl.GL11;
import tconstruct.entity.CartEntity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -98,7 +98,7 @@ public class CartRender extends Render
if (cart.getCartType() == 1)
{
GL11.glTranslatef(0.0F, 0.5F, 0.0F);
renderblocks.renderBlockAsItem(Block.chest, 0, cart.getBrightness(par9));
renderblocks.renderBlockAsItem(Blocks.chest, 0, cart.getBrightness(par9));
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.5F, 0.0F, -0.5F);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -106,7 +106,7 @@ public class CartRender extends Render
else if (cart.getCartType() == 2)
{
GL11.glTranslatef(0.0F, 0.3125F, 0.0F);
renderblocks.renderBlockAsItem(Block.furnaceIdle, 0, cart.getBrightness(par9));
renderblocks.renderBlockAsItem(Blocks.furnace, 0, cart.getBrightness(par9));
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.0F, -0.3125F, 0.0F);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -15,7 +15,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.ForgeHooksClient;
@@ -136,7 +136,7 @@ public class FancyItemRender extends Render
for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k)
{
this.random.setSeed(187L);
Icon icon = itemstack.getItem().getIcon(itemstack, k);
IIcon icon = itemstack.getItem().getIcon(itemstack, k);
f8 = 1.0F;
if (this.renderWithColor)
@@ -166,7 +166,7 @@ public class FancyItemRender extends Render
GL11.glScalef(0.5F, 0.5F, 0.5F);
}
Icon icon1 = itemstack.getIconIndex();
IIcon icon1 = itemstack.getIconIndex();
if (this.renderWithColor)
{
@@ -213,10 +213,10 @@ public class FancyItemRender extends Render
par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno");
}
float f4 = ((Icon) par2Icon).getMinU();
float f5 = ((Icon) par2Icon).getMaxU();
float f6 = ((Icon) par2Icon).getMinV();
float f7 = ((Icon) par2Icon).getMaxV();
float f4 = ((IIcon) par2Icon).getMinU();
float f5 = ((IIcon) par2Icon).getMaxU();
float f6 = ((IIcon) par2Icon).getMinV();
float f7 = ((IIcon) par2Icon).getMaxV();
float f8 = 1.0F;
float f9 = 0.5F;
float f10 = 0.25F;
@@ -356,7 +356,7 @@ public class FancyItemRender extends Render
for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1)
{
par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1);
IIcon icon = Item.itemsList[k].getIcon(par3ItemStack, j1);
int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1);
f1 = (float) (k1 >> 16 & 255) / 255.0F;
f2 = (float) (k1 >> 8 & 255) / 255.0F;
@@ -398,7 +398,7 @@ public class FancyItemRender extends Render
GL11.glColor4f(f, f1, f2, 1.0F);
}
this.renderIcon(par4, par5, (Icon) object, 16, 16);
this.renderIcon(par4, par5, (IIcon) object, 16, 16);
GL11.glEnable(GL11.GL_LIGHTING);
if (par3ItemStack.hasEffect(0))
@@ -557,7 +557,7 @@ public class FancyItemRender extends Render
par1Tessellator.draw();
}
public void renderIcon (int par1, int par2, Icon par3Icon, int par4, int par5)
public void renderIcon (int par1, int par2, IIcon par3Icon, int par4, int par5)
{
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
@@ -6,6 +6,7 @@ import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.init.Blocks;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
@@ -62,7 +63,7 @@ public class ExplosiveRender extends Render
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA);
GL11.glColor4f(1.0F, 1.0F, 1.0F, f2);
this.blockRenderer.renderBlockAsItem(Block.tnt, 0, 1.0F);
this.blockRenderer.renderBlockAsItem(Blocks.tnt, 0, 1.0F);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
GL11.glDisable(GL11.GL_BLEND);
GL11.glEnable(GL11.GL_LIGHTING);
@@ -14,7 +14,7 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.Entity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.ForgeHooksClient;
@@ -118,7 +118,7 @@ public class ArrowRender extends Render
for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k)
{
this.random.setSeed(187L);
Icon icon = itemstack.getItem().getIcon(itemstack, k);
IIcon icon = itemstack.getItem().getIcon(itemstack, k);
f8 = 1.0F;
if (this.renderWithColor)
@@ -140,7 +140,7 @@ public class ArrowRender extends Render
{
GL11.glScalef(0.5F, 0.5F, 0.5F);
Icon icon1 = itemstack.getIconIndex();
IIcon icon1 = itemstack.getIconIndex();
if (this.renderWithColor)
{
@@ -171,12 +171,12 @@ public class ArrowRender extends Render
/**
* Renders a dropped item
*/
private void renderDroppedItem (ArrowEntity par1ArrowEntity, Icon par2Icon, int par3, float par4, float par5, float par6, float par7)
private void renderDroppedItem (ArrowEntity par1ArrowEntity, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7)
{
renderDroppedItem(par1ArrowEntity, par2Icon, par3, par4, par5, par6, par7, 0);
}
private void renderDroppedItem (ArrowEntity arrow, Icon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass)
private void renderDroppedItem (ArrowEntity arrow, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass)
{
Tessellator tessellator = Tessellator.instance;
@@ -187,10 +187,10 @@ public class ArrowRender extends Render
par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno");
}
float f4 = ((Icon) par2Icon).getMinU();
float f5 = ((Icon) par2Icon).getMaxU();
float f6 = ((Icon) par2Icon).getMinV();
float f7 = ((Icon) par2Icon).getMaxV();
float f4 = ((IIcon) par2Icon).getMinU();
float f5 = ((IIcon) par2Icon).getMaxU();
float f6 = ((IIcon) par2Icon).getMinV();
float f7 = ((IIcon) par2Icon).getMaxV();
float f8 = 1.0F;
float f9 = 0.5F;
float f10 = 0.25F;
@@ -236,7 +236,7 @@ public class ArrowRender extends Render
GL11.glColor4f(par5, par6, par7, 1.0F);
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12);
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((IIcon) par2Icon).getIconWidth(), ((IIcon) par2Icon).getIconHeight(), f12);
if (itemstack.hasEffect(pass))
{
@@ -14,7 +14,7 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.Entity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.ForgeHooksClient;
@@ -133,7 +133,7 @@ public class DaggerRender extends Render
for (int k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k)
{
this.random.setSeed(187L);
Icon icon = itemstack.getItem().getIcon(itemstack, k);
IIcon icon = itemstack.getItem().getIcon(itemstack, k);
f8 = 1.0F;
if (this.renderWithColor)
@@ -163,7 +163,7 @@ public class DaggerRender extends Render
GL11.glScalef(0.5F, 0.5F, 0.5F);
}
Icon icon1 = itemstack.getIconIndex();
IIcon icon1 = itemstack.getIconIndex();
if (this.renderWithColor)
{
@@ -210,10 +210,10 @@ public class DaggerRender extends Render
par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno");
}
float f4 = ((Icon) par2Icon).getMinU();
float f5 = ((Icon) par2Icon).getMaxU();
float f6 = ((Icon) par2Icon).getMinV();
float f7 = ((Icon) par2Icon).getMaxV();
float f4 = ((IIcon) par2Icon).getMinU();
float f5 = ((IIcon) par2Icon).getMaxU();
float f6 = ((IIcon) par2Icon).getMinV();
float f7 = ((IIcon) par2Icon).getMaxV();
float f8 = 1.0F;
float f9 = 0.5F;
float f10 = 0.25F;
@@ -259,7 +259,7 @@ public class DaggerRender extends Render
GL11.glColor4f(par5, par6, par7, 1.0F);
GL11.glRotatef(90, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(rotation, 0.0F, 0.0F, 1.0F);
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12);
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((IIcon) par2Icon).getIconWidth(), ((IIcon) par2Icon).getIconHeight(), f12);
/*if (itemstack.hasEffect(pass))
{
@@ -348,7 +348,7 @@ public class DaggerRender extends Render
for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1)
{
par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1);
IIcon icon = Item.itemsList[k].getIcon(par3ItemStack, j1);
int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1);
f1 = (float) (k1 >> 16 & 255) / 255.0F;
f2 = (float) (k1 >> 8 & 255) / 255.0F;
@@ -390,7 +390,7 @@ public class DaggerRender extends Render
GL11.glColor4f(f, f1, f2, 1.0F);
}
this.renderIcon(par4, par5, (Icon) object, 16, 16);
this.renderIcon(par4, par5, (IIcon) object, 16, 16);
GL11.glEnable(GL11.GL_LIGHTING);
if (par3ItemStack.hasEffect(0))
@@ -549,7 +549,7 @@ public class DaggerRender extends Render
par1Tessellator.draw();
}
public void renderIcon (int par1, int par2, Icon par3Icon, int par4, int par5)
public void renderIcon (int par1, int par2, IIcon par3Icon, int par4, int par5)
{
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
@@ -7,7 +7,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemPotion;
import net.minecraft.potion.PotionHelper;
import net.minecraft.util.Icon;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
@@ -43,7 +43,7 @@ public class LaunchedItemRender extends Render
*/
public void doRender (Entity par1Entity, double par2, double par4, double par6, float par8, float par9)
{
Icon icon = this.field_94151_a.getIconFromDamage(this.field_94150_f);
IIcon icon = this.field_94151_a.getIconFromDamage(this.field_94150_f);
if (icon != null)
{