diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java index 869fa1539..df1194152 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java @@ -114,11 +114,8 @@ public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlo public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java index 919838b08..57285b5a2 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java @@ -82,11 +82,8 @@ public class BlockCanolaPress extends BlockContainerBase implements IActAddItemO public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java index 77d058058..3f8425d69 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java @@ -99,11 +99,8 @@ public class BlockCoalGenerator extends BlockContainerBase implements IActAddIte public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java index fe0326676..44890c984 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java @@ -118,11 +118,8 @@ public class BlockCoffeeMachine extends BlockContainerBase implements IActAddIte public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java index 711720d37..ed9c15c15 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java @@ -134,11 +134,8 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(true); this.setMaxDamage(0); } @@ -153,7 +150,7 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ if(stack.getItemDamage() >= allLampTypes.length){ return null; } - return StringUtil.localize(this.getUnlocalizedName(stack)+".name")+(((BlockColoredLamp)this.theBlock).isOn ? " ("+StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+".onSuffix.desc")+")" : ""); + return StringUtil.localize(this.getUnlocalizedName(stack)+".name")+(((BlockColoredLamp)this.field_150939_a).isOn ? " ("+StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+".onSuffix.desc")+")" : ""); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java index 44c2187fc..a6ac7ca14 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java @@ -145,11 +145,8 @@ public class BlockCompost extends BlockContainerBase implements IActAddItemOrBlo public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java index 221513880..12d3da260 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java @@ -111,11 +111,8 @@ public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlo public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java index b9cf064cc..9aa879f2a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java @@ -95,11 +95,8 @@ public class BlockEnergizer extends BlockContainerBase implements IActAddItemOrB public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java index 880cda963..a7e43a7e1 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java @@ -82,11 +82,8 @@ public class BlockFeeder extends BlockContainerBase implements IActAddItemOrBloc public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java index ce896a9b6..1807406ce 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java @@ -82,11 +82,8 @@ public class BlockFermentingBarrel extends BlockContainerBase implements IActAdd public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java index fc16e698a..cad2041e5 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java @@ -75,11 +75,8 @@ public class BlockFishingNet extends BlockContainerBase implements IActAddItemOr public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java index 5114479b1..70c6c85ae 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java @@ -114,11 +114,8 @@ public class BlockFluidCollector extends BlockContainerBase implements IActAddIt public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java index b726a30ba..35edf6a1a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java @@ -69,11 +69,8 @@ public class BlockFluidFlowing extends BlockFluidClassic implements IActAddItemO public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java index bee024c71..2e8781e09 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java @@ -171,11 +171,8 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java index 016d25016..a7dd996d6 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java @@ -75,11 +75,8 @@ public class BlockFurnaceSolar extends BlockContainerBase implements IActAddItem public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java index b5673bf56..16f3b22ad 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java @@ -53,11 +53,8 @@ public class BlockGeneric extends Block implements IActAddItemOrBlock{ public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java index 4c636340c..e9612b84a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java @@ -84,11 +84,8 @@ public class BlockGiantChest extends BlockContainerBase implements IActAddItemOr public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java index 76a1229d1..aa2975802 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java @@ -83,11 +83,8 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements IActAddI public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java index 59466d1c9..bc916fd72 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java @@ -121,11 +121,8 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } @@ -142,7 +139,7 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo @Override public EnumRarity getRarity(ItemStack stack){ - return ((BlockGrinder)theBlock).isDouble ? EnumRarity.epic : EnumRarity.rare; + return ((BlockGrinder)this.field_150939_a).isDouble ? EnumRarity.epic : EnumRarity.rare; } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java index 43ccc38fc..5adcdb375 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java @@ -63,11 +63,8 @@ public class BlockHeatCollector extends BlockContainerBase implements IActAddIte public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java index 4d61c8312..5e655d352 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java @@ -95,14 +95,11 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - private long lastSysTime; private int toPick; public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } @@ -132,7 +129,7 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl @Override public EnumRarity getRarity(ItemStack stack){ - return ((BlockInputter)theBlock).isAdvanced ? EnumRarity.epic : EnumRarity.rare; + return ((BlockInputter)this.field_150939_a).isAdvanced ? EnumRarity.epic : EnumRarity.rare; } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java index 8885bfd14..b27ff11ef 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java @@ -97,11 +97,8 @@ public class BlockItemRepairer extends BlockContainerBase implements IActAddItem public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java index 89bcd747a..4a936173f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java @@ -106,11 +106,8 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java index 36e73ee1d..0a8cccba1 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java @@ -83,11 +83,8 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IA public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java index 606fffbd0..b04fae354 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java @@ -72,11 +72,8 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(true); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java index c751691e0..e76a19e8b 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java @@ -99,11 +99,8 @@ public class BlockOilGenerator extends BlockContainerBase implements IActAddItem public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java index abb197f9d..a986bb949 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java @@ -84,11 +84,8 @@ public class BlockOreMagnet extends BlockContainerBase implements IActAddItemOrB public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java index b957ff1ab..e099f18c2 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java @@ -151,11 +151,8 @@ public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlo public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java index 225e7b6f2..7b4218c1c 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java @@ -77,11 +77,8 @@ public class BlockPhantomBooster extends BlockContainerBase implements IActAddIt public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java index 6f593bedd..808cc0726 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java @@ -109,11 +109,8 @@ public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{ public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java index 822003d46..9082cc59b 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java @@ -100,11 +100,8 @@ public class BlockSlabs extends Block implements IActAddItemOrBlock{ public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } @@ -121,9 +118,9 @@ public class BlockSlabs extends Block implements IActAddItemOrBlock{ @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ){ - if(world.getBlock(x, y, z) == this.theBlock && ((side == 1 && world.getBlockMetadata(x, y, z) == 0) || (side == 0 && world.getBlockMetadata(x, y, z) == 1))){ - if(world.setBlock(x, y, z, ((BlockSlabs)this.theBlock).fullBlock, 0, 3)){ - world.playSoundEffect(x+0.5F, y+0.5F, z+0.5F, this.theBlock.stepSound.getBreakSound(), (this.theBlock.stepSound.getVolume()+1.0F)/2.0F, this.theBlock.stepSound.getPitch()*0.8F); + if(world.getBlock(x, y, z) == this.field_150939_a && ((side == 1 && world.getBlockMetadata(x, y, z) == 0) || (side == 0 && world.getBlockMetadata(x, y, z) == 1))){ + if(world.setBlock(x, y, z, ((BlockSlabs)this.field_150939_a).fullBlock, 0, 3)){ + world.playSoundEffect(x+0.5F, y+0.5F, z+0.5F, this.field_150939_a.stepSound.getBreakSound(), (this.field_150939_a.stepSound.getVolume()+1.0F)/2.0F, this.field_150939_a.stepSound.getPitch()*0.8F); stack.stackSize--; return true; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java index adb522c87..705993cab 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java @@ -133,11 +133,8 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java index 3327a402e..b50094084 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java @@ -34,11 +34,8 @@ public class BlockStair extends BlockStairs implements IActAddItemOrBlock{ public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java index f2147d359..93946ab2e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java @@ -169,11 +169,8 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java index 56bdaedde..2120a9416 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java @@ -87,11 +87,8 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(true); this.setMaxDamage(0); } @@ -109,7 +106,7 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ @SideOnly(Side.CLIENT) @Override public IIcon getIconFromDamage(int meta){ - return this.theBlock.getIcon(0, meta); + return this.field_150939_a.getIcon(0, meta); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java index 9aecc11a5..32278784b 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java @@ -152,11 +152,8 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem public static class TheItemBlock extends ItemBlock{ - private Block theBlock; - public TheItemBlock(Block block){ super(block); - this.theBlock = block; this.setHasSubtypes(false); this.setMaxDamage(0); }