diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java index 16b2d0b4..e59840d2 100644 --- a/src/main/java/tconstruct/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/blocks/EquipBlock.java @@ -42,7 +42,7 @@ public class EquipBlock extends InventoryBlock public IIcon getIcon (int side, int meta) { - return Blocks.iron_block.getIcon(side, meta); + return Blocks.iron_block.func_149691_a(side, meta); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java index 1ba96bae..3567e58b 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/blocks/FurnaceSlab.java @@ -57,14 +57,14 @@ public class FurnaceSlab extends InventorySlab } @Override - public IIcon getIcon (int side, int meta) + public IIcon func_149691_a (int side, int meta) { return icons[(meta % 8) * 3 + getTextureIndex(side)]; } public IIcon getBlockTexture (IBlockAccess world, int x, int y, int z, int side) { - TileEntity logic = world.getBlockTileEntity(x, y, z); + TileEntity logic = world.func_147438_o(x, y, z); short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getRenderDirection() : 0; int meta = world.getBlockMetadata(x, y, z) % 8; diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java index 585de6ec..77878089 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java @@ -50,7 +50,7 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected } @Override - public IIcon getIcon (int par1, int par2) + public IIcon func_149691_a (int par1, int par2) { return icons[par2][0]; } diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index 343c70fe..86d0602e 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -219,7 +219,7 @@ public class LavaTankBlock extends BlockContainer if (stack.stackSize == 1) { if (stack.getItem().hasContainerItem()) - return stack.getItem().getContainerItemStack(stack); + return stack.getItem().getContainerItem(stack); else return null; } diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java index 3a4e608a..0d1bb26a 100644 --- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java @@ -59,7 +59,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory par1NBTTagCompound.setInteger("triggerType", triggerType); - if (this.isInvNameLocalized()) + if (this.func_145818_k_()) { par1NBTTagCompound.setString("CustomName", this.containerName); } @@ -181,13 +181,13 @@ public class TileEntityLandmine extends TileEntity implements IInventory } @Override - public String getInvName () + public String func_145825_b () { - return this.isInvNameLocalized() ? this.containerName : "Landmine"; + return this.func_145818_k_() ? this.containerName : "Landmine"; } @Override - public boolean isInvNameLocalized () + public boolean func_145818_k_ () { return containerName != null && containerName.length() > 0; } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index 08a0be1c..ad4372dc 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, (var9.field_149762_H.func_150497_c()) / 2.0F, var9.field_149762_H.getPitch() * 0.65F); + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.field_149762_H.field_150501_a, (var9.field_149762_H.func_150497_c()) / 2.0F, var9.field_149762_H.func_150494_d() * 0.65F); } entity.motionY *= -1.2F; if (entity instanceof EntityLivingBase) @@ -60,7 +60,7 @@ public class SlimeGel extends TConstructBlock } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) + public AxisAlignedBB func_149668_a (World world, int x, int y, int z) { return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D); } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 393a53e0..7584ab0b 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -60,14 +60,14 @@ public class SlimeGrass extends MantleBlock @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) + public IIcon func_149691_a (int side, int meta) { if (meta >= 2) meta = 0; if (side == 0) { - return meta % 2 == 1 ? Blocks.dirt.getIcon(0, 0) : icons[1]; + return meta % 2 == 1 ? Blocks.dirt.func_149691_a(0, 0) : icons[1]; } else if (side == 1) { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index b1b7d5ab..6ee040b5 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -73,7 +73,7 @@ public class SlimeSapling extends BlockSapling @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) + public IIcon func_149691_a (int side, int meta) { return icons[meta % 8]; } diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index 45a6a9ee..31bbf8d5 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -34,7 +34,7 @@ public class BarricadeBlock extends MantleBlock public IIcon getIcon (int side, int meta) { - return modelBlock.getIcon(2, modelMeta); + return modelBlock.func_149691_a(2, modelMeta); } @Override @@ -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, (var9.field_149762_H.func_150497_c() + 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.field_150501_a, (var9.field_149762_H.func_150497_c() + 1.0F) / 2.0F, var9.field_149762_H.func_150494_d() * 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 6fc35af6..9dc7582d 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -60,8 +60,8 @@ public class Punji extends MantleBlock if (stack != null && stack == new ItemStack(TRepo.punji)) { 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.func_150497_c() + 1.0F) / 2.0F, this.field_149762_H.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.field_149762_H.field_150501_a, + (this.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.field_149762_H.func_150494_d() * 0.8F); player.swingItem(); if (!player.capabilities.isCreativeMode) { diff --git a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java index b628f0a0..be08da81 100644 --- a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java +++ b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java @@ -105,7 +105,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa i.func_149719_a(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + AxisAlignedBB axisalignedbb = i.func_149668_a(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); if (axisalignedbb != null && axisalignedbb.isVecInside(this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ))) { diff --git a/src/main/java/tconstruct/items/Pattern.java b/src/main/java/tconstruct/items/Pattern.java index b42029c6..bb55cbff 100644 --- a/src/main/java/tconstruct/items/Pattern.java +++ b/src/main/java/tconstruct/items/Pattern.java @@ -53,7 +53,7 @@ public class Pattern extends CraftingItem implements IPattern } @Override - public ItemStack getContainerItemStack (ItemStack stack) + public ItemStack getContainerItem (ItemStack stack) { if (stack.stackSize <= 0) return null; diff --git a/src/main/java/tconstruct/items/TitleIcon.java b/src/main/java/tconstruct/items/TitleIcon.java index e7844f4e..d6c5ba3a 100644 --- a/src/main/java/tconstruct/items/TitleIcon.java +++ b/src/main/java/tconstruct/items/TitleIcon.java @@ -84,7 +84,7 @@ public class TitleIcon extends Item } @Override - public String getItemDisplayName (ItemStack par1ItemStack) + public String func_150896_i (ItemStack par1ItemStack) { String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); String s1 = mobNames[par1ItemStack.getItemDamage()]; diff --git a/src/main/java/tconstruct/items/ToolPart.java b/src/main/java/tconstruct/items/ToolPart.java index 68e48241..0f76b81f 100644 --- a/src/main/java/tconstruct/items/ToolPart.java +++ b/src/main/java/tconstruct/items/ToolPart.java @@ -25,7 +25,7 @@ public class ToolPart extends CraftingItem implements IToolPart } @Override - public String getItemDisplayName (ItemStack par1ItemStack) + public String func_150896_i (ItemStack par1ItemStack) { String material = StatCollector.translateToLocal("parttype." + toolTextureNames[par1ItemStack.getItemDamage()]); String name = StatCollector.translateToLocal("toolpart." + partName); diff --git a/src/main/java/tconstruct/items/blocks/BarricadeItem.java b/src/main/java/tconstruct/items/blocks/BarricadeItem.java index ea1e4f8c..4a80828b 100644 --- a/src/main/java/tconstruct/items/blocks/BarricadeItem.java +++ b/src/main/java/tconstruct/items/blocks/BarricadeItem.java @@ -94,8 +94,8 @@ 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.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.field_149762_H.field_150501_a, + (block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.func_150494_d() * 0.8F); --stack.stackSize; } diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java index 92e589e2..d4b13498 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java @@ -14,7 +14,7 @@ public class WoolSlab1Item extends MultiItemBlock public WoolSlab1Item(Block b) { - super(b, "", "slab", ItemDye.dyeColorNames); + super(b, "", "slab", ItemDye.field_150923_a); this.setSpecialIndex(7, 15); this.block = b; setMaxDamage(0); @@ -33,8 +33,8 @@ 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.func_150497_c() + 1.0F) / 2.0F, this.block.field_149762_H.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.field_149762_H.field_150501_a, + (this.block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.block.field_149762_H.func_150494_d() * 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 d4dc7906..e3f42920 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java @@ -15,7 +15,7 @@ public class WoolSlab2Item extends MultiItemBlock public WoolSlab2Item(Block b) { - super(b, "", "slab" ,ItemDye.dyeColorNames); + super(b, "", "slab" ,ItemDye.field_150923_a); this.setSpecialIndex(7,7); this.blockID = id + 256; this.block = Block.blocksList[id + 256]; @@ -36,8 +36,8 @@ public class WoolSlab2Item extends MultiItemBlock { 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.func_150497_c() + 1.0F) / 2.0F, this.block.field_149762_H.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.field_149762_H.field_150501_a, + (this.block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.block.field_149762_H.func_150494_d() * 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 66b98a16..f3588498 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -30,7 +30,7 @@ public class Chisel extends ToolCore } @Override - public ItemStack getContainerItemStack (ItemStack itemStack) + public ItemStack getContainerItem (ItemStack itemStack) { if (itemStack.hasTagCompound()) { diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index eaacc4cd..da1e859b 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -184,7 +184,7 @@ public class LumberAxe extends HarvestTool destroyWood(world, x, y, z, stack, tags, player); if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, woodID + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.func_149682_b(wood) + (meta << 12)); } else if (wood.func_149688_o() == Material.field_151575_d) { @@ -192,7 +192,7 @@ public class LumberAxe extends HarvestTool int meta = world.getBlockMetadata(x, y, z); destroyWood(world, x, y, z, stack, tags, player); if (!world.isRemote) - world.playAuxSFX(2001, x, y, z, woodID + (meta << 12)); + world.playAuxSFX(2001, x, y, z, Block.func_149682_b(wood) + (meta << 12)); } return super.onBlockStartBreak(stack, x, y, z, player); } diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index dda19145..3cc1d0c0 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -505,8 +505,8 @@ public class AbilityHelper else { Block block = Blocks.tilledField; - world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.field_149762_H.getfield_149762_H(), - (block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.getPitch() * 0.8F); + world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.field_149762_H.field_150501_a, + (block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.func_150494_d() * 0.8F); if (world.isRemote) { diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index 653e7510..193bf997 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -30,8 +30,8 @@ public abstract class DualHarvestTool extends HarvestTool Block block = player.worldObj.func_147439_a(x, y, z); if (block == null || block == Blocks.air) return false; - int hlvl = block.getBlockHarvestLevel(meta, getHarvestType()); - int shlvl = block.getBlockHarvestLevel(meta, getSecondHarvestType()); + int hlvl = block.getHarvestLevel(meta); + int shlvl = block.getHarvestLevel(meta); if (hlvl <= tags.getInteger("HarvestLevel") && shlvl <= tags.getInteger("HarvestLevel2")) { @@ -70,7 +70,7 @@ public abstract class DualHarvestTool extends HarvestTool { float speed = tags.getInteger("MiningSpeed"); speed /= 100f; - int hlvl = block.getBlockHarvestLevel(meta, getHarvestType()); + int hlvl = block.getHarvestLevel(meta); int durability = tags.getInteger("Damage"); float shoddy = tags.getFloat("Shoddy"); @@ -88,7 +88,7 @@ public abstract class DualHarvestTool extends HarvestTool { float speed = tags.getInteger("MiningSpeed2"); speed /= 100f; - int hlvl = block.getBlockHarvestLevel(meta, getHarvestType()); + int hlvl = block.getHarvestLevel(meta); int durability = tags.getInteger("Damage"); float shoddy = tags.getFloat("Shoddy");