diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java index 7e897bfc3..1f60ca4b0 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java @@ -35,7 +35,8 @@ public class BlockBreaker extends BlockContainerBase implements INameableItem{ super(Material.rock); this.isPlacer = isPlacer; this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java index ead177202..6e757409a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java @@ -28,7 +28,8 @@ public class BlockCanolaPress extends BlockContainerBase implements INameableIte public BlockCanolaPress(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java index eddbfae96..4fa7fa86e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java @@ -30,7 +30,8 @@ public class BlockCoalGenerator extends BlockContainerBase implements INameableI public BlockCoalGenerator(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); this.setTickRandomly(true); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java index b18b126dc..792fea1c1 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java @@ -29,7 +29,8 @@ public class BlockCoffeeMachine extends BlockContainerBase implements INameableI public BlockCoffeeMachine(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); float f = 1/16F; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java index 0bae3152d..1277735c7 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java @@ -36,6 +36,7 @@ public class BlockColoredLamp extends Block implements INameableItem{ super(Material.redstoneLight); this.setHarvestLevel("pickaxe", 0); this.setHardness(0.5F); + this.setResistance(3.0F); this.isOn = isOn; } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java index 9d41e097e..0fdf3f3a6 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java @@ -31,7 +31,8 @@ public class BlockCompost extends BlockContainerBase implements INameableItem{ public BlockCompost(){ super(Material.wood); this.setHarvestLevel("axe", 0); - this.setHardness(1.0F); + this.setHardness(0.5F); + this.setResistance(5.0F); this.setStepSound(soundTypeWood); this.setBlockBoundsForItemRender(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java index 186603e90..a7676110c 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java @@ -32,7 +32,8 @@ public class BlockDropper extends BlockContainerBase implements INameableItem{ public BlockDropper(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java index 06cbe841a..5c684f94b 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java @@ -33,6 +33,7 @@ public class BlockEnergizer extends BlockContainerBase implements INameableItem{ this.isEnergizer = isEnergizer; this.setHarvestLevel("pickaxe", 0); this.setHardness(2.0F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java index c367d9012..e4edbfac9 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java @@ -28,7 +28,8 @@ public class BlockFeeder extends BlockContainerBase implements INameableItem{ public BlockFeeder(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(0.5F); + this.setResistance(6.0F); this.setStepSound(soundTypeStone); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java index 6a5567a95..85d0d7c9b 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java @@ -28,7 +28,8 @@ public class BlockFermentingBarrel extends BlockContainerBase implements INameab public BlockFermentingBarrel(){ super(Material.wood); this.setHarvestLevel("axe", 0); - this.setHardness(1.0F); + this.setHardness(0.5F); + this.setResistance(5.0F); this.setStepSound(soundTypeWood); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java index 2de61b2b2..5363e1224 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java @@ -25,7 +25,8 @@ public class BlockFishingNet extends BlockContainerBase implements INameableItem public BlockFishingNet(){ super(Material.wood); this.setHarvestLevel("axe", 0); - this.setHardness(1.0F); + this.setHardness(0.5F); + this.setResistance(3.0F); this.setStepSound(soundTypeWood); this.setBlockBounds(0F, 0F, 0F, 1F, 1F/16F, 1F); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java index 1bc252842..d16fe5793 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java @@ -35,7 +35,8 @@ public class BlockFluidCollector extends BlockContainerBase implements INameable super(Material.rock); this.isPlacer = isPlacer; this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java index a0d624d73..269adb224 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java @@ -35,7 +35,8 @@ public class BlockFurnaceDouble extends BlockContainerBase implements INameableI public BlockFurnaceDouble(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); this.setTickRandomly(true); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java index e718520f6..d7291088e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java @@ -25,7 +25,8 @@ public class BlockFurnaceSolar extends BlockContainerBase implements INameableIt public BlockFurnaceSolar(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); this.setBlockBounds(0F, 0F, 0F, 1F, 3F/16F, 1F); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java index 743bf8289..97a4d8271 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java @@ -24,7 +24,8 @@ public class BlockGeneric extends Block implements INameableItem{ super(Material.rock); this.name = name; this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java index 3129e4749..e1e5faa58 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java @@ -29,7 +29,8 @@ public class BlockGiantChest extends BlockContainerBase implements INameableItem public BlockGiantChest(){ super(Material.wood); this.setHarvestLevel("axe", 0); - this.setHardness(1.0F); + this.setHardness(0.5F); + this.setResistance(15.0F); this.setStepSound(soundTypeWood); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java index 31b421f4f..5cfdd68c4 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java @@ -26,7 +26,8 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements INameabl public BlockGreenhouseGlass(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(0.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java index d6864e2ab..fb9576519 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java @@ -36,7 +36,8 @@ public class BlockGrinder extends BlockContainerBase implements INameableItem{ super(Material.rock); this.isDouble = isDouble; this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); this.setTickRandomly(true); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java index acc2f0c30..56c026745 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java @@ -27,7 +27,8 @@ public class BlockHeatCollector extends BlockContainerBase implements INameableI public BlockHeatCollector(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(2.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java index e9083067e..8be2cb27a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java @@ -30,7 +30,8 @@ public class BlockInputter extends BlockContainerBase implements INameableItem{ public BlockInputter(boolean isAdvanced){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); this.setTickRandomly(true); this.isAdvanced = isAdvanced; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java index 82cf27396..9b806aa36 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java @@ -30,7 +30,8 @@ public class BlockItemRepairer extends BlockContainerBase implements INameableIt public BlockItemRepairer(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(20.0F); + this.setResistance(15.0F); this.setStepSound(soundTypeStone); this.setTickRandomly(true); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java index 6ba9caa53..f5c23e19b 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java @@ -29,7 +29,8 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IN public BlockLavaFactoryController(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(4.5F); + this.setResistance(20.0F); this.setStepSound(soundTypeStone); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java index 83b5cfe05..6a1c3adcc 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java @@ -27,6 +27,7 @@ public class BlockMisc extends Block implements INameableItem{ public BlockMisc(){ super(Material.rock); this.setHardness(1.5F); + this.setResistance(10.0F); this.setHarvestLevel("pickaxe", 1); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java index 6c20be3b7..51914b7b1 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java @@ -30,7 +30,8 @@ public class BlockOilGenerator extends BlockContainerBase implements INameableIt public BlockOilGenerator(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); this.setTickRandomly(true); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java index c6a4f29b0..4434f319c 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java @@ -25,7 +25,8 @@ public class BlockPhantomBooster extends BlockContainerBase implements INameable public BlockPhantomBooster(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(1.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); float f = 1F/16F; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomface.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomface.java index 12dc69441..1bbcfc6b8 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomface.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomface.java @@ -38,7 +38,8 @@ public class BlockPhantomface extends BlockContainerBase implements INameableIte super(Material.rock); this.type = type; this.setHarvestLevel("pickaxe", 0); - this.setHardness(1.0F); + this.setHardness(4.5F); + this.setResistance(10.0F); this.setStepSound(soundTypeStone); if(type == FACE || type == LIQUIFACE || type == ENERGYFACE) this.range = ConfigIntValues.PHANTOMFACE_RANGE.getValue(); diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java index 7724b2852..1216e26c3 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java @@ -26,6 +26,8 @@ public class BlockSlabs extends Block implements INameableItem{ public BlockSlabs(String name, Block fullBlock){ super(Material.rock); + this.setHardness(1.5F); + this.setResistance(10.0F); this.fullBlock = fullBlock; this.name = name; }