Skip to content

Commit

Permalink
around 300 combined errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@progwml6
progwml6 committed Feb 1, 2014
1 parent ffd383d commit ee7bc7d
Show file tree
Hide file tree
Showing 30 changed files with 43 additions and 61 deletions.
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/GlassPaneStained.java
View file
Expand Up @@ -28,7 +28,7 @@ private static String[] assembleBlockTextures ()
}

@Override
public int getRenderBlockPass ()
public int func_149701_w ()
{
return 1;
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/tconstruct/blocks/GravelOre.java
View file
Expand Up @@ -9,6 +9,7 @@
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
Expand Down Expand Up @@ -67,7 +68,7 @@ public int idDropped (int par1, Random par2Random, int par3)
}

@Override
public void getSubBlocks (Block b, CreativeTabs tab, List list)
public void func_149666_a (Item b, CreativeTabs tab, List list)
{
for (int iter = 0; iter < 6; iter++)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/LavaTankBlock.java
View file
Expand Up @@ -238,7 +238,7 @@ public TileEntity createNewTileEntity (World world)
}

@Override
public void getSubBlocks (Item i, CreativeTabs tab, List list)
public void func_149666_a (Item i, CreativeTabs tab, List list)
{
for (int iter = 0; iter < 3; iter++)
{
Expand Down
20 changes: 0 additions & 20 deletions src/main/java/tconstruct/blocks/OreberryBush.java
View file
Expand Up @@ -287,26 +287,6 @@ public boolean canPlaceBlockAt (World world, int x, int y, int z)
return false;
}

/* Resistance to fire */

@Override
public int getFlammability (IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face)
{
return 0;
}

@Override
public boolean isFlammable (IBlockAccess world, int x, int y, int z, int metadata, ForgeDirection face)
{
return false;
}

@Override
public int getFireSpreadSpeed (World world, int x, int y, int z, int metadata, ForgeDirection face)
{
return 0;
}

/**
* returns a list of items with the same ID, but different meta (eg: dye returns 16 items)
*/
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/logic/FrypanLogic.java
View file
Expand Up @@ -213,7 +213,7 @@ public boolean isBurning ()

public ItemStack getResultFor (ItemStack stack)
{
ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(stack);
ItemStack result = FurnaceRecipes.smelting().func_151395_a(stack);
if (result != null && result.getItem() instanceof ItemFood) //Only valid for food
return result.copy();

Expand Down Expand Up @@ -251,7 +251,7 @@ public static int getItemBurnTime (ItemStack stack)
}
if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD"))
return 200;
if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD"))
if (item instanceof ItemSword && ((ItemSword) item).func_150932_j().equals("WOOD"))
return 200;
if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD"))
return 200;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/tconstruct/blocks/logic/FurnaceLogic.java
View file
Expand Up @@ -138,7 +138,7 @@ public void cookItems ()
{
if (this.canSmelt())
{
ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.inventory[0]);
ItemStack itemstack = FurnaceRecipes.smelting().func_151395_a(this.inventory[0]);

if (this.inventory[2] == null)
{
Expand All @@ -165,7 +165,7 @@ public boolean canSmelt ()
return false;
else
{
ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.inventory[0]);
ItemStack itemstack = FurnaceRecipes.smelting().func_151395_a(this.inventory[0]);
if (itemstack == null)
return false;
if (this.inventory[2] == null)
Expand All @@ -184,7 +184,7 @@ public boolean isBurning ()

public ItemStack getResultFor (ItemStack stack)
{
ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(stack);
ItemStack result = FurnaceRecipes.smelting().func_151395_a(stack);
if (result != null) //Only valid for food
return result.copy();

Expand Down Expand Up @@ -228,7 +228,7 @@ public static int getItemBurnTime (ItemStack stack)

if (item instanceof ItemTool && ((ItemTool) item).getToolMaterialName().equals("WOOD"))
return 200;
if (item instanceof ItemSword && ((ItemSword) item).getToolMaterialName().equals("WOOD"))
if (item instanceof ItemSword && ((ItemSword) item).func_150932_j().equals("WOOD"))
return 200;
if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD"))
return 200;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java
View file
Expand Up @@ -69,7 +69,7 @@ public void func_145841_b (NBTTagCompound par1NBTTagCompound)
public void func_145839_a (NBTTagCompound par1NBTTagCompound)
{
super.func_145839_a(par1NBTTagCompound);
NBTTagList nbttaglist = par1NBTTagCompound.getTagList("Items");
NBTTagList nbttaglist = par1NBTTagCompound.func_150295_c("Items",9);
this.inventory = new ItemStack[this.getSizeInventory()];

for (int i = 0; i < nbttaglist.tagCount(); ++i)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/slime/SlimeGel.java
View file
Expand Up @@ -48,7 +48,7 @@ public void func_149670_a (World world, int x, int y, int z, Entity entity)
if (entity.motionY < -0.08F)
{
Block var9 = (Block) this;
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.field_149762_H.getStepSound(), (var9.field_149762_H.getVolume()) / 2.0F, var9.field_149762_H.getPitch() * 0.65F);
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.field_149762_H, (var9.field_149762_H.func_150497_c()) / 2.0F, var9.field_149762_H.getPitch() * 0.65F);
}
entity.motionY *= -1.2F;
if (entity instanceof EntityLivingBase)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/slime/SlimeGrass.java
View file
Expand Up @@ -80,7 +80,7 @@ else if (side == 1)
}

@Override
public void getSubBlocks (Item b, CreativeTabs tab, List list)
public void func_149666_a (Item b, CreativeTabs tab, List list)
{
for (int iter = 0; iter < 1; iter++)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/slime/SlimeSapling.java
View file
Expand Up @@ -122,7 +122,7 @@ public int damageDropped (int i)

@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks (Item b, CreativeTabs par2CreativeTabs, List par3List)
public void func_149666_a (Item b, CreativeTabs par2CreativeTabs, List par3List)
{
for (int i = 0; i < 1; i++)
par3List.add(new ItemStack(b, 1, i));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/traps/BarricadeBlock.java
View file
Expand Up @@ -95,7 +95,7 @@ public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer pla
this.func_149714_e(world, x, y, z, meta);

Block var9 = this;
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.field_149762_H.getStepSound(), (var9.field_149762_H.getVolume() + 1.0F) / 2.0F, var9.field_149762_H.getPitch() * 0.8F);
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.field_149762_H, (var9.field_149762_H.func_150497_c() + 1.0F) / 2.0F, var9.field_149762_H.getPitch() * 0.8F);
player.swingItem();
if (!player.capabilities.isCreativeMode)
stack.stackSize -= 1;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/traps/Punji.java
View file
Expand Up @@ -61,7 +61,7 @@ public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer pla
{
world.setBlockMetadataWithNotify(x, y, z, meta + 1, 3);
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.field_149762_H.getPlaceSound(),
(this.field_149762_H.getVolume() + 1.0F) / 2.0F, this.field_149762_H.getPitch() * 0.8F);
(this.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.field_149762_H.getPitch() * 0.8F);
player.swingItem();
if (!player.capabilities.isCreativeMode)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/entity/CartEntity.java
View file
Expand Up @@ -709,7 +709,7 @@ protected void readEntityFromNBT (NBTTagCompound par1NBTTagCompound)

if (getSizeInventory() > 0)
{
NBTTagList var2 = par1NBTTagCompound.getTagList("Items");
NBTTagList var2 = par1NBTTagCompound.func_150295_c("Items",9);
this.cargoItems = new ItemStack[this.getSizeInventory()];

for (int var3 = 0; var3 < var2.tagCount(); ++var3)
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/tconstruct/items/FilledBucket.java
View file
Expand Up @@ -2,6 +2,7 @@

import java.util.List;

import mantle.world.WorldHelper;
import net.minecraftforge.fluids.BlockFluidFinite;
import tconstruct.TConstruct;
import tconstruct.blocks.logic.LiquidTextureLogic;
Expand Down Expand Up @@ -134,7 +135,7 @@ public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer pl

public boolean tryPlaceContainedLiquid (World world, int clickX, int clickY, int clickZ, int type)
{
if (!world.isAirBlock(clickX, clickY, clickZ) && world.getBlockMaterial(clickX, clickY, clickZ).isSolid())
if (!WorldHelper.isAirBlock(world, clickX, clickY, clickZ) && world.func_147439_a(clickX, clickY, clickZ).func_149688_o().isSolid())
{
return false;
}
Expand All @@ -156,7 +157,7 @@ public boolean tryPlaceContainedLiquid (World world, int clickX, int clickY, int
}

@Override
public void getSubItems (Item b, CreativeTabs tab, List list)
public void func_150895_a (Item b, CreativeTabs tab, List list)
{
for (int i = 0; i < icons.length; i++)
list.add(new ItemStack(b, 1, i));
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/tconstruct/items/TitleIcon.java
View file
Expand Up @@ -98,7 +98,7 @@ public String getItemDisplayName (ItemStack par1ItemStack)
}

@Override
public void getSubItems (Item b, CreativeTabs tab, List list)
public void func_150895_a (Item b, CreativeTabs tab, List list)
{
for (int i = 0; i < mobNames.length; i++)
list.add(new ItemStack(b, 1, i));
Expand All @@ -119,13 +119,13 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int
{
if (!world.isRemote)
{
Block b = world.getBlock(posX, posY, posZ);
Block b = world.func_147439_a(posX, posY, posZ);
posX += Facing.offsetsXForSide[par7];
posY += Facing.offsetsYForSide[par7];
posZ += Facing.offsetsZForSide[par7];
double d0 = 0.0D;

if (par7 == 1 && b != null && b.getRenderType() == 11)
if (par7 == 1 && b != null && b.func_149645_b() == 11)
{
d0 = 0.5D;
}
Expand All @@ -150,13 +150,13 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int

public static EntityLiving activateSpawnEgg (ItemStack stack, World world, double posX, double posY, double posZ, int par7)
{
Block b = world.getBlock((int) posX, (int) posY, (int) posZ);
Block b = world.func_147439_a((int) posX, (int) posY, (int) posZ);
posX += Facing.offsetsXForSide[par7];
posY += Facing.offsetsYForSide[par7];
posZ += Facing.offsetsZForSide[par7];
double d0 = 0.0D;

if (par7 == 1 && b != null && b.getRenderType() == 11)
if (par7 == 1 && b != null && b.func_149645_b() == 11)
{
d0 = 0.5D;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/items/blocks/BarricadeItem.java
View file
Expand Up @@ -95,7 +95,7 @@ else if (world.canPlaceEntityOnSide(this.b, x, y, z, false, side, player, stack)
if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata))
{
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.field_149762_H.getPlaceSound(),
(block.field_149762_H.getVolume() + 1.0F) / 2.0F, block.field_149762_H.getPitch() * 0.8F);
(block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.getPitch() * 0.8F);
--stack.stackSize;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/items/blocks/OreberryBushItem.java
View file
Expand Up @@ -50,7 +50,7 @@ else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y
if (!player.capabilities.isCreativeMode)
stack.stackSize--;
if (!world.isRemote)
world.playAuxSFX(2001, x, y, z, blockID);
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block));
return true;
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java
View file
Expand Up @@ -56,7 +56,7 @@ else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y
if (!player.capabilities.isCreativeMode)
stack.stackSize--;
if (!world.isRemote)
world.playAuxSFX(2001, x, y, z, blockID);
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block));
return true;
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/items/blocks/WoolSlab1Item.java
View file
Expand Up @@ -34,7 +34,7 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int
if (world.func_147465_d(x, y, z, Blocks.wool, trueMeta, 3))
{
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.field_149762_H.getPlaceSound(),
(this.block.field_149762_H.getVolume() + 1.0F) / 2.0F, this.block.field_149762_H.getPitch() * 0.8F);
(this.block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.block.field_149762_H.getPitch() * 0.8F);
--stack.stackSize;
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/tconstruct/items/blocks/WoolSlab2Item.java
View file
Expand Up @@ -27,17 +27,17 @@ public WoolSlab2Item(Block b)
@Override
public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
{
int id = world.func_147439_a(x, y, z);
Block block = world.func_147439_a(x, y, z);
int meta = world.getBlockMetadata(x, y, z);
int trueMeta = meta % 8;
boolean flag = (id & 8) != 0;

if ((side == 1 && flag || side == 0 && !flag) && id == this.blockID && trueMeta == stack.getItemDamage())
if ((side == 1 && flag || side == 0 && !flag) && block == this.block && trueMeta == stack.getItemDamage())
{
if (world.func_147465_d(x, y, z, Blocks.wool, trueMeta + 8, 3))
{
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.field_149762_H.getPlaceSound(),
(this.block.field_149762_H.getVolume() + 1.0F) / 2.0F, this.block.field_149762_H.getPitch() * 0.8F);
(this.block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.block.field_149762_H.getPitch() * 0.8F);
--stack.stackSize;
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/items/tools/Chisel.java
View file
Expand Up @@ -116,7 +116,7 @@ public ItemStack onEaten (ItemStack itemstack, World world, EntityPlayer entityp
AbilityHelper.damageTool(itemstack, 1, null, false);
}
}
world.playAuxSFX(2001, x, y, z, blockID + (meta << 12));
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12));
entityplayer.swingItem();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/items/tools/Excavator.java
View file
Expand Up @@ -240,7 +240,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
}
}
if (!world.isRemote)
world.playAuxSFX(2001, x, y, z, blockID + (meta << 12));
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12));
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/items/tools/Hammer.java
View file
Expand Up @@ -337,7 +337,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
}
}
if (!world.isRemote)
world.playAuxSFX(2001, x, y, z, blockID + (meta << 12));
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12));
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/items/tools/Scythe.java
View file
Expand Up @@ -202,7 +202,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
}
}
if (!world.isRemote)
world.playAuxSFX(2001, x, y, z, blockID + (meta << 12));
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(blockB) + (meta << 12));
return super.onBlockStartBreak(stack, x, y, z, player);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/library/component/MultiFluidTank.java
View file
Expand Up @@ -180,7 +180,7 @@ public FluidTankInfo[] getMultiTankInfo ()
@Override
public void readNetworkNBT (NBTTagCompound tags)
{
NBTTagList liquidTag = tags.getTagList("Liquids");
NBTTagList liquidTag = tags.func_150295_c("Liquids",9);
fluidlist.clear();

for (int iter = 0; iter < liquidTag.tagCount(); iter++)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/library/tools/DualHarvestTool.java
View file
Expand Up @@ -50,7 +50,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl
onBlockDestroyed(stack, world, block, x, y, z, player);
WorldHelper.setBlockToAir(world, x, y, z);
if (!world.isRemote)
world.playAuxSFX(2001, x, y, z, bID + (meta << 12));
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12));
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java
View file
Expand Up @@ -47,7 +47,7 @@ public void modify (ItemStack[] input, ItemStack armor)
NBTTagList attributes;
if (baseTag.hasKey("AttributeModifiers"))
{
attributes = baseTag.getTagList("AttributeModifiers");
attributes = baseTag.func_150295_c("AttributeModifiers",9);
for (int iter = 0; iter < attributes.tagCount(); iter++)
{
NBTTagCompound tag = (NBTTagCompound) attributes.func_150305_b(iter);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java
View file
Expand Up @@ -70,7 +70,7 @@ public boolean beforeBlockBreak (ToolCore tool, ItemStack stack, int x, int y, i
ItemStack smeltStack = new ItemStack(block.IDropped(meta, random, 0), block.quantityDropped(meta, 0, random), block.func_149692_a(meta));
if (smeltStack.getItem() == null)
return false;
ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(smeltStack);
ItemStack result = FurnaceRecipes.smelting().func_151395_a(smeltStack);
if (result != null)
{
WorldHelper.setBlockToAir(world, x, y, z);
Expand All @@ -91,7 +91,7 @@ public boolean beforeBlockBreak (ToolCore tool, ItemStack stack, int x, int y, i

entityitem.field_145804_b = 10;
world.spawnEntityInWorld(entityitem);
world.playAuxSFX(2001, x, y, z, bID + (meta << 12));
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12));

int i = spawnme.stackSize;
float f = FurnaceRecipes.smelting().getExperience(spawnme);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/util/player/ArmorExtended.java
View file
Expand Up @@ -258,7 +258,7 @@ public void saveToNBT (EntityPlayer entityplayer)
public void readFromNBT (EntityPlayer entityplayer)
{
NBTTagCompound tags = entityplayer.getEntityData();
NBTTagList tagList = tags.getTagList("TConstruct.Inventory");
NBTTagList tagList = tags.func_150295_c("TConstruct.Inventory",9);
for (int i = 0; i < tagList.tagCount(); ++i)
{
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.func_150305_b(i);
Expand Down

0 comments on commit ee7bc7d

Please sign in to comment.