diff --git a/src/main/java/forestry/apiculture/CommandBeekeepingMode.java b/src/main/java/forestry/apiculture/CommandBeekeepingMode.java index b55eebc72..2125b5756 100755 --- a/src/main/java/forestry/apiculture/CommandBeekeepingMode.java +++ b/src/main/java/forestry/apiculture/CommandBeekeepingMode.java @@ -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()) { diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java index b9d31566d..d39ee437a 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java @@ -138,7 +138,7 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IPowe @Override public String getInventoryName() { - return "tile.alveary.climatiser"; + return "alveary.climatiser"; } /* NETWORK */ diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java index 325e2c70c..5f3f290b3 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java @@ -77,7 +77,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory @Override public String getInventoryName() { - return "tile.alveary.5"; + return "alveary.5.name"; } /* UPDATING */ diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index 104284e46..3f0a80c3e 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -582,7 +582,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IS @Override public String getInventoryName() { - return "alveary.0"; + return "alveary.0.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java index 9c79627fc..1a793fb6c 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java @@ -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 diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java index 1b0ff3200..165fd1b27 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java @@ -48,7 +48,7 @@ public class TileAlvearyStabiliser extends TileAlveary implements IBeeModifier { @Override public String getInventoryName() { - return "tile.alveary.6"; + return "alveary.6.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java index b05f393fb..600d0c43d 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java @@ -267,7 +267,7 @@ public class TileAlvearySwarmer extends TileAlveary implements ISpecialInventory @Override public String getInventoryName() { - return "tile.alveary.2"; + return "alveary.2.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileApiary.java b/src/main/java/forestry/apiculture/gadgets/TileApiary.java index 9c0693ff8..2bc0257e8 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileApiary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileApiary.java @@ -30,7 +30,7 @@ public class TileApiary extends TileBeehouse implements ISidedInventory { @Override public String getInventoryName() { - return "apiculture.0"; + return "apiculture.0.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java index 3e4f38665..3fc870ee2 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java @@ -70,7 +70,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised { @Override public String getInventoryName() { - return "apiculture.2"; + return "apiculture.2.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gui/GuiAlveary.java b/src/main/java/forestry/apiculture/gui/GuiAlveary.java index 85da7f1d4..af6ca04ad 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlveary.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlveary.java @@ -30,7 +30,7 @@ public class GuiAlveary extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java index 3d5266c5d..f941c1767 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java @@ -29,7 +29,7 @@ public class GuiAlvearyHygroregulator extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java index 90b484238..be2a1768c 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeeGE.java +++ b/src/main/java/forestry/apiculture/items/ItemBeeGE.java @@ -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" }) diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index 514e82d40..14e2635b9 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -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 */ diff --git a/src/main/java/forestry/core/gadgets/TileEscritoire.java b/src/main/java/forestry/core/gadgets/TileEscritoire.java index 735c59cd7..2a279e0e9 100755 --- a/src/main/java/forestry/core/gadgets/TileEscritoire.java +++ b/src/main/java/forestry/core/gadgets/TileEscritoire.java @@ -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() { diff --git a/src/main/java/forestry/core/gui/GuiAnalyzer.java b/src/main/java/forestry/core/gui/GuiAnalyzer.java index 8c3775b5c..6d04a6851 100755 --- a/src/main/java/forestry/core/gui/GuiAnalyzer.java +++ b/src/main/java/forestry/core/gui/GuiAnalyzer.java @@ -30,7 +30,7 @@ public class GuiAnalyzer extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/core/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java index f459b8af0..69590976a 100755 --- a/src/main/java/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -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); } /** diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index c8cdf1801..8efcc62fb 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -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"; } /** diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index 7a0e74f6c..4612eb923 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -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"; } /** diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java index a1f74ec75..690803635 100755 --- a/src/main/java/forestry/energy/gadgets/EngineTin.java +++ b/src/main/java/forestry/energy/gadgets/EngineTin.java @@ -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"; } /** diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index 77444dba4..2dc316e37 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -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 diff --git a/src/main/java/forestry/energy/gui/GuiEngineBronze.java b/src/main/java/forestry/energy/gui/GuiEngineBronze.java index 5b0374c0a..c26e22287 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineBronze.java +++ b/src/main/java/forestry/energy/gui/GuiEngineBronze.java @@ -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")); } diff --git a/src/main/java/forestry/energy/gui/GuiEngineCopper.java b/src/main/java/forestry/energy/gui/GuiEngineCopper.java index bea21fa42..f0082e58b 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineCopper.java +++ b/src/main/java/forestry/energy/gui/GuiEngineCopper.java @@ -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")); } diff --git a/src/main/java/forestry/energy/gui/GuiEngineTin.java b/src/main/java/forestry/energy/gui/GuiEngineTin.java index 0a6d2035c..7aca755dc 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineTin.java +++ b/src/main/java/forestry/energy/gui/GuiEngineTin.java @@ -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")); } diff --git a/src/main/java/forestry/energy/gui/GuiGenerator.java b/src/main/java/forestry/energy/gui/GuiGenerator.java index c2a4f01f4..e4fdafb93 100755 --- a/src/main/java/forestry/energy/gui/GuiGenerator.java +++ b/src/main/java/forestry/energy/gui/GuiGenerator.java @@ -28,7 +28,7 @@ public class GuiGenerator extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index 2b9c0a6e3..0dba330d5 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -166,7 +166,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq @Override public String getInventoryName() { - return "factory.0"; + return "factory.0.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 5e30b7f43..913c7803f 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -237,7 +237,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL @Override public String getInventoryName() { - return "factory.1"; + return "factory.1.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index 294d09bf3..3133ca12b 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -148,7 +148,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I @Override public String getInventoryName() { - return "factory.2"; + return "factory.2.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index 989e27820..07e67d597 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -246,7 +246,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial @Override public String getInventoryName() { - return "factory2.0"; + return "factory2.0.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index fc0ec9bbd..7a1f8c962 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -198,7 +198,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL @Override public String getInventoryName() { - return "factory.3"; + return "factory.3.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 6ef2d0c4a..25285b966 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -145,7 +145,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, @Override public String getInventoryName() { - return "factory.4"; + return "factory.4.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index b8b327b24..4310b170b 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -70,7 +70,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui @Override public String getInventoryName() { - return "factory2.1"; + return "factory2.1.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index da55534c1..fc2e30d33 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -154,7 +154,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I @Override public String getInventoryName() { - return "factory.5"; + return "factory.5.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index f972240f5..ac1a20fd9 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -133,7 +133,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid @Override public String getInventoryName() { - return "factory.6"; + return "factory.6.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MillRainmaker.java b/src/main/java/forestry/factory/gadgets/MillRainmaker.java index 75a349c33..f4a5f0784 100755 --- a/src/main/java/forestry/factory/gadgets/MillRainmaker.java +++ b/src/main/java/forestry/factory/gadgets/MillRainmaker.java @@ -34,7 +34,7 @@ public class MillRainmaker extends Mill implements ISpecialInventory { @Override public String getInventoryName() { - return "Rainmaker"; + return "factory.7.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index 693e93499..6deedda88 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -374,7 +374,7 @@ public class TileWorktable extends TileBase implements ICrafter { @Override public String getInventoryName() { - return "factory2.2"; + return "factory2.2.name"; } @Override diff --git a/src/main/java/forestry/factory/gui/GuiBottler.java b/src/main/java/forestry/factory/gui/GuiBottler.java index a2ff20397..23e4ac39a 100755 --- a/src/main/java/forestry/factory/gui/GuiBottler.java +++ b/src/main/java/forestry/factory/gui/GuiBottler.java @@ -28,7 +28,7 @@ public class GuiBottler extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/factory/gui/GuiCarpenter.java b/src/main/java/forestry/factory/gui/GuiCarpenter.java index 102cf0666..e99f5ccf8 100755 --- a/src/main/java/forestry/factory/gui/GuiCarpenter.java +++ b/src/main/java/forestry/factory/gui/GuiCarpenter.java @@ -36,7 +36,7 @@ public class GuiCarpenter extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/factory/gui/GuiCentrifuge.java b/src/main/java/forestry/factory/gui/GuiCentrifuge.java index 254c8d720..7bbb4d708 100755 --- a/src/main/java/forestry/factory/gui/GuiCentrifuge.java +++ b/src/main/java/forestry/factory/gui/GuiCentrifuge.java @@ -26,7 +26,7 @@ public class GuiCentrifuge extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/factory/gui/GuiFabricator.java b/src/main/java/forestry/factory/gui/GuiFabricator.java index 626bd509f..3e78bf001 100755 --- a/src/main/java/forestry/factory/gui/GuiFabricator.java +++ b/src/main/java/forestry/factory/gui/GuiFabricator.java @@ -29,7 +29,7 @@ public class GuiFabricator extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/factory/gui/GuiFermenter.java b/src/main/java/forestry/factory/gui/GuiFermenter.java index 23ca2d97f..f040c761e 100755 --- a/src/main/java/forestry/factory/gui/GuiFermenter.java +++ b/src/main/java/forestry/factory/gui/GuiFermenter.java @@ -29,7 +29,7 @@ public class GuiFermenter extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/factory/gui/GuiMoistener.java b/src/main/java/forestry/factory/gui/GuiMoistener.java index 8b0b118dc..b445ecff1 100755 --- a/src/main/java/forestry/factory/gui/GuiMoistener.java +++ b/src/main/java/forestry/factory/gui/GuiMoistener.java @@ -28,7 +28,7 @@ public class GuiMoistener extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/factory/gui/GuiRaintank.java b/src/main/java/forestry/factory/gui/GuiRaintank.java index 044ed9a07..5a62fe33c 100755 --- a/src/main/java/forestry/factory/gui/GuiRaintank.java +++ b/src/main/java/forestry/factory/gui/GuiRaintank.java @@ -28,7 +28,7 @@ public class GuiRaintank extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/factory/gui/GuiSqueezer.java b/src/main/java/forestry/factory/gui/GuiSqueezer.java index c09c07dc1..f70c95a43 100755 --- a/src/main/java/forestry/factory/gui/GuiSqueezer.java +++ b/src/main/java/forestry/factory/gui/GuiSqueezer.java @@ -28,7 +28,7 @@ public class GuiSqueezer extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/factory/gui/GuiStill.java b/src/main/java/forestry/factory/gui/GuiStill.java index 74f8f437c..4e01269e5 100755 --- a/src/main/java/forestry/factory/gui/GuiStill.java +++ b/src/main/java/forestry/factory/gui/GuiStill.java @@ -29,7 +29,7 @@ public class GuiStill extends GuiForestry { @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")); } diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index a909d4913..5bb3ded17 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -141,7 +141,7 @@ public class GuiWorktable extends GuiForestry { @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")); } } diff --git a/src/main/java/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/gadgets/MachineMailbox.java index e289970e9..ff44c9159 100755 --- a/src/main/java/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/gadgets/MachineMailbox.java @@ -52,7 +52,7 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial @Override public String getInventoryName() { - return "mail.0"; + return "mail.0.name"; } /* GUI */ diff --git a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java index 27531aa05..f334336b9 100755 --- a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java +++ b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java @@ -37,7 +37,7 @@ public class MachinePhilatelist extends TileBase implements IInventory { @Override public String getInventoryName() { - return "mail.2"; + return "mail.2.name"; } @Override diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 661d463f7..7256c2950 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -49,7 +49,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided @Override public String getInventoryName() { - return "mail.1"; + return "mail.1.name"; } @Override diff --git a/src/main/java/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java index f32521eba..73a2ba613 100755 --- a/src/main/java/forestry/mail/gui/GuiTrader.java +++ b/src/main/java/forestry/mail/gui/GuiTrader.java @@ -33,7 +33,7 @@ public class GuiTrader extends GuiForestry { @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")); }