Fixed chat messages

This commit is contained in:
Vexatos committed 2014-08-19 14:59:47 +02:00
1 parent d516f209f0
commit c2bc3a3d01
5 files changed
+13 -12

No files matched your search

@@ -187,7 +187,7 @@ public class BlockBase extends BlockForestry {
ownerName = tile.getOwnerProfile().getName();
player.addChatMessage(new ChatComponentTranslation("\u00A7c%s %s", new ChatComponentText(ownerName), new ChatComponentTranslation("chat.accesslocked")));
player.addChatMessage(new ChatComponentTranslation("for.chat.accesslocked",ownerName));
}
return true;
}
@@ -80,7 +80,7 @@ public abstract class BlockStructure extends BlockForestry {
if (tile.getOwnerProfile() != null)
ownerName = tile.getOwnerProfile().getName();
player.addChatMessage(new ChatComponentTranslation("\u00A7c%s %s", new ChatComponentText(ownerName), new ChatComponentTranslation("chat.accesslocked")));
player.addChatMessage(new ChatComponentTranslation("for.chat.accesslocked",ownerName));
}
return true;
}
@@ -13,6 +13,7 @@ package forestry.core.genetics;
import java.util.ArrayList;
import java.util.IllegalFormatException;
import java.util.List;
import java.util.Locale;
import forestry.core.utils.StringUtil;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -86,10 +87,10 @@ public class ItemResearchNote extends ItemForestry {
if(encoded == null)
return tooltips;
tooltips.add("\u00A7aMutation discovered!");
tooltips.add(String.format("\u00A7e'%s'\u00A77 and \u00A7e'%s'\u00A77.", encoded.getAllele0().getName(), encoded.getAllele1().getName()));
tooltips.add(String.format("Chance for success is \u00A79%s\u00A77.", EnumMutateChance.rateChance(encoded.getBaseChance())));
tooltips.add(String.format("New species is \u00A7d'%s'\u00A77.", (encoded.getTemplate()[root.getKaryotypeKey().ordinal()].getName())));
tooltips.add(StringUtil.localize("researchNote.discovery.0"));
tooltips.add(StringUtil.localize("researchNote.discovery.1").replace("%SPEC1",encoded.getAllele0().getName()).replace("%SPEC2", encoded.getAllele1().getName()));
tooltips.add(StringUtil.localizeAndFormat("researchNote.discovery.2", StringUtil.localize("researchNote.chance." + EnumMutateChance.rateChance(encoded.getBaseChance()).toString().toLowerCase(Locale.ENGLISH))));
tooltips.add(StringUtil.localizeAndFormat("researchNote.discovery.3", (encoded.getTemplate()[root.getKaryotypeKey().ordinal()].getName())));
if(encoded.getSpecialConditions() != null && encoded.getSpecialConditions().size() > 0) {
for(String line : encoded.getSpecialConditions())
@@ -103,8 +104,8 @@ public class ItemResearchNote extends ItemForestry {
if(root == null)
return tooltips;
tooltips.add("\u00A7aSpecies researched!");
tooltips.add(String.format("\u00A7e'%s'\u00A77 (%s)", allele0.getName(), allele0.getBinomial()));
tooltips.add("researchNote.discovered.0");
tooltips.add(StringUtil.localizeAndFormat("researchNote.discovered.1", allele0.getName(), allele0.getBinomial()));
}
return tooltips;
@@ -125,7 +126,7 @@ public class ItemResearchNote extends ItemForestry {
IBreedingTracker tracker = encoded.getRoot().getBreedingTracker(world, player.getGameProfile());
if(tracker.isDiscovered(encoded)) {
player.addChatMessage(new ChatComponentTranslation("chat.cannotmemorizeagain"));
player.addChatMessage(new ChatComponentTranslation("for.chat.cannotmemorizeagain"));
return false;
}
@@ -133,7 +134,7 @@ public class ItemResearchNote extends ItemForestry {
tracker.registerSpecies((IAlleleSpecies)encoded.getAllele1());
tracker.registerSpecies((IAlleleSpecies)encoded.getTemplate()[root.getKaryotypeKey().ordinal()]);
tracker.registerMutation(encoded);
player.addChatMessage(new ChatComponentTranslation("chat.memorizednote"));
player.addChatMessage(new ChatComponentTranslation("for.chat.memorizednote"));
return true;
}
@@ -66,7 +66,7 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial
if (PostManager.postRegistry.isLetter(held)) {
IPostalState result = this.tryDispatchLetter(held, true);
if (!result.isOk())
player.addChatMessage(new ChatComponentTranslation("chat.mail." + result.getIdentifier()));
player.addChatMessage(new ChatComponentTranslation("for.chat.mail." + result.getIdentifier()));
else
held.stackSize--;
} else
@@ -190,7 +190,7 @@ public class ItemLetter extends ItemInventoried {
entityplayer.openGui(ForestryAPI.instance, GuiId.LetterGUI.ordinal(), world, (int) entityplayer.posX, (int) entityplayer.posY,
(int) entityplayer.posZ);
} else {
entityplayer.addChatMessage(new ChatComponentTranslation("chat.mail.wrongstacksize"));
entityplayer.addChatMessage(new ChatComponentTranslation("for.chat.mail.wrongstacksize"));
}
return itemstack;