Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Fixed missing Localizations and changed ESD Localization

Browse source
This commit is contained in:
Ellpeck 2015-07-10 14:00:23 +02:00
parent 8d54614a9d
commit 077fe68885
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/ellpeck/actuallyadditions/inventory/gui/GuiInputter.java
View file

@ -226,19 +226,21 @@ public class GuiInputter extends GuiContainer{
//Info Mode on! //Info Mode on!
if(x >= guiLeft+11 && y >= guiTop+65 && x <= guiLeft+11+31 && y <= guiTop+65+12){ 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); this.func_146283_a(Arrays.asList(strings), x, y);
} }
if(x >= guiLeft+96 && y >= guiTop+65 && x <= guiLeft+96+31 && y <= guiTop+65+12){ 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); this.func_146283_a(Arrays.asList(strings), x, y);
} }
if(x >= guiLeft+48 && y >= guiTop+65 && x <= guiLeft+48+31 && y <= guiTop+65+12){ 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); this.func_146283_a(Arrays.asList(strings), x, y);
} }
if(x >= guiLeft+133 && y >= guiTop+65 && x <= guiLeft+133+31 && y <= guiTop+65+12){ 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); this.func_146283_a(Arrays.asList(strings), x, y);
} }
} }

3
src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java
View file

@ -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)) + ")"); list.add(StatCollector.translateToLocal(effect.getEffectName())+" "+(effect.getAmplifier()+1)+ " (" + Potion.getDurationString(new PotionEffect(0, effect.getDuration()*20, 0)) + ")");
} }
} }
//TODO else list.add(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+".noEffects.desc"));
else list.add("No Effects");
} }
else list.add(ItemUtil.shiftForInfo()); else list.add(ItemUtil.shiftForInfo());
} }

5
src/main/java/ellpeck/actuallyadditions/nei/TreasureChestRecipeHandler.java
View file

@ -120,10 +120,7 @@ public class TreasureChestRecipeHandler extends TemplateRecipeHandler{
public void drawExtras(int rec){ public void drawExtras(int rec){
CachedTreasure recipe = (CachedTreasure)this.arecipes.get(rec); CachedTreasure recipe = (CachedTreasure)this.arecipes.get(rec);
if(recipe.result != null){ if(recipe.result != null){
int secondChance = recipe.chance; 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);
String secondString = secondChance + "%";
//TODO
GuiDraw.drawString(recipe.minAmount + "-" + recipe.maxAmount + " Items at " + secondString, 65+10, 45, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false);
} }
} }

4
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -362,6 +362,7 @@ tooltip.actuallyadditions.shiftForInfo.desc=Press Shift for Info
tooltip.actuallyadditions.hunger.desc=Fills tooltip.actuallyadditions.hunger.desc=Fills
tooltip.actuallyadditions.saturation.desc=Saturation tooltip.actuallyadditions.saturation.desc=Saturation
tooltip.actuallyadditions.durability.desc=Durability tooltip.actuallyadditions.durability.desc=Durability
tooltip.actuallyadditions.noEffects.desc=No Effects
tooltip.actuallyadditions.oredictName.desc=OreDictionary Entries tooltip.actuallyadditions.oredictName.desc=OreDictionary Entries
tooltip.actuallyadditions.noOredictNameAvail.desc=Has No 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.crushing.name=Crusher
container.nei.actuallyadditions.ballOfHair.name=Ball Of Hair Usage container.nei.actuallyadditions.ballOfHair.name=Ball Of Hair Usage
container.nei.actuallyadditions.compost.name=Compost container.nei.actuallyadditions.compost.name=Compost
container.nei.actuallyadditions.treasureChest.name=Treasure Chest 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.name=Coffee Machine
container.nei.actuallyadditions.coffee.special=Special Feature 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.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 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.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. 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.