lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

All soul containers show work for lookup in JEI now

Browse source
This commit is contained in:
Nick 2016-01-08 17:50:12 -08:00
parent 988e2bd4a2
commit 9329dd12f4
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeCategory.java
View file

@ -10,9 +10,12 @@ import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeCategory;
import mezz.jei.api.recipe.IRecipeWrapper; import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.List;
import java.util.Set;
public class SoulForgeRecipeCategory implements IRecipeCategory public class SoulForgeRecipeCategory implements IRecipeCategory
{ {
@ -65,6 +68,7 @@ public class SoulForgeRecipeCategory implements IRecipeCategory
} }
@Override @Override
@SuppressWarnings("unchecked")
public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper)
{ {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
@ -81,9 +85,9 @@ public class SoulForgeRecipeCategory implements IRecipeCategory
if (recipeWrapper instanceof SoulForgeRecipeJEI) { if (recipeWrapper instanceof SoulForgeRecipeJEI) {
SoulForgeRecipeJEI recipe = (SoulForgeRecipeJEI) recipeWrapper; 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.setOutput(guiItemStacks, recipe.getOutputs());
craftingGridHelper.setInput(guiItemStacks, recipe.getInputs(), 2, 3); craftingGridHelper.setInput(guiItemStacks, (List) recipe.getInputs().get(0), 2, 3);
} }
} }
} }

2
src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeHandler.java
View file

@ -32,6 +32,6 @@ public class SoulForgeRecipeHandler implements IRecipeHandler<SoulForgeRecipeJEI
@Override @Override
public boolean isRecipeValid(@Nonnull SoulForgeRecipeJEI recipe) 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;
} }
} }

7
src/main/java/WayofTime/bloodmagic/compat/jei/forge/SoulForgeRecipeJEI.java
View file

@ -31,9 +31,12 @@ public class SoulForgeRecipeJEI extends BlankRecipeWrapper
@Override @Override
@Nonnull @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 @Override

1
src/main/resources/assets/bloodmagic/lang/en_US.lang
View file

@ -278,6 +278,7 @@ chat.BloodMagic.livingArmour.upgrade.poisonRemove=You are starting to feel bette
jei.BloodMagic.recipe.altar=Blood Altar jei.BloodMagic.recipe.altar=Blood Altar
jei.BloodMagic.recipe.binding=Binding Ritual jei.BloodMagic.recipe.binding=Binding Ritual
jei.BloodMagic.recipe.alchemyArrayCrafting=Alchemy Array jei.BloodMagic.recipe.alchemyArrayCrafting=Alchemy Array
jei.BloodMagic.recipe.soulForge=Soul Forge
jei.BloodMagic.recipe.requiredLP=LP: %d jei.BloodMagic.recipe.requiredLP=LP: %d
jei.BloodMagic.recipe.requiredTier=Tier: %d jei.BloodMagic.recipe.requiredTier=Tier: %d
jei.BloodMagic.recipe.minimumSouls=Minimum: %d Souls jei.BloodMagic.recipe.minimumSouls=Minimum: %d Souls