Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 16:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused variables

Browse source
This commit is contained in:
Ellpeck 2015-10-08 17:37:09 +02:00
parent dd9e3cb08d
commit 8b0190cbbf
36 changed files with 7 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java
View file

@ -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);
}

5
src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java
View file

@ -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

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java
View file

@ -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);
}

5
src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java
View file

@ -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;
}
}
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java
View file

@ -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);
}

5
src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java
View file

@ -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;
}
}
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java
View file

@ -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);
}

9
src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java
View file

@ -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;
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java
View file

@ -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);
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java
View file

@ -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);
}

5
src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java
View file

@ -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

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java
View file

@ -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);
}