From c3f286d84284329b6c19e3251052a922ccdd2386 Mon Sep 17 00:00:00 2001
From: Ammon Lauritzen <allaryin@gmail.com>
Date: Mon, 22 Feb 2016 12:33:38 -0600
Subject: [PATCH] Added generic localization support, localized Queen's title
 (#5).

---
 src/main/java/fairies/Loc.java                | 30 +++++++++++++++++++
 src/main/java/fairies/entity/EntityFairy.java | 15 +++++-----
 .../assets/fairyfactions/lang/en_US.lang      |  4 ++-
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/fairies/Loc.java

diff --git a/src/main/java/fairies/Loc.java b/src/main/java/fairies/Loc.java
new file mode 100644
index 0000000..ff9b8bb
--- /dev/null
+++ b/src/main/java/fairies/Loc.java
@@ -0,0 +1,30 @@
+package fairies;
+
+import cpw.mods.fml.common.registry.LanguageRegistry;
+
+/**
+ * Constants for various message localizations as well as shortcut methods
+ * to look them up for use.
+ */
+public enum Loc {
+	QUEEN("text.queen.prefix");
+	
+	public final String key;
+	private Loc(String key) {
+		this.key = key;
+	}
+
+	private static final LanguageRegistry REG = LanguageRegistry.instance();
+	
+	public String get() {
+		return getLoc(this.key);
+	}
+	
+	public static String getLoc(String key) {
+		final String res = REG.getStringLocalization(key);
+		if( res.isEmpty() )
+			return "#"+key+"#";
+		else
+			return res;
+	}
+}
diff --git a/src/main/java/fairies/entity/EntityFairy.java b/src/main/java/fairies/entity/EntityFairy.java
index 8495577..76fe03d 100644
--- a/src/main/java/fairies/entity/EntityFairy.java
+++ b/src/main/java/fairies/entity/EntityFairy.java
@@ -11,6 +11,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import fairies.FairyConfig;
 import fairies.FairyFactions;
+import fairies.Loc;
 import fairies.Version;
 import fairies.ai.FairyJob;
 import fairies.world.FairyGroupGenerator;
@@ -1805,7 +1806,7 @@ public class EntityFairy extends EntityAnimal {
 			job = MAX_JOB;
 		}
 
-		FairyFactions.LOGGER.info("setJob: " + this + " -> " + job);
+		// FairyFactions.LOGGER.info("setJob: " + this + " -> " + job);
 
 		byte byte0 = dataWatcher.getWatchableObjectByte(B_TYPE);
 		byte0 = (byte) ( byte0 & 0xf3 );
@@ -1908,9 +1909,9 @@ public class EntityFairy extends EntityAnimal {
 
 	public String getQueenName(int prefix, int suffix, int faction) {
 		if (faction < 0 || faction > MAX_FACTION)
-			return "Queen Error-faction";
+			return Loc.QUEEN.get()+" Error-faction";
 
-		return faction_colors[faction] + "Queen "
+		return faction_colors[faction] + Loc.QUEEN.get()+ " "
 				+ getActualName(prefix, suffix);
 	}
 
@@ -1933,7 +1934,7 @@ public class EntityFairy extends EntityAnimal {
 			String woosh = getActualName(getNamePrefix(), getNameSuffix());
 
 			if (queen()) {
-				woosh = "Queen " + woosh;
+				woosh = Loc.QUEEN.get()+ " " + woosh;
 			}
 
 			if (isRuler(FairyFactions.proxy.getCurrentPlayer())) {
@@ -2528,7 +2529,7 @@ public class EntityFairy extends EntityAnimal {
 						+ " ";
 
 				if (queen()) {
-					s = "Queen " + s;
+					s = Loc.QUEEN.get()+ " " + s;
 				}
 
 				int i = rand.nextInt(6);
@@ -2579,7 +2580,7 @@ public class EntityFairy extends EntityAnimal {
 		String f = getActualName(getNamePrefix(), getNameSuffix()) + " ";
 
 		if (queen()) {
-			f = "Queen " + f;
+			f = Loc.QUEEN.get()+ " " + f;
 		}
 
 		String s = f;
@@ -2671,7 +2672,7 @@ public class EntityFairy extends EntityAnimal {
 			String f = getActualName(getNamePrefix(), getNameSuffix());
 
 			if (queen()) {
-				f = "Queen " + f;
+				f = Loc.QUEEN.get()+ " " + f;
 			}
 
 			String s = f;
diff --git a/src/main/resources/assets/fairyfactions/lang/en_US.lang b/src/main/resources/assets/fairyfactions/lang/en_US.lang
index 5ef2179..e31a1dd 100644
--- a/src/main/resources/assets/fairyfactions/lang/en_US.lang
+++ b/src/main/resources/assets/fairyfactions/lang/en_US.lang
@@ -1 +1,3 @@
-entity.FairyFactions.Fairy.name=Fairy
\ No newline at end of file
+entity.FairyFactions.Fairy.name=Fairy
+
+text.queen.prefix=Queen