From f49cea199e0140f7e2833efe272dc31737aaf785 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 26 Apr 2016 17:10:41 -0700 Subject: [PATCH] Fix Forestry allele keys --- lang | 2 +- .../java/forestry/api/genetics/IAlleleFactory.java | 6 +++--- .../forestry/core/genetics/GenericRatings.java | 14 +++++++------- .../core/genetics/alleles/AlleleCategorized.java | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lang b/lang index a796b5ef3..c30cd88ed 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit a796b5ef386de3d5841951b191a59355e77eed23 +Subproject commit c30cd88ed65424042908da81e288daa9b55c0f86 diff --git a/src/main/java/forestry/api/genetics/IAlleleFactory.java b/src/main/java/forestry/api/genetics/IAlleleFactory.java index f216fae10..1344774cd 100644 --- a/src/main/java/forestry/api/genetics/IAlleleFactory.java +++ b/src/main/java/forestry/api/genetics/IAlleleFactory.java @@ -19,10 +19,10 @@ package forestry.api.genetics; * * For example: * en_US - * forestry.allele.smallest=Smallest + * Forestry.allele.smallest=Smallest * ru_RU - * forestry.allele.smallest=????? ????????? - * forestry.allele.height.smallest=????? ?????? + * Forestry.allele.smallest=????? ????????? + * Forestry.allele.height.smallest=????? ?????? */ public interface IAlleleFactory { /** diff --git a/src/main/java/forestry/core/genetics/GenericRatings.java b/src/main/java/forestry/core/genetics/GenericRatings.java index 882594358..b77d1508e 100755 --- a/src/main/java/forestry/core/genetics/GenericRatings.java +++ b/src/main/java/forestry/core/genetics/GenericRatings.java @@ -18,19 +18,19 @@ public class GenericRatings { public static String rateMetabolism(int metabolism) { if (metabolism >= 19) { - return StatCollector.translateToLocal("forestry.allele.highest"); + return StatCollector.translateToLocal("Forestry.allele.highest"); } else if (metabolism >= 16) { - return StatCollector.translateToLocal("forestry.allele.higher"); + return StatCollector.translateToLocal("Forestry.allele.higher"); } else if (metabolism >= 13) { - return StatCollector.translateToLocal("forestry.allele.high"); + return StatCollector.translateToLocal("Forestry.allele.high"); } else if (metabolism >= 10) { - return StatCollector.translateToLocal("forestry.allele.average"); + return StatCollector.translateToLocal("Forestry.allele.average"); } else if (metabolism >= 7) { - return StatCollector.translateToLocal("forestry.allele.slow"); + return StatCollector.translateToLocal("Forestry.allele.slow"); } else if (metabolism >= 4) { - return StatCollector.translateToLocal("forestry.allele.slower"); + return StatCollector.translateToLocal("Forestry.allele.slower"); } else { - return StatCollector.translateToLocal("forestry.allele.slowest"); + return StatCollector.translateToLocal("Forestry.allele.slowest"); } } diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java b/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java index b0f712796..ca896f5c2 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleCategorized.java @@ -9,9 +9,9 @@ import net.minecraft.util.StatCollector; * For example, temperature tolerances or speeds are categories with several values. * * This class helps localization by allowing specific names like - * forestry.allele.speed.fast + * Forestry.allele.speed.fast * and can fall back on generic names like - * forestry.allele.fast + * Forestry.allele.fast */ public abstract class AlleleCategorized extends Allele { protected AlleleCategorized(String modId, String category, String valueName, boolean isDominant) {