From 60178eeb3f5eb86205e879468dba94bdcb81ea73 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 22 Mar 2014 21:21:47 +0800 Subject: [PATCH] Registered alloys in the ore dictionary. --- common/crazypants/enderio/material/ItemMaterial.java | 12 ++++++++++++ .../crazypants/enderio/material/MaterialRecipes.java | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/common/crazypants/enderio/material/ItemMaterial.java b/common/crazypants/enderio/material/ItemMaterial.java index ce85e204..be4bc1a3 100644 --- a/common/crazypants/enderio/material/ItemMaterial.java +++ b/common/crazypants/enderio/material/ItemMaterial.java @@ -64,4 +64,16 @@ public class ItemMaterial extends Item { } } + @Override + public boolean hasEffect(ItemStack par1ItemStack, int pass) { + if(par1ItemStack == null) { + return false; + } + int damage = par1ItemStack.getItemDamage(); + if(damage == Material.VIBRANT_CYSTAL.ordinal()) { + return true; + } + return false; + } + } diff --git a/common/crazypants/enderio/material/MaterialRecipes.java b/common/crazypants/enderio/material/MaterialRecipes.java index 1d862e6e..cd9b04db 100644 --- a/common/crazypants/enderio/material/MaterialRecipes.java +++ b/common/crazypants/enderio/material/MaterialRecipes.java @@ -24,9 +24,16 @@ public class MaterialRecipes { OreDictionary.registerOre("dustGold", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_GOLD.ordinal())); OreDictionary.registerOre("dustCopper", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_COPPER.ordinal())); OreDictionary.registerOre("dustTin", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_TIN.ordinal())); + + OreDictionary.registerOre("gearStone", new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.BASIC_GEAR.ordinal())); + OreDictionary.registerOre("dustEnderPearl", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_ENDER.ordinal())); OreDictionary.registerOre("itemSilicon", new ItemStack(ModObject.itemMaterial.actualId, 1, Material.SILICON.ordinal())); - OreDictionary.registerOre("gearStone", new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.BASIC_GEAR.ordinal())); + OreDictionary.registerOre("ingotConductiveIron", new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.CONDUCTIVE_IRON.ordinal())); + OreDictionary.registerOre("ingotElectricalSteel", new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ELECTRICAL_STEEL.ordinal())); + OreDictionary.registerOre("ingotEnergeticAlloy", new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENERGETIC_ALLOY.ordinal())); + OreDictionary.registerOre("ingotVibrantAlloy", new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_GOLD.ordinal())); + OreDictionary.registerOre("ingotPulsatingIron", new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_IRON.ordinal())); int oreId = OreDictionary.getOreID("glass"); ArrayList ingots = OreDictionary.getOres(oreId);