diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 64238f894..b2f2ad0b5 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -30,6 +30,7 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.event.world.ChunkDataEvent.Load; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.DummyMethodHandler; import vazkii.botania.api.internal.DummySubTile; @@ -53,6 +54,8 @@ import vazkii.botania.api.wiki.WikiHooks; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import cpw.mods.fml.common.Loader; + public final class BotaniaAPI { private static List categories = new ArrayList(); @@ -72,6 +75,7 @@ public final class BotaniaAPI { private static BiMap> subTiles = HashBiMap.> create(); private static Map, SubTileSignature> subTileSignatures = new HashMap, SubTileSignature>(); public static Set subtilesForCreativeMenu = new LinkedHashSet(); + public static Map subTileMods = new HashMap(); public static Map oreWeights = new HashMap(); public static Map seeds = new HashMap(); @@ -327,9 +331,11 @@ public final class BotaniaAPI { /** * Registers a SubTileEntity, a new special flower. Look in the subtile package of the API. + * If you call this after PostInit you're a failiure and we are very disappointed in you. */ public static void registerSubTile(String key, Class subtileClass) { subTiles.put(key, subtileClass); + subTileMods.put(key, Loader.instance().activeModContainer().getModId()); } /** diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 8faf49218..a2b85a63c 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -32,6 +32,7 @@ import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { @@ -80,13 +81,19 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - SubTileSignature sig = BotaniaAPI.getSignatureForName(getType(par1ItemStack)); + String type = getType(par1ItemStack); + SubTileSignature sig = BotaniaAPI.getSignatureForName(type); + if(ConfigHandler.referencesEnabled) { String refUnlocalized = sig.getUnlocalizedLoreTextForStack(par1ItemStack); String refLocalized = StatCollector.translateToLocal(refUnlocalized); if(!refLocalized.equals(refUnlocalized)) par3List.add(EnumChatFormatting.ITALIC + refLocalized); } + + String mod = BotaniaAPI.subTileMods.get(type); + if(!mod.equals(LibMisc.MOD_ID)) + par3List.add(EnumChatFormatting.ITALIC + "[" + mod + "]"); sig.addTooltip(par1ItemStack, par2EntityPlayer, par3List); }