From b246cf8538257cdaf895ac77b3eebc8bef003fc9 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Mon, 18 Aug 2014 18:44:46 +0200 Subject: [PATCH] Finally fixed all the localization --- src/main/java/forestry/arboriculture/items/ItemStairs.java | 2 +- src/main/java/forestry/core/circuits/ItemCircuitBoard.java | 2 +- src/main/java/forestry/core/utils/StringUtil.java | 2 +- src/main/java/forestry/mail/items/ItemStamps.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/arboriculture/items/ItemStairs.java b/src/main/java/forestry/arboriculture/items/ItemStairs.java index 4c13b1a72..531e25b91 100755 --- a/src/main/java/forestry/arboriculture/items/ItemStairs.java +++ b/src/main/java/forestry/arboriculture/items/ItemStairs.java @@ -64,7 +64,7 @@ public class ItemStairs extends ItemForestryBlock { @Override public String getUnlocalizedName(ItemStack stack) { WoodType type = WoodType.getFromCompound(stack.getTagCompound()); - return super.getUnlocalizedName(stack) + "." + type.ordinal(); //To change body of generated methods, choose Tools | Templates. + return getBlock().getUnlocalizedName() + "." + type.ordinal(); //To change body of generated methods, choose Tools | Templates. } } diff --git a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java index ed487c475..626d549a0 100755 --- a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java +++ b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java @@ -62,7 +62,7 @@ public class ItemCircuitBoard extends ItemForestryMultiPass { @Override public String getUnlocalizedName(ItemStack stack) { EnumCircuitBoardType type = EnumCircuitBoardType.values()[stack.getItemDamage()]; - return "item.circuitboard." + type.toString().toLowerCase(Locale.ENGLISH); + return "item.for.circuitboard." + type.toString().toLowerCase(Locale.ENGLISH); } @SuppressWarnings({"unchecked", "rawtypes"}) diff --git a/src/main/java/forestry/core/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java index 191ab175d..cffc9ff9a 100755 --- a/src/main/java/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -19,7 +19,7 @@ import net.minecraft.util.StatCollector; public class StringUtil { public static String localize(String key) { - return StatCollector.translateToLocal(key).replace("\\n", "\n").replace("@", "%").replace("\\%", "@"); + return StatCollector.translateToLocal("for." + key).replace("\\n", "\n").replace("@", "%").replace("\\%", "@"); } public static String localizeAndFormat(String key, Object... args) { diff --git a/src/main/java/forestry/mail/items/ItemStamps.java b/src/main/java/forestry/mail/items/ItemStamps.java index 6590981e7..0315d5f81 100755 --- a/src/main/java/forestry/mail/items/ItemStamps.java +++ b/src/main/java/forestry/mail/items/ItemStamps.java @@ -64,7 +64,7 @@ public class ItemStamps extends ItemOverlay implements IStamps { if (itemstack.getItemDamage() < 0 || itemstack.getItemDamage() >= stampInfo.length) return null; - return super.getUnlocalizedName(itemstack) + "." + stampInfo[itemstack.getItemDamage()].name; + return super.getUnlocalizedName(itemstack); }