mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 19:29:31 +00:00
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.
This commit is contained in:
1 parent
dadd9f25b5
commit
5ff8b549d9
2 files changed
+11
-11
No files matched your search
@@ -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();
|
||||
}
|
||||
|
||||
+10
-11
@@ -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<Block> 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<String> 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;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user