mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-21 12:32:23 +00:00
Fixed custom bee names, localized even more things.
This commit is contained in:
1 parent
83789ae8f7
commit
88ddc9a85a
4 files changed
+15
-10
No files matched your search
@@ -160,12 +160,12 @@ public class CommandBeekeepingMode extends CommandMC {
|
||||
file.getParentFile().mkdirs();
|
||||
|
||||
if (!file.exists() && !file.createNewFile()) {
|
||||
sendChatMessage(sender, "Log file could not be created. Failed to save statistics.");
|
||||
sendChatMessage(sender, StringUtil.localize("chat.bees.command.stats.error1"));
|
||||
return;
|
||||
}
|
||||
|
||||
if (!file.canWrite()) {
|
||||
sendChatMessage(sender, "Cannot write to log file. Failed to save statistics.");
|
||||
sendChatMessage(sender, StringUtil.localize("chat.bees.command.stats.error2"));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -180,11 +180,11 @@ public class CommandBeekeepingMode extends CommandMC {
|
||||
writer.close();
|
||||
|
||||
} catch (Exception ex) {
|
||||
sendChatMessage(sender, "Write operation threw an exception. Failed to save statistics.");
|
||||
sendChatMessage(sender, StringUtil.localize("chat.bees.command.stats.error3"));
|
||||
ex.printStackTrace();
|
||||
}
|
||||
|
||||
sendChatMessage(sender, "Saved statistics for player " + player);
|
||||
sendChatMessage(sender, StringUtil.localizeAndFormat("chat.bees.command.stats.saved", player));
|
||||
}
|
||||
|
||||
private String generateSpeciesListEntry(IAlleleBeeSpecies species, IApiaristTracker tracker) {
|
||||
@@ -204,7 +204,7 @@ public class CommandBeekeepingMode extends CommandMC {
|
||||
private void listModes(ICommandSender sender, String[] arguments) {
|
||||
World world = getWorld(sender, arguments);
|
||||
|
||||
sendChatMessage(sender, "Current: " + PluginApiculture.beeInterface.getBeekeepingMode(world).getName() + " (#" + world.getWorldInfo().getSaveVersion() + ")");
|
||||
sendChatMessage(sender, StringUtil.localize("chat.bees.command.mode.current").replaceAll("%MODE", PluginApiculture.beeInterface.getBeekeepingMode(world).getName()).replaceAll("%WORLD", String.valueOf(world.getWorldInfo().getSaveVersion())));
|
||||
|
||||
String help = "";
|
||||
for (IBeekeepingMode mode : PluginApiculture.beeInterface.getBeekeepingModes()) {
|
||||
@@ -212,7 +212,7 @@ public class CommandBeekeepingMode extends CommandMC {
|
||||
help += ", ";
|
||||
help += mode.getName();
|
||||
}
|
||||
sendChatMessage(sender, "Available modes: " + help);
|
||||
sendChatMessage(sender, StringUtil.localizeAndFormat("chat.bees.command.mode.help", help));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -73,10 +73,10 @@ public class ItemBeeGE extends ItemGE {
|
||||
return super.getItemStackDisplayName(itemstack);
|
||||
|
||||
IBee individual = new Bee(itemstack.getTagCompound());
|
||||
if(StatCollector.canTranslate("bees.custom." + type.getName() + "." + individual.getDisplayName())){
|
||||
return StringUtil.localize("bees.custom." + type.getName() + "." + individual.getDisplayName());
|
||||
if(StatCollector.canTranslate("bees.custom." + type.getName() + "." + individual.getGenome().getPrimary().getUnlocalizedName().replace("bees.species.",""))){
|
||||
return StringUtil.localize("bees.custom." + type.getName() + "." + individual.getGenome().getPrimary().getUnlocalizedName().replace("bees.species.",""));
|
||||
}
|
||||
return StringUtil.localize(type.getName() + ".grammar").replaceAll("%SPECIES", individual.getDisplayName()).replaceAll("%TYPE", StringUtil.localize(type.getName() + ".type"));
|
||||
return StringUtil.localize("bees." + type.getName() + ".grammar").replaceAll("%SPECIES", individual.getDisplayName()).replaceAll("%TYPE", StringUtil.localize("bees." + type.getName() + ".type"));
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
|
||||
@@ -690,6 +690,11 @@ public class Allele implements IAllele {
|
||||
public String getName() {
|
||||
return StringUtil.localize(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public Allele setName(String string) {
|
||||
name = string;
|
||||
|
||||
Reference in new issue
Block a user