diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index ef21961a..90b6858f 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -894,28 +894,6 @@ gui.modifier.necro=Necrotic gui.modifier.spider=Anti-Spider gui.modifier.quartz=Quartz -modifier.armour.jump.double=Double-Jump -modifier.armour.jump.triple=Triple-Jump -modifier.armour.jump.quad=Quadruple-Jump -modifier.armour.protection= -modifier.tool.spider=Bane of Arthropods -modifier.tool.quartz=Sharpness -modifier.tool.blaze=Fiery -modifier.tool.silk=Silky -modifier.tool.flux=Flux -modifier.tool.lapis=Luck -modifier.tool.piston=Knockback -modifier.tool.redstone=Haste -modifier.tool.reinforced=Reinforced -modifier.tool.unbreaking= -modifier.tool.smite=Smite -modifier.tool.diamond=Durability +500 -modifier.tool.emerald=Durability +50% -modifier.tool.moss=Auto-Repair -modifier.tool.lava=Auto-Smelt -modifier.tool.necro=Life Steal -modifier.tool.beheading=Beheading - creativeModLock.tooltip=Target Lock: attribute.name.ammo.attackDamage=Base Damage @@ -986,6 +964,8 @@ tool.glassarrows.lore=Crafted by a legendary Glassmaker tool.baneofpigs=Bane of Pigs tool.infiminer=InfiMiner +tool.core.broken=Broken + armor.core.broken=Broken armor.core.protection=Protection: armor.travelbelt.ability=Ability: Swap Hotbar @@ -994,4 +974,29 @@ 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 +armor.travelboots.ability=Ability: High Step + +modifier.armour.jump.double=Double-Jump +modifier.armour.jump.triple=Triple-Jump +modifier.armour.jump.quad=Quadruple-Jump +modifier.armour.protection= + +tool.reinforced=Reinforced +tool.unbreakable=Unbreakable + +modifier.tooltip.Auto-Smelt=Auto-Smelt +modifier.tool.spider=Bane of Arthropods +modifier.tool.quartz=Sharpness +modifier.tool.blaze=Fiery +modifier.tool.silk=Silky +modifier.tool.flux=Flux +modifier.tool.lapis=Luck +modifier.tool.piston=Knockback +modifier.tool.redstone=Haste +modifier.tool.smite=Smite +modifier.tool.diamond=Durability +500 +modifier.tool.emerald=Durability +50% +modifier.tool.moss=Auto-Repair +modifier.tool.lava=Auto-Smelt +modifier.tool.necro=Life Steal +modifier.tool.beheading=Beheading \ No newline at end of file diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index 2b2fac64..7758d013 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -429,6 +429,12 @@ public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IMod if (tags.hasKey(tooltip)) { String tipName = tags.getString(tooltip); + // let's see if we can translate it somehow + // strip color information + String locString = "modifier.tooltip." + EnumChatFormatting.getTextWithoutFormattingCodes(tipName); + locString = locString.replace(" ", ""); + //if(StatCollector.canTranslate(locString)) + tipName = tipName.replace(EnumChatFormatting.getTextWithoutFormattingCodes(tipName), StatCollector.translateToLocal(locString)); if (!tipName.equals("")) list.add(tipName); } diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 8c6b65f1..834dbaa6 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -324,7 +324,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq { boolean broken = tags.getCompoundTag("InfiTool").getBoolean("Broken"); if (broken) - list.add("\u00A7oBroken"); + list.add("\u00A7o" + StatCollector.translateToLocal("tool.core.broken")); else { int head = tags.getCompoundTag("InfiTool").getInteger("Head"); @@ -368,8 +368,16 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq if (tags.getCompoundTag("InfiTool").hasKey(tooltip)) { String tipName = tags.getCompoundTag("InfiTool").getString(tooltip); - if (!tipName.equals("")) + if (!tipName.equals("")) { + // let's see if we can translate it somehow + // strip color information + String locString = "modifier.tooltip." + EnumChatFormatting.getTextWithoutFormattingCodes(tipName); + locString = locString.replace(" ", ""); + //if(StatCollector.canTranslate(locString)) + tipName = tipName.replace(EnumChatFormatting.getTextWithoutFormattingCodes(tipName), StatCollector.translateToLocal(locString)); + list.add(tipName); + } } else displayToolTips = false; @@ -447,8 +455,8 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IEq String getReinforcedString (int reinforced) { if (reinforced > 9) - return "Unbreakable"; - String ret = "Reinforced "; + return StatCollector.translateToLocal("tool.unbreakable"); + String ret = StatCollector.translateToLocal("tool.reinforced") + " "; switch (reinforced) { case 1: diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java index 28870932..82f3bdb3 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java @@ -5,6 +5,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import tconstruct.library.accessory.AccessoryCore; import tconstruct.library.armor.ArmorCore; @@ -155,7 +156,12 @@ public final class ToolStationGuiHelper { String tooltip = "ModifierTip"; int tipNum = 1; while (tags.hasKey(tooltip + tipNum)) { - write("- " + tags.getString(tooltip + tipNum)); + String tipName = tags.getString(tooltip + tipNum); + String locString = "modifier.toolstation." + EnumChatFormatting.getTextWithoutFormattingCodes(tipName); + locString = locString.replace(" ", ""); + //if(StatCollector.canTranslate(locString)) + tipName = tipName.replace(EnumChatFormatting.getTextWithoutFormattingCodes(tipName), StatCollector.translateToLocal(locString)); + write("- " + tipName); tipNum++; } }