From 79b6a89ce5fc0d80a0b3912400d12fa612c1e442 Mon Sep 17 00:00:00 2001 From: Leon Date: Fri, 25 Nov 2016 10:30:49 -0500 Subject: [PATCH] Fix tooltips additional info --- .../api/electricity/MuseElectricItem.java | 3 ++- .../api/moduletrigger/IBlockBreakingModule.java | 1 + .../general/gui/frame/ItemInfoFrame.java | 7 +++---- .../powersuits/item/ItemElectricArmor.java | 13 ++++++------- .../powersuits/item/MPSItemElectricTool.java | 8 ++++++++ .../powersuits/item/ModularItemBase.java | 2 +- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/machinemuse/api/electricity/MuseElectricItem.java b/src/main/java/net/machinemuse/api/electricity/MuseElectricItem.java index 8cf6941..6e6b7a3 100644 --- a/src/main/java/net/machinemuse/api/electricity/MuseElectricItem.java +++ b/src/main/java/net/machinemuse/api/electricity/MuseElectricItem.java @@ -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) { diff --git a/src/main/java/net/machinemuse/api/moduletrigger/IBlockBreakingModule.java b/src/main/java/net/machinemuse/api/moduletrigger/IBlockBreakingModule.java index 6711702..c4370ad 100644 --- a/src/main/java/net/machinemuse/api/moduletrigger/IBlockBreakingModule.java +++ b/src/main/java/net/machinemuse/api/moduletrigger/IBlockBreakingModule.java @@ -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; diff --git a/src/main/java/net/machinemuse/general/gui/frame/ItemInfoFrame.java b/src/main/java/net/machinemuse/general/gui/frame/ItemInfoFrame.java index 0093313..618e5c6 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/ItemInfoFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/ItemInfoFrame.java @@ -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++; } diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemElectricArmor.java b/src/main/java/net/machinemuse/powersuits/item/ItemElectricArmor.java index 4874dfb..96c3c09 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemElectricArmor.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemElectricArmor.java @@ -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 getLongInfo(final EntityPlayer player, final ItemStack stack) { - return (List) ModularItemBase.getInstance().getLongInfo(player, stack); + return ModularItemBase.getInstance().getLongInfo(player, stack); } public double getArmorDouble(final EntityPlayer player, final ItemStack stack) { diff --git a/src/main/java/net/machinemuse/powersuits/item/MPSItemElectricTool.java b/src/main/java/net/machinemuse/powersuits/item/MPSItemElectricTool.java index dacee17..77fdb5e 100644 --- a/src/main/java/net/machinemuse/powersuits/item/MPSItemElectricTool.java +++ b/src/main/java/net/machinemuse/powersuits/item/MPSItemElectricTool.java @@ -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) { diff --git a/src/main/java/net/machinemuse/powersuits/item/ModularItemBase.java b/src/main/java/net/machinemuse/powersuits/item/ModularItemBase.java index 7ee414a..2ff4010 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ModularItemBase.java +++ b/src/main/java/net/machinemuse/powersuits/item/ModularItemBase.java @@ -80,8 +80,8 @@ public class ModularItemBase extends Item implements IModularItemBase { } - /* IModularItem ------------------------------------------------------------------------------- */ + @SideOnly(Side.CLIENT) @Override public List getLongInfo(EntityPlayer player, ItemStack stack) { List info = new ArrayList<>();