diff --git a/src/main/java/com/hbm/items/armor/ArmorFSB.java b/src/main/java/com/hbm/items/armor/ArmorFSB.java index b6d38e212..5da09df69 100644 --- a/src/main/java/com/hbm/items/armor/ArmorFSB.java +++ b/src/main/java/com/hbm/items/armor/ArmorFSB.java @@ -287,7 +287,7 @@ public class ArmorFSB extends ItemArmor implements IArmorDisableModel { } if(protectionYield != 100F) { - list.add(EnumChatFormatting.BLUE + " Protection applies to damage <" + protectionYield); + list.add(EnumChatFormatting.BLUE + " " + I18nUtil.resolveKey("armor.yield", protectionYield)); } } diff --git a/src/main/java/com/hbm/items/armor/ArmorGasMask.java b/src/main/java/com/hbm/items/armor/ArmorGasMask.java index 7e0b7e20b..c332a565a 100644 --- a/src/main/java/com/hbm/items/armor/ArmorGasMask.java +++ b/src/main/java/com/hbm/items/armor/ArmorGasMask.java @@ -177,7 +177,7 @@ public class ArmorGasMask extends ItemArmor implements IGasMask { List haz = getBlacklist(stack, player); if(!haz.isEmpty()) { - list.add(EnumChatFormatting.RED + "Will never protect against:"); + list.add(EnumChatFormatting.RED + I18nUtil.resolveKey("hazard.neverProtects")); for(HazardClass clazz : haz) { list.add(EnumChatFormatting.DARK_RED + " -" + I18nUtil.resolveKey(clazz.lang)); diff --git a/src/main/java/com/hbm/items/armor/ItemArmorMod.java b/src/main/java/com/hbm/items/armor/ItemArmorMod.java index b3924f557..332042585 100644 --- a/src/main/java/com/hbm/items/armor/ItemArmorMod.java +++ b/src/main/java/com/hbm/items/armor/ItemArmorMod.java @@ -5,6 +5,7 @@ import java.util.List; import com.google.common.collect.Multimap; import com.hbm.handler.ArmorModHandler; import com.hbm.main.MainRegistry; +import com.hbm.util.I18nUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -37,32 +38,32 @@ public class ItemArmorMod extends Item { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - list.add(EnumChatFormatting.DARK_PURPLE + "Applicable to:"); + list.add(EnumChatFormatting.DARK_PURPLE + I18nUtil.resolveKey("armorMod.applicableTo")); if(helmet && chestplate && leggings && boots) { - list.add(" All"); + list.add(" " + I18nUtil.resolveKey("armorMod.all")); } else { if(helmet) - list.add(" Helmets"); + list.add(" " + I18nUtil.resolveKey("armorMod.helmets")); if(chestplate) - list.add(" Chestplates"); + list.add(" " + I18nUtil.resolveKey("armorMod.chestplates")); if(leggings) - list.add(" Leggings"); + list.add(" " + I18nUtil.resolveKey("armorMod.leggins")); if(boots) - list.add(" Boots"); + list.add(" " + I18nUtil.resolveKey("armorMod.boots")); } list.add(EnumChatFormatting.DARK_PURPLE + "Slot:"); switch(this.type) { - case ArmorModHandler.helmet_only: list.add(" Helmet"); break; - case ArmorModHandler.plate_only: list.add(" Chestplate"); break; - case ArmorModHandler.legs_only: list.add(" Leggings"); break; - case ArmorModHandler.boots_only: list.add(" Boots"); break; - case ArmorModHandler.servos: list.add(" Servos"); break; - case ArmorModHandler.cladding: list.add(" Cladding"); break; - case ArmorModHandler.kevlar: list.add(" Insert"); break; - case ArmorModHandler.extra: list.add(" Special"); break; + case ArmorModHandler.helmet_only: list.add(" " + I18nUtil.resolveKey("armorMod.type.helmet")); break; + case ArmorModHandler.plate_only: list.add(" " + I18nUtil.resolveKey("armorMod.type.chestplate")); break; + case ArmorModHandler.legs_only: list.add(" " + I18nUtil.resolveKey("armorMod.type.leggings")); break; + case ArmorModHandler.boots_only: list.add(" " + I18nUtil.resolveKey("armorMod.type.boots")); break; + case ArmorModHandler.servos: list.add(" " + I18nUtil.resolveKey("armorMod.type.servo")); break; + case ArmorModHandler.cladding: list.add(" " + I18nUtil.resolveKey("armorMod.type.cladding")); break; + case ArmorModHandler.kevlar: list.add(" " + I18nUtil.resolveKey("armorMod.type.insert")); break; + case ArmorModHandler.extra: list.add(" " + I18nUtil.resolveKey("armorMod.type.special")); break; } } diff --git a/src/main/java/com/hbm/items/machine/ItemTemplateFolder.java b/src/main/java/com/hbm/items/machine/ItemTemplateFolder.java index 4cf7dab59..f54cec863 100644 --- a/src/main/java/com/hbm/items/machine/ItemTemplateFolder.java +++ b/src/main/java/com/hbm/items/machine/ItemTemplateFolder.java @@ -4,6 +4,7 @@ import java.util.List; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; +import com.hbm.util.I18nUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,12 +23,11 @@ public class ItemTemplateFolder extends Item { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) - { - list.add("Machine Templates: Paper + Dye"); - list.add("Fluid IDs: Iron Plate + Dye"); - list.add("Press Stamps: Flat Stamp"); - list.add("Siren Tracks: Insulator + Steel Plate"); + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + + String[] lang = I18nUtil.resolveKeyArray(this.getUnlocalizedName() + ".desc"); + for(String line : lang) { + list.add(lang); + } } - } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 8ce100638..ffdff8f6d 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -101,6 +101,22 @@ armor.sprintBoost=Verstärkter Sprint armor.thermal=Wärmebildkamera armor.threshold=Schadensschwelle: %s armor.vats=Feinde-HUD +armor.yield=Schutz betrifft Schaden <%s + +armorMod.all=Alle +armorMod.applicableTo=Anwendbar an: +armorMod.boots=Stiefel +armorMod.chestplates=Brustplatten +armorMod.helmets=Helme +armorMod.leggings=Beinschienen +armorMod.type.boots=Stiefel +armorMod.type.chestplate=Brustplatte +armorMod.type.cladding=Beschläge +armorMod.type.helmet=Helm +armorMod.type.insert=Einlage +armorMod.type.leggins=Beinschienen +armorMod.type.servo=Servos +armorMod.type.special=Spezial bomb.detonated=Erfolgreich gezündet! bomb.incompatible=Gerät kann nicht ausgelöst werden! @@ -469,6 +485,7 @@ hazard.gasInert=Träge Gase / Strickgas hazard.gasMonoxide=Kohlenstoffmonoxid hazard.light=Starkes Licht hazard.nerveAgent=Nervengift +hazard.neverProtects=Schützt nicht vor: hazard.particleCoarse=Partikel hazard.particleFine=Feinstaub hazard.sand=Augenreizstoffe @@ -2723,6 +2740,7 @@ item.tank_waste_8.name=Schlammcontainer item.telepad.name=Teleplatte item.tem_flakes.name=Tem Flakes item.template_folder.name=Produktionsvorlagen-Zeichenmappe +item.template_folder.desc=Vorlagen: Papier + Farbe$Flüssigkeits-ID: Eisenplatte + Farbe$Stempel: Flacher Stempel$Sirenen-Track: Isolator + Stahlplatte item.test_nuke_igniter.name=Zünder item.test_nuke_propellant.name=Treibladung item.test_nuke_tier1_bullet.name=U235 Geschoss (Stufe 1) diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 9c5f71776..d51734ff4 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -146,6 +146,22 @@ armor.sprintBoost=Boosted Sprint armor.thermal=Thermal Sight armor.threshold=Damage threshold of %s armor.vats=Enemy HUD +armor.yield=Protection applies to damage <%s + +armorMod.all=All +armorMod.applicableTo=Applicable To: +armorMod.boots=Boots +armorMod.chestplates=Chestplates +armorMod.helmets=Helmets +armorMod.leggings=Leggings +armorMod.type.boots=Boots +armorMod.type.chestplate=Chestplate +armorMod.type.cladding=Cladding +armorMod.type.helmet=Helmet +armorMod.type.insert=Insert +armorMod.type.leggins=Leggings +armorMod.type.servo=Servos +armorMod.type.special=Special bomb.detonated=Detonated successfully! bomb.incompatible=Device can not be triggered! @@ -674,6 +690,7 @@ hazard.gasInert=Inert Gas / Asphxiants hazard.gasMonoxide=Carbon Monoxide hazard.light=Bright Lights hazard.nerveAgent=Nerve Agent +hazard.neverProtects=Will never protect against: hazard.particleCoarse=Airborne Particles hazard.particleFine=Particulates hazard.sand=Eye Irritants @@ -3121,6 +3138,7 @@ item.tank_waste_8.name=Mud Container item.telepad.name=Telepad item.tem_flakes.name=Tem Flakes item.template_folder.name=Machine Template Folder +item.template_folder.desc=Machine Templates: Paper + Dye$Fluid IDs: Iron Plate + Dye$Press Stamps: Flat Stamp$Siren Tracks: Insulator + Steel Plate item.test_nuke_igniter.name=Igniter item.test_nuke_propellant.name=Propellant item.test_nuke_tier1_bullet.name=U235 Projectile (Tier 1)