mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 12:19:48 +00:00
few hundred errors gone just like that
This commit is contained in:
1 parent
c5426eb992
commit
0ee7ac1718
28 files changed
+720
-718
No files matched your search
@@ -76,7 +76,7 @@ public class BlockLandmine extends BlockContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
|
||||
public IIcon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
|
||||
{
|
||||
TileEntityLandmine te = (TileEntityLandmine) par1IBlockAccess.getBlockTileEntity(par2, par3, par4);
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ public class GlassBlockConnected extends MantleBlock
|
||||
return par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 15 ? icons[0] : getConnectedBlockTexture(par1IBlockAccess, par2, par3, par4, par5, icons);
|
||||
}
|
||||
|
||||
public IIcon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons)
|
||||
public IIcon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, IIcon[] icons)
|
||||
{
|
||||
if (PHConstruct.connectedTexturesMode == 0)
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@ package tconstruct.blocks;
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -49,17 +49,17 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getIcon (int par1, int par2)
|
||||
public IIcon getIcon (int par1, int par2)
|
||||
{
|
||||
return icons[par2][0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks (int par1, CreativeTabs par2CreativeTabs, List par3List)
|
||||
public void getSubBlocks (Block b, CreativeTabs par2CreativeTabs, List par3List)
|
||||
{
|
||||
for (int i = 0; i < textures.length; i++)
|
||||
{
|
||||
par3List.add(new ItemStack(par1, 1, i));
|
||||
par3List.add(new ItemStack(b, 1, i));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -38,9 +38,9 @@ public class GlassBlockStained extends TConstructBlock
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons (IconRegister iconRegister)
|
||||
public void registerIcons (IIconRegister iconRegister)
|
||||
{
|
||||
this.icons = new Icon[textureNames.length];
|
||||
this.icons = new IIcon[textureNames.length];
|
||||
|
||||
for (int i = 0; i < this.icons.length; ++i)
|
||||
{
|
||||
|
||||
@@ -33,7 +33,7 @@ public class GlassPaneConnected extends GlassBlockConnected
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
|
||||
public IIcon getBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
|
||||
{
|
||||
if (par5 == 0 || par5 == 1)
|
||||
{
|
||||
@@ -47,7 +47,7 @@ public class GlassPaneConnected extends GlassBlockConnected
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons)
|
||||
public IIcon getConnectedBlockTexture (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, IIcon[] icons)
|
||||
{
|
||||
if (par5 == 0 || par5 == 1)
|
||||
{
|
||||
|
||||
@@ -16,8 +16,8 @@ import tconstruct.library.TConstructRegistry;
|
||||
public class LiquidMetalFinite extends BlockFluidFinite
|
||||
{
|
||||
String texture;
|
||||
public Icon stillIcon;
|
||||
public Icon flowIcon;
|
||||
public IIcon stillIcon;
|
||||
public IIcon flowIcon;
|
||||
|
||||
public LiquidMetalFinite(int id, Fluid fluid, String texture)
|
||||
{
|
||||
@@ -33,14 +33,14 @@ public class LiquidMetalFinite extends BlockFluidFinite
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcons (IconRegister iconRegister)
|
||||
public void registerIcons (IIconRegister iconRegister)
|
||||
{
|
||||
stillIcon = iconRegister.registerIcon("tinker:" + texture);
|
||||
flowIcon = iconRegister.registerIcon("tinker:" + texture + "_flow");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getIcon (int side, int meta)
|
||||
public IIcon getIcon (int side, int meta)
|
||||
{
|
||||
if (side == 0 || side == 1)
|
||||
return stillIcon;
|
||||
|
||||
@@ -206,7 +206,7 @@ public class SearedBlock extends InventoryBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public Icon getIcon (int side, int meta)
|
||||
public IIcon getIcon (int side, int meta)
|
||||
{
|
||||
if (meta == 0)
|
||||
return icons[getTextureIndex(side)];
|
||||
|
||||
@@ -10,6 +10,7 @@ import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.item.EntityTNTPrimed;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.projectile.EntityArrow;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
@@ -112,7 +113,7 @@ public class SlimeExplosive extends TConstructBlock
|
||||
@Override
|
||||
public boolean onBlockActivated (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9)
|
||||
{
|
||||
if (par5EntityPlayer.getCurrentEquippedItem() != null && par5EntityPlayer.getCurrentEquippedItem().itemID == Item.flintAndSteel.itemID)
|
||||
if (par5EntityPlayer.getCurrentEquippedItem() != null && par5EntityPlayer.getCurrentEquippedItem().itemID == Items.flint_and_steel.itemID)
|
||||
{
|
||||
this.primeTnt(par1World, par2, par3, par4, 1, par5EntityPlayer);
|
||||
par1World.setBlockToAir(par2, par3, par4);
|
||||
|
||||
@@ -125,7 +125,7 @@ public class SlimePad extends MantleBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcons (IconRegister iconRegister)
|
||||
public void registerIcons (IIconRegister iconRegister)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -57,12 +57,12 @@ public class SoilBlock extends TConstructBlock
|
||||
}
|
||||
}
|
||||
|
||||
public float getBlockHardness (World world, int x, int y, int z)
|
||||
public float getfield_149782_v (World world, int x, int y, int z)
|
||||
{
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
if (meta == 5)
|
||||
return Blocks.dirt.blockHardness;
|
||||
return this.blockHardness;
|
||||
return Blocks.dirt.field_149782_v;
|
||||
return this.field_149782_v;
|
||||
}
|
||||
|
||||
public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z)
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -519,9 +519,9 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
|
||||
/**
|
||||
* Returns the item ID for the item the mob drops on death.
|
||||
*/
|
||||
protected int getDropItemId ()
|
||||
protected Item getDropItem ()
|
||||
{
|
||||
return TRepo.strangeFood.itemID;
|
||||
return TRepo.strangeFood;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -68,7 +68,7 @@ public class TitleIcon extends Item
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIconFromDamage (int par1)
|
||||
public IIcon getIconFromDamage (int par1)
|
||||
{
|
||||
if (par1 >= 4096)
|
||||
{
|
||||
|
||||
@@ -12,6 +12,7 @@ import net.minecraft.enchantment.EnchantmentProtection;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.MathHelper;
|
||||
@@ -223,7 +224,7 @@ public class MiningExplosion extends Explosion
|
||||
|
||||
if (l == 0 && Block.opaqueCubeLookup[i1] && this.random.nextInt(3) == 0)
|
||||
{
|
||||
this.world.setBlock(i, j, k, Block.fire.blockID);
|
||||
this.world.setBlock(i, j, k, Blocks.fire);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,8 +50,8 @@ public abstract class Behavior
|
||||
addBehavior(new ItemStack(Blocks.torch), blockThrow);
|
||||
addBehavior(new ItemStack(Items.gunpowder), explosive);
|
||||
addBehavior(new ItemStack(Blocks.tnt), explosive);
|
||||
addBehavior(new ItemStack(Items.firework), firework);
|
||||
addBehavior(new ItemStack(Items.potion), potion);
|
||||
addBehavior(new ItemStack(Items.fireworks), firework);
|
||||
addBehavior(new ItemStack(Items.potionitem), potion);
|
||||
addBehavior(new ItemStack(Items.fireballCharge), fireball);
|
||||
addBehavior(new ItemStack(Items.monsterPlacer), spawn);
|
||||
addBehavior(new ItemStack(Items.arrow), shoot);
|
||||
|
||||
@@ -44,7 +44,7 @@ public class BehaviorFirecharge extends Behavior
|
||||
for (int j = par4 - 2; j <= (par4 + 2); j++)
|
||||
{
|
||||
if ((par1World.getBlockId(i, par3, j) == 0 || (Block.blocksList[par1World.getBlockId(i, par3, j)] != null && Block.blocksList[par1World.getBlockId(i, par3, j)].isBlockReplaceable(
|
||||
par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Block.fire.canPlaceBlockAt(par1World, i, par3, j))
|
||||
par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j))
|
||||
{
|
||||
par1World.setBlock(i, par3, j, Blocks.fire.blockID);
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.nbt.NBTTagString;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
import net.minecraftforge.event.entity.living.LivingFallEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerDropsEvent;
|
||||
import tconstruct.common.TRepo;
|
||||
@@ -24,6 +23,7 @@ import tconstruct.util.config.PHConstruct;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.IPlayerTracker;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -201,7 +201,7 @@ public class TPlayerHandler implements IPlayerTracker
|
||||
}
|
||||
}
|
||||
|
||||
@ForgeSubscribe
|
||||
@SubscribeEvent
|
||||
public void livingFall (LivingFallEvent evt) //Only for negating fall damage
|
||||
{
|
||||
if (evt.entityLiving instanceof EntityPlayer)
|
||||
@@ -210,7 +210,7 @@ public class TPlayerHandler implements IPlayerTracker
|
||||
}
|
||||
}
|
||||
|
||||
/*@ForgeSubscribe
|
||||
/*@SubscribeEvent
|
||||
public void livingUpdate (LivingUpdateEvent evt)
|
||||
{
|
||||
Side side = FMLCommonHandler.instance().getEffectiveSide();
|
||||
@@ -232,7 +232,7 @@ public class TPlayerHandler implements IPlayerTracker
|
||||
}
|
||||
}*/
|
||||
|
||||
@ForgeSubscribe
|
||||
@SubscribeEvent
|
||||
public void playerDrops (PlayerDropsEvent evt)
|
||||
{
|
||||
TPlayerStats stats = getPlayerStats(evt.entityPlayer.username);
|
||||
|
||||
@@ -93,7 +93,7 @@ public class OreberryBushGen extends WorldGenerator
|
||||
}*/
|
||||
|
||||
Block block = Block.blocksList[world.getBlockId(x, y, z)];
|
||||
if (block == null || (block != Block.endPortalFrame && !Block.opaqueCubeLookup[world.getBlockId(x, y, z)]))
|
||||
if (block == null || (block != Blocks.end_portal_frame && !Block.opaqueCubeLookup[world.getBlockId(x, y, z)]))
|
||||
world.setBlock(x, y, z, this, metadata, 2);
|
||||
else
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user