From 9a11ebef1f85b02fef5798e964713971be3a8e53 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 22 Jun 2016 19:16:52 -0500 Subject: [PATCH] Fix 1.8 stones not being voided, clean up ore dict registrations that are no longer needed --- .../botania/common/block/ModBlocks.java | 14 ------------- .../common/crafting/ModCraftingRecipes.java | 6 +++--- .../tool/elementium/ItemElementiumPick.java | 21 ++++++++++++------- .../vazkii/botania/common/lib/LibOreDict.java | 7 ------- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 61de7cb57..64e8a2a18 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -381,27 +381,13 @@ public final class ModBlocks { OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock); // Vanilla OreDict entries - OreDictionary.registerOre("dirt", Blocks.DIRT); - OreDictionary.registerOre("grass", Blocks.GRASS); - OreDictionary.registerOre("sand", Block.getBlockFromName("sand")); - OreDictionary.registerOre("gravel", Block.getBlockFromName("gravel")); OreDictionary.registerOre("hardenedClay", new ItemStack(Blocks.HARDENED_CLAY, 1, OreDictionary.WILDCARD_VALUE)); 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); OreDictionary.registerOre("soulSand", Blocks.SOUL_SAND); OreDictionary.registerOre("ice", Blocks.ICE); OreDictionary.registerOre("slabCobblestone", new ItemStack(Blocks.STONE_SLAB, 1, 3)); - OreDictionary.registerOre("chestWood", Blocks.CHEST); - OreDictionary.registerOre("craftingTableWood", Blocks.CRAFTING_TABLE); - OreDictionary.registerOre(LibOreDict.PRISMARINE_BLOCK, new ItemStack(Blocks.PRISMARINE, 1, OreDictionary.WILDCARD_VALUE)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[3], new ItemStack(Blocks.STONE, 1, 1)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[2], new ItemStack(Blocks.STONE, 1, 3)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[0], new ItemStack(Blocks.STONE, 1, 5)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[7], new ItemStack(Blocks.STONE, 1, 2)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[6], new ItemStack(Blocks.STONE, 1, 4)); - OreDictionary.registerOre(LibOreDict.STONE_18_VARIANTS[4], new ItemStack(Blocks.STONE, 1, 6)); BotaniaAPI.registerPaintableBlock(unstableBlock, BotaniaStateProps.COLOR); BotaniaAPI.registerPaintableBlock(manaBeacon, BotaniaStateProps.COLOR); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index a15b29c37..0378ea537 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1243,12 +1243,12 @@ public final class ModCraftingRecipes { // Crafty Crate Recipe GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.openCrate, 1, 1), "WCW", "W W", "W W", - 'C', "craftingTableWood", + 'C', "workbench", 'W', new ItemStack(ModBlocks.dreamwood, 1, 1))); recipeCraftCrate = BotaniaAPI.getLatestAddedRecipe(); // Crafting Placeholder Recipe - addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 32, 11), "craftingTableWood", LibOreDict.LIVING_ROCK); + addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 32, 11), "workbench", LibOreDict.LIVING_ROCK); recipePlaceholder = BotaniaAPI.getLatestAddedRecipe(); // Nether Brick Recipe @@ -1523,7 +1523,7 @@ public final class ModCraftingRecipes { " P ", "ICI", " I ", 'P', LibOreDict.MANA_PEARL, 'I', LibOreDict.MANA_STEEL, - 'C', "craftingTableWood"); + 'C', "workbench"); recipeCraftingHalo = BotaniaAPI.getLatestAddedRecipe(); // Mana Lens: Flash Recipe 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 0b008d15c..adc263411 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 @@ -27,11 +27,8 @@ public class ItemElementiumPick extends ItemManasteelPick { for(int i = 0; i < event.getDrops().size(); i++) { ItemStack drop = event.getDrops().get(i); if(drop != null) { - Block block = Block.getBlockFromItem(drop.getItem()); - if(block != null){ - if(isDisposable(block) || (isSemiDisposable(block) && !event.getHarvester().isSneaking())) - event.getDrops().remove(i); - } + if(isDisposable(drop) || (isSemiDisposable(drop) && !event.getHarvester().isSneaking())) + event.getDrops().remove(i); } } } @@ -39,7 +36,11 @@ public class ItemElementiumPick extends ItemManasteelPick { } public static boolean isDisposable(Block block) { - for(int id : OreDictionary.getOreIDs(new ItemStack(block))) { + return isDisposable(new ItemStack(block)); + } + + private static boolean isDisposable(ItemStack stack) { + for(int id : OreDictionary.getOreIDs(stack)) { String name = OreDictionary.getOreName(id); if(BotaniaAPI.disposableBlocks.contains(name)) return true; @@ -47,8 +48,12 @@ public class ItemElementiumPick extends ItemManasteelPick { return false; } - public static boolean isSemiDisposable(Block block) { - for(int id : OreDictionary.getOreIDs(new ItemStack(block))) { + private static boolean isSemiDisposable(Block block) { + return isSemiDisposable(new ItemStack(block)); + } + + private static boolean isSemiDisposable(ItemStack stack) { + for(int id : OreDictionary.getOreIDs(stack)) { String name = OreDictionary.getOreName(id); if(BotaniaAPI.semiDisposableBlocks.contains(name)) return true; diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index 145ed4827..21d9e56b1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -84,13 +84,6 @@ public final class LibOreDict { "runeSlothB", "runeWrathB", "runeEnvyB", "runePrideB" }; - public static final String[] STONE_18_VARIANTS = new String[] { - "stoneAndesite", "stoneBasalt", "stoneDiorite", "stoneGranite", - "stoneAndesitePolished", "stoneBasaltPolished", "stoneDioritePolished", "stoneGranitePolished", - "stoneAndesiteBricks", "stoneBasaltBricks", "stoneDioriteBricks", "stoneGraniteBricks", - "stoneAndesiteChiseled", "stoneBasaltChiseled", "stoneDioriteChiseled", "stoneGraniteChiseled" - }; - public static final String[] QUARTZ = new String[] { "quartzDark", "quartzMana", "quartzBlaze", "quartzLavender", "quartzRed", "quartzElven", "quartzSunny"