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

Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite

Browse source
This commit is contained in:
WayofTime 2016-01-02 17:34:49 -05:00
parent 15cf8a94ae ae3f5ddf3f
commit d1ff8c6d4f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java
View file

@ -1,5 +1,6 @@
package WayofTime.bloodmagic.compat.jei.altar; package WayofTime.bloodmagic.compat.jei.altar;
import WayofTime.bloodmagic.api.orb.IBloodOrb;
import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -20,9 +21,9 @@ public class AltarRecipeMaker
for (Map.Entry<ItemStack, AltarRecipeRegistry.AltarRecipe> itemStackAltarRecipeEntry : altarMap.entrySet()) for (Map.Entry<ItemStack, AltarRecipeRegistry.AltarRecipe> itemStackAltarRecipeEntry : altarMap.entrySet())
{ {
if (itemStackAltarRecipeEntry.getValue().getOutput() != null) if (!(itemStackAltarRecipeEntry.getKey().getItem() instanceof IBloodOrb))
{ {
// Make sure output is not null. If it is, the recipe is for a filling orb, and we don't want that. // Make sure input is not a Blood Orb. If it is, the recipe is for a filling orb, and we don't want that.
ItemStack input = itemStackAltarRecipeEntry.getKey(); ItemStack input = itemStackAltarRecipeEntry.getKey();
ItemStack output = itemStackAltarRecipeEntry.getValue().getOutput(); ItemStack output = itemStackAltarRecipeEntry.getValue().getOutput();
int requiredTier = itemStackAltarRecipeEntry.getValue().getMinTier().toInt(); int requiredTier = itemStackAltarRecipeEntry.getValue().getMinTier().toInt();