From 739f22ee05893c4e94575c14a3c884eee5e9c524 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Fri, 4 Nov 2016 10:37:13 -0400 Subject: [PATCH] Allow inserting elven lexica into the portal --- .../common/block/tile/TileAlfPortal.java | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 734f98c26..6e28c18ba 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -128,7 +128,18 @@ public class TileAlfPortal extends TileMod { continue; ItemStack stack = item.getEntityItem(); - if((!(stack.getItem() instanceof IElvenItem) || !((IElvenItem) stack.getItem()).isElvenItem(stack)) && !item.getEntityData().hasKey(TAG_PORTAL_FLAG)) { + boolean consume; + if (item.getEntityData().hasKey(TAG_PORTAL_FLAG)) { + consume = false; + } else if (stack.getItem() instanceof ItemLexicon) { + consume = true; + } else if ((!(stack.getItem() instanceof IElvenItem) || !((IElvenItem) stack.getItem()).isElvenItem(stack))) { + consume = true; + } else { + consume = false; + } + + if (consume) { item.setDead(); addItem(stack); ticksSinceLastItem = 0; @@ -198,11 +209,14 @@ public class TileAlfPortal extends TileMod { int i = 0; for(ItemStack stack : stacksIn) { if(stack != null && stack.getItem() instanceof ILexicon) { - ((ILexicon) stack.getItem()).unlockKnowledge(stack, BotaniaAPI.elvenKnowledge); - ItemLexicon.setForcedPage(stack, LexiconData.elvenMessage.getUnlocalizedName()); - spawnItem(stack); - stacksIn.remove(i); - return; + ILexicon lexicon = (ILexicon) stack.getItem(); + if (!lexicon.isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge)) { + lexicon.unlockKnowledge(stack, BotaniaAPI.elvenKnowledge); + ItemLexicon.setForcedPage(stack, LexiconData.elvenMessage.getUnlocalizedName()); + spawnItem(stack); + stacksIn.remove(i); + return; + } } i++; }