Leahnaya/FairyFactions
1
0
Fork 0
mirror of https://github.com/allaryin/FairyFactions.git synced 2026-04-25 16:19:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Localized all remaining messages (closes #5).

Browse Source
This commit is contained in:
Ammon Lauritzen 2016-02-22 13:18:01 -06:00
parent b1181c3865
commit a9fd035624
3 changed files with 112 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/fairies/Loc.java
View File

@ -32,7 +32,36 @@ public enum Loc {
DISBAND_OTHER_3("text.disband.other.3.message"),
DISBAND_OTHER_4("text.disband.other.4.message"),
DISBAND_OTHER_5("text.disband.other.5.message"),
DISBAND_OTHER_6("text.disband.other.6.message");
DISBAND_OTHER_6("text.disband.other.6.message"),
TAME_QUEEN_1("text.disband.queen.1.message"),
TAME_QUEEN_2("text.disband.queen.2.message"),
TAME_QUEEN_3("text.disband.queen.3.message"),
TAME_OTHER_1("text.disband.other.1.message"),
TAME_OTHER_2("text.disband.other.2.message"),
TAME_OTHER_3("text.disband.other.3.message"),
TAME_OTHER_4("text.disband.other.4.message"),
TAME_OTHER_5("text.disband.other.5.message"),
TAME_OTHER_6("text.disband.other.6.message"),
TAME_FAIL_PREFIX("text.tame.fail.prefix"),
TAME_FAIL_ANGRY("text.tame.fail.angry.message"),
TAME_FAIL_CRYING("text.tame.fail.crying.message"),
TAME_FAIL_HAS_FOLLOWERS("text.tame.fail.has_followers.message"),
TAME_FAIL_HAS_QUEEN("text.tame.fail.has_queen.message"),
TAME_FAIL_TAME_QUEEN("text.tame.fail.tame_queen.message"),
TAME_FAIL_POSTED("text.tame.fail.posted.message"),
TAME_FAIL_GLOWSTONE("text.tame.fail.glowstone.message"),
TAME_FAIL_NOT_MELON("text.tame.fail.not_melon.message"),
TAME_FAIL_NOT_SNACK("text.tame.fail.not_snack.message"),
DEATH_1("text.death.1.message"),
DEATH_2("text.death.2.message"),
DEATH_3("text.death.3.message"),
DEATH_4("text.death.4.message"),
DEATH_5("text.death.5.message"),
DEATH_6("text.death.6.message"),
DEATH_7("text.death.7.message");
public final String key;
private Loc(String key) {
@ -44,6 +73,9 @@ public enum Loc {
public String get() {
return getLoc(this.key);
}
public String toString() {
return get();
}
public static String getLoc(String key) {
final String res = REG.getStringLocalization(key);

84
src/main/java/fairies/entity/EntityFairy.java
View File

@ -1909,9 +1909,9 @@ public class EntityFairy extends EntityAnimal {
public String getQueenName(int prefix, int suffix, int faction) {
if (faction < 0 || faction > MAX_FACTION)
return Loc.QUEEN.get()+" Error-faction";
return Loc.QUEEN + " Error-faction";
return faction_colors[faction] + Loc.QUEEN.get()+ " "
return faction_colors[faction] + Loc.QUEEN + " "
+ getActualName(prefix, suffix);
}
@ -1934,7 +1934,7 @@ public class EntityFairy extends EntityAnimal {
String woosh = getActualName(getNamePrefix(), getNameSuffix());
if (queen()) {
woosh = Loc.QUEEN.get()+ " " + woosh;
woosh = Loc.QUEEN + " " + woosh;
}
if (isRuler(FairyFactions.proxy.getCurrentPlayer())) {
@ -2535,27 +2535,27 @@ public class EntityFairy extends EntityAnimal {
+ " ";
if (queen()) {
s = Loc.QUEEN.get()+ " " + s;
s = Loc.QUEEN + " " + s;
}
int i = rand.nextInt(6);
if (queen() && i < 3) {
s += Loc.DISBAND_QUEEN_1.get();
s += Loc.DISBAND_QUEEN_1;
} else if (queen()) {
s += Loc.DISBAND_QUEEN_2.get();
s += Loc.DISBAND_QUEEN_2;
} else if (i == 0) {
s += Loc.DISBAND_OTHER_1.get();
s += Loc.DISBAND_OTHER_1;
} else if (i == 1) {
s += Loc.DISBAND_OTHER_2.get();
s += Loc.DISBAND_OTHER_2;
} else if (i == 2) {
s += Loc.DISBAND_OTHER_3.get();
s += Loc.DISBAND_OTHER_3;
} else if (i == 3) {
s += Loc.DISBAND_OTHER_4.get();
s += Loc.DISBAND_OTHER_4;
} else if (i == 4) {
s += Loc.DISBAND_OTHER_5.get();
s += Loc.DISBAND_OTHER_5;
} else {
s += Loc.DISBAND_OTHER_6.get();
s += Loc.DISBAND_OTHER_6;
}
FairyFactions.proxy.sendChat((EntityPlayerMP) ruler,
@ -2586,30 +2586,30 @@ public class EntityFairy extends EntityAnimal {
String f = getActualName(getNamePrefix(), getNameSuffix()) + " ";
if (queen()) {
f = Loc.QUEEN.get()+ " " + f;
f = Loc.QUEEN + " " + f;
}
String s = f;
int i = rand.nextInt(6);
if (queen() && i < 2) {
s += "reluctantly joined your party.";
s += Loc.TAME_QUEEN_1;
} else if (queen() && i > 3) {
s += "sighed and became your follower.";
s += Loc.TAME_QUEEN_2;
} else if (queen()) {
s += "really enjoys eating glistering melons.";
s += Loc.TAME_QUEEN_3;
} else if (i == 0) {
s += "was kind of lonely without a leader.";
s += Loc.TAME_OTHER_1;
} else if (i == 1) {
s += "shrugged and decided to follow you.";
s += Loc.TAME_OTHER_2;
} else if (i == 2) {
s += "put the past behind her and joined you.";
s += Loc.TAME_OTHER_3;
} else if (i == 3) {
s += "was easily persuaded by that yummy snack.";
s += Loc.TAME_OTHER_4;
} else if (i == 4) {
s += "introduced herself properly to you.";
s += Loc.TAME_OTHER_5;
} else {
s += "ate that snack like there was no tomorrow.";
s += Loc.TAME_OTHER_6;
}
if (player instanceof EntityPlayerMP) {
@ -2678,26 +2678,26 @@ public class EntityFairy extends EntityAnimal {
String f = getActualName(getNamePrefix(), getNameSuffix());
if (queen()) {
f = Loc.QUEEN.get()+ " " + f;
f = Loc.QUEEN + " " + f;
}
String s = f;
int i = rand.nextInt(6);
int i = rand.nextInt(7);
if (i == 0) {
s += " bit the dust.";
s += " "+Loc.DEATH_1;
} else if (i == 1) {
s += " ran into some problems.";
s += " "+Loc.DEATH_2;
} else if (i == 2) {
s += " went to the big forest in the sky.";
s += " "+Loc.DEATH_3;
} else if (i == 3) {
s += " had to go away for a while.";
} else if (i == 3) {
s += " lived a good life.";
s += " "+Loc.DEATH_4;
} else if (i == 4) {
s += " is in a better place now.";
s += " "+Loc.DEATH_5;
} else if (i == 5) {
s += " "+Loc.DEATH_6;
} else {
s += " kicked the bucket.";
s += " "+Loc.DEATH_7;
}
// mod_FairyMod.fairyMod.sendDisband(player, "* §c" + s);
@ -2969,22 +2969,22 @@ public class EntityFairy extends EntityAnimal {
}
public void tameFailMessage(EntityPlayer player) {
String s = "You can't ";
String s = Loc.TAME_FAIL_PREFIX + " ";
if (angry()) {
s += "tame this fairy because she's angry right now.";
s += Loc.TAME_FAIL_ANGRY;
} else if (crying()) {
s += "tame this fairy because she's upset right now.";
s += Loc.TAME_FAIL_CRYING;
} else if (getFaction() > 0) {
if (queen()) {
s += "tame a fairy queen until you defeat her minions.";
s += Loc.TAME_FAIL_HAS_FOLLOWERS;
} else {
s += "tame this fairy until you defeat her queen.";
s += Loc.TAME_FAIL_HAS_QUEEN;
}
} else if (tamed() && queen()) {
s += "steal a fairy queen owned by someone else.";
s += Loc.TAME_FAIL_TAME_QUEEN;
} else if (posted()) {
s += "steal a fairy who's assigned to a post";
s += Loc.TAME_FAIL_POSTED;
} else {
ItemStack stack = (ItemStack) null;
@ -2994,11 +2994,11 @@ public class EntityFairy extends EntityAnimal {
if (stack != null && stack.stackSize > 0
&& stack.getItem() == Items.glowstone_dust) {
s += "seriously be trying to feed a fairy something that resembles its own guts.";
s += Loc.TAME_FAIL_GLOWSTONE;
} else if (queen()) {
s += "tame a fairy queen without a slice of speckled melon.";
s += Loc.TAME_FAIL_NOT_MELON;
} else {
s += "tame a fairy without a sweet-tasting snack.";
s += Loc.TAME_FAIL_NOT_SNACK;
}
}

45
src/main/resources/assets/fairyfactions/lang/en_US.lang
View File

@ -18,11 +18,40 @@ text.faction.13.name=Maiden Militia
text.faction.14.name=Nimble Nymphs
text.faction.15.name=Petite Pugilists
text.disband.queen.1.message=was greatly offended by your offering
text.disband.queen.2.message=called you a 'dirty peasant' and stormed out
text.disband.other.1.message=threw it on the ground and had a fit
text.disband.other.2.message=called you a 'poopy-head' and ran away
text.disband.other.3.message=would rather die than eat that gross thing
text.disband.other.4.message=decided not to be your friend anymore
text.disband.other.5.message=gave you a dirty look and headed off
text.disband.other.6.message=says that's the grossest thing she's ever seen
text.disband.queen.1.message=was greatly offended by your offering.
text.disband.queen.2.message=called you a 'dirty peasant' and stormed out.
text.disband.other.1.message=threw it on the ground and had a fit.
text.disband.other.2.message=called you a 'poopy-head' and ran away.
text.disband.other.3.message=would rather die than eat that gross thing.
text.disband.other.4.message=decided not to be your friend anymore.
text.disband.other.5.message=gave you a dirty look and headed off.
text.disband.other.6.message=says that's the grossest thing she's ever seen.
text.tame.queen.1.message=reluctantly joined your party.
text.tame.queen.2.message=sighed and became your follower.
text.tame.queen.3.message=really enjoys eating glistering melons.
text.tame.other.1.message=was kind of lonely without a leader.
text.tame.other.2.message=shrugged and decided to follow you.
text.tame.other.3.message=put the past behind her and joined you.
text.tame.other.4.message=was easily persuaded by that yummy snack.
text.tame.other.5.message=introduced herself properly to you.
text.tame.other.6.message=ate that snack like there was no tomorrow.
text.tame.fail.prefix=You can't
text.tame.fail.angry.message=tame this fairy because she's angry right now.
text.tame.fail.crying.message=tame this fairy because she's upset right now.
text.tame.fail.has_followers.message=tame a fairy queen until you defeat her minions.
text.tame.fail.has_queen.message=tame this fairy until you defeat her queen.
text.tame.fail.tame_queen.message=steal a fairy queen owned by someone else.
text.tame.fail.posted.message=steal a fairy who's assigned to a post.
text.tame.fail.glowstone.message=seriously be trying to feed a fairy something that resembles its own guts.
text.tame.fail.not_melon.message=tame a fairy queen without a slice of speckled melon.
text.tame.fail.not_snack.message=tame a fairy without a sweet-tasting snack.
text.death.1.message=bit the dust.
text.death.2.message=ran into some problems.
text.death.3.message=went to the big forest in the sky.
text.death.4.message=had to go away for a while.
text.death.5.message=lived a good life.
text.death.6.message=is in a better place now.
text.death.7.message=kicked the bucket.