From 30d7b322bd9ab247ad3fa015b475c9906a5ca8de Mon Sep 17 00:00:00 2001 From: Adaptivity Date: Fri, 2 Jan 2015 15:27:10 +0300 Subject: [PATCH] Localize armor tooltips --- resources/assets/tinker/lang/en_US.lang | 12 +++++- resources/assets/tinker/lang/ru_RU.lang | 39 +++++++++++++++++++ .../tconstruct/armor/items/TravelBelt.java | 5 ++- .../tconstruct/armor/items/TravelGear.java | 11 +++--- .../tconstruct/library/armor/ArmorCore.java | 5 ++- 5 files changed, 62 insertions(+), 10 deletions(-) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 6cbc7ed3..0da93490 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -954,4 +954,14 @@ manual.page.material8=Stonebound level manual.page.material9=Splintering level tool.glassarrows=Glass Arrows -tool.glassarrows.lore=Crafted by a legendary Glassmaker \ No newline at end of file +tool.glassarrows.lore=Crafted by a legendary Glassmaker + +armor.core.broken=Broken +armor.core.protection=Protection: +armor.travelbelt.ability=Ability: Swap Hotbar +armor.travelbelt.control=Control: +armor.travelgoggles.ability=Ability: Zoom with +armor.travelgoggles.toggleabilities=Ability: Swap Hotbar +armor.travelvest.ability=Ability: Swift Swim +armor.travelwings.ability=Ability: High Jump +armor.travelboots.ability=Ability: High Step \ No newline at end of file diff --git a/resources/assets/tinker/lang/ru_RU.lang b/resources/assets/tinker/lang/ru_RU.lang index 58175fc9..2ec0171b 100644 --- a/resources/assets/tinker/lang/ru_RU.lang +++ b/resources/assets/tinker/lang/ru_RU.lang @@ -926,6 +926,45 @@ tool.kingslimeprefix=King Slime # Specific localization like materials #tool.shovel.kingslime=Regret + +manual.page.tool1=Детали для создания +manual.page.modifier1=Инженерная станция +manual.page.modifier2=Инженерная кузня +manual.page.modifier3=Стол инженера +manual.page.casting1=Ингридиенты + +manual.page.material.material=Материал +manual.page.material.shard=Осколок +manual.page.material.rod=Стержень +manual.page.material.durability=Прочность +manual.page.material.handle=Модификатор ручки +manual.page.material.speed=Скорость добычи +manual.page.material.level=Уровень добычи +manual.page.material.attack=Основной урон + +manual.page.material1=Полная прочность +manual.page.material2=Сердце +manual.page.material3=Сердца(-дец) +manual.page.material4=Особенность материала +manual.page.material5=+1 модификатор +manual.page.material6=Особенность материала: Усиление +manual.page.material7=Уровень усиления +manual.page.material8=Уровень силы камня +manual.page.material9=Splintering level + +tool.glassarrows=Стеклянные стрелы +tool.glassarrows.lore=Созданы легендой по имени Glassmaker + +armor.core.broken=Сломан. +armor.core.protection=Защита: +armor.travelbelt.ability=Функция: Swap Hotbar +armor.travelbelt.control=Управление: +armor.travelgoggles.ability=Функция: Приближение +armor.travelgoggles.toggleabilities=Переключение функций +armor.travelvest.ability=Функция: Быстрое плавание +armor.travelwings.ability=Функция: Высокий прыжок +armor.travelboots.ability=Функция: Высокий шаг + tool.pickaxe.netherrack=Кирка из камня Нижнего мира tool.shovel.netherrack=Лопата из камня Нижнего мира tool.hatchet.netherrack=Топорик из камня Нижнего мира diff --git a/src/main/java/tconstruct/armor/items/TravelBelt.java b/src/main/java/tconstruct/armor/items/TravelBelt.java index 219910c0..315840ec 100644 --- a/src/main/java/tconstruct/armor/items/TravelBelt.java +++ b/src/main/java/tconstruct/armor/items/TravelBelt.java @@ -9,6 +9,7 @@ import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import tconstruct.armor.ArmorProxyClient; import tconstruct.client.ArmorControls; import tconstruct.library.accessory.*; @@ -55,7 +56,7 @@ public class TravelBelt extends AccessoryCore implements IAccessoryModel if (!stack.hasTagCompound()) return; - list.add("\u00a76Ability: Swap Hotbar"); - list.add("\u00a76Control: " + GameSettings.getKeyDisplayString(ArmorControls.beltSwap.getKeyCode())); + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelbelt.ability")); + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelbelt.control") + GameSettings.getKeyDisplayString(ArmorControls.beltSwap.getKeyCode())); } } diff --git a/src/main/java/tconstruct/armor/items/TravelGear.java b/src/main/java/tconstruct/armor/items/TravelGear.java index 97323eec..00b26876 100644 --- a/src/main/java/tconstruct/armor/items/TravelGear.java +++ b/src/main/java/tconstruct/armor/items/TravelGear.java @@ -11,6 +11,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.TinkerArmor; @@ -181,17 +182,17 @@ public class TravelGear extends ArmorCore implements IRevealer, IGoggles switch (armorPart) { case Head: - list.add("\u00a76Ability: Zoom with " + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.zoomKey.getKeyCode())); - list.add("\u00a76Toggle Abilities: " + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.toggleGoggles.getKeyCode())); + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.ability") + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.zoomKey.getKeyCode())); + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelgoggles.toggleabilities") + GameSettings.getKeyDisplayString(tconstruct.client.ArmorControls.toggleGoggles.getKeyCode())); break; case Chest: - list.add("\u00a76Ability: Swift Swim"); + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelvest.ability")); break; case Legs: - list.add("\u00a76Ability: High Jump"); + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelwings.ability")); break; case Feet: - list.add("\u00a76Ability: High Step"); + list.add("\u00a76" + StatCollector.translateToLocal("armor.travelboots.ability")); break; default: } diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index 2eaccc55..2b2fac64 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -12,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import tconstruct.library.TConstructRegistry; @@ -415,9 +416,9 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod protection = getProtection(tags); } if (protection > 0) - list.add("\u00a77Protection: " + df.format(protection) + "%"); + list.add("\u00a77" + StatCollector.translateToLocal("armor.core.protection") + df.format(protection) + "%"); else - list.add("\u00A7oBroken"); + list.add("\u00A7o" + StatCollector.translateToLocal("armor.core.broken")); boolean displayToolTips = true; int tipNum = 0;