From ee7bc7d7eb6fe0a6876ea73e686735b33436ec51 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sat, 1 Feb 2014 14:55:52 -0500 Subject: [PATCH] around 300 combined errors --- .../tconstruct/blocks/GlassPaneStained.java | 2 +- .../java/tconstruct/blocks/GravelOre.java | 3 ++- .../java/tconstruct/blocks/LavaTankBlock.java | 2 +- .../java/tconstruct/blocks/OreberryBush.java | 20 ------------------- .../tconstruct/blocks/logic/FrypanLogic.java | 4 ++-- .../tconstruct/blocks/logic/FurnaceLogic.java | 8 ++++---- .../blocks/logic/TileEntityLandmine.java | 2 +- .../tconstruct/blocks/slime/SlimeGel.java | 2 +- .../tconstruct/blocks/slime/SlimeGrass.java | 2 +- .../tconstruct/blocks/slime/SlimeSapling.java | 2 +- .../blocks/traps/BarricadeBlock.java | 2 +- .../java/tconstruct/blocks/traps/Punji.java | 2 +- .../java/tconstruct/entity/CartEntity.java | 2 +- .../java/tconstruct/items/FilledBucket.java | 5 +++-- src/main/java/tconstruct/items/TitleIcon.java | 10 +++++----- .../items/blocks/BarricadeItem.java | 2 +- .../items/blocks/OreberryBushItem.java | 2 +- .../items/blocks/OreberryBushSecondItem.java | 2 +- .../items/blocks/WoolSlab1Item.java | 2 +- .../items/blocks/WoolSlab2Item.java | 6 +++--- .../java/tconstruct/items/tools/Chisel.java | 2 +- .../tconstruct/items/tools/Excavator.java | 2 +- .../java/tconstruct/items/tools/Hammer.java | 2 +- .../java/tconstruct/items/tools/Scythe.java | 2 +- .../library/component/MultiFluidTank.java | 2 +- .../library/tools/DualHarvestTool.java | 2 +- .../modifiers/armor/AModMoveSpeed.java | 2 +- .../modifiers/tools/TActiveOmniMod.java | 4 ++-- .../tconstruct/util/player/ArmorExtended.java | 2 +- .../util/player/KnapsackInventory.java | 2 +- 30 files changed, 43 insertions(+), 61 deletions(-) diff --git a/src/main/java/tconstruct/blocks/GlassPaneStained.java b/src/main/java/tconstruct/blocks/GlassPaneStained.java index 647063b0..c3e68818 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneStained.java +++ b/src/main/java/tconstruct/blocks/GlassPaneStained.java @@ -28,7 +28,7 @@ public class GlassPaneStained extends PaneBase } @Override - public int getRenderBlockPass () + public int func_149701_w () { return 1; } diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java index 4daf7cac..631445ff 100644 --- a/src/main/java/tconstruct/blocks/GravelOre.java +++ b/src/main/java/tconstruct/blocks/GravelOre.java @@ -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++) { diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index c6ce3383..343c70fe 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -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++) { diff --git a/src/main/java/tconstruct/blocks/OreberryBush.java b/src/main/java/tconstruct/blocks/OreberryBush.java index eb8a1d3b..360c06c6 100644 --- a/src/main/java/tconstruct/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/blocks/OreberryBush.java @@ -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) */ diff --git a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java index 837afa17..e38f2a6d 100644 --- a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java @@ -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; diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java index feb0d7a3..fce3cf70 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -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; diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java index cef9b72c..3a4e608a 100644 --- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java @@ -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) diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index 55ef7783..08a0be1c 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -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) diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 09fde295..393a53e0 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -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++) { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 7861f875..b1b7d5ab 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -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)); diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index 861b293f..45a6a9ee 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -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; diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index df6e0851..6fc35af6 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -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) { diff --git a/src/main/java/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/entity/CartEntity.java index eac75fd3..8a83723e 100644 --- a/src/main/java/tconstruct/entity/CartEntity.java +++ b/src/main/java/tconstruct/entity/CartEntity.java @@ -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) diff --git a/src/main/java/tconstruct/items/FilledBucket.java b/src/main/java/tconstruct/items/FilledBucket.java index 452941a1..5318aed7 100644 --- a/src/main/java/tconstruct/items/FilledBucket.java +++ b/src/main/java/tconstruct/items/FilledBucket.java @@ -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)); diff --git a/src/main/java/tconstruct/items/TitleIcon.java b/src/main/java/tconstruct/items/TitleIcon.java index 0b517973..e7844f4e 100644 --- a/src/main/java/tconstruct/items/TitleIcon.java +++ b/src/main/java/tconstruct/items/TitleIcon.java @@ -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; } diff --git a/src/main/java/tconstruct/items/blocks/BarricadeItem.java b/src/main/java/tconstruct/items/blocks/BarricadeItem.java index ddb850e0..ea1e4f8c 100644 --- a/src/main/java/tconstruct/items/blocks/BarricadeItem.java +++ b/src/main/java/tconstruct/items/blocks/BarricadeItem.java @@ -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; } diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java index a13d7d0b..7ae1f313 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java @@ -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 diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java index 73d781b6..509e6a95 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java @@ -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 diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java index 9392b4c0..92e589e2 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java @@ -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; } diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java index 46ed5b6d..d4dc7906 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java @@ -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; } diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index c05dd3d2..66b98a16 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -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(); } } diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 062db882..b69fd900 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -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; } diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index 52930e41..8e53264e 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -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; } diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index adade27d..46903987 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -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); } diff --git a/src/main/java/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java index ec7b4c2c..05438535 100644 --- a/src/main/java/tconstruct/library/component/MultiFluidTank.java +++ b/src/main/java/tconstruct/library/component/MultiFluidTank.java @@ -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++) diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index 5f0d3ca3..f19eeaf8 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -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; } } diff --git a/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java b/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java index d8baf95f..7b7b70ee 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java +++ b/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java @@ -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); diff --git a/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java b/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java index 27fccfea..1da660dd 100644 --- a/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java +++ b/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java @@ -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); diff --git a/src/main/java/tconstruct/util/player/ArmorExtended.java b/src/main/java/tconstruct/util/player/ArmorExtended.java index 8c9a76d8..811d6ce4 100644 --- a/src/main/java/tconstruct/util/player/ArmorExtended.java +++ b/src/main/java/tconstruct/util/player/ArmorExtended.java @@ -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); diff --git a/src/main/java/tconstruct/util/player/KnapsackInventory.java b/src/main/java/tconstruct/util/player/KnapsackInventory.java index 19914315..52e55af3 100644 --- a/src/main/java/tconstruct/util/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/util/player/KnapsackInventory.java @@ -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);