Added generic localization support, localized Queen's title (#5).

This commit is contained in:
Ammon Lauritzen
2016-02-22 12:33:38 -06:00
parent cacf3f1c6a
commit c3f286d842
3 changed files with 41 additions and 8 deletions

View File

@@ -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;
}
}

View File

@@ -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;

View File

@@ -1 +1,3 @@
entity.FairyFactions.Fairy.name=Fairy
entity.FairyFactions.Fairy.name=Fairy
text.queen.prefix=Queen