From 5ff8b549d989f307118fe0ebd2c37fff312219c5 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 24 Jan 2015 22:21:26 +0000 Subject: [PATCH] The Elementium Pickaxe (and Elementium Tipped Terra Shatterer) will now look in the ore dictionary for what blocks not to break. Should help with Underground Biomes and other mods that add new stones. --- .../botania/common/block/ModBlocks.java | 1 + .../tool/elementium/ItemElementiumPick.java | 21 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index d1c6b3cd7..2e6ee0526 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -298,6 +298,7 @@ public final class ModBlocks { OreDictionary.registerOre("snowLayer", Blocks.snow_layer); OreDictionary.registerOre("mycelium", Blocks.mycelium); OreDictionary.registerOre("podzol", new ItemStack(Blocks.dirt, 1, 2)); + OreDictionary.registerOre("netherrack", Blocks.netherrack); initTileEntities(); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 00d40b18d..33cba8dd2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -1,13 +1,13 @@ package vazkii.botania.common.item.equipment.tool.elementium; -import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; +import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ItemTerraPick; @@ -17,14 +17,9 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ItemElementiumPick extends ItemManasteelPick { - static final List validBlocks = new ArrayList() {private static final long serialVersionUID = 2265395319423142758L; - { - add(Blocks.dirt); - add(Block.getBlockFromName("sand")); - add(Block.getBlockFromName("gravel")); - add(Blocks.cobblestone); - add(Blocks.netherrack); - }}; + static final List validBlocks = Arrays.asList(new String[] { + "dirt", "sand", "gravel", "cobblestone", "netherrack" + }); public ItemElementiumPick() { super(BotaniaAPI.elementiumToolMaterial, LibItemNames.ELEMENTIUM_PICK); @@ -48,7 +43,11 @@ public class ItemElementiumPick extends ItemManasteelPick { } public static boolean isDisposable(Block block) { - return validBlocks.contains(block); + for(int id : OreDictionary.getOreIDs(new ItemStack(block))) + if(validBlocks.contains(OreDictionary.getOreName(id))) + return true; + + return false; } }