diff --git a/src/main/java/forestry/apiculture/blocks/BlockApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockApiculture.java index e2e2dc9b6..623ef9ce8 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockApiculture.java @@ -12,10 +12,11 @@ package forestry.apiculture.blocks; import forestry.api.core.Tabs; import forestry.core.blocks.BlockBase; +import net.minecraft.block.material.Material; public class BlockApiculture extends BlockBase { public BlockApiculture(BlockTypeApiculture type) { - super(type); + super(type, Material.WOOD); setCreativeTab(Tabs.tabApiculture); setHarvestLevel("axe", 0); } diff --git a/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java index bbd44fd2f..e9f1af7b4 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockRegistryApiculture.java @@ -12,6 +12,7 @@ package forestry.apiculture.blocks; import java.util.Map; +import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import forestry.api.core.Tabs; @@ -36,7 +37,7 @@ public class BlockRegistryApiculture extends BlockRegistry { beeHouse = new BlockApiculture(BlockTypeApiculture.BEE_HOUSE); registerBlock(beeHouse, new ItemBlockForestry(beeHouse), "bee_house"); - beeChest = new BlockBase<>(BlockTypeApicultureTesr.APIARIST_CHEST); + beeChest = new BlockBase<>(BlockTypeApicultureTesr.APIARIST_CHEST, Material.WOOD); registerBlock(beeChest, new ItemBlockForestry(beeChest), "bee_chest"); beeChest.setCreativeTab(Tabs.tabApiculture); beeChest.setHarvestLevel("axe", 0); diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java index c3fb06102..88c3d25bf 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArboriculture.java @@ -12,10 +12,12 @@ package forestry.arboriculture.blocks; import forestry.api.core.Tabs; import forestry.core.blocks.BlockBase; +import net.minecraft.block.material.Material; public class BlockArboriculture extends BlockBase { public BlockArboriculture(BlockTypeArboricultureTesr type) { - super(type); + super(type, Material.WOOD); setCreativeTab(Tabs.tabArboriculture); + setHarvestLevel("axe", 0); } } diff --git a/src/main/java/forestry/core/blocks/BlockBase.java b/src/main/java/forestry/core/blocks/BlockBase.java index be7bfb0c0..096f807bd 100644 --- a/src/main/java/forestry/core/blocks/BlockBase.java +++ b/src/main/java/forestry/core/blocks/BlockBase.java @@ -74,8 +74,8 @@ public class BlockBase

& IBlockType & IStringSerializable> ext protected final BlockStateContainer blockState; - public BlockBase(@Nonnull P blockType) { - super(Material.IRON); + public BlockBase(@Nonnull P blockType, Material material) { + super(material); this.blockType = blockType; blockType.getMachineProperties().setBlock(this); @@ -90,6 +90,10 @@ public class BlockBase

& IBlockType & IStringSerializable> ext particleCallback = new MachineParticleCallback<>(this, blockType); } + + public BlockBase(@Nonnull P blockType) { + this(blockType, Material.IRON); + } @Override public boolean isOpaqueCube(IBlockState state) { diff --git a/src/main/java/forestry/core/blocks/BlockCore.java b/src/main/java/forestry/core/blocks/BlockCore.java index 30bdaddac..cd3d022cd 100644 --- a/src/main/java/forestry/core/blocks/BlockCore.java +++ b/src/main/java/forestry/core/blocks/BlockCore.java @@ -13,5 +13,6 @@ package forestry.core.blocks; public class BlockCore extends BlockBase { public BlockCore(BlockTypeCoreTesr blockType) { super(blockType); + setHarvestLevel("pickaxe", 0); } } diff --git a/src/main/java/forestry/core/items/ItemForestryTool.java b/src/main/java/forestry/core/items/ItemForestryTool.java index ed314fae1..200d2d1e7 100755 --- a/src/main/java/forestry/core/items/ItemForestryTool.java +++ b/src/main/java/forestry/core/items/ItemForestryTool.java @@ -17,7 +17,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; +import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemTool; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -48,6 +50,15 @@ public class ItemForestryTool extends ItemForestry { public void setEfficiencyOnProperMaterial(float efficiencyOnProperMaterial) { this.efficiencyOnProperMaterial = efficiencyOnProperMaterial; } + + @Override + public boolean canHarvestBlock(IBlockState block) { + if(this == PluginCore.items.bronzePickaxe){ + Material material = block.getMaterial(); + return material == Material.ROCK ? true : (material == Material.IRON ? true : material == Material.ANVIL); + } + return super.canHarvestBlock(block); + } @Override public float getStrVsBlock(ItemStack itemstack, IBlockState state) { @@ -56,6 +67,10 @@ public class ItemForestryTool extends ItemForestry { return efficiencyOnProperMaterial; } } + if(this == PluginCore.items.bronzePickaxe){ + Material material = state.getMaterial(); + return material != Material.IRON && material != Material.ANVIL && material != Material.ROCK ? super.getStrVsBlock(itemstack, state) : this.efficiencyOnProperMaterial; + } return super.getStrVsBlock(itemstack, state); } diff --git a/src/main/java/forestry/energy/blocks/BlockEngine.java b/src/main/java/forestry/energy/blocks/BlockEngine.java index 65c722f45..26002e4b5 100644 --- a/src/main/java/forestry/energy/blocks/BlockEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockEngine.java @@ -56,6 +56,7 @@ public class BlockEngine extends BlockBase { public BlockEngine(BlockTypeEngine blockType) { super(blockType); + setHarvestLevel("pickaxe", 0); } @Override diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java b/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java index 827de9561..7805d0f2d 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryPlain.java @@ -15,5 +15,6 @@ import forestry.core.blocks.BlockBase; public class BlockFactoryPlain extends BlockBase { public BlockFactoryPlain(BlockTypeFactoryPlain type) { super(type); + setHarvestLevel("pickaxe", 0); } } diff --git a/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java b/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java index ffc16a982..7df053488 100644 --- a/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java +++ b/src/main/java/forestry/factory/blocks/BlockFactoryTESR.java @@ -15,5 +15,6 @@ import forestry.core.blocks.BlockBase; public class BlockFactoryTESR extends BlockBase { public BlockFactoryTESR(BlockTypeFactoryTesr type) { super(type); + setHarvestLevel("pickaxe", 0); } } diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java b/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java index fe3b6fb91..34cf57d36 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockLepidopterology.java @@ -12,10 +12,12 @@ package forestry.lepidopterology.blocks; import forestry.api.core.Tabs; import forestry.core.blocks.BlockBase; +import net.minecraft.block.material.Material; public class BlockLepidopterology extends BlockBase { public BlockLepidopterology(BlockTypeLepidopterologyTesr type) { - super(type); + super(type, Material.WOOD); setCreativeTab(Tabs.tabLepidopterology); + setHarvestLevel("axe", 0); } } diff --git a/src/main/java/forestry/mail/blocks/BlockMail.java b/src/main/java/forestry/mail/blocks/BlockMail.java index 5e71a4c32..159f2421a 100644 --- a/src/main/java/forestry/mail/blocks/BlockMail.java +++ b/src/main/java/forestry/mail/blocks/BlockMail.java @@ -15,5 +15,6 @@ import forestry.core.blocks.BlockBase; public class BlockMail extends BlockBase { public BlockMail(BlockTypeMail blockType) { super(blockType); + setHarvestLevel("pickaxe", 0); } }