From 6b5edfb6515a6ac1e20f781b7326b7dcd0b928e2 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 9 Jul 2015 16:59:43 +0200 Subject: [PATCH] Added descriptions to the ESD --- .../inventory/gui/GuiInputter.java | 21 ++++++++++++++++++ .../assets/actuallyadditions/lang/en_US.lang | 10 ++++++--- .../textures/gui/guiInputter.png | Bin 3496 -> 3900 bytes .../textures/gui/guiInputterAdvanced.png | Bin 1997 -> 1997 bytes 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java index 22671ef42..048d432bf 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java @@ -22,8 +22,10 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import scala.actors.threadpool.Arrays; import java.util.Collections; +import java.util.regex.Pattern; @SideOnly(Side.CLIENT) public class GuiInputter extends GuiContainer{ @@ -204,6 +206,7 @@ public class GuiInputter extends GuiContainer{ } @Override + @SuppressWarnings("unchecked") public void drawScreen(int x, int y, float f){ super.drawScreen(x, y, f); @@ -220,6 +223,24 @@ public class GuiInputter extends GuiContainer{ this.func_146283_a(Collections.singletonList(text2), x, y); } } + + //Info Mode on! + if(x >= guiLeft+11 && y >= guiTop+65 && x <= guiLeft+11+31 && y <= guiTop+65+12){ + String[] strings = StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".inputter.info.1").replace("%s", StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.pull")).split(Pattern.quote("|")); + this.func_146283_a(Arrays.asList(strings), x, y); + } + if(x >= guiLeft+96 && y >= guiTop+65 && x <= guiLeft+96+31 && y <= guiTop+65+12){ + String[] strings = StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".inputter.info.1").replace("%s", StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.put")).split(Pattern.quote("|")); + this.func_146283_a(Arrays.asList(strings), x, y); + } + if(x >= guiLeft+48 && y >= guiTop+65 && x <= guiLeft+48+31 && y <= guiTop+65+12){ + String[] strings = StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".inputter.info.2").replace("%s", StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.pull")).split(Pattern.quote("|")); + this.func_146283_a(Arrays.asList(strings), x, y); + } + if(x >= guiLeft+133 && y >= guiTop+65 && x <= guiLeft+133+31 && y <= guiTop+65+12){ + String[] strings = StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".inputter.info.2").replace("%s", StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.put")).split(Pattern.quote("|")); + this.func_146283_a(Arrays.asList(strings), x, y); + } } @Override diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 27df39981..4331f1dbf 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -250,8 +250,8 @@ tooltip.actuallyadditions.itemDrillUpgradeFortuneII.desc=Gives the Drill Fortune tooltip.actuallyadditions.itemDrillUpgradeBlockPlacing.desc.1=Places Blocks from your Hotbar when Right-Clicking with the Drill! tooltip.actuallyadditions.itemDrillUpgradeBlockPlacing.desc.2=You can define the Slot on your Hotbar to place from! tooltip.actuallyadditions.itemDrillUpgradeBlockPlacing.desc.3=Sneak-Right-Click this Upgrade in the desired Slot to store it! -tooltip.actuallyadditions.itemDrillUpgradeThreeByThree.desc=Lets you mine a 3x3 Area! -tooltip.actuallyadditions.itemDrillUpgradeFiveByFive.desc=Lets you mine a 5x5 Area! Requires the 3x3 Upgrade. +tooltip.actuallyadditions.itemDrillUpgradeThreeByThree.desc=Lets you mine a 3x3 Area! Sneaking while mining will ignore the Augment. +tooltip.actuallyadditions.itemDrillUpgradeFiveByFive.desc=Lets you mine a 5x5 Area! Sneaking while mining will ignore the Augment. Requires the 3x3 Upgrade. tooltip.actuallyadditions.itemDrillUpgrade.desc=Sneak-Right-Click the Drill to apply Upgrades! tile.actuallyadditions.blockMiscEnderCasing.name=Ender Casing @@ -397,7 +397,7 @@ tooltip.actuallyadditions.blockInputter.desc.3=Turn me off with Redstone! tooltip.actuallyadditions.blockInputter.desc.4=Configurable: tooltip.actuallyadditions.blockInputter.desc.5=-Side to Output to and Input from tooltip.actuallyadditions.blockInputter.desc.6=-A Range of Slots in the other Inventory to Output to and Input from -tooltip.actuallyadditions.blockInputter.desc.7=-> Just input the Minimum and Maximum Slots into the input Fields! +tooltip.actuallyadditions.blockInputter.desc.7=-Hover over GUI Elements to find out what they mean! tooltip.actuallyadditions.blockInputterAdvanced.desc=Has an Input and Output Filter! (White- and Blacklist!) tooltip.actuallyadditions.blockFishingNet.desc=Catches Fish automatically when placed above Water tooltip.actuallyadditions.blockFurnaceSolar.desc=Produces RF in Daylight @@ -555,6 +555,10 @@ info.actuallyadditions.update.download.desc=[{"text":"Download the newest Versio info.actuallyadditions.update.failed.desc=[{"text":"The Update Check for "},{"text":"Actually Additions ","color":"dark_green","bold":"true"},{"text":"failed! Check your Internet Connection and the Logs for more Info!","color":"none"}] info.actuallyadditions.update.changelog.desc=Updates: %s +#The "|" are places where the String splits into a new Line +info.actuallyadditions.inputter.info.1=This is the first Slot in the |connected Inventory to %s at. +info.actuallyadditions.inputter.info.2=This is the slot after the last Slot |in the connected Inventory to %s at. |What that means: If you, for example, write 2 in |the field to the left and 5 in this one, |it will %s from Slot 2, 3, and 4. + achievement.actuallyadditions.pickUpSolidXP=Square and yummy! achievement.actuallyadditions.pickUpSolidXP.desc=Pick up some Solidified Experience achievement.actuallyadditions.craftKnifeBlade=Sharp! So Sharp! diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/guiInputter.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiInputter.png index a6cb89c47ed1d36497a445175825ca80379230c0..9b4bc4d364488caec065cbb02fa7b8ba81e8be24 100644 GIT binary patch literal 3900 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 literal 3496 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