Unify the way item and itemBlock tooltips are added

This commit is contained in:
mezz committed 2016-08-16 16:49:28 -07:00
1 parent 4259a55e7a
commit 2031f7fe02
17 files changed
+107 -138

No files matched your search

@@ -12,17 +12,6 @@ package forestry.apiculture.items;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.ForestryAPI;
@@ -36,6 +25,15 @@ import forestry.apiculture.inventory.ItemInventoryHabitatLocator;
import forestry.apiculture.render.TextureHabitatLocator;
import forestry.core.items.ItemWithGui;
import forestry.core.utils.Translator;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemHabitatLocator extends ItemWithGui implements ISpriteRegister {
private static final String iconName = "forestry:items/biomefinder";
@@ -69,6 +67,8 @@ public class ItemHabitatLocator extends ItemWithGui implements ISpriteRegister {
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> list, boolean flag) {
super.addInformation(itemstack, player, list, flag);
Biome currentBiome = player.worldObj.getBiome(player.getPosition());
float temperatureValue = ForestryAPI.climateManager.getTemperature(player.worldObj, player.getPosition());
@@ -1,7 +1,10 @@
package forestry.apiculture.items;
import java.util.List;
import forestry.api.apiculture.IArmorApiarist;
import forestry.api.apiculture.IHiveTile;
import forestry.api.core.Tabs;
import forestry.core.items.ItemForestry;
import forestry.core.proxy.Proxies;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -9,20 +12,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumHandSide;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import forestry.api.apiculture.IArmorApiarist;
import forestry.api.apiculture.IHiveTile;
import forestry.api.core.Tabs;
import forestry.core.items.ItemForestry;
import forestry.core.proxy.Proxies;
import forestry.core.utils.Translator;
public class ItemSmoker extends ItemForestry implements IArmorApiarist {
public ItemSmoker() {
super(Tabs.tabApiculture);
@@ -106,12 +102,6 @@ public class ItemSmoker extends ItemForestry implements IArmorApiarist {
return 32;
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
tooltip.add(Translator.translateToLocal("item.for.smoker.description"));
}
@Override
public boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect) {
return true;
@@ -13,15 +13,6 @@ package forestry.core.circuits;
import java.util.List;
import java.util.Locale;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.circuits.ChipsetManager;
import forestry.api.circuits.ICircuit;
import forestry.api.circuits.ICircuitBoard;
@@ -30,6 +21,13 @@ import forestry.api.core.IModelManager;
import forestry.core.PluginCore;
import forestry.core.items.IColoredItem;
import forestry.core.items.ItemForestry;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemCircuitBoard extends ItemForestry implements IColoredItem {
@@ -80,6 +78,7 @@ public class ItemCircuitBoard extends ItemForestry implements IColoredItem {
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> list, boolean flag) {
super.addInformation(itemstack, player, list, flag);
ICircuitBoard circuitboard = ChipsetManager.circuitRegistry.getCircuitBoard(itemstack);
if (circuitboard != null) {
circuitboard.addTooltip(list);
@@ -275,6 +275,7 @@ public class ItemResearchNote extends ItemForestry {
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> list, boolean flag) {
super.addInformation(itemstack, player, list, flag);
ResearchNote note = new ResearchNote(itemstack.getTagCompound());
note.addTooltip(list);
}
@@ -11,16 +11,13 @@
package forestry.core.items;
import javax.annotation.Nonnull;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import forestry.api.core.Tabs;
import forestry.core.gui.ContainerAlyzer;
import forestry.core.gui.GuiAlyzer;
import forestry.core.inventory.ItemInventoryAlyzer;
import forestry.core.utils.ItemTooltipUtil;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
public class ItemAlyzer extends ItemWithGui {
public ItemAlyzer() {
@@ -41,10 +38,4 @@ public class ItemAlyzer extends ItemWithGui {
public Object getContainer(@Nonnull EntityPlayer player, ItemStack heldItem, int data) {
return new ContainerAlyzer(new ItemInventoryAlyzer(player, heldItem), player);
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
ItemTooltipUtil.addInformation(stack, playerIn, tooltip, advanced);
}
}
@@ -10,6 +10,13 @@
******************************************************************************/
package forestry.core.items;
import java.util.List;
import forestry.core.blocks.BlockBase;
import forestry.core.blocks.IBlockWithMeta;
import forestry.core.tiles.TileForestry;
import forestry.core.tiles.TileUtil;
import forestry.core.utils.ItemTooltipUtil;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
@@ -19,11 +26,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import forestry.core.blocks.BlockBase;
import forestry.core.blocks.IBlockWithMeta;
import forestry.core.tiles.TileForestry;
import forestry.core.tiles.TileUtil;
public class ItemBlockForestry<B extends Block> extends ItemBlock {
public ItemBlockForestry(Block block) {
@@ -54,6 +56,12 @@ public class ItemBlockForestry<B extends Block> extends ItemBlock {
return block.getUnlocalizedName();
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
ItemTooltipUtil.addInformation(stack, playerIn, tooltip, advanced);
}
@Override
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) {
boolean placed = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState);
@@ -23,11 +23,11 @@ public class ItemBlockNBT extends ItemBlockForestry<Block> {
}
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> info, boolean par4) {
if (!itemstack.hasTagCompound()) {
return;
}
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> info, boolean advanced) {
super.addInformation(itemstack, player, info, advanced);
info.add("There are still some scribbles on this.");
if (itemstack.hasTagCompound()) {
info.add("There are still some scribbles on this.");
}
}
}
@@ -10,18 +10,11 @@
******************************************************************************/
package forestry.core.items;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import java.util.Collection;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import forestry.api.circuits.ChipsetManager;
import forestry.api.circuits.ICircuit;
import forestry.api.circuits.ICircuitLayout;
@@ -30,6 +23,11 @@ import forestry.core.circuits.SolderManager;
import forestry.core.config.Config;
import forestry.core.proxy.Proxies;
import forestry.core.utils.Translator;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
public class ItemElectronTube extends ItemOverlay {
@@ -39,6 +37,7 @@ public class ItemElectronTube extends ItemOverlay {
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> list, boolean flag) {
super.addInformation(itemstack, player, list, flag);
Multimap<ICircuitLayout, ICircuit> circuits = getCircuits(itemstack);
if (!circuits.isEmpty()) {
if (Proxies.common.isShiftDown()) {
@@ -10,17 +10,19 @@
******************************************************************************/
package forestry.core.items;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.oredict.OreDictionary;
import java.util.List;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.core.CreativeTabForestry;
import forestry.core.utils.ItemTooltipUtil;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.oredict.OreDictionary;
public class ItemForestry extends Item implements IItemModelRegister {
public ItemForestry() {
@@ -48,4 +50,10 @@ public class ItemForestry extends Item implements IItemModelRegister {
public ItemStack getWildcard() {
return new ItemStack(this, 1, OreDictionary.WILDCARD_VALUE);
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
ItemTooltipUtil.addInformation(stack, playerIn, tooltip, advanced);
}
}
@@ -12,6 +12,9 @@ package forestry.core.items;
import java.util.List;
import forestry.api.core.IModelManager;
import forestry.api.core.IToolPipette;
import forestry.core.fluids.PipetteContents;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -20,17 +23,12 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IModelManager;
import forestry.api.core.IToolPipette;
import forestry.core.fluids.PipetteContents;
public class ItemPipette extends ItemForestry implements IToolPipette, IFluidContainerItem {
public ItemPipette() {
@@ -90,6 +88,8 @@ public class ItemPipette extends ItemForestry implements IToolPipette, IFluidCon
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> list, boolean flag) {
super.addInformation(itemstack, player, list, flag);
PipetteContents contained = PipetteContents.create(itemstack);
if (contained != null) {
contained.addTooltip(list);
@@ -10,25 +10,14 @@
******************************************************************************/
package forestry.core.items;
import java.util.List;
import forestry.core.utils.Translator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import forestry.core.circuits.ContainerSolderingIron;
import forestry.core.circuits.GuiSolderingIron;
import forestry.core.circuits.ISolderingIron;
import forestry.core.inventory.ItemInventorySolderingIron;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
public class ItemSolderingIron extends ItemWithGui implements ISolderingIron {
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
tooltip.add(Translator.translateToLocal("item.for.solderingIron.tooltip"));
}
@Override
public Object getGui(EntityPlayer player, ItemStack heldItem, int data) {
return new GuiSolderingIron(player, new ItemInventorySolderingIron(player, heldItem));
@@ -10,9 +10,11 @@ public class ItemTooltipUtil {
public static void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
String unlocalizedName = stack.getUnlocalizedName();
String tooltipKey = unlocalizedName + ".tooltip";
String tooltipInfo = Translator.translateToLocal(tooltipKey);
Minecraft minecraft = Minecraft.getMinecraft();
List<String> tooltipInfoWrapped = minecraft.fontRendererObj.listFormattedStringToWidth(tooltipInfo, 150);
tooltip.addAll(tooltipInfoWrapped);
if (Translator.canTranslateToLocal(tooltipKey)) {
String tooltipInfo = Translator.translateToLocal(tooltipKey);
Minecraft minecraft = Minecraft.getMinecraft();
List<String> tooltipInfoWrapped = minecraft.fontRendererObj.listFormattedStringToWidth(tooltipInfo, 150);
tooltip.addAll(tooltipInfoWrapped);
}
}
}
@@ -11,7 +11,7 @@
package forestry.energy.blocks;
import forestry.core.blocks.BlockRegistry;
import forestry.energy.items.ItemEngine;
import forestry.core.items.ItemBlockForestry;
public class BlockRegistryEnergy extends BlockRegistry {
public final BlockEngine peatEngine;
@@ -20,12 +20,12 @@ public class BlockRegistryEnergy extends BlockRegistry {
public BlockRegistryEnergy() {
peatEngine = new BlockEngine(BlockTypeEngine.PEAT);
registerBlock(peatEngine, new ItemEngine(peatEngine), "engine_peat");
registerBlock(peatEngine, new ItemBlockForestry<>(peatEngine), "engine_peat");
biogasEngine = new BlockEngine(BlockTypeEngine.BIOGAS);
registerBlock(biogasEngine, new ItemEngine(biogasEngine), "engine_biogas");
registerBlock(biogasEngine, new ItemBlockForestry<>(biogasEngine), "engine_biogas");
clockworkEngine = new BlockEngine(BlockTypeEngine.CLOCKWORK);
registerBlock(clockworkEngine, new ItemEngine(clockworkEngine), "engine_clockwork");
registerBlock(clockworkEngine, new ItemBlockForestry<>(clockworkEngine), "engine_clockwork");
}
}
@@ -1,24 +0,0 @@
package forestry.energy.items;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import forestry.core.items.ItemBlockForestry;
import forestry.core.utils.ItemTooltipUtil;
import forestry.energy.blocks.BlockEngine;
public class ItemEngine extends ItemBlockForestry<BlockEngine> {
public ItemEngine(Block block) {
super(block);
}
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
super.addInformation(stack, playerIn, tooltip, advanced);
ItemTooltipUtil.addInformation(stack, playerIn, tooltip, advanced);
}
}
@@ -12,6 +12,15 @@ package forestry.mail.items;
import java.util.List;
import forestry.api.core.IModelManager;
import forestry.api.mail.ILetter;
import forestry.core.items.ItemWithGui;
import forestry.core.utils.Translator;
import forestry.mail.Letter;
import forestry.mail.LetterProperties;
import forestry.mail.gui.ContainerLetter;
import forestry.mail.gui.GuiLetter;
import forestry.mail.inventory.ItemInventoryLetter;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -22,20 +31,9 @@ import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IModelManager;
import forestry.api.mail.ILetter;
import forestry.core.items.ItemWithGui;
import forestry.core.utils.Translator;
import forestry.mail.Letter;
import forestry.mail.LetterProperties;
import forestry.mail.gui.ContainerLetter;
import forestry.mail.gui.GuiLetter;
import forestry.mail.inventory.ItemInventoryLetter;
public class ItemLetter extends ItemWithGui {
public ItemLetter() {
setMaxStackSize(64);
@@ -65,6 +63,8 @@ public class ItemLetter extends ItemWithGui {
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> list, boolean flag) {
super.addInformation(itemstack, player, list, flag);
NBTTagCompound nbttagcompound = itemstack.getTagCompound();
if (nbttagcompound == null) {
list.add('<' + Translator.translateToLocal("for.gui.blank") + '>');
@@ -2,19 +2,19 @@ package forestry.plugins.compat;
import forestry.core.blocks.BlockBase;
import forestry.core.blocks.BlockRegistry;
import forestry.core.items.ItemBlockForestry;
import forestry.energy.blocks.BlockEngine;
import forestry.energy.blocks.BlockTypeEngine;
import forestry.energy.items.ItemEngine;
public class BlockRegistryIC2 extends BlockRegistry {
public final BlockBase electricalEngine;
public final BlockEngine generator;
public BlockRegistryIC2() {
electricalEngine = new BlockBase(BlockTypeEngine.ELECTRICAL);
registerBlock(electricalEngine, new ItemEngine(electricalEngine), "engine_electrical");
electricalEngine = new BlockBase<>(BlockTypeEngine.ELECTRICAL);
registerBlock(electricalEngine, new ItemBlockForestry<>(electricalEngine), "engine_electrical");
generator = new BlockEngine(BlockTypeEngine.GENERATOR);
registerBlock(generator, new ItemEngine(generator), "engine_generator");
registerBlock(generator, new ItemBlockForestry<>(generator), "engine_generator");
}
}
@@ -186,6 +186,12 @@ public class ItemBackpack extends ItemWithGui implements IColoredItem {
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> list, boolean flag) {
super.addInformation(itemstack, player, list, flag);
if (type == EnumBackpackType.WOVEN) {
list.add(Translator.translateToLocalFormatted("item.for.bag.woven.tooltip"));
}
int occupied = ItemInventory.getOccupiedSlotCount(itemstack);
BackpackMode mode = getMode(itemstack);