lots o fixes

This commit is contained in:
Progwml6 committed 2014-01-18 02:52:49 -05:00
1 parent d914004bde
commit af3f99a746
66 files changed
+241 -229

No files matched your search

@@ -45,7 +45,7 @@ public class TControls extends TKeyHandler
{
mc = Minecraft.getMinecraft();
jumpKey = mc.gameSettings.keyBindJump;
invKey = mc.gameSettings.keyBindInventory;
invKey = mc.gameSettings.field_151445_Q;
return new KeyBinding[] { jumpKey, invKey };
}
@@ -98,7 +98,7 @@ public class CartRender extends Render
if (cart.getCartType() == 1)
{
GL11.glTranslatef(0.0F, 0.5F, 0.0F);
renderblocks.renderBlockAsItem(Blocks.chest, 0, cart.getBrightness(par9));
renderblocks.func_147800_a(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(Blocks.furnace, 0, cart.getBrightness(par9));
renderblocks.func_147800_a(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);
@@ -74,7 +74,7 @@ public class FancyItemRender extends Render
block = BlockUtils.getBlockFromItem(itemstack.getItem());
if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c))
if (ForgeHooksClient.renderEntityItem(par1EntityItem, itemstack, f2, f3, random, renderManager.renderEngine, field_147909_c,1))
{
;
}
@@ -112,7 +112,7 @@ public class FancyItemRender extends Render
}
f5 = 1.0F;
this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5);
this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5);
GL11.glPopMatrix();
}
}
@@ -344,7 +344,7 @@ public class FancyItemRender extends Render
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
this.itemRenderBlocks.field_147844_c = this.renderWithColor;
this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F);
this.itemRenderBlocks.func_147800_a(block, l, 1.0F);
this.itemRenderBlocks.field_147844_c = true;
GL11.glPopMatrix();
}
@@ -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.renderBlockAsItem(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9));
this.blockRenderer.func_147800_a(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.renderBlockAsItem(Blocks.tnt, 0, 1.0F);
this.blockRenderer.func_147800_a(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);
@@ -100,7 +100,7 @@ public class ArrowRender extends Render
}
f5 = 1.0F;
this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5);
this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5);
GL11.glPopMatrix();
}
}
@@ -47,7 +47,7 @@ public class ArrowRenderCustom extends Render
GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f);
float scale = 1.35f;
GL11.glScalef(scale, scale, scale);
ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c);
ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c, 1);
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glPopMatrix();
}
@@ -106,7 +106,7 @@ public class DaggerRender extends Render
}
f5 = 1.0F;
this.itemRenderBlocks.renderBlockAsItem(block, itemstack.getItemDamage(), f5);
this.itemRenderBlocks.func_147800_a(block, itemstack.getItemDamage(), f5);
GL11.glPopMatrix();
}
}
@@ -333,7 +333,7 @@ public class DaggerRender extends Render
GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
this.itemRenderBlocks.field_147844_c = this.renderWithColor;
this.itemRenderBlocks.renderBlockAsItem(block, l, 1.0F);
this.itemRenderBlocks.func_147800_a(block, l, 1.0F);
this.itemRenderBlocks.field_147844_c = true;
GL11.glPopMatrix();
}
@@ -54,7 +54,7 @@ public class DaggerRenderCustom extends Render
GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f);
float scale = 1.35f;
GL11.glScalef(scale, scale, scale);
ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c);
ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c,1);
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glPopMatrix();
}
@@ -830,7 +830,7 @@ public abstract class NewContainerGui extends GuiScreen
*/
protected void keyTyped (char par1, int par2)
{
if (par2 == 1 || par2 == this.field_146297_k.gameSettings.keyBindInventory.keyCode)
if (par2 == 1 || par2 == this.field_146297_k.gameSettings.field_151445_Q.keyCode)
{
this.field_146297_k.thePlayer.closeScreen();
}
@@ -464,7 +464,7 @@ public class ToolStationGui extends NewContainerGui
protected void keyTyped (char par1, int keyCode)
{
if (keyCode == 1 || (!active && keyCode == this.field_146297_k.gameSettings.keyBindInventory.keyCode))
if (keyCode == 1 || (!active && keyCode == this.field_146297_k.gameSettings.field_151445_Q.keyCode))
{
logic.setToolname("");
updateServer("");