upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-14 01:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR fixes.

Browse Source
This commit is contained in:
Lizbeth Rika committed 2015-05-12 15:42:19 +01:00
1 parent c4173e1595
commit 559d51c529
2 files changed
+15 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java
+4 -3
View File
@@ -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
src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java
+11 -17
View File
@@ -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;
}
}