run through remap script

This commit is contained in:
Progwml6 committed 2014-02-05 08:28:53 -05:00
1 parent 689aeba09b
commit b8cf7cdc5e
208 files changed
+4117 -4117

No files matched your search

@@ -32,7 +32,7 @@ public class CartRender extends Render
public void renderPullcart (CartEntity cart, double posX, double posY, double posZ, float par8, float par9)
{
GL11.glPushMatrix();
long var10 = (long) cart.field_145783_c * 493286711L;
long var10 = (long) cart.entityId * 493286711L;
var10 = var10 * var10 * 4392167121L + var10 * 98761L;
float var12 = (((float) (var10 >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F;
float var13 = (((float) (var10 >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F;
@@ -76,7 +76,7 @@ public class CartRender extends Render
GL11.glTranslatef((float) posX, (float) posY + 0.3125f, (float) posZ);
GL11.glRotatef(180.0F - par8, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(-var24, 0.0F, 0.0F, 1.0F);
float var28 = (float) cart.func_70496_j() - par9;
float var28 = (float) cart.getRollingAmplitude() - par9;
float var30 = (float) cart.getDamage() - par9;
if (var30 < 0.0F)
@@ -86,7 +86,7 @@ public class CartRender extends Render
if (var28 > 0.0F)
{
GL11.glRotatef(MathHelper.sin(var28) * var28 * var30 / 10.0F * (float) cart.func_70493_k(), 1.0F, 0.0F, 0.0F);
GL11.glRotatef(MathHelper.sin(var28) * var28 * var30 / 10.0F * (float) cart.getRollingDirection(), 1.0F, 0.0F, 0.0F);
}
if (cart.getCartType() != 0)
@@ -98,7 +98,7 @@ public class CartRender extends Render
if (cart.getCartType() == 1)
{
GL11.glTranslatef(0.0F, 0.5F, 0.0F);
renderblocks.func_147800_a(Blocks.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.func_147800_a(Blocks.furnace, 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);
@@ -30,7 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class FancyItemRender extends Render
{
private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png");
private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png");
private RenderBlocks itemRenderBlocks = new RenderBlocks();
/** The RNG used in RenderItem (for bobbing itemstacks on the ground) */
@@ -78,7 +78,7 @@ public class FancyItemRender extends Render
{
;
}
else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(BlockUtils.getBlockFromItem(itemstack.getItem()).func_149645_b()))
else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType()))
{
GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F);
@@ -90,7 +90,7 @@ public class FancyItemRender extends Render
}
float f7 = 0.25F;
int j = block.func_149645_b();
int j = block.getRenderType();
if (j == 1 || j == 19 || j == 12 || j == 2)
{
@@ -112,7 +112,7 @@ public class FancyItemRender extends Render
}
f5 = 1.0F;
this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5);
this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5);
GL11.glPopMatrix();
}
}
@@ -271,7 +271,7 @@ public class FancyItemRender extends Render
{
GL11.glDepthFunc(GL11.GL_EQUAL);
GL11.glDisable(GL11.GL_LIGHTING);
this.renderManager.renderEngine.bindTexture(field_110798_h);
this.renderManager.renderEngine.bindTexture(RES_ITEM_GLINT);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE);
float f13 = 0.76F;
@@ -322,7 +322,7 @@ public class FancyItemRender extends Render
float f2;
//TODO make this be the block equivalent to k
Block block = BlockUtils.getBlockFromItem(k);
if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(block.func_149645_b()))
if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(block.getRenderType()))
{
par2TextureManager.bindTexture(TextureMap.locationBlocksTexture);
GL11.glPushMatrix();
@@ -343,9 +343,9 @@ public class FancyItemRender extends Render
}
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
this.itemRenderBlocks.field_147844_c = this.renderWithColor;
this.itemRenderBlocks.func_147800_a(block, l, 1.0F);
this.itemRenderBlocks.field_147844_c = true;
this.itemRenderBlocks.useInventoryTint = this.renderWithColor;
this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F);
this.itemRenderBlocks.useInventoryTint = true;
GL11.glPopMatrix();
}
else if (k.requiresMultipleRenderPasses())
@@ -414,7 +414,7 @@ public class FancyItemRender extends Render
GL11.glDepthFunc(GL11.GL_GREATER);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDepthMask(false);
manager.bindTexture(field_110798_h);
manager.bindTexture(RES_ITEM_GLINT);
this.zLevel -= 50.0F;
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
@@ -445,7 +445,7 @@ public class FancyItemRender extends Render
GL11.glDepthFunc(GL11.GL_GREATER);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDepthMask(false);
par2TextureManager.bindTexture(field_110798_h);
par2TextureManager.bindTexture(RES_ITEM_GLINT);
this.zLevel -= 50.0F;
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
@@ -54,7 +54,7 @@ public class ExplosiveRender extends Render
f2 = (1.0F - ((float) par1EntityTNTPrimed.fuse - par9 + 1.0F) / 100.0F) * 0.8F;
this.bindEntityTexture(par1EntityTNTPrimed);
this.blockRenderer.func_147800_a(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9));
this.blockRenderer.renderBlockAsItem(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9));
if (par1EntityTNTPrimed.fuse / 5 % 2 == 0)
{
@@ -63,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.func_147800_a(Blocks.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);
@@ -30,7 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ArrowRender extends Render
{
private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png");
private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png");
private RenderBlocks itemRenderBlocks = new RenderBlocks();
/** The RNG used in RenderItem (for bobbing itemstacks on the ground) */
@@ -73,12 +73,12 @@ public class ArrowRender extends Render
Block block = null;
block = BlockUtils.getBlockFromItem(itemstack.getItem());
if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(BlockUtils.getBlockFromItem(itemstack.getItem()).func_149645_b()))
if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType()))
{
GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F);
float f7 = 0.25F;
int j = block.func_149645_b();
int j = block.getRenderType();
if (j == 1 || j == 19 || j == 12 || j == 2)
{
@@ -100,7 +100,7 @@ public class ArrowRender extends Render
}
f5 = 1.0F;
this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5);
this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5);
GL11.glPopMatrix();
}
}
@@ -239,7 +239,7 @@ public class ArrowRender extends Render
{
GL11.glDepthFunc(GL11.GL_EQUAL);
GL11.glDisable(GL11.GL_LIGHTING);
this.renderManager.renderEngine.bindTexture(field_110798_h);
this.renderManager.renderEngine.bindTexture(RES_ITEM_GLINT);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE);
float f13 = 0.76F;
@@ -30,7 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class DaggerRender extends Render
{
private static final ResourceLocation field_110798_h = new ResourceLocation("textures/misc/enchanted_item_glint.png");
private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png");
private RenderBlocks itemRenderBlocks = new RenderBlocks();
/** The RNG used in RenderItem (for bobbing itemstacks on the ground) */
@@ -72,7 +72,7 @@ public class DaggerRender extends Render
Block block = BlockUtils.getBlockFromItem(itemstack.getItem());
if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(BlockUtils.getBlockFromItem(itemstack.getItem()).func_149645_b()))
if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType()))
{
GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F);
@@ -84,7 +84,7 @@ public class DaggerRender extends Render
}
float f7 = 0.25F;
int j = block.func_149645_b();
int j = block.getRenderType();
if (j == 1 || j == 19 || j == 12 || j == 2)
{
@@ -106,7 +106,7 @@ public class DaggerRender extends Render
}
f5 = 1.0F;
this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5);
this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5);
GL11.glPopMatrix();
}
}
@@ -261,7 +261,7 @@ public class DaggerRender extends Render
{
GL11.glDepthFunc(GL11.GL_EQUAL);
GL11.glDisable(GL11.GL_LIGHTING);
this.renderManager.renderEngine.bindTexture(field_110798_h);
this.renderManager.renderEngine.bindTexture(RES_ITEM_GLINT);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE);
float f13 = 0.76F;
@@ -311,7 +311,7 @@ public class DaggerRender extends Render
float f2;
Block block = BlockUtils.getBlockFromItem(k);
if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(BlockUtils.getBlockFromItem(k).func_149645_b()))
if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(k).getRenderType()))
{
par2TextureManager.bindTexture(TextureMap.locationBlocksTexture);
GL11.glPushMatrix();
@@ -332,9 +332,9 @@ public class DaggerRender extends Render
}
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
this.itemRenderBlocks.field_147844_c = this.renderWithColor;
this.itemRenderBlocks.func_147800_a(block, l, 1.0F);
this.itemRenderBlocks.field_147844_c = true;
this.itemRenderBlocks.useInventoryTint = this.renderWithColor;
this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F);
this.itemRenderBlocks.useInventoryTint = true;
GL11.glPopMatrix();
}
else if (k.requiresMultipleRenderPasses())
@@ -403,7 +403,7 @@ public class DaggerRender extends Render
GL11.glDepthFunc(GL11.GL_GREATER);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDepthMask(false);
manager.bindTexture(field_110798_h);
manager.bindTexture(RES_ITEM_GLINT);
this.zLevel -= 50.0F;
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
@@ -434,7 +434,7 @@ public class DaggerRender extends Render
GL11.glDepthFunc(GL11.GL_GREATER);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDepthMask(false);
par2TextureManager.bindTexture(field_110798_h);
par2TextureManager.bindTexture(RES_ITEM_GLINT);
this.zLevel -= 50.0F;
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);