From b706fcb41da3704276040e1a95906f78f69d3f38 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 18 Aug 2015 03:34:41 +0100 Subject: [PATCH] Fixed a dupe with the Resolute Ivy. Closes #1049 --- .../vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java | 2 +- src/main/java/vazkii/botania/common/lexicon/LexiconData.java | 2 +- src/main/resources/assets/botania/lang/en_US.lang | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index e478e373a..9bd7d75e7 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -30,7 +30,7 @@ public class KeepIvyRecipe implements IRecipe { if(stack != null) { if(stack.getItem() == ModItems.keepIvy) foundIvy = true; - else if(!foundItem && !(ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, ItemKeepIvy.TAG_KEEP, false))) + else if(!foundItem && !(ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, ItemKeepIvy.TAG_KEEP, false)) && stack.getItem().getContainerItem(stack) == null) foundItem = true; else return false; } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 995940cc4..ae055623d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -804,7 +804,7 @@ public final class LexiconData { spawnerMover.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSpawnerMover)); keepIvy = new ALexiconEntry(LibLexicon.ENDER_KEEP_IVY, categoryEnder); - keepIvy.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeKeepIvy)); + keepIvy.setLexiconPages(new PageText("0"), new PageText("2"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeKeepIvy)); blackHoleTalisman = new ALexiconEntry(LibLexicon.ENDER_BLACK_HOLE_TALISMAN, categoryEnder); blackHoleTalisman.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeBlackHoleTalisman)); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 0b6ae31b7..a2a8374bd 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2586,6 +2586,7 @@ botania.page.spawnerMover1=We got the spawner, but this isn't a won run yet # -- RESOLUTE IVY botania.entry.keepIvy=Resolute Ivy botania.page.keepIvy0=Everyone knows that before being ressurected, one's items splatter all over the ground, generally a massive nuisance. The fix for this is rather simple. By attaching a piece of &1Resolute Ivy&0 to an item through a crafting grid, that item will presist on one's inventory through death. The ivy will degenerate after that fact and will need to be applied again if one wishes to have the item survive another downfall. +botania.page.keepIvy2=There is, however, one restriction to the items in which this ivy can be attached to.
For &otechnical reasons&r, the ivy may not be attached to any item that, upon being used in a crafting table, gives something in return, such as &1Buckets of Water&0 or the &1Mortar and Pestle&0. botania.page.keepIvy1=Because people die when they are killed # -- BLACK HOLE TALISMAN