Fixed Forestry Tile localization keys

closes #166
This commit is contained in:
mezz committed 2014-09-03 23:54:25 -07:00
1 parent 17a7f1331e
commit a7c1de56f2
50 files changed
+67 -66

No files matched your search

@@ -204,7 +204,10 @@ public class CommandBeekeepingMode extends CommandMC {
private void listModes(ICommandSender sender, String[] arguments) {
World world = getWorld(sender, arguments);
sendChatMessage(sender, StringUtil.localize("chat.bees.command.mode.current").replaceAll("%MODE", PluginApiculture.beeInterface.getBeekeepingMode(world).getName()).replaceAll("%WORLD", String.valueOf(world.getWorldInfo().getSaveVersion())));
String message = StringUtil.localize("chat.bees.command.mode.current");
message = message.replaceAll("%MODE", PluginApiculture.beeInterface.getBeekeepingMode(world).getName());
message = message.replaceAll("%WORLD", String.valueOf(world.getWorldInfo().getSaveVersion()));
sendChatMessage(sender, message);
String help = "";
for (IBeekeepingMode mode : PluginApiculture.beeInterface.getBeekeepingModes()) {
@@ -138,7 +138,7 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IPowe
@Override
public String getInventoryName() {
return "tile.alveary.climatiser";
return "alveary.climatiser";
}
/* NETWORK */
@@ -77,7 +77,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory
@Override
public String getInventoryName() {
return "tile.alveary.5";
return "alveary.5.name";
}
/* UPDATING */
@@ -582,7 +582,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IS
@Override
public String getInventoryName() {
return "alveary.0";
return "alveary.0.name";
}
@Override
@@ -47,7 +47,7 @@ public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListe
@Override
public String getInventoryName() {
return "tile.alveary.7";
return "alveary.7.name";
}
@Override
@@ -48,7 +48,7 @@ public class TileAlvearyStabiliser extends TileAlveary implements IBeeModifier {
@Override
public String getInventoryName() {
return "tile.alveary.6";
return "alveary.6.name";
}
@Override
@@ -267,7 +267,7 @@ public class TileAlvearySwarmer extends TileAlveary implements ISpecialInventory
@Override
public String getInventoryName() {
return "tile.alveary.2";
return "alveary.2.name";
}
@Override
@@ -30,7 +30,7 @@ public class TileApiary extends TileBeehouse implements ISidedInventory {
@Override
public String getInventoryName() {
return "apiculture.0";
return "apiculture.0.name";
}
@Override
@@ -70,7 +70,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised {
@Override
public String getInventoryName() {
return "apiculture.2";
return "apiculture.2.name";
}
@Override
@@ -30,7 +30,7 @@ public class GuiAlveary extends GuiForestry<TileAlvearyPlain> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String title = StringUtil.localize("tile." + tile.getInventoryName());
String title = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(title, getCenteredOffset(title), 6, fontColor.get("gui.title"));
}
@@ -29,7 +29,7 @@ public class GuiAlvearyHygroregulator extends GuiForestry<TileAlvearyHygroregula
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.alveary.5");
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -37,7 +37,7 @@ public class GuiApiary extends GuiForestry<TileBeehouse> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -77,7 +77,10 @@ public class ItemBeeGE extends ItemGE {
if(StatCollector.canTranslate("for." + customBeeKey)){
return StringUtil.localize(customBeeKey);
}
return StringUtil.localize("bees.grammar." + type.getName()).replaceAll("%SPECIES", individual.getDisplayName()).replaceAll("%TYPE", StringUtil.localize("bees.grammar." + type.getName() + ".type"));
String beeGrammar = StringUtil.localize("bees.grammar." + type.getName());
String beeSpecies = individual.getDisplayName();
String beeType = StringUtil.localize("bees.grammar." + type.getName() + ".type");
return beeGrammar.replaceAll("%SPECIES", beeSpecies).replaceAll("%TYPE", beeType);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -76,7 +76,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI
@Override
public String getInventoryName() {
return StringUtil.localize("core.0");
return "core.0.name";
}
/* GUI */
@@ -47,7 +47,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender
private final InventoryAdapter inventory;
@Override
public String getInventoryName() {
return StringUtil.localize("core.1");
return "core.1.name";
}
public TileEscritoire() {
@@ -30,7 +30,7 @@ public class GuiAnalyzer extends GuiForestry<TileAnalyzer> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String title = StringUtil.localize("tile.for." + tile.getInventoryName());
String title = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(title, getCenteredOffset(title), 6, fontColor.get("gui.title"));
}
@@ -19,17 +19,15 @@ import net.minecraft.util.StatCollector;
public class StringUtil {
public static String localize(String key) {
return StatCollector.translateToLocal("for." + key).replace("\\n", "\n").replace("@", "%").replace("\\%", "@");
return StatCollector.translateToLocal("for." + key);
}
public static String localizeTile(String key) {
return StatCollector.translateToLocal("tile.for." + key);
}
public static String localizeAndFormat(String key, Object... args) {
String text = StringUtil.localize(key);
try {
return String.format(text, args);
} catch (IllegalFormatException ex) {
return "Format error: " + text;
}
return localizeAndFormatRaw("for." + key, args);
}
/**
@@ -405,12 +405,9 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa
return super.isUseableByPlayer(player);
}
/**
* TODO: just a specialsource workaround
*/
@Override
public String getInventoryName() {
return super.getInventoryName();
return "engine.2.name";
}
/**
@@ -397,12 +397,9 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv
return super.isUseableByPlayer(player);
}
/**
* TODO: just a specialsource workaround
*/
@Override
public String getInventoryName() {
return super.getInventoryName();
return "engine.1.name";
}
/**
@@ -311,12 +311,9 @@ public class EngineTin extends Engine implements ISocketable, IInventory {
return super.isUseableByPlayer(player);
}
/**
* TODO: just a specialsource workaround
*/
@Override
public String getInventoryName() {
return super.getInventoryName();
return "engine.0.name";
}
/**
@@ -65,7 +65,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi
@Override
public String getInventoryName() {
return StringUtil.localize("engine.3");
return "engine.3.name";
}
@Override
@@ -31,6 +31,8 @@ import forestry.energy.gadgets.EngineBronze;
public class GuiEngineBronze extends GuiEngine {
EngineBronze tile;
protected class BiogasSlot extends Widget {
EngineBronze engine;
@@ -106,7 +108,7 @@ public class GuiEngineBronze extends GuiEngine {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for.engine.2");
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -18,6 +18,8 @@ import forestry.energy.gadgets.EngineCopper;
public class GuiEngineCopper extends GuiEngine {
EngineCopper tile;
public GuiEngineCopper(InventoryPlayer inventory, EngineCopper tile) {
super(Defaults.TEXTURE_PATH_GUI + "/peatengine.png", new ContainerEngineCopper(inventory, tile), tile);
}
@@ -25,7 +27,7 @@ public class GuiEngineCopper extends GuiEngine {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for.engine.1");
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
this.fontRendererObj.drawString("Inventory", 8, this.ySize - 96 + 2, fontColor.get("gui.title"));
}
@@ -20,6 +20,8 @@ import forestry.energy.gadgets.EngineTin;
public class GuiEngineTin extends GuiEngine {
EngineTin tile;
public GuiEngineTin(InventoryPlayer inventory, EngineTin tile) {
super(Defaults.TEXTURE_PATH_GUI + "/electricalengine.png", new ContainerEngineTin(inventory, tile), tile);
widgetManager.add(new SocketWidget(this.widgetManager, 30, 40, tile, 0));
@@ -28,7 +30,7 @@ public class GuiEngineTin extends GuiEngine {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for.engine.0");
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -28,7 +28,7 @@ public class GuiGenerator extends GuiForestry<MachineGenerator> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String title = StringUtil.localize("tile.for." + tile.getInventoryName());
String title = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(title, getCenteredOffset(title), 6, fontColor.get("gui.title"));
}
@@ -166,7 +166,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq
@Override
public String getInventoryName() {
return "factory.0";
return "factory.0.name";
}
@Override
@@ -237,7 +237,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL
@Override
public String getInventoryName() {
return "factory.1";
return "factory.1.name";
}
@Override
@@ -148,7 +148,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I
@Override
public String getInventoryName() {
return "factory.2";
return "factory.2.name";
}
@Override
@@ -246,7 +246,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial
@Override
public String getInventoryName() {
return "factory2.0";
return "factory2.0.name";
}
@Override
@@ -198,7 +198,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL
@Override
public String getInventoryName() {
return "factory.3";
return "factory.3.name";
}
@Override
@@ -145,7 +145,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory,
@Override
public String getInventoryName() {
return "factory.4";
return "factory.4.name";
}
@Override
@@ -70,7 +70,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui
@Override
public String getInventoryName() {
return "factory2.1";
return "factory2.1.name";
}
@Override
@@ -154,7 +154,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I
@Override
public String getInventoryName() {
return "factory.5";
return "factory.5.name";
}
@Override
@@ -133,7 +133,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid
@Override
public String getInventoryName() {
return "factory.6";
return "factory.6.name";
}
@Override
@@ -34,7 +34,7 @@ public class MillRainmaker extends Mill implements ISpecialInventory {
@Override
public String getInventoryName() {
return "Rainmaker";
return "factory.7.name";
}
@Override
@@ -374,7 +374,7 @@ public class TileWorktable extends TileBase implements ICrafter {
@Override
public String getInventoryName() {
return "factory2.2";
return "factory2.2.name";
}
@Override
@@ -28,7 +28,7 @@ public class GuiBottler extends GuiForestry<MachineBottler> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -36,7 +36,7 @@ public class GuiCarpenter extends GuiForestry<MachineCarpenter> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -26,7 +26,7 @@ public class GuiCentrifuge extends GuiForestry<MachineCentrifuge> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -29,7 +29,7 @@ public class GuiFabricator extends GuiForestry<MachineFabricator> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -29,7 +29,7 @@ public class GuiFermenter extends GuiForestry<MachineFermenter> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -28,7 +28,7 @@ public class GuiMoistener extends GuiForestry<MachineMoistener> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -28,7 +28,7 @@ public class GuiRaintank extends GuiForestry<MachineRaintank> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -28,7 +28,7 @@ public class GuiSqueezer extends GuiForestry<MachineSqueezer> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -29,7 +29,7 @@ public class GuiStill extends GuiForestry<MachineStill> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
@@ -141,7 +141,7 @@ public class GuiWorktable extends GuiForestry<TileWorktable> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
}
}
@@ -52,7 +52,7 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial
@Override
public String getInventoryName() {
return "mail.0";
return "mail.0.name";
}
/* GUI */
@@ -37,7 +37,7 @@ public class MachinePhilatelist extends TileBase implements IInventory {
@Override
public String getInventoryName() {
return "mail.2";
return "mail.2.name";
}
@Override
@@ -49,7 +49,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided
@Override
public String getInventoryName() {
return "mail.1";
return "mail.1.name";
}
@Override
@@ -33,7 +33,7 @@ public class GuiTrader extends GuiForestry<MachineTrader> {
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localize("tile.for." + tile.getInventoryName());
String name = StringUtil.localizeTile(tile.getInventoryName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.mail.text"));
}