diff --git a/resources/assets/enderio/lang/de_DE.lang b/resources/assets/enderio/lang/de_DE.lang index cead18f8..2dbca7d0 100644 --- a/resources/assets/enderio/lang/de_DE.lang +++ b/resources/assets/enderio/lang/de_DE.lang @@ -562,6 +562,10 @@ enderio.gui.conduit.item.roundRobinEnabled=Round-Robin Aktiviert enderio.gui.conduit.item.roundRobinDisabled=Round-Robin Deaktiviert enderio.gui.conduit.item.priority=Priorität +enderio.gui.conduit.item.filterupgrade=Item-Filter einsetzen +enderio.gui.conduit.item.speedupgrade=Leitungsgeschwindigkeits-Upgrade oder -Downgrade einsetzen +enderio.gui.conduit.item.speedupgrade2=Maximum der Upgrades ist 15; Maximum der Downgrades ist 1 + enderio.gui.conduit.redstone.signalColor=Signalfarbe enderio.gui.conduit.redstone.color=Farbe diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 24783a42..b9b0e8a7 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -892,7 +892,7 @@ 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.speedupgrade=Insert Item Conduit Speed Upgrades/Downgrade enderio.gui.conduit.item.speedupgrade2=Max upgrades is 15; Max downgrades is 1 enderio.gui.conduit.redstone.signalColor=Signal Color diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index 67b016b4..18e9f9ec 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -75,6 +75,8 @@ public class ItemSettings extends BaseSettingsPanel { private int priWidth = 32; private GuiToolTip priorityTooltip; + private GuiToolTip speedUpgradeTooltip; + private GuiToolTip filterUpgradeTooltip; private IItemFilterGui filterGui; @@ -96,6 +98,9 @@ public class ItemSettings extends BaseSettingsPanel { channelB.setColorIndex(0); channelB.setToolTipHeading(Lang.localize("gui.conduit.item.channel")); + filterUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18 * 2, customTop + 3 + 16, 18, 18), Lang.localize("gui.conduit.item.filterupgrade")); + speedUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18, customTop + 3 + 16, 18, 18), Lang.localize("gui.conduit.item.speedupgrade"), Lang.localize("gui.conduit.item.speedupgrade2")); + x += channelB.getWidth() + 4; priLeft = x - 8; @@ -293,6 +298,8 @@ public class ItemSettings extends BaseSettingsPanel { colorB.setColorIndex(itemConduit.getExtractionSignalColor(gui.getDir()).ordinal()); } + gui.addToolTip(filterUpgradeTooltip); + if(mode == ConnectionMode.IN_OUT && !outputActive) { loopB.onGuiInit(); loopB.setSelected(itemConduit.isSelfFeedEnabled(gui.getDir())); @@ -301,6 +308,7 @@ public class ItemSettings extends BaseSettingsPanel { if((mode == ConnectionMode.IN_OUT && !outputActive) || mode == ConnectionMode.INPUT) { roundRobinB.onGuiInit(); roundRobinB.setSelected(itemConduit.isRoundRobinEnabled(gui.getDir())); + gui.addToolTip(speedUpgradeTooltip); } if((mode == ConnectionMode.IN_OUT && outputActive) || mode == ConnectionMode.OUTPUT) { @@ -410,7 +418,6 @@ public class ItemSettings extends BaseSettingsPanel { String str = itemConduit.getOutputPriority(gui.getDir()) + ""; int sw = fr.getStringWidth(str); fr.drawString(str, left + priLeft + priWidth - sw - gap, top, ColorUtil.getRGB(Color.black)); - } else { //draw speed upgrade slot GL11.glColor3f(1, 1, 1); @@ -442,6 +449,8 @@ public class ItemSettings extends BaseSettingsPanel { priUpB.detach(); priDownB.detach(); gui.removeToolTip(priorityTooltip); + gui.removeToolTip(speedUpgradeTooltip); + gui.removeToolTip(filterUpgradeTooltip); channelB.detach(); if(filterGui != null) {