diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 170b5dd7f..2f60e8e1a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1727,10 +1727,11 @@ public final class ModCraftingRecipes { // Revealing Helmet Recipes if(Botania.thaumcraftLoaded) { - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manasteelHelmRevealing), new ItemStack(ModItems.manasteelHelm), (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles")); + Item goggles = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles"); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manasteelHelmRevealing), new ItemStack(ModItems.manasteelHelm), goggles); recipeHelmetOfRevealing = BotaniaAPI.getLatestAddedRecipe(); //We want manasteel to show in the Lexicon - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), new ItemStack(ModItems.terrasteelHelm), (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles")); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.elementiumHelmRevealing), new ItemStack(ModItems.elementiumHelm), (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles")); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), new ItemStack(ModItems.terrasteelHelm), goggles); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.elementiumHelmRevealing), new ItemStack(ModItems.elementiumHelm), goggles); } // Slab & Stair Recipes diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index 02a80542c..719b71906 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -23,6 +23,9 @@ public class HelmRevealingRecipe implements IRecipe { @Override public boolean matches(InventoryCrafting var1, World var2) { + Item goggles = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles"); + if(goggles == null) + return false; // NO TC loaded boolean foundGoggles = false; boolean foundHelm = false; @@ -31,10 +34,8 @@ public class HelmRevealingRecipe implements IRecipe { if(stack != null) { if(checkHelm(stack)) foundHelm = true; - - else if(stack.getItem() == (Item) Item.itemRegistry.getObject("Thaumcraft:ItemGoggles")) + else if(stack.getItem() == goggles) foundGoggles = true; - else return false; // Found an invalid item, breaking the recipe } } @@ -59,26 +60,19 @@ public class HelmRevealingRecipe implements IRecipe { ItemStack newHelm; - if(helmItem == ModItems.manasteelHelm){ + if(helmItem == ModItems.manasteelHelm) newHelm = new ItemStack(ModItems.manasteelHelmRevealing); - } - - else if(helmItem == ModItems.terrasteelHelm){ + else if(helmItem == ModItems.terrasteelHelm) newHelm = new ItemStack(ModItems.terrasteelHelmRevealing); - } - - else if(helmItem == ModItems.elementiumHelm){ + else if(helmItem == ModItems.elementiumHelm) newHelm = new ItemStack(ModItems.elementiumHelmRevealing); - } - else{ - return null; - } + else return null; //Copy Ancient Wills - for(int i = 0; i < 6; i++){ + for(int i = 0; i < 6; i++) if(ItemNBTHelper.getBoolean(helmCopy, "AncientWill" + i, false)) ItemNBTHelper.setBoolean(newHelm, "AncientWill" + i, true); - } + //Copy Enchantments NBTTagList enchList = ItemNBTHelper.getList(helmCopy, "ench", 10, true); if(enchList != null) @@ -99,7 +93,7 @@ public class HelmRevealingRecipe implements IRecipe { private boolean checkHelm(ItemStack helmStack) { Item helmItem = helmStack.getItem(); - return (helmItem == ModItems.manasteelHelm || helmItem == ModItems.terrasteelHelm || helmItem == ModItems.elementiumHelm); + return helmItem == ModItems.manasteelHelm || helmItem == ModItems.terrasteelHelm || helmItem == ModItems.elementiumHelm; } } \ No newline at end of file