From 05d7da5c99a3777254a3f6142e1cd62fe4044bf9 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 20 Mar 2014 18:13:38 +0000 Subject: [PATCH] API: Add IRecipeKeyProvider. --- .../api/lexicon/IRecipeKeyProvider.java | 24 +++++++++++++++++++ .../api/lexicon/LexiconRecipeMappings.java | 10 ++------ .../item/block/ItemBlockSpecialFlower.java | 8 ++++++- 3 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 MODSRC/vazkii/botania/api/lexicon/IRecipeKeyProvider.java diff --git a/MODSRC/vazkii/botania/api/lexicon/IRecipeKeyProvider.java b/MODSRC/vazkii/botania/api/lexicon/IRecipeKeyProvider.java new file mode 100644 index 000000000..85c9bfc75 --- /dev/null +++ b/MODSRC/vazkii/botania/api/lexicon/IRecipeKeyProvider.java @@ -0,0 +1,24 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Mar 20, 2014, 6:08:48 PM (GMT)] + */ +package vazkii.botania.api.lexicon; + +import net.minecraft.item.ItemStack; + +/** + * Have an Item implement this so that the method used for mapping it into + * the lexicon recipe mappings isn't the typical id:meta key. + */ +public interface IRecipeKeyProvider { + + public String getKey(ItemStack stack); + +} diff --git a/MODSRC/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/MODSRC/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index cee677a63..8fe2eabb0 100644 --- a/MODSRC/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/MODSRC/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -15,9 +15,6 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import vazkii.botania.api.ISpecialFlower; -import vazkii.botania.api.subtile.SubTileEntity; /** * This class contains mappings for which entry and page correspond to each @@ -49,11 +46,8 @@ public final class LexiconRecipeMappings { } public static String stackToString(ItemStack stack) { - if(stack.hasTagCompound() && stack.getItem() instanceof ISpecialFlower) { - NBTTagCompound cmp = stack.getTagCompound(); - if(cmp.hasKey(SubTileEntity.TAG_TYPE)) - return cmp.getString(SubTileEntity.TAG_TYPE); - } + if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) + return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); return stack.itemID + ":" + stack.getItemDamage(); } diff --git a/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index b58de51c6..2f5984768 100644 --- a/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -22,6 +22,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.ISpecialFlower; +import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; @@ -29,7 +30,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.network.PacketDispatcher; -public class ItemBlockSpecialFlower extends ItemBlock implements ISpecialFlower { +public class ItemBlockSpecialFlower extends ItemBlock implements IRecipeKeyProvider { public ItemBlockSpecialFlower(int par1) { super(par1); @@ -82,4 +83,9 @@ public class ItemBlockSpecialFlower extends ItemBlock implements ISpecialFlower return stack; } + @Override + public String getKey(ItemStack stack) { + return getType(stack); + } + }