mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
around 300 combined errors
This commit is contained in:
1 parent
ffd383dc41
commit
ee7bc7d7eb
30 files changed
+43
-61
No files matched your search
@@ -28,7 +28,7 @@ public class GlassPaneStained extends PaneBase
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRenderBlockPass ()
|
||||
public int func_149701_w ()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ import net.minecraft.block.BlockSand;
|
||||
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;
|
||||
@@ -67,7 +68,7 @@ public class GravelOre extends BlockSand
|
||||
}
|
||||
|
||||
@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++)
|
||||
{
|
||||
|
||||
@@ -238,7 +238,7 @@ public class LavaTankBlock extends BlockContainer
|
||||
}
|
||||
|
||||
@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++)
|
||||
{
|
||||
|
||||
@@ -287,26 +287,6 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
|
||||
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)
|
||||
*/
|
||||
|
||||
@@ -213,7 +213,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic
|
||||
|
||||
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();
|
||||
|
||||
@@ -251,7 +251,7 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic
|
||||
}
|
||||
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;
|
||||
|
||||
@@ -138,7 +138,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin
|
||||
{
|
||||
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)
|
||||
{
|
||||
@@ -165,7 +165,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin
|
||||
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)
|
||||
@@ -184,7 +184,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin
|
||||
|
||||
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();
|
||||
|
||||
@@ -228,7 +228,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin
|
||||
|
||||
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;
|
||||
|
||||
@@ -69,7 +69,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
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)
|
||||
|
||||
@@ -48,7 +48,7 @@ public class SlimeGel extends TConstructBlock
|
||||
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)
|
||||
|
||||
@@ -80,7 +80,7 @@ public class SlimeGrass extends MantleBlock
|
||||
}
|
||||
|
||||
@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++)
|
||||
{
|
||||
|
||||
@@ -122,7 +122,7 @@ public class SlimeSapling extends BlockSapling
|
||||
|
||||
@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));
|
||||
|
||||
@@ -95,7 +95,7 @@ public class BarricadeBlock extends MantleBlock
|
||||
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;
|
||||
|
||||
@@ -61,7 +61,7 @@ public class Punji extends MantleBlock
|
||||
{
|
||||
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)
|
||||
{
|
||||
|
||||
@@ -709,7 +709,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS
|
||||
|
||||
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)
|
||||
|
||||
@@ -2,6 +2,7 @@ package tconstruct.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mantle.world.WorldHelper;
|
||||
import net.minecraftforge.fluids.BlockFluidFinite;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.LiquidTextureLogic;
|
||||
@@ -134,7 +135,7 @@ public class FilledBucket extends ItemBucket
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -156,7 +157,7 @@ public class FilledBucket extends ItemBucket
|
||||
}
|
||||
|
||||
@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));
|
||||
|
||||
@@ -98,7 +98,7 @@ public class TitleIcon extends Item
|
||||
}
|
||||
|
||||
@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));
|
||||
@@ -119,13 +119,13 @@ public class TitleIcon extends Item
|
||||
{
|
||||
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;
|
||||
}
|
||||
@@ -150,13 +150,13 @@ public class TitleIcon extends Item
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ public class BarricadeItem extends ItemBlock
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ public class OreberryBushItem extends MultiItemBlock
|
||||
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
|
||||
|
||||
@@ -56,7 +56,7 @@ public class OreberryBushSecondItem extends MultiItemBlock
|
||||
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
|
||||
|
||||
@@ -34,7 +34,7 @@ public class WoolSlab1Item extends MultiItemBlock
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -27,17 +27,17 @@ public class WoolSlab2Item extends MultiItemBlock
|
||||
@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;
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@ public class Chisel extends ToolCore
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -240,7 +240,7 @@ public class Excavator extends HarvestTool
|
||||
}
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -337,7 +337,7 @@ public class Hammer extends HarvestTool
|
||||
}
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -202,7 +202,7 @@ public class Scythe extends Weapon
|
||||
}
|
||||
}
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
@@ -180,7 +180,7 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank
|
||||
@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++)
|
||||
|
||||
@@ -50,7 +50,7 @@ public abstract class DualHarvestTool extends HarvestTool
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ public class AModMoveSpeed extends ArmorModTypeFilter
|
||||
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);
|
||||
|
||||
@@ -70,7 +70,7 @@ public class TActiveOmniMod extends ActiveToolMod
|
||||
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);
|
||||
@@ -91,7 +91,7 @@ public class TActiveOmniMod extends ActiveToolMod
|
||||
|
||||
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);
|
||||
|
||||
@@ -258,7 +258,7 @@ public class ArmorExtended implements IInventory
|
||||
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);
|
||||
|
||||
@@ -149,7 +149,7 @@ public class KnapsackInventory implements IInventory
|
||||
public void readFromNBT (EntityPlayer entityplayer)
|
||||
{
|
||||
NBTTagCompound tags = entityplayer.getEntityData();
|
||||
NBTTagList tagList = tags.getTagList("TConstruct.Knapsack");
|
||||
NBTTagList tagList = tags.func_150295_c("TConstruct.Knapsack", 9);
|
||||
for (int i = 0; i < tagList.tagCount(); ++i)
|
||||
{
|
||||
NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.func_150305_b(i);
|
||||
|
||||
Reference in new issue
Block a user