diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java index 048d432bf..4515fe54b 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java @@ -226,19 +226,21 @@ public class GuiInputter extends GuiContainer{ //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("|")); + String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.1", 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("|")); + String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.1", 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("|")); + String pull = StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.pull"); + String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.2", pull, 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("|")); + String put = StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".gui.put"); + String[] strings = StatCollector.translateToLocalFormatted("info."+ModUtil.MOD_ID_LOWER+".inputter.info.2", put, put).split(Pattern.quote("|")); this.func_146283_a(Arrays.asList(strings), x, y); } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java index 186913f35..79d6a425b 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java @@ -211,8 +211,7 @@ public class ItemCoffee extends ItemFood implements INameableItem{ list.add(StatCollector.translateToLocal(effect.getEffectName())+" "+(effect.getAmplifier()+1)+ " (" + Potion.getDurationString(new PotionEffect(0, effect.getDuration()*20, 0)) + ")"); } } - //TODO - else list.add("No Effects"); + else list.add(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+".noEffects.desc")); } else list.add(ItemUtil.shiftForInfo()); } diff --git a/src/main/java/ellpeck/actuallyadditions/nei/TreasureChestRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/nei/TreasureChestRecipeHandler.java index ad09dd933..e8c62f3a3 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/TreasureChestRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/TreasureChestRecipeHandler.java @@ -120,10 +120,7 @@ public class TreasureChestRecipeHandler extends TemplateRecipeHandler{ public void drawExtras(int rec){ CachedTreasure recipe = (CachedTreasure)this.arecipes.get(rec); if(recipe.result != null){ - int secondChance = recipe.chance; - String secondString = secondChance + "%"; - //TODO - GuiDraw.drawString(recipe.minAmount + "-" + recipe.maxAmount + " Items at " + secondString, 65+10, 45, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); + GuiDraw.drawString(recipe.minAmount+"-"+recipe.maxAmount+" "+StatCollector.translateToLocal("container.nei."+ModUtil.MOD_ID_LOWER+".treasureChest.info")+" "+recipe.chance+"%", 65+10, 45, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); } } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index ddd6aba6f..611d72e72 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -362,6 +362,7 @@ tooltip.actuallyadditions.shiftForInfo.desc=Press Shift for Info tooltip.actuallyadditions.hunger.desc=Fills tooltip.actuallyadditions.saturation.desc=Saturation tooltip.actuallyadditions.durability.desc=Durability +tooltip.actuallyadditions.noEffects.desc=No Effects tooltip.actuallyadditions.oredictName.desc=OreDictionary Entries tooltip.actuallyadditions.noOredictNameAvail.desc=Has No OreDictionary Entries @@ -546,7 +547,9 @@ container.actuallyadditions.enervator.name=Enervator container.nei.actuallyadditions.crushing.name=Crusher container.nei.actuallyadditions.ballOfHair.name=Ball Of Hair Usage container.nei.actuallyadditions.compost.name=Compost + container.nei.actuallyadditions.treasureChest.name=Treasure Chest +container.nei.actuallyadditions.treasureChest.info=Items at container.nei.actuallyadditions.coffee.name=Coffee Machine container.nei.actuallyadditions.coffee.special=Special Feature @@ -560,7 +563,6 @@ 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.