mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-19 19:59:58 +00:00
Merge pull request #1870 from HenryLoenwind/solarTooltips
Make Photovoltaic Cell more findable
This commit is contained in:
commit
52c628a7ab
4 files changed
+33
-14
No files matched your search
@@ -285,23 +285,29 @@ public class TooltipAddera {
|
||||
}
|
||||
}
|
||||
|
||||
private static String getUnlocalizedNameForTooltip(ItemStack itemstack) {
|
||||
String unlocalizedNameForTooltip = null;
|
||||
if (itemstack.getItem() instanceof IResourceTooltipProvider) {
|
||||
unlocalizedNameForTooltip = ((IResourceTooltipProvider)itemstack.getItem()).getUnlocalizedNameForTooltip(itemstack);
|
||||
}
|
||||
if(unlocalizedNameForTooltip == null) {
|
||||
unlocalizedNameForTooltip = itemstack.getItem().getUnlocalizedName(itemstack);
|
||||
}
|
||||
return unlocalizedNameForTooltip;
|
||||
}
|
||||
|
||||
public static void addCommonTooltipFromResources(List list, ItemStack itemstack) {
|
||||
if(itemstack.getItem() == null) {
|
||||
return;
|
||||
}
|
||||
addCommonTooltipFromResources(list, getUnlocalizedNameForTooltip(itemstack));
|
||||
}
|
||||
|
||||
public static void addDetailedTooltipFromResources(List list, ItemStack itemstack) {
|
||||
if(itemstack.getItem() == null) {
|
||||
return;
|
||||
}
|
||||
String unloc = null;
|
||||
// Block blk = Block.getBlockFromItem(itemstack.getItem());
|
||||
// if(blk != null && blk != Blocks.air) {
|
||||
// unlock = blk.getUnlocalizedName();
|
||||
// }
|
||||
|
||||
if (itemstack.getItem() instanceof IResourceTooltipProvider) {
|
||||
unloc = ((IResourceTooltipProvider)itemstack.getItem()).getUnlocalizedNameForTooltip(itemstack);
|
||||
}
|
||||
if(unloc == null) {
|
||||
unloc = itemstack.getItem().getUnlocalizedName(itemstack);
|
||||
}
|
||||
addDetailedTooltipFromResources(list, unloc);
|
||||
addDetailedTooltipFromResources(list, getUnlocalizedNameForTooltip(itemstack));
|
||||
}
|
||||
|
||||
private static class BallTipProvider implements IAdvancedTooltipProvider {
|
||||
|
||||
@@ -12,11 +12,12 @@ import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
import crazypants.enderio.config.Config;
|
||||
import crazypants.enderio.gui.IAdvancedTooltipProvider;
|
||||
import crazypants.enderio.gui.IResourceTooltipProvider;
|
||||
import crazypants.enderio.gui.TooltipAddera;
|
||||
import crazypants.enderio.machine.power.PowerDisplayUtil;
|
||||
import crazypants.util.Lang;
|
||||
|
||||
public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvancedTooltipProvider{
|
||||
public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvancedTooltipProvider, IResourceTooltipProvider {
|
||||
|
||||
public BlockItemSolarPanel() {
|
||||
super(EnderIO.blockSolarPanel, EnderIO.blockSolarPanel);
|
||||
@@ -52,6 +53,7 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan
|
||||
@SuppressWarnings("rawtypes")
|
||||
@Override
|
||||
public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
|
||||
TooltipAddera.addCommonTooltipFromResources(list, itemstack);
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
@@ -70,4 +72,9 @@ public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvan
|
||||
list.add(Lang.localize("maxSolorProduction") + " " + PowerDisplayUtil.formatPowerPerTick(prod));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedNameForTooltip(ItemStack itemStack) {
|
||||
return super.getUnlocalizedName(itemStack);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user