diff --git a/src/main/java/tconstruct/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/blocks/CastingChannelBlock.java index c1472495..bf74b88a 100644 --- a/src/main/java/tconstruct/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/blocks/CastingChannelBlock.java @@ -23,10 +23,10 @@ public class CastingChannelBlock extends BlockContainer public CastingChannelBlock() { - super(Material.rock); + super(Material.field_151576_e); this.func_149711_c(1F); this.func_149752_b(10); - this.setStepSound(soundStoneFootstep); + this.setStepSound(field_149769_e); func_149647_a(TConstructRegistry.blockTab); } diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java index e9af0733..8e06a751 100644 --- a/src/main/java/tconstruct/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/blocks/CraftingSlab.java @@ -33,7 +33,7 @@ public class CraftingSlab extends InventorySlab super(material); this.func_149647_a(TConstructRegistry.blockTab); this.func_149711_c(2f); - this.setStepSound(Block.soundWoodFootstep); + this.setStepSound(Block.field_149766_f); } /* Rendering */ @@ -48,7 +48,7 @@ public class CraftingSlab 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)]; } @@ -67,9 +67,9 @@ public class CraftingSlab extends InventorySlab { int metadata = world.getBlockMetadata(x, y, z); if (metadata == 5) - return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, - (double) z + this.maxZ); - return AxisAlignedBB.getAABBPool().getAABB((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); + return AxisAlignedBB.getAABBPool().getAABB((double) x + this.field_149759_B, (double) y + this.field_149760_C, (double) z + this.field_149754_D, (double) x + this.field_149755_E, (double) y + this.field_149756_F - 0.125, + (double) z + this.field_149757_G); + return AxisAlignedBB.getAABBPool().getAABB((double) x + this.field_149759_B, (double) y + this.field_149760_C, (double) z + this.field_149754_D, (double) x + this.field_149755_E, (double) y + this.field_149756_F, (double) z + this.field_149757_G); } @Override @@ -124,7 +124,7 @@ public class CraftingSlab extends InventorySlab } @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 < 6; iter++) { @@ -133,14 +133,14 @@ public class CraftingSlab extends InventorySlab } @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) + public void func_149689_a (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) { if (PHConstruct.freePatterns) { int meta = world.getBlockMetadata(x, y, z); if (meta == 4) { - PatternChestLogic logic = (PatternChestLogic) world.getBlockTileEntity(x, y, z); + PatternChestLogic logic = (PatternChestLogic) world.func_147438_o(x, y, z); for (int i = 1; i <= 13; i++) { logic.setInventorySlotContents(i - 1, new ItemStack(TRepo.woodPattern, 1, i)); @@ -148,6 +148,28 @@ public class CraftingSlab extends InventorySlab logic.setInventorySlotContents(13, new ItemStack(TRepo.woodPattern, 1, 22)); } } - super.onBlockPlacedBy(world, x, y, z, entityliving, stack); + super.func_149689_a(world, x, y, z, entityliving, stack); + } + + @Override + public TileEntity func_149915_a (World var1, int metadata) + { + switch (metadata % 8) + { + case 0: + return new CraftingStationLogic(); + case 1: + return new ToolStationLogic(); + case 2: + return new PartBuilderLogic(); + case 3: + return new StencilTableLogic(); + case 4: + return new PatternChestLogic(); + case 5: + return new ToolForgeLogic(); + default: + return null; + } } } diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java index 38887f26..2d431f54 100644 --- a/src/main/java/tconstruct/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/blocks/CraftingStationBlock.java @@ -25,7 +25,7 @@ public class CraftingStationBlock extends InventoryBlock super(material); this.func_149647_a(TConstructRegistry.blockTab); this.func_149711_c(2f); - this.setStepSound(Block.soundWoodFootstep); + this.setStepSound(Block.field_149766_f); } //Block.hasComparatorInputOverride and Block.getComparatorInputOverride diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java index 85022f86..33785f2f 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/blocks/DryingRack.java @@ -30,7 +30,7 @@ public class DryingRack extends InventoryBlock super(Material.field_151575_d); this.func_149647_a(TConstructRegistry.blockTab); func_149711_c(2.0f); - setStepSound(soundMetalFootstep); + setStepSound(field_149777_j); } @Override diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index 8fe0bfc0..e6e1e83a 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -25,7 +25,7 @@ public class GlassBlockConnected extends MantleBlock public GlassBlockConnected(String location, boolean hasAlpha) { super(Material.field_151592_s); - this.setStepSound(soundGlassFootstep); + this.setStepSound(field_149778_k); folder = location; renderPass = hasAlpha ? 1 : 0; func_149711_c(0.3F); diff --git a/src/main/java/tconstruct/blocks/GlassPane.java b/src/main/java/tconstruct/blocks/GlassPane.java index 97ae781f..bbc05371 100644 --- a/src/main/java/tconstruct/blocks/GlassPane.java +++ b/src/main/java/tconstruct/blocks/GlassPane.java @@ -11,7 +11,7 @@ public class GlassPane extends PaneBase { super(Material.field_151592_s, "glass/", blockTextures); this.func_149711_c(0.3F); - this.setStepSound(soundGlassFootstep); + this.setStepSound(field_149778_k); this.func_149663_c("tconstruct.glasspane"); this.func_149647_a(TConstructRegistry.blockTab); } diff --git a/src/main/java/tconstruct/blocks/GlassPaneStained.java b/src/main/java/tconstruct/blocks/GlassPaneStained.java index d0393f00..fcabc40e 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneStained.java +++ b/src/main/java/tconstruct/blocks/GlassPaneStained.java @@ -12,7 +12,7 @@ public class GlassPaneStained extends PaneBase super(Material.field_151592_s, "glass/", assembleBlockTextures()); //TODO setHardness this.func_149711_c(0.3F); - this.setStepSound(soundGlassFootstep); + this.setStepSound(field_149778_k); this.func_149663_c("tconstruct.glasspanestained"); this.func_149647_a(TConstructRegistry.blockTab); } diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java index 4daba679..1255ec8e 100644 --- a/src/main/java/tconstruct/blocks/GravelOre.java +++ b/src/main/java/tconstruct/blocks/GravelOre.java @@ -22,7 +22,7 @@ public class GravelOre extends BlockSand { super(); this.func_149647_a(TConstructRegistry.blockTab); - this.setStepSound(soundGravelFootstep); + this.setStepSound(field_149767_g); this.field_149764_J = Material.field_151596_z; } diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index e23cc8d1..457d78b3 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -34,12 +34,12 @@ public class LavaTankBlock extends BlockContainer public LavaTankBlock() { - super(Material.rock); + super(Material.field_151576_e); func_149711_c(3F); func_149752_b(20F); func_149647_a(TConstructRegistry.blockTab); func_149663_c("TConstruct.LavaTank"); - setStepSound(Block.soundGlassFootstep); + setStepSound(Block.field_149778_k); } public LavaTankBlock(String prefix) diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index 8af02474..821d9f13 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -21,7 +21,7 @@ public class SlimeGel extends TConstructBlock { public SlimeGel() { - super(Material.sponge, 0.5f, new String[] { "slimeblock_blue", "slimeblock_green", "slimeblock_purple" }); + super(Material.field_151583_m, 0.5f, new String[] { "slimeblock_blue", "slimeblock_green", "slimeblock_purple" }); func_149647_a(TConstructRegistry.blockTab); } @@ -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.stepSound.getStepSound(), (var9.stepSound.getVolume()) / 2.0F, var9.stepSound.getPitch() * 0.65F); + 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); } 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 4e4edc45..470405d3 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -92,7 +92,7 @@ public class SlimeGrass extends MantleBlock public boolean canSustainPlant (World world, int x, int y, int z, ForgeDirection direction, IPlantable plant) { EnumPlantType plantType = plant.getPlantType(world, x, y + 1, z); - return plantType == EnumPlantType.Plains && plant.getPlantID(world, x, y + 1, z) != Block.tallGrass.blockID; + return plantType == EnumPlantType.Plains && plant.getPlant(world, x, y + 1, z) != Blocks.tallgrass; } public void onPlantGrow (World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ) diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 77de3f02..24459d77 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -32,7 +32,7 @@ public class SlimeSapling extends BlockSapling float f = 0.4F; func_149676_a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); this.func_149711_c(0.0F); - this.setStepSound(Block.soundGrassFootstep); + this.setStepSound(Block.field_149779_h); this.func_149647_a(TConstructRegistry.blockTab); } diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index 6a793b11..9b0dca2c 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.onPostBlockPlaced(world, x, y, z, meta); Block var9 = this; - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.stepSound.getStepSound(), (var9.stepSound.getVolume() + 1.0F) / 2.0F, var9.stepSound.getPitch() * 0.8F); + 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); 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 0d231a6f..5ce4b80f 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -28,7 +28,7 @@ public class Punji extends MantleBlock { super(Material.field_151585_k); this.func_149676_a(0.125f, 0, 0.125f, 0.875f, 0.375f, 0.875f); - this.setStepSound(Block.soundGrassFootstep); + this.setStepSound(Block.field_149779_h); this.func_149647_a(TConstructRegistry.blockTab); this.func_149711_c(3.0f); } @@ -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.stepSound.getPlaceSound(), - (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F); + 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); player.swingItem(); if (!player.capabilities.isCreativeMode) { diff --git a/src/main/java/tconstruct/client/StepSoundSlime.java b/src/main/java/tconstruct/client/StepSoundSlime.java index 03492cfd..a9597321 100644 --- a/src/main/java/tconstruct/client/StepSoundSlime.java +++ b/src/main/java/tconstruct/client/StepSoundSlime.java @@ -1,8 +1,8 @@ package tconstruct.client; -import net.minecraft.block.StepSound; +import net.minecraft.block.Block.SoundType; -public class StepSoundSlime extends StepSound +public class StepSoundSlime extends SoundType { public StepSoundSlime(String par1Str, float par2, float par3) @@ -16,7 +16,7 @@ public class StepSoundSlime extends StepSound */ public String getBreakSound () { - return this.stepSoundName + ".big"; + return this.field_150501_a + ".big"; } /** @@ -24,7 +24,7 @@ public class StepSoundSlime extends StepSound */ public String getStepSound () { - return this.stepSoundName + ".small"; + return this.field_150501_a + ".small"; } } diff --git a/src/main/java/tconstruct/client/entity/FancyItemRender.java b/src/main/java/tconstruct/client/entity/FancyItemRender.java index f05cecb8..169fb205 100644 --- a/src/main/java/tconstruct/client/entity/FancyItemRender.java +++ b/src/main/java/tconstruct/client/entity/FancyItemRender.java @@ -78,7 +78,7 @@ public class FancyItemRender extends Render { ; } - else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(BlockUtils.getBlockFromItem(itemstack.getItem()).getRenderType())) + else if (itemstack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(BlockUtils.getBlockFromItem(itemstack.getItem()).func_149645_b())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); @@ -90,7 +90,7 @@ public class FancyItemRender extends Render } float f7 = 0.25F; - int j = block.getRenderType(); + int j = block.func_149645_b(); if (j == 1 || j == 19 || j == 12 || j == 2) { @@ -321,8 +321,8 @@ public class FancyItemRender extends Render float f1; float f2; //TODO make this be the block equivalent to k - Block block = BlockUtils.getBlockFromItem(k]; - if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(block.getRenderType())) + Block block = BlockUtils.getBlockFromItem(k); + if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.func_147739_a(block.func_149645_b())) { par2TextureManager.bindTexture(TextureMap.locationBlocksTexture); GL11.glPushMatrix(); diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 5f853535..94133717 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -99,31 +99,31 @@ public class TContent implements IFuelHandler TRepo.heldItemBlock = new EquipBlock(Material.field_151575_d).func_149663_c("Frypan"); TRepo.craftedSoil = new SoilBlock().func_149713_g(0).func_149663_c("TConstruct.Soil"); - TRepo.craftedSoil.field_149762_H = Block.soundGravelFootstep; + TRepo.craftedSoil.field_149762_H = Block.field_149767_g; TRepo.searedSlab = new SearedSlab().func_149663_c("SearedSlab"); - TRepo.searedSlab.field_149762_H = Block.soundStoneFootstep; + TRepo.searedSlab.field_149762_H = Block.field_149769_e; TRepo.speedSlab = new SpeedSlab().func_149663_c("SpeedSlab"); - TRepo.speedSlab.field_149762_H = Block.soundStoneFootstep; + TRepo.speedSlab.field_149762_H = Block.field_149769_e; TRepo.metalBlock = new TMetalBlock(Material.field_151573_f, 10.0F).func_149663_c("tconstruct.metalblock"); - TRepo.metalBlock.field_149762_H = Block.soundMetalFootstep; + TRepo.metalBlock.field_149762_H = Block.field_149777_j; TRepo.meatBlock = new MeatBlock().func_149663_c("tconstruct.meatblock"); TRepo.glueBlock = new GlueBlock().func_149663_c("GlueBlock").func_149647_a(TConstructRegistry.blockTab); TRepo.woolSlab1 = new SlabBase(Material.field_151580_n, Blocks.wool, 0, 8).func_149663_c("cloth"); - TRepo.woolSlab1.func_149672_a(Block.soundClothFootstep).func_149647_a(CreativeTabs.tabDecorations); + TRepo.woolSlab1.func_149672_a(Block.field_149775_l).func_149647_a(CreativeTabs.tabDecorations); TRepo.woolSlab2 = new SlabBase(Material.field_151580_n, Blocks.wool, 8, 8).func_149663_c("cloth"); - TRepo.woolSlab2.func_149672_a(Block.soundClothFootstep).func_149647_a(CreativeTabs.tabDecorations); + TRepo.woolSlab2.func_149672_a(Block.field_149775_l).func_149647_a(CreativeTabs.tabDecorations); //Smeltery TRepo.smeltery = new SmelteryBlock().func_149663_c("Smeltery"); TRepo.smelteryNether = new SmelteryBlock("nether").func_149663_c("Smeltery"); TRepo.lavaTank = new LavaTankBlock().func_149663_c("LavaTank"); - TRepo.lavaTank.func_149672_a(Block.soundGlassFootstep); - TRepo.lavaTankNether = new LavaTankBlock("nether").func_149672_a(Block.soundGlassFootstep).func_149663_c("LavaTank"); + TRepo.lavaTank.func_149672_a(Block.field_149778_k); + TRepo.lavaTankNether = new LavaTankBlock("nether").func_149672_a(Block.field_149778_k).func_149663_c("LavaTank"); TRepo.searedBlock = new SearedBlock().func_149663_c("SearedBlock"); TRepo.searedBlockNether = new SearedBlock("nether").func_149663_c("SearedBlock"); @@ -133,7 +133,7 @@ public class TContent implements IFuelHandler TRepo.tankAir = new TankAirBlock(Material.field_151584_j).setBlockUnbreakable().func_149663_c("tconstruct.tank.air"); //Traps - TRepo.landmine = new BlockLandmine().func_149711_c(0.5F).setResistance(0F).func_149672_a(Block.soundMetalFootstep).func_149647_a(CreativeTabs.tabRedstone) + TRepo.landmine = new BlockLandmine().func_149711_c(0.5F).setResistance(0F).func_149672_a(Block.field_149777_j).func_149647_a(CreativeTabs.tabRedstone) .func_149663_c("landmine"); TRepo.punji = new Punji().func_149663_c("trap.punji"); TRepo.barricadeOak = new BarricadeBlock(Blocks.log, 0).func_149663_c("trap.barricade.oak"); @@ -399,7 +399,7 @@ public class TContent implements IFuelHandler //Ores String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" }; - TRepo.oreBerry = (OreberryBush) new OreberryBush(, berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).func_149663_c("ore.berries.one"); + TRepo.oreBerry = (OreberryBush) new OreberryBush(berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).func_149663_c("ore.berries.one"); String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" }; TRepo.oreBerrySecond = (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }) .func_149663_c("ore.berries.two"); @@ -424,15 +424,15 @@ public class TContent implements IFuelHandler //Glass TRepo.clearGlass = new GlassBlockConnected("clear", false).func_149663_c("GlassBlock"); - TRepo.clearGlass.field_149762_H = Block.soundGlassFootstep; + TRepo.clearGlass.field_149762_H = Block.field_149778_k; TRepo.glassPane = new GlassPaneConnected("clear", false); TRepo.stainedGlassClear = new GlassBlockConnectedMeta("stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", "blue", "brown", "green", "red", "black").func_149663_c("GlassBlock.StainedClear"); - TRepo.stainedGlassClear.field_149762_H = Block.soundGlassFootstep; + TRepo.stainedGlassClear.field_149762_H = Block.field_149778_k; TRepo.stainedGlassClearPane = new GlassPaneStained(PHConstruct.stainedGlassClearPane); //Rail - TRepo.woodenRail = new WoodRail().func_149672_a(Block.soundWoodFootstep).func_149647_a(TConstructRegistry.blockTab).setUnlocalizedName("rail.wood"); + TRepo.woodenRail = new WoodRail().func_149672_a(Block.field_149766_f).func_149647_a(TConstructRegistry.blockTab).setUnlocalizedName("rail.wood"); } diff --git a/src/main/java/tconstruct/items/blocks/BarricadeItem.java b/src/main/java/tconstruct/items/blocks/BarricadeItem.java index 241425cd..ddb850e0 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.stepSound.getPlaceSound(), - (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); + 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); --stack.stackSize; } diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java index cad9c11c..ecf526d7 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java @@ -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.stepSound.getPlaceSound(), - (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.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.getPlaceSound(), + (this.block.field_149762_H.getVolume() + 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 c3b714ec..46ed5b6d 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java @@ -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.stepSound.getPlaceSound(), - (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.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.getPlaceSound(), + (this.block.field_149762_H.getVolume() + 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/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 7280d423..1768514c 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -144,7 +144,7 @@ public class LumberAxe extends HarvestTool { return super.onBlockStartBreak(stack, x, y, z, player); } - if (wood.isWood(world, x, y, z) || wood.func_149688_o() == Material.sponge) + if (wood.isWood(world, x, y, z) || wood.func_149688_o() == Material.field_151583_m) { int height = y; boolean foundTop = false; diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 2ad6708f..165bf70f 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.stepSound.getStepSound(), - (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); + 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.getVolume() + 1.0F) / 2.0F, block.field_149762_H.getPitch() * 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 0c46d534..5f0d3ca3 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -30,7 +30,7 @@ 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 hlvl = block.getBlockHarvestLevel(meta, getHarvestType()); int shlvl = block.getBlockHarvestLevel(meta, getSecondHarvestType()); if (hlvl <= tags.getInteger("HarvestLevel") && shlvl <= tags.getInteger("HarvestLevel2"))