Fix tooltips additional info
This commit is contained in:
parent
eb3f4aa016
commit
79b6a89ce5
|
@ -158,7 +158,8 @@ public class MuseElectricItem extends Item implements IMuseElectricItem {
|
|||
|
||||
@Override
|
||||
public String getToolTip(ItemStack itemStack) {
|
||||
return itemStack.getTooltip(Minecraft.getMinecraft().thePlayer, false).toString();
|
||||
// return itemStack.getTooltip(Minecraft.getMinecraft().thePlayer, false).toString(); // enabling this doubles up the tooltips
|
||||
return "";
|
||||
}
|
||||
|
||||
public Item getChargedItem(ItemStack itemStack) {
|
||||
|
|
|
@ -2,6 +2,7 @@ package net.machinemuse.api.moduletrigger;
|
|||
|
||||
import net.machinemuse.api.IPowerModule;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
|
|
@ -49,10 +49,9 @@ public class ItemInfoFrame extends ScrollableFrame {
|
|||
for (String infostring : info) {
|
||||
String[] str = infostring.split("\t");
|
||||
MuseRenderer.drawStringsJustified(Arrays.asList(str),
|
||||
border.left()
|
||||
+ xoffset, border.right() - xoffset,
|
||||
border.top() + yoffset
|
||||
+ i * 10);
|
||||
border.left() + xoffset,
|
||||
border.right() - xoffset,
|
||||
border.top() + yoffset + i * 10);
|
||||
|
||||
i++;
|
||||
}
|
||||
|
|
|
@ -21,8 +21,6 @@ public abstract class ItemElectricArmor extends ItemArmor implements IModularIte
|
|||
{
|
||||
public ItemElectricArmor(final ItemArmor.ArmorMaterial material, final int index1, final int index2) {
|
||||
super(material, index1, index2);
|
||||
// MuseElectricItem$class.$init$(this);
|
||||
// ModularItemBase$class.$init$(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -48,17 +46,18 @@ public abstract class ItemElectricArmor extends ItemArmor implements IModularIte
|
|||
return ModularItemBase.getInstance().requiresMultipleRenderPasses();
|
||||
}
|
||||
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public void addInformation(final ItemStack stack, final EntityPlayer player, final List<?> currentTipList, final boolean advancedToolTips) {
|
||||
// ModularItemBase$class.addInformation(this, stack, player, currentTipList, advancedToolTips);
|
||||
// }
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List currentTipList, boolean advancedToolTips) {
|
||||
ModularItemBase.getInstance().addInformation(stack, player, currentTipList, advancedToolTips);
|
||||
}
|
||||
|
||||
public String formatInfo(final String string, final double value) {
|
||||
return ModularItemBase.getInstance().formatInfo(string, value);
|
||||
}
|
||||
|
||||
public List<String> getLongInfo(final EntityPlayer player, final ItemStack stack) {
|
||||
return (List<String>) ModularItemBase.getInstance().getLongInfo(player, stack);
|
||||
return ModularItemBase.getInstance().getLongInfo(player, stack);
|
||||
}
|
||||
|
||||
public double getArmorDouble(final EntityPlayer player, final ItemStack stack) {
|
||||
|
|
|
@ -2,6 +2,8 @@ package net.machinemuse.powersuits.item;
|
|||
|
||||
import appeng.api.config.AccessRestriction;
|
||||
import com.google.common.collect.Sets;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.machinemuse.api.electricity.IMuseElectricItem;
|
||||
import net.machinemuse.api.electricity.MuseElectricItem;
|
||||
import net.machinemuse.numina.geometry.Colour;
|
||||
|
@ -62,6 +64,12 @@ public class MPSItemElectricTool extends ItemTool implements IModularItemBase, I
|
|||
return MuseElectricItem.getInstance().giveEnergyTo(stack, provided);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List currentTipList, boolean advancedToolTips) {
|
||||
ModularItemBase.getInstance().addInformation(stack, player, currentTipList, advancedToolTips);
|
||||
}
|
||||
|
||||
/* Industrialcraft 2 -------------------------------------------------------------------------- */
|
||||
@Override
|
||||
public IMuseElectricItem getManager(ItemStack stack) {
|
||||
|
|
|
@ -80,8 +80,8 @@ public class ModularItemBase extends Item implements IModularItemBase {
|
|||
}
|
||||
|
||||
|
||||
|
||||
/* IModularItem ------------------------------------------------------------------------------- */
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public List<String> getLongInfo(EntityPlayer player, ItemStack stack) {
|
||||
List<String> info = new ArrayList<>();
|
||||
|
|
Loading…
Reference in a new issue