diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java index a362996b..9375fac4 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.compat.jei.forge; +import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -90,7 +91,7 @@ public class TartaricForgeRecipeCategory implements IRecipeCategory if (recipeWrapper instanceof TartaricForgeRecipeJEI) { TartaricForgeRecipeJEI recipe = (TartaricForgeRecipeJEI) recipeWrapper; - guiItemStacks.set(GEM_SLOT, (Set) recipe.getInputs().get(1)); + guiItemStacks.set(GEM_SLOT, (ArrayList) recipe.getInputs().get(1)); craftingGridHelper.setOutput(guiItemStacks, recipe.getOutputs()); craftingGridHelper.setInput(guiItemStacks, (List) recipe.getInputs().get(0), 2, 3); } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java index 5f7bcd12..06c5ab5f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java @@ -18,17 +18,15 @@ public class TartaricForgeRecipeJEI extends BlankRecipeWrapper @Getter private TartaricForgeRecipe recipe; @Getter - private Set validGems = new HashSet(); + private ArrayList validGems = new ArrayList(); public TartaricForgeRecipeJEI(TartaricForgeRecipe recipe) { this.recipe = recipe; - this.validGems.add(new ItemStack(ModItems.soulGem, 1, 0)); - this.validGems.add(new ItemStack(ModItems.soulGem, 1, 1)); - this.validGems.add(new ItemStack(ModItems.soulGem, 1, 2)); - this.validGems.add(new ItemStack(ModItems.soulGem, 1, 3)); - this.validGems.add(new ItemStack(ModItems.monsterSoul)); + for (DefaultWill will : DefaultWill.values()) + if (will.minSouls >= recipe.getMinimumSouls()) + this.validGems.add(will.willStack); } @Override @@ -61,4 +59,21 @@ public class TartaricForgeRecipeJEI extends BlankRecipeWrapper } return null; } + + public enum DefaultWill { + SOUL(new ItemStack(ModItems.monsterSoul, 1, 0), 64), + PETTY(new ItemStack(ModItems.soulGem, 1, 0), 64), + LESSER(new ItemStack(ModItems.soulGem, 1, 1), 256), + COMMON(new ItemStack(ModItems.soulGem, 1, 2), 1024), + GREATER(new ItemStack(ModItems.soulGem, 1, 3), 4096), + GRAND(new ItemStack(ModItems.soulGem, 1, 4), 16384); + + public final ItemStack willStack; + public final double minSouls; + + DefaultWill(ItemStack willStack, double minSouls) { + this.willStack = willStack; + this.minSouls = minSouls; + } + } }