From 9329dd12f44440f48718bbc5cfbd5406cc4cd730 Mon Sep 17 00:00:00 2001
From: Nick <speedynutty68@gmail.com>
Date: Fri, 8 Jan 2016 17:50:12 -0800
Subject: [PATCH] All soul containers show work for lookup in JEI now

---
 .../compat/jei/forge/SoulForgeRecipeCategory.java         | 8 ++++++--
 .../compat/jei/forge/SoulForgeRecipeHandler.java          | 2 +-
 .../bloodmagic/compat/jei/forge/SoulForgeRecipeJEI.java   | 7 +++++--
 src/main/resources/assets/bloodmagic/lang/en_US.lang      | 1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeCategory.java
index 15840db7..f1be1e5c 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeCategory.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeCategory.java
@@ -10,9 +10,12 @@ import mezz.jei.api.gui.IRecipeLayout;
 import mezz.jei.api.recipe.IRecipeCategory;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
 import javax.annotation.Nonnull;
+import java.util.List;
+import java.util.Set;
 
 public class SoulForgeRecipeCategory implements IRecipeCategory
 {
@@ -65,6 +68,7 @@ public class SoulForgeRecipeCategory implements IRecipeCategory
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper)
     {
         IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
@@ -81,9 +85,9 @@ public class SoulForgeRecipeCategory implements IRecipeCategory
 
         if (recipeWrapper instanceof SoulForgeRecipeJEI) {
             SoulForgeRecipeJEI recipe = (SoulForgeRecipeJEI) recipeWrapper;
-            guiItemStacks.set(GEM_SLOT, recipe.getValidGems());
+            guiItemStacks.set(GEM_SLOT, (Set<ItemStack>) recipe.getInputs().get(1));
             craftingGridHelper.setOutput(guiItemStacks, recipe.getOutputs());
-            craftingGridHelper.setInput(guiItemStacks, recipe.getInputs(), 2, 3);
+            craftingGridHelper.setInput(guiItemStacks, (List) recipe.getInputs().get(0), 2, 3);
         }
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeHandler.java
index a73bcf6a..3e5ec9ac 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeHandler.java
@@ -32,6 +32,6 @@ public class SoulForgeRecipeHandler implements IRecipeHandler<SoulForgeRecipeJEI
     @Override
     public boolean isRecipeValid(@Nonnull SoulForgeRecipeJEI recipe)
     {
-        return recipe.getInputs().size() > 0 && recipe.getOutputs().size() > 0;
+        return recipe.getInputs().get(0).size() > 0 && recipe.getOutputs().size() > 0;
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeJEI.java
index 9a7d5da8..ef416e12 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeJEI.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeJEI.java
@@ -31,9 +31,12 @@ public class SoulForgeRecipeJEI extends BlankRecipeWrapper
 
     @Override
     @Nonnull
-    public List getInputs()
+    public List<Collection> getInputs()
     {
-        return recipe.getInput();
+        ArrayList<Collection> ret = new ArrayList<Collection>();
+        ret.add(recipe.getInput());
+        ret.add(validGems);
+        return ret;
     }
 
     @Override
diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang
index f34a4f62..ec2c44ab 100644
--- a/src/main/resources/assets/bloodmagic/lang/en_US.lang
+++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang
@@ -278,6 +278,7 @@ chat.BloodMagic.livingArmour.upgrade.poisonRemove=You are starting to feel bette
 jei.BloodMagic.recipe.altar=Blood Altar
 jei.BloodMagic.recipe.binding=Binding Ritual
 jei.BloodMagic.recipe.alchemyArrayCrafting=Alchemy Array
+jei.BloodMagic.recipe.soulForge=Soul Forge
 jei.BloodMagic.recipe.requiredLP=LP: %d
 jei.BloodMagic.recipe.requiredTier=Tier: %d
 jei.BloodMagic.recipe.minimumSouls=Minimum: %d Souls