diff --git a/resources/assets/enderio/lang/de_DE.lang b/resources/assets/enderio/lang/de_DE.lang index 7745e140..cead18f8 100644 --- a/resources/assets/enderio/lang/de_DE.lang +++ b/resources/assets/enderio/lang/de_DE.lang @@ -167,6 +167,7 @@ tile.blockAlloySmelter.tooltip.detailed.line5=Geschw. und Energiespeicher erhöh tile.blockSolarPanel.name=Photovoltaikzelle tile.blockSolarPanel.advanced.name=Fortgeschrittene Photovoltaikzelle +tile.blockSolarPanel.tooltip.common.line1=Solarenergie! tile.blockSolarPanel.tooltip.detailed.line1=Produziert Energie am Tag tile.blockSolarPanel.tooltip.detailed.line2=Braucht klare Sicht tile.blockSolarPanel.tooltip.detailed.line3=zum Himmel diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index df40096c..324288cd 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -244,6 +244,7 @@ tile.blockAlloySmelter.tooltip.detailed.line5=speed and energy storage tile.blockSolarPanel.name=Photovoltaic Cell tile.blockSolarPanel.advanced.name=Advanced Photovoltaic Cell +tile.blockSolarPanel.tooltip.common.line1=Solar power! tile.blockSolarPanel.tooltip.detailed.line1=Produces power during daylight hours tile.blockSolarPanel.tooltip.detailed.line2=Must have a clear line of sight to tile.blockSolarPanel.tooltip.detailed.line3=the sky @@ -875,6 +876,10 @@ enderio.gui.conduit.item.roundRobinEnabled=Round Robin Enabled enderio.gui.conduit.item.roundRobinDisabled=Round Robin Disabled enderio.gui.conduit.item.priority=Priority +enderio.gui.conduit.item.filterupgrade=Insert Item Filter +enderio.gui.conduit.item.speedupgrade=Insert Item Conduit Speed Up-/ Downgrade +enderio.gui.conduit.item.speedupgrade2=Max upgrades is 15; Max downgrades is 1 + enderio.gui.conduit.redstone.signalColor=Signal Color enderio.gui.conduit.redstone.color=Color enderio.gui.conduit.redstone.signalStrengh=Strong Signal diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index ede5a5a7..1e83d649 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -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 { diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java index 90060cd2..a15ec040 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java @@ -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); + } + }