From 3dba43b122db5877dfd18d4f837631c9ca2003f7 Mon Sep 17 00:00:00 2001 From: Hubry Date: Fri, 10 Jan 2020 00:26:38 +0100 Subject: [PATCH] Allow creative mana tablets and a tipped terra shatterer in JEI --- .../botania/client/integration/jei/JEIBotaniaPlugin.java | 9 +++++++-- .../item/equipment/tool/terrasteel/ItemTerraPick.java | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index f97fa203a..5a6f0ed7d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -53,10 +53,12 @@ import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; import vazkii.botania.common.item.ItemLaputaShard; import vazkii.botania.common.item.ItemLexicon; +import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; +import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -78,8 +80,11 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.registerSubtypeInterpreter(ModItems.flightTiara, stack -> String.valueOf(ItemFlightTiara.getVariant(stack))); registry.registerSubtypeInterpreter(ModItems.lexicon, stack -> String.valueOf(ItemNBTHelper.getBoolean(stack, ItemLexicon.TAG_ELVEN_UNLOCK, false))); registry.registerSubtypeInterpreter(ModItems.laputaShard, stack -> String.valueOf(ItemLaputaShard.getShardLevel(stack))); - - for(Item item : new Item[]{ModItems.manaTablet, ModItems.manaRing, ModItems.manaRingGreater, ModItems.terraPick}) { + + registry.registerSubtypeInterpreter(ModItems.terraPick, stack -> String.valueOf(ItemTerraPick.getLevel(stack)) + ItemTerraPick.isTipped(stack)); + registry.registerSubtypeInterpreter(ModItems.manaTablet, stack -> String.valueOf(((IManaItem) ModItems.manaTablet).getMana(stack)) + ItemManaTablet.isStackCreative(stack)); + + for(Item item : new Item[]{ModItems.manaRing, ModItems.manaRingGreater}) { registry.registerSubtypeInterpreter(item, stack -> String.valueOf(((IManaItem) item).getMana(stack))); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index d3f54d5fd..4b7b41223 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -92,6 +92,10 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ setMana(stack, mana); list.add(stack); } + ItemStack stack = new ItemStack(this); + setMana(stack, CREATIVE_MANA[1]); + setTipped(stack); + list.add(stack); } }