few hundred errors gone just like that

This commit is contained in:
Progwml6 committed 2014-01-01 09:16:34 -05:00
1 parent c5426eb992
commit 0ee7ac1718
28 files changed
+720 -718

No files matched your search

@@ -1,6 +1,7 @@
package tconstruct.client;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.*;
import java.util.Random;
@@ -14,7 +15,7 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.*;
import net.minecraft.entity.ai.attributes.AttributeInstance;
import net.minecraft.entity.ai.attributes.IAttributeInstance;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.potion.*;
@@ -24,7 +25,6 @@ import net.minecraftforge.client.GuiIngameForge;
import net.minecraftforge.client.event.*;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import net.minecraftforge.client.event.sound.SoundLoadEvent;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.fluids.*;
import tconstruct.TConstruct;
import tconstruct.client.armor.WingModel;
@@ -41,7 +41,7 @@ public class TClientEvents
boolean initSounds;
@ForgeSubscribe
@SubscribeEvent
public void onSound (SoundLoadEvent event)
{
if (!initSounds)
@@ -67,7 +67,7 @@ public class TClientEvents
IIcon[] stillIcons = new IIcon[2];
IIcon[] flowIcons = new IIcon[2];
@ForgeSubscribe
@SubscribeEvent
public void preStitch (TextureStitchEvent.Pre event)
{
TextureMap register = event.map;
@@ -78,7 +78,7 @@ public class TClientEvents
}
}
@ForgeSubscribe
@SubscribeEvent
public void postStitch (TextureStitchEvent.Post event)
{
if (event.map.textureType == 0)
@@ -99,7 +99,7 @@ public class TClientEvents
int updateCounter = 0;
/* HUD */
@ForgeSubscribe
@SubscribeEvent
public void renderHealthbar (RenderGameOverlayEvent.Pre event)
{
if (!Loader.isModLoaded("tukmc_Vz"))// Loader check to avoid conflicting with a GUI mod (thanks Vazkii!)
@@ -122,7 +122,7 @@ public class TClientEvents
highlight = false;
}
AttributeInstance attrMaxHealth = this.mc.thePlayer.getEntityAttribute(SharedMonsterAttributes.maxHealth);
IAttributeInstance attrMaxHealth = this.mc.thePlayer.getEntityAttribute(SharedMonsterAttributes.maxHealth);
int health = MathHelper.ceiling_float_int(mc.thePlayer.getHealth());
int healthLast = MathHelper.ceiling_float_int(mc.thePlayer.prevHealth);
float healthMax = (float) attrMaxHealth.getAttributeValue();
@@ -243,7 +243,7 @@ public class TClientEvents
double zLevel = 0;
@ForgeSubscribe
@SubscribeEvent
public void fovModifier(FOVUpdateEvent event)
{
float f = 1.0F;
@@ -125,27 +125,27 @@ public class TProxyClient extends TProxyCommon
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(0, meta));
renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(1, meta));
renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(2, meta));
renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(3, meta));
renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(4, meta));
renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(5, meta));
renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
@@ -159,27 +159,27 @@ public class TProxyClient extends TProxyCommon
GL11.glRotatef(60, 1, 0, 0);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, -1F, 0.0F);
renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(0, meta));
renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(1, meta));
renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1F);
renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(2, meta));
renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(3, meta));
renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0.0F, 0.0F);
renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIIcon(4, meta));
renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta));
tessellator.draw();
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIIcon(5, meta));
renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta));
tessellator.draw();
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
@@ -244,10 +244,10 @@ public class TProxyClient extends TProxyCommon
RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender());
RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender());
RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Items.potion, 16384));
RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Items.potionitem, 16384));
RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom());
RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRenderCustom());
RenderingRegistry.registerEntityRenderingHandler(EntityLandmineFirework.class, new RenderSnowball(Items.firework));
RenderingRegistry.registerEntityRenderingHandler(EntityLandmineFirework.class, new RenderSnowball(Items.fireworks));
RenderingRegistry.registerEntityRenderingHandler(ExplosivePrimed.class, new ExplosiveRender());
// RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class,
// new PlayerArmorRender()); // <-- Works, woo!
@@ -424,7 +424,7 @@ public class TProxyClient extends TProxyCommon
ItemStack stick = new ItemStack(Items.stick, 1, 0);
ItemStack plank = new ItemStack(Blocks.planks, 1, 0);
ItemStack plankSlab = new ItemStack(Blocks.woodSingleSlab, 1, 0);
ItemStack plankSlab = new ItemStack(Blocks.wooden_slab, 1, 0);
ItemStack workbench = new ItemStack(Blocks.crafting_table, 1, 0);
ItemStack chest = new ItemStack(Blocks.chest, 1, 0);
ItemStack log = new ItemStack(Blocks.log, 1, 0);
@@ -84,7 +84,7 @@ public class RenderArmorCast implements IItemRenderer
GL11.glPopMatrix();
}
public void renderCube (Tessellator tessellator, RenderBlocks renderer, Icon icon)
public void renderCube (Tessellator tessellator, RenderBlocks renderer, IIcon icon)
{
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0F, 0F);
@@ -102,7 +102,7 @@ public class RenderArmorCast implements IItemRenderer
tessellator.draw();
}
public void renderSelectedCube (Tessellator tessellator, RenderBlocks renderer, Icon icon, List<ForgeDirection> sidesToRender)
public void renderSelectedCube (Tessellator tessellator, RenderBlocks renderer, IIcon icon, List<ForgeDirection> sidesToRender)
{
tessellator.startDrawingQuads();
tessellator.setNormal(-1F, 0F, 0F);
File diff suppressed because it is too large. Load diff
@@ -73,8 +73,8 @@ public class PaneRender implements ISimpleBlockRenderingHandler
tessellator.setColorOpaque_F(f * f1, f * f2, f * f3);
boolean flag = false;
boolean flag1 = false;
Icon icon;
Icon icon1;
IIcon icon;
IIcon icon1;
int meta = iblockaccess.getBlockMetadata(x, y, z);
icon = renderblocks.getBlockIconFromSideAndMetadata(pane, 0, meta);
icon1 = pane.getSideTextureIndex(meta);
@@ -126,10 +126,10 @@ public class PaneRender implements ISimpleBlockRenderingHandler
double xMidUp = (double) x + 0.5D + 0.0625D;
double zMidDown = ((double) z + 0.5D) - 0.0625D;
double zMidUp = (double) z + 0.5D + 0.0625D;
boolean west = pane.canConnectTo(iblockaccess.getBlockId(x, y, z - 1));
boolean east = pane.canConnectTo(iblockaccess.getBlockId(x, y, z + 1));
boolean south = pane.canConnectTo(iblockaccess.getBlockId(x - 1, y, z));
boolean north = pane.canConnectTo(iblockaccess.getBlockId(x + 1, y, z));
boolean west = pane.canConnectTo(iblockaccess.getBlock(x, y, z - 1));
boolean east = pane.canConnectTo(iblockaccess.getBlock(x, y, z + 1));
boolean south = pane.canConnectTo(iblockaccess.getBlock(x - 1, y, z));
boolean north = pane.canConnectTo(iblockaccess.getBlock(x + 1, y, z));
boolean renderAbove = pane.shouldSideBeRendered(iblockaccess, x, y + 1, z, 1);
boolean renderBelow = pane.shouldSideBeRendered(iblockaccess, x, y - 1, z, 0);
if ((!south || !north) && (south || north || west || east))
File diff suppressed because it is too large. Load diff
@@ -197,12 +197,12 @@ public class FancyItemRender extends Render
/**
* Renders a dropped item
*/
private void renderDroppedItem (EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7)
private void renderDroppedItem (EntityItem par1EntityItem, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7)
{
renderDroppedItem(par1EntityItem, par2Icon, par3, par4, par5, par6, par7, 0);
}
private void renderDroppedItem (EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass)
private void renderDroppedItem (EntityItem par1EntityItem, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass)
{
Tessellator tessellator = Tessellator.instance;
@@ -266,7 +266,7 @@ public class FancyItemRender 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))
{
@@ -194,12 +194,12 @@ public class DaggerRender extends Render
/**
* Renders a dropped item
*/
private void renderDroppedItem (DaggerEntity par1ArrowEntity, Icon par2Icon, int par3, float par4, float par5, float par6, float par7)
private void renderDroppedItem (DaggerEntity 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 (DaggerEntity dagger, Icon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass)
private void renderDroppedItem (DaggerEntity dagger, IIcon par2Icon, int par3, float par4, float par5, float par6, float par7, int pass)
{
Tessellator tessellator = Tessellator.instance;
@@ -78,7 +78,7 @@ public class LaunchedItemRender extends Render
return TextureMap.locationItemsTexture;
}
private void func_77026_a (Tessellator par1Tessellator, Icon par2Icon)
private void func_77026_a (Tessellator par1Tessellator, IIcon par2Icon)
{
float f = par2Icon.getMinU();
float f1 = par2Icon.getMaxU();
@@ -204,7 +204,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui
for (int i = 0; i < info.length - 1; i++)
{
FluidStack liquid = info[i].fluid;
Icon renderIndex = liquid.getFluid().getStillIcon();
IIcon renderIndex = liquid.getFluid().getStillIcon();
int basePos = 54;
if (capacity > 0)
{
@@ -418,7 +418,7 @@ public class AdaptiveSmelteryGui extends NewContainerGui
}
}
public void drawLiquidRect (int startU, int startV, Icon par3Icon, int endU, int endV)
public void drawLiquidRect (int startU, int startV, IIcon par3Icon, int endU, int endV)
{
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
@@ -404,7 +404,7 @@ public class SmelteryGui extends NewContainerGui
}
}
public void drawLiquidRect (int startU, int startV, Icon par3Icon, int endU, int endV)
public void drawLiquidRect (int startU, int startV, IIcon par3Icon, int endU, int endV)
{
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();