From ea03a4c9fef9c5906c80aa5453063f59fa9f4d51 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 16 May 2015 00:42:32 -0700 Subject: [PATCH] #657 Add localization for gui.flyer.tooltip --- lang | 2 +- src/main/java/forestry/apiculture/genetics/Bee.java | 4 ++++ .../java/forestry/lepidopterology/genetics/Butterfly.java | 8 ++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lang b/lang index e5ab246e3..b72d6a6f7 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit e5ab246e3adee1fa1491b10c8ed31dec40429e4d +Subproject commit b72d6a6f7cfb0d17dd5a5df4ecc93b8707a3d28f diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 88ba9245e..9facd568f 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -403,6 +403,10 @@ public class Bee extends IndividualLiving implements IBee { if (genome.getNocturnal()) { list.add(EnumChatFormatting.RED + GenericRatings.rateActivityTime(genome.getNocturnal(), false)); } + + if (genome.getTolerantFlyer()) { + list.add(EnumChatFormatting.WHITE + StringUtil.localize("gui.flyer.tooltip")); + } } @Override diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 9af5f531c..6c01727fb 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -73,8 +73,8 @@ public class Butterfly extends IndividualLiving implements IButterfly { list.add(EnumChatFormatting.RED + StringUtil.localize("gui.fecundated").toUpperCase(Locale.ENGLISH)); } list.add(EnumChatFormatting.YELLOW + genome.getActiveAllele(EnumButterflyChromosome.SIZE).getName()); - list.add(EnumChatFormatting.WHITE + genome.getActiveAllele(EnumButterflyChromosome.SPEED).getName() + " " + StringUtil.localize("gui.flyer")); - list.add(genome.getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName() + " " + StringUtil.localize("gui.life")); + list.add(EnumChatFormatting.DARK_GREEN + genome.getActiveAllele(EnumButterflyChromosome.SPEED).getName()); + list.add(genome.getActiveAllele(EnumButterflyChromosome.LIFESPAN).getName() + ' ' + StringUtil.localize("gui.life")); IAlleleTolerance tempTolerance = (IAlleleTolerance) getGenome().getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE); list.add(EnumChatFormatting.GREEN + "T: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getTemperature()) + " / " + tempTolerance.getName()); @@ -83,6 +83,10 @@ public class Butterfly extends IndividualLiving implements IButterfly { list.add(EnumChatFormatting.GREEN + "H: " + AlleleManager.climateHelper.toDisplay(genome.getPrimary().getHumidity()) + " / " + humidTolerance.getName()); list.add(EnumChatFormatting.RED + GenericRatings.rateActivityTime(genome.getNocturnal(), genome.getPrimary().isNocturnal())); + + if (genome.getTolerantFlyer()) { + list.add(EnumChatFormatting.WHITE + StringUtil.localize("gui.flyer.tooltip")); + } } /* SAVING & LOADING */