From d31cf8ddbc52c9d5d9792762fd7d06a756848ff3 Mon Sep 17 00:00:00 2001 From: Craig Burton Date: Thu, 7 Apr 2016 14:49:31 -0400 Subject: [PATCH] Update ore dictionary (#2721) Updated the Ore Dictionary with more vanilla items: -Prismarine Shard ( "gemPrismarine" ) -Prismarine Crystals ( "dustPrismarine" ) -Prismarine Block ( "blockPrismarine" ) -Prismarine Brick ( "blockPrismarineBrick" ) -Dark Prismarine ( "blockDarkPrismarine" ) -Nether Wart ( "cropNetherWart" ) -Sugarcane ( "sugarcane" ) -Paper ( "paper" ) -Ender Pearl ( "enderpearl" ) -Bone ( "bone) -Gunpowder ( "gunpowder) -String ( "string" ) -Nether Star ( "netherStar" ) -Leather ( "leather" ) -Feather ( "feather" ) -Egg ( "egg" ) -End Stone ( "endstone" ) -Torch ( "torch" ) -Vine ( "vine" ) -Cactus ( "blockCactus" ) -Grass ( "grass") -Obsidian ( "obsidian" ) -Red Sandstone ( added to "sandstone" ) -Crafting Table ( "workbench" ) -Slime Block ( "blockSlime" ) -Granite ( "stoneGranite" ) -Polished Granite ( "stoneGranitePolished" ) -Diorite ( "stoneDiorite" ) -Polished Diorite ( "stoneDioritePolished" ) -Andesite ( "stoneAndesite" ) -Polished Andesite ( "stoneAndesitePolished" ) --- .../minecraftforge/oredict/OreDictionary.java | 151 ++++++++++++++---- 1 file changed, 121 insertions(+), 30 deletions(-) diff --git a/src/main/java/net/minecraftforge/oredict/OreDictionary.java b/src/main/java/net/minecraftforge/oredict/OreDictionary.java index 5202172444..d420e6237f 100644 --- a/src/main/java/net/minecraftforge/oredict/OreDictionary.java +++ b/src/main/java/net/minecraftforge/oredict/OreDictionary.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraft.block.BlockPrismarine; import net.minecraft.util.ResourceLocation; import org.apache.logging.log4j.Level; @@ -55,6 +56,7 @@ public class OreDictionary { if (!hasInit) { + // tree- and wood-related things registerOre("logWood", new ItemStack(Blocks.log, 1, WILDCARD_VALUE)); registerOre("logWood", new ItemStack(Blocks.log2, 1, WILDCARD_VALUE)); registerOre("plankWood", new ItemStack(Blocks.planks, 1, WILDCARD_VALUE)); @@ -69,6 +71,9 @@ public class OreDictionary registerOre("treeSapling", new ItemStack(Blocks.sapling, 1, WILDCARD_VALUE)); registerOre("treeLeaves", new ItemStack(Blocks.leaves, 1, WILDCARD_VALUE)); registerOre("treeLeaves", new ItemStack(Blocks.leaves2, 1, WILDCARD_VALUE)); + registerOre("vine", Blocks.vine); + + // Ores registerOre("oreGold", Blocks.gold_ore); registerOre("oreIron", Blocks.iron_ore); registerOre("oreLapis", Blocks.lapis_ore); @@ -77,6 +82,25 @@ public class OreDictionary registerOre("oreEmerald", Blocks.emerald_ore); registerOre("oreQuartz", Blocks.quartz_ore); registerOre("oreCoal", Blocks.coal_ore); + + // ingots/nuggets + registerOre("ingotIron", Items.iron_ingot); + registerOre("ingotGold", Items.gold_ingot); + registerOre("ingotBrick", Items.brick); + registerOre("ingotBrickNether", Items.netherbrick); + registerOre("nuggetGold", Items.gold_nugget); + + // gems and dusts + registerOre("gemDiamond", Items.diamond); + registerOre("gemEmerald", Items.emerald); + registerOre("gemQuartz", Items.quartz); + registerOre("gemPrismarine", Items.prismarine_shard); + registerOre("dustPrismarine", Items.prismarine_crystals); + registerOre("dustRedstone", Items.redstone); + registerOre("dustGlowstone", Items.glowstone_dust); + registerOre("gemLapis", new ItemStack(Items.dye, 1, 4)); + + // storage blocks registerOre("blockGold", Blocks.gold_block); registerOre("blockIron", Blocks.iron_block); registerOre("blockLapis", Blocks.lapis_block); @@ -85,35 +109,31 @@ public class OreDictionary registerOre("blockEmerald", Blocks.emerald_block); registerOre("blockQuartz", Blocks.quartz_block); registerOre("blockCoal", Blocks.coal_block); - registerOre("blockGlassColorless", Blocks.glass); - registerOre("blockGlass", Blocks.glass); - registerOre("blockGlass", new ItemStack(Blocks.stained_glass, 1, WILDCARD_VALUE)); - //blockGlass{Color} is added below with dyes - registerOre("paneGlassColorless", Blocks.glass_pane); - registerOre("paneGlass", Blocks.glass_pane); - registerOre("paneGlass", new ItemStack(Blocks.stained_glass_pane, 1, WILDCARD_VALUE)); - //paneGlass{Color} is added below with dyes - registerOre("ingotIron", Items.iron_ingot); - registerOre("ingotGold", Items.gold_ingot); - registerOre("ingotBrick", Items.brick); - registerOre("ingotBrickNether", Items.netherbrick); - registerOre("nuggetGold", Items.gold_nugget); - registerOre("gemDiamond", Items.diamond); - registerOre("gemEmerald", Items.emerald); - registerOre("gemQuartz", Items.quartz); - registerOre("dustRedstone", Items.redstone); - registerOre("dustGlowstone", Items.glowstone_dust); - registerOre("gemLapis", new ItemStack(Items.dye, 1, 4)); - registerOre("slimeball", Items.slime_ball); - registerOre("glowstone", Blocks.glowstone); + + // crops registerOre("cropWheat", Items.wheat); registerOre("cropPotato", Items.potato); registerOre("cropCarrot", Items.carrot); - registerOre("stone", Blocks.stone); - registerOre("cobblestone", Blocks.cobblestone); - registerOre("sandstone", new ItemStack(Blocks.sandstone, 1, WILDCARD_VALUE)); - registerOre("sand", new ItemStack(Blocks.sand, 1, WILDCARD_VALUE)); + registerOre("cropNetherWart", Items.nether_wart); + registerOre("sugarcane", Items.reeds); + registerOre("blockCactus", Blocks.cactus); + + // misc materials registerOre("dye", new ItemStack(Items.dye, 1, WILDCARD_VALUE)); + registerOre("paper", new ItemStack(Items.paper)); + + // mob drops + registerOre("slimeball", Items.slime_ball); + registerOre("enderpearl", Items.ender_pearl); + registerOre("bone", Items.bone); + registerOre("gunpowder", Items.gunpowder); + registerOre("string", Items.string); + registerOre("netherStar", Items.nether_star); + registerOre("leather", Items.leather); + registerOre("feather", Items.feather); + registerOre("egg", Items.egg); + + // records registerOre("record", Items.record_13); registerOre("record", Items.record_cat); registerOre("record", Items.record_blocks); @@ -126,6 +146,42 @@ public class OreDictionary registerOre("record", Items.record_ward); registerOre("record", Items.record_11); registerOre("record", Items.record_wait); + + // blocks + registerOre("dirt", Blocks.dirt); + registerOre("grass", Blocks.grass); + registerOre("stone", Blocks.stone); + registerOre("cobblestone", Blocks.cobblestone); + registerOre("gravel", Blocks.gravel); + registerOre("sand", new ItemStack(Blocks.sand, 1, WILDCARD_VALUE)); + registerOre("sandstone", new ItemStack(Blocks.sandstone, 1, WILDCARD_VALUE)); + registerOre("sandstone", new ItemStack(Blocks.red_sandstone, 1, WILDCARD_VALUE)); + registerOre("netherrack", Blocks.netherrack); + registerOre("obsidian", Blocks.obsidian); + registerOre("glowstone", Blocks.glowstone); + registerOre("endstone", Blocks.end_stone); + registerOre("torch", Blocks.torch); + registerOre("workbench", Blocks.crafting_table); + registerOre("blockSlime", Blocks.slime_block); + registerOre("blockPrismarine", new ItemStack(Blocks.prismarine, 1, BlockPrismarine.EnumType.ROUGH.getMetadata())); + registerOre("blockPrismarineBrick", new ItemStack(Blocks.prismarine, 1, BlockPrismarine.EnumType.BRICKS.getMetadata())); + registerOre("blockPrismarineDark", new ItemStack(Blocks.prismarine, 1, BlockPrismarine.EnumType.DARK.getMetadata())); + registerOre("stoneGranite", new ItemStack(Blocks.stone, 1, 1)); + registerOre("stoneGranitePolished", new ItemStack(Blocks.stone, 1, 2)); + registerOre("stoneDiorite", new ItemStack(Blocks.stone, 1, 3)); + registerOre("stoneDioritePolished", new ItemStack(Blocks.stone, 1, 4)); + registerOre("stoneAndesite", new ItemStack(Blocks.stone, 1, 5)); + registerOre("stoneAndesitePolished", new ItemStack(Blocks.stone, 1, 6)); + registerOre("blockGlassColorless", Blocks.glass); + registerOre("blockGlass", Blocks.glass); + registerOre("blockGlass", new ItemStack(Blocks.stained_glass, 1, WILDCARD_VALUE)); + //blockGlass{Color} is added below with dyes + registerOre("paneGlassColorless", Blocks.glass_pane); + registerOre("paneGlass", Blocks.glass_pane); + registerOre("paneGlass", new ItemStack(Blocks.stained_glass_pane, 1, WILDCARD_VALUE)); + //paneGlass{Color} is added below with dyes + + // chests registerOre("chest", Blocks.chest); registerOre("chest", Blocks.ender_chest); registerOre("chest", Blocks.trapped_chest); @@ -136,23 +192,58 @@ public class OreDictionary // Build our list of items to replace with ore tags Map replacements = new HashMap(); + + // wood-related things replacements.put(new ItemStack(Items.stick), "stickWood"); replacements.put(new ItemStack(Blocks.planks), "plankWood"); replacements.put(new ItemStack(Blocks.planks, 1, WILDCARD_VALUE), "plankWood"); replacements.put(new ItemStack(Blocks.wooden_slab, 1, WILDCARD_VALUE), "slabWood"); - replacements.put(new ItemStack(Blocks.stone), "stone"); - //replacements.put(new ItemStack(Blocks.stone, 1, WILDCARD_VALUE), "stone"); - replacements.put(new ItemStack(Blocks.cobblestone), "cobblestone"); - replacements.put(new ItemStack(Blocks.cobblestone, 1, WILDCARD_VALUE), "cobblestone"); + + // ingots/nuggets replacements.put(new ItemStack(Items.gold_ingot), "ingotGold"); replacements.put(new ItemStack(Items.iron_ingot), "ingotIron"); + + // gems and dusts replacements.put(new ItemStack(Items.diamond), "gemDiamond"); replacements.put(new ItemStack(Items.emerald), "gemEmerald"); + replacements.put(new ItemStack(Items.prismarine_shard), "gemPrismarine"); + replacements.put(new ItemStack(Items.prismarine_crystals), "dustPrismarine"); replacements.put(new ItemStack(Items.redstone), "dustRedstone"); replacements.put(new ItemStack(Items.glowstone_dust), "dustGlowstone"); - replacements.put(new ItemStack(Blocks.glowstone), "glowstone"); + + // crops + replacements.put(new ItemStack(Items.reeds), "sugarcane"); + replacements.put(new ItemStack(Blocks.cactus), "blockCactus"); + + // misc materials + replacements.put(new ItemStack(Items.paper), "paper"); + + // mob drops replacements.put(new ItemStack(Items.slime_ball), "slimeball"); + replacements.put(new ItemStack(Items.string), "string"); + replacements.put(new ItemStack(Items.leather), "leather"); + replacements.put(new ItemStack(Items.ender_pearl), "enderpearl"); + replacements.put(new ItemStack(Items.gunpowder), "gunpowder"); + replacements.put(new ItemStack(Items.nether_star), "netherStar"); + replacements.put(new ItemStack(Items.feather), "feather"); + replacements.put(new ItemStack(Items.bone), "bone"); + replacements.put(new ItemStack(Items.egg), "egg"); + + // blocks + replacements.put(new ItemStack(Blocks.stone), "stone"); + replacements.put(new ItemStack(Blocks.cobblestone), "cobblestone"); + replacements.put(new ItemStack(Blocks.cobblestone, 1, WILDCARD_VALUE), "cobblestone"); + replacements.put(new ItemStack(Blocks.glowstone), "glowstone"); replacements.put(new ItemStack(Blocks.glass), "blockGlassColorless"); + replacements.put(new ItemStack(Blocks.prismarine), "prismarine"); + replacements.put(new ItemStack(Blocks.stone, 1, 1), "stoneGranite"); + replacements.put(new ItemStack(Blocks.stone, 1, 2), "stoneGranitePolished"); + replacements.put(new ItemStack(Blocks.stone, 1, 3), "stoneDiorite"); + replacements.put(new ItemStack(Blocks.stone, 1, 4), "stoneDioritePolished"); + replacements.put(new ItemStack(Blocks.stone, 1, 5), "stoneAndesite"); + replacements.put(new ItemStack(Blocks.stone, 1, 6), "stoneAndesitePolished"); + + // chests replacements.put(new ItemStack(Blocks.chest), "chestWood"); replacements.put(new ItemStack(Blocks.ender_chest), "chestEnder"); replacements.put(new ItemStack(Blocks.trapped_chest), "chestTrapped");