From 79b3d910ead72c79f4451a7cae0e2449cbdfd6f5 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 1 May 2016 16:01:31 -0700 Subject: [PATCH] Add butterfly type to the names (butterfly, serum, caterpillar, cocoon) --- lang | 2 +- .../api/lepidopterology/EnumFlutterType.java | 6 ++++ .../items/ItemButterflyGE.java | 33 ++++++++++--------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/lang b/lang index a64ed7b8d..d76b11e94 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit a64ed7b8d582a99b70d445f0184c9c1ad43ece33 +Subproject commit d76b11e9406554cfbf32b8855417af2c9368732c diff --git a/src/main/java/forestry/api/lepidopterology/EnumFlutterType.java b/src/main/java/forestry/api/lepidopterology/EnumFlutterType.java index 0722637ce..5c97b61c3 100644 --- a/src/main/java/forestry/api/lepidopterology/EnumFlutterType.java +++ b/src/main/java/forestry/api/lepidopterology/EnumFlutterType.java @@ -5,10 +5,16 @@ ******************************************************************************/ package forestry.api.lepidopterology; +import java.util.Locale; + import forestry.api.genetics.ISpeciesType; public enum EnumFlutterType implements ISpeciesType { BUTTERFLY, SERUM, CATERPILLAR, COCOON; public static final EnumFlutterType[] VALUES = values(); + + public String getName() { + return toString().toLowerCase(Locale.ENGLISH); + } } diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 6a91ec28a..d22c9a590 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -51,6 +51,7 @@ import forestry.core.proxy.Proxies; import forestry.core.utils.BlockUtil; import forestry.core.utils.EntityUtil; import forestry.core.utils.GeneticsUtil; +import forestry.core.utils.Translator; import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.genetics.ButterflyGenome; @@ -77,21 +78,6 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister { return ButterflyGenome.getSpecies(itemStack); } - @Override - public String getItemStackDisplayName(ItemStack itemstack) { - - if (itemstack.getTagCompound() == null) { - return "???"; - } - - IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(itemstack); - if (butterfly == null) { - return "???"; - } - - return butterfly.getDisplayName(); - } - @Override public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { addCreativeItems(itemList, true); @@ -315,4 +301,21 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister { } } + @Override + public String getItemStackDisplayName(ItemStack itemstack) { + if (itemstack.getTagCompound() == null) { + return super.getItemStackDisplayName(itemstack); + } + + IButterfly individual = ButterflyManager.butterflyRoot.getMember(itemstack); + String customKey = "for.butterflies.custom." + type.getName() + "." + individual.getGenome().getPrimary().getUnlocalizedName().replace("butterflies.species.", ""); + if (Translator.canTranslateToLocal(customKey)) { + return Translator.translateToLocal(customKey); + } + String grammar = Translator.translateToLocal("for.butterflies.grammar." + type.getName()); + String speciesString = individual.getDisplayName(); + String typeString = Translator.translateToLocal("for.butterflies.grammar." + type.getName() + ".type"); + return grammar.replaceAll("%SPECIES", speciesString).replaceAll("%TYPE", typeString); + } + }