From 9ffc1bdff35559c9d8e089aa7380579fda407822 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 10 May 2015 19:04:42 -0400 Subject: [PATCH] Localization fixes, part 1 --- .../mekanism/client/MekanismKeyHandler.java | 13 +++-- .../gui/GuiAdvancedElectricMachine.java | 7 +-- .../client/gui/GuiAmbientAccumulator.java | 3 +- .../mekanism/client/gui/GuiChanceMachine.java | 5 +- .../client/gui/GuiChemicalCrystallizer.java | 5 +- .../gui/GuiChemicalDissolutionChamber.java | 5 +- .../client/gui/GuiChemicalInfuser.java | 7 +-- .../client/gui/GuiChemicalOxidizer.java | 5 +- .../client/gui/GuiChemicalWasher.java | 3 +- .../mekanism/client/gui/GuiDictionary.java | 5 +- .../mekanism/client/gui/GuiDigitalMiner.java | 33 +++++++------ .../client/gui/GuiDigitalMinerConfig.java | 19 +++---- .../mekanism/client/gui/GuiDynamicTank.java | 8 +-- .../mekanism/client/gui/GuiElectricChest.java | 8 +-- .../client/gui/GuiElectricMachine.java | 5 +- .../mekanism/client/gui/GuiElectricPump.java | 4 +- .../client/gui/GuiElectrolyticSeparator.java | 7 +-- .../mekanism/client/gui/GuiEnergyCube.java | 7 +-- .../client/gui/GuiEntangledBlock.java | 4 +- .../java/mekanism/client/gui/GuiFactory.java | 7 +-- .../client/gui/GuiFluidicPlenisher.java | 6 +-- .../java/mekanism/client/gui/GuiGasTank.java | 7 +-- .../client/gui/GuiInductionMatrix.java | 7 +-- .../client/gui/GuiLaserAmplifier.java | 11 +++-- .../client/gui/GuiLaserTractorBeam.java | 4 +- .../client/gui/GuiLogisticalSorter.java | 39 ++++++++------- .../mekanism/client/gui/GuiMFilterSelect.java | 12 ++--- .../client/gui/GuiMItemStackFilter.java | 20 ++++---- .../client/gui/GuiMMaterialFilter.java | 18 +++---- .../mekanism/client/gui/GuiMModIDFilter.java | 22 ++++----- .../client/gui/GuiMOreDictFilter.java | 22 ++++----- .../mekanism/client/gui/GuiMatrixStats.java | 17 ++++--- .../client/gui/GuiMekanismConfig.java | 12 ++--- .../client/gui/GuiMetallurgicInfuser.java | 7 +-- .../client/gui/GuiOredictionificator.java | 7 +-- .../gui/GuiOredictionificatorFilter.java | 15 +++--- src/main/java/mekanism/client/gui/GuiPRC.java | 5 +- .../mekanism/client/gui/GuiPasswordEnter.java | 14 +++--- .../client/gui/GuiPasswordModify.java | 16 +++--- .../mekanism/client/gui/GuiPortableTank.java | 3 +- .../mekanism/client/gui/GuiRobitCrafting.java | 6 +-- .../client/gui/GuiRobitInventory.java | 6 +-- .../mekanism/client/gui/GuiRobitMain.java | 24 ++++----- .../mekanism/client/gui/GuiRobitRepair.java | 7 ++- .../mekanism/client/gui/GuiRobitSmelting.java | 6 +-- .../client/gui/GuiRotaryCondensentrator.java | 7 +-- .../mekanism/client/gui/GuiSeismicReader.java | 3 +- .../client/gui/GuiSeismicVibrator.java | 7 +-- .../client/gui/GuiSideConfiguration.java | 11 +++-- .../gui/GuiSolarEvaporationController.java | 18 +++---- .../client/gui/GuiSolarNeutronActivator.java | 3 +- .../mekanism/client/gui/GuiTFilterSelect.java | 12 ++--- .../client/gui/GuiTItemStackFilter.java | 24 ++++----- .../client/gui/GuiTMaterialFilter.java | 20 ++++---- .../mekanism/client/gui/GuiTModIDFilter.java | 23 ++++----- .../client/gui/GuiTOreDictFilter.java | 23 ++++----- .../mekanism/client/gui/GuiTeleporter.java | 37 +++++++------- .../client/gui/GuiTransporterConfig.java | 14 +++--- .../client/gui/GuiUpgradeManagement.java | 12 ++--- .../client/gui/element/GuiDetectionTab.java | 2 +- .../client/gui/element/GuiEnergyGauge.java | 3 +- .../client/gui/element/GuiFluidGauge.java | 3 +- .../client/gui/element/GuiGasGauge.java | 4 +- .../client/gui/element/GuiMatrixTab.java | 3 +- .../gui/element/GuiSideConfigurationTab.java | 3 +- .../client/gui/element/GuiSortingTab.java | 2 +- .../gui/element/GuiTransporterConfigTab.java | 3 +- .../client/gui/element/GuiUpgradeTab.java | 3 +- .../client/gui/element/GuiVisualsTab.java | 2 +- .../ChemicalCrystallizerRecipeHandler.java | 2 +- ...emicalDissolutionChamberRecipeHandler.java | 2 +- .../nei/ChemicalInfuserRecipeHandler.java | 2 +- ...ChemicalInjectionChamberRecipeHandler.java | 3 +- .../nei/ChemicalOxidizerRecipeHandler.java | 2 +- .../nei/ChemicalWasherRecipeHandler.java | 2 +- .../client/nei/CombinerRecipeHandler.java | 4 +- .../client/nei/CrusherRecipeHandler.java | 4 +- .../ElectrolyticSeparatorRecipeHandler.java | 2 +- .../nei/EnrichmentChamberRecipeHandler.java | 4 +- .../client/nei/MekanismRecipeHandler.java | 4 +- .../nei/MetallurgicInfuserRecipeHandler.java | 3 +- .../nei/OsmiumCompressorRecipeHandler.java | 4 +- .../mekanism/client/nei/PRCRecipeHandler.java | 2 +- .../nei/PrecisionSawmillRecipeHandler.java | 4 +- .../nei/PurificationChamberRecipeHandler.java | 3 +- .../RotaryCondensentratorRecipeHandler.java | 4 +- .../nei/SolarEvaporationRecipeHandler.java | 2 +- .../client/nei/SolarNeutronRecipeHandler.java | 2 +- src/main/java/mekanism/common/SideData.java | 4 +- src/main/java/mekanism/common/Tier.java | 4 +- src/main/java/mekanism/common/Upgrade.java | 10 ++-- .../java/mekanism/common/base/IFactory.java | 5 +- .../common/base/IRedstoneControl.java | 4 +- .../mekanism/common/block/BlockMachine.java | 5 +- .../common/item/ItemAtomicDisassembler.java | 17 ++++--- .../mekanism/common/item/ItemBalloon.java | 5 +- .../mekanism/common/item/ItemBlockBasic.java | 7 +-- .../common/item/ItemBlockCardboardBox.java | 10 ++-- .../common/item/ItemBlockEnergyCube.java | 8 +-- .../common/item/ItemBlockGasTank.java | 10 ++-- .../common/item/ItemBlockMachine.java | 16 +++--- .../mekanism/common/item/ItemBlockOre.java | 6 +-- .../common/item/ItemConfigurator.java | 11 +++-- .../mekanism/common/item/ItemDictionary.java | 6 +-- .../mekanism/common/item/ItemElectricBow.java | 3 +- .../mekanism/common/item/ItemEnergized.java | 5 +- .../mekanism/common/item/ItemFilterCard.java | 11 ++--- .../common/item/ItemFlamethrower.java | 6 +-- .../mekanism/common/item/ItemFreeRunners.java | 5 +- .../common/item/ItemGaugeDropper.java | 8 +-- .../mekanism/common/item/ItemJetpack.java | 10 ++-- .../java/mekanism/common/item/ItemRobit.java | 7 ++- .../mekanism/common/item/ItemScubaTank.java | 10 ++-- .../common/item/ItemSeismicReader.java | 6 +-- .../mekanism/common/item/ItemUpgrade.java | 4 +- .../common/item/ItemWalkieTalkie.java | 7 ++- .../common/multipart/ItemPartTransmitter.java | 49 ++++++++++--------- .../multipart/PartDiversionTransporter.java | 12 ++--- .../multipart/PartLogisticalTransporter.java | 9 ++-- .../mekanism/common/tile/TileEntityBin.java | 6 +-- .../common/tile/TileEntityContainerBlock.java | 5 +- .../common/tile/TileEntityDynamicValve.java | 4 +- .../common/tile/TileEntityElectricPump.java | 3 +- .../common/tile/TileEntityEnergyCube.java | 6 +-- .../tile/TileEntityFluidicPlenisher.java | 3 +- .../tile/TileEntityInductionCasing.java | 5 +- .../common/tile/TileEntityInductionCell.java | 3 +- .../common/tile/TileEntityInductionPort.java | 2 +- .../tile/TileEntityInductionProvider.java | 3 +- .../mekanism/common/tile/TileEntityPRC.java | 3 +- .../common/util/FluidContainerUtils.java | 2 +- .../java/mekanism/common/util/LangUtils.java | 18 +++++-- .../mekanism/common/util/MekanismUtils.java | 23 +++------ .../client/gui/GuiBioGenerator.java | 13 ++--- .../generators/client/gui/GuiFuelTab.java | 3 +- .../client/gui/GuiGasGenerator.java | 9 ++-- .../client/gui/GuiHeatGenerator.java | 9 ++-- .../generators/client/gui/GuiHeatTab.java | 3 +- .../client/gui/GuiNeutronCapture.java | 7 +-- .../client/gui/GuiReactorController.java | 9 ++-- .../generators/client/gui/GuiReactorFuel.java | 7 +-- .../generators/client/gui/GuiReactorHeat.java | 5 +- .../client/gui/GuiReactorLogicAdapter.java | 8 +-- .../client/gui/GuiReactorStats.java | 31 ++++++------ .../client/gui/GuiSolarGenerator.java | 13 ++--- .../generators/client/gui/GuiStatTab.java | 3 +- .../generators/client/gui/GuiWindTurbine.java | 15 +++--- .../common/block/BlockGenerator.java | 3 +- .../generators/common/block/BlockReactor.java | 3 +- .../common/item/ItemBlockGenerator.java | 8 +-- .../common/item/ItemBlockReactor.java | 4 +- .../generators/common/item/ItemHohlraum.java | 12 ++--- .../TileEntityReactorLogicAdapter.java | 6 +-- .../tools/client/gui/GuiToolsConfig.java | 8 +-- .../tools/item/ItemMekanismArmor.java | 5 +- .../mekanism/tools/item/ItemMekanismHoe.java | 5 +- .../tools/item/ItemMekanismSword.java | 5 +- .../mekanism/tools/item/ItemMekanismTool.java | 5 +- .../resources/assets/mekanism/lang/en_US.lang | 1 + 159 files changed, 686 insertions(+), 650 deletions(-) diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 43d835c5f..79b91382b 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -22,7 +22,6 @@ import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; @@ -44,9 +43,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class MekanismKeyHandler extends MekKeyHandler { public static final String keybindCategory = "Mekanism"; - public static KeyBinding modeSwitchKey = new KeyBinding("Mekanism " + MekanismUtils.localize("key.mode"), Keyboard.KEY_M, keybindCategory); - public static KeyBinding armorModeSwitchKey = new KeyBinding("Mekanism " + MekanismUtils.localize("key.armorMode"), Keyboard.KEY_F, keybindCategory); - public static KeyBinding voiceKey = new KeyBinding("Mekanism " + MekanismUtils.localize("key.voice"), Keyboard.KEY_U, keybindCategory); + public static KeyBinding modeSwitchKey = new KeyBinding("Mekanism " + LangUtils.localize("key.mode"), Keyboard.KEY_M, keybindCategory); + public static KeyBinding armorModeSwitchKey = new KeyBinding("Mekanism " + LangUtils.localize("key.armorMode"), Keyboard.KEY_F, keybindCategory); + public static KeyBinding voiceKey = new KeyBinding("Mekanism " + LangUtils.localize("key.voice"), Keyboard.KEY_U, keybindCategory); public static KeyBinding sneakKey = Minecraft.getMinecraft().gameSettings.keyBindSneak; public static KeyBinding jumpKey = Minecraft.getMinecraft().gameSettings.keyBindJump; @@ -84,7 +83,7 @@ public class MekanismKeyHandler extends MekKeyHandler int toSet = configurator.getState(toolStack).ordinal() < ConfiguratorMode.values().length-1 ? configurator.getState(toolStack).ordinal() + 1 : 0; configurator.setState(toolStack, ConfiguratorMode.values()[toSet]); Mekanism.packetHandler.sendToServer(new ConfiguratorStateMessage(configurator.getState(toolStack))); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.configureState") + ": " + configurator.getColor(configurator.getState(toolStack)) + configurator.getStateDisplay(configurator.getState(toolStack)))); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configureState") + ": " + configurator.getColor(configurator.getState(toolStack)) + configurator.getStateDisplay(configurator.getState(toolStack)))); } else if(player.isSneaking() && item instanceof ItemElectricBow) { @@ -92,7 +91,7 @@ public class MekanismKeyHandler extends MekKeyHandler bow.setFireState(toolStack, !bow.getFireState(toolStack)); Mekanism.packetHandler.sendToServer(new ElectricBowStateMessage(bow.getFireState(toolStack))); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.fireMode") + ": " + (bow.getFireState(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transYesNo(bow.getFireState(toolStack)))); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.fireMode") + ": " + (bow.getFireState(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transYesNo(bow.getFireState(toolStack)))); } else if(player.isSneaking() && item instanceof ItemBlockMachine) { @@ -102,7 +101,7 @@ public class MekanismKeyHandler extends MekKeyHandler { machine.setBucketMode(toolStack, !machine.getBucketMode(toolStack)); Mekanism.packetHandler.sendToServer(new PortableTankStateMessage(machine.getBucketMode(toolStack))); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.portableTank.bucketMode") + ": " + (machine.getBucketMode(toolStack) ? (EnumColor.DARK_GREEN + "ON") : (EnumColor.DARK_RED + "OFF")))); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + (machine.getBucketMode(toolStack) ? (EnumColor.DARK_GREEN + "ON") : (EnumColor.DARK_RED + "OFF")))); } } else if(player.isSneaking() && item instanceof ItemWalkieTalkie) diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index 57281f836..6b6a44d9f 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -20,6 +20,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; @@ -48,7 +49,7 @@ public class GuiAdvancedElectricMachine extends GuiMekanism public List getInfo() { String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity.guiLocation)); @@ -79,11 +80,11 @@ public class GuiAdvancedElectricMachine extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); if(xAxis >= 61 && xAxis <= 67 && yAxis >= 37 && yAxis <= 49) { - drawCreativeTabHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : MekanismUtils.localize("gui.none"), xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : LangUtils.localize("gui.none"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java index 0d27d689e..37fd31e9f 100644 --- a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java +++ b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java @@ -6,6 +6,7 @@ import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityAmbientAccumulator; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; @@ -34,7 +35,7 @@ public class GuiAmbientAccumulator extends GuiMekanism protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index 08eea6e7e..a0122ca17 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -18,6 +18,7 @@ import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChanceMachine; import mekanism.common.tile.TileEntityChanceMachine; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; @@ -46,7 +47,7 @@ public class GuiChanceMachine extends GuiMekanism public List getInfo() { String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity.guiLocation)); @@ -73,7 +74,7 @@ public class GuiChanceMachine extends GuiMekanism protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 2847f58f9..f7bf39b36 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -30,6 +30,7 @@ import mekanism.common.inventory.container.ContainerChemicalCrystallizer; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.tile.TileEntityChemicalCrystallizer; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -72,7 +73,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism public List getInfo() { String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyUsage); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); guiElements.add(new GuiGasGauge(new IGasInfoHandler() { @@ -117,7 +118,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism if(recipe == null) { - fontRendererObj.drawString("(" + MekanismUtils.localize("gui.noRecipe") + ")", 29, 24, 0x00CD00); + fontRendererObj.drawString("(" + LangUtils.localize("gui.noRecipe") + ")", 29, 24, 0x00CD00); } else { fontRendererObj.drawString("(" + recipe.recipeOutput.output.getDisplayName() + ")", 29, 24, 0x00CD00); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index daeefd2e3..657c36101 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -19,6 +19,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -44,7 +45,7 @@ public class GuiChemicalDissolutionChamber extends GuiMekanism public List getInfo() { String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyUsage); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); guiElements.add(new GuiGasGauge(new IGasInfoHandler() { @@ -83,7 +84,7 @@ public class GuiChemicalDissolutionChamber extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString(MekanismUtils.localize("gui.chemicalDissolutionChamber.short"), 35, 4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.chemicalDissolutionChamber.short"), 35, 4, 0x404040); if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index a71ad9311..a53cf1d01 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -24,6 +24,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalInfuser; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -49,7 +50,7 @@ public class GuiChemicalInfuser extends GuiMekanism public List getInfo() { String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + usage + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); guiElements.add(new GuiGasGauge(new IGasInfoHandler() { @@ -103,8 +104,8 @@ public class GuiChemicalInfuser extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString(MekanismUtils.localize("gui.chemicalInfuser.short"), 5, 5, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.chemicalInfuser.short"), 5, 5, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index 63744b83b..a81931728 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -19,6 +19,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -44,7 +45,7 @@ public class GuiChemicalOxidizer extends GuiMekanism public List getInfo() { String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyUsage); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); guiElements.add(new GuiGasGauge(new IGasInfoHandler() { @@ -76,7 +77,7 @@ public class GuiChemicalOxidizer extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index d82de7fa1..36a9e1002 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -28,6 +28,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalWasher; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalWasher; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -55,7 +56,7 @@ public class GuiChemicalWasher extends GuiMekanism public List getInfo() { String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + usage + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index a02d86fd3..134468833 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiScrollList; import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerDictionary; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -34,8 +35,8 @@ public class GuiDictionary extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString(MekanismUtils.localize("item.Dictionary.name"), 64, 5, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("item.Dictionary.name"), 64, 5, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); if(itemType != null) { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 646273383..a7baa0603 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -24,6 +24,7 @@ import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; @@ -57,7 +58,7 @@ public class GuiDigitalMiner extends GuiMekanism public List getInfo() { String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.getPerTick()); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); @@ -76,21 +77,21 @@ public class GuiDigitalMiner extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - startButton = new GuiButton(0, guiWidth + 69, guiHeight + 17, 60, 20, MekanismUtils.localize("gui.start")); + startButton = new GuiButton(0, guiWidth + 69, guiHeight + 17, 60, 20, LangUtils.localize("gui.start")); if(tileEntity.searcher.state != State.IDLE && tileEntity.running) { startButton.enabled = false; } - stopButton = new GuiButton(1, guiWidth + 69, guiHeight + 37, 60, 20, MekanismUtils.localize("gui.stop")); + stopButton = new GuiButton(1, guiWidth + 69, guiHeight + 37, 60, 20, LangUtils.localize("gui.stop")); if(tileEntity.searcher.state == State.IDLE || !tileEntity.running) { stopButton.enabled = false; } - configButton = new GuiButton(2, guiWidth + 69, guiHeight + 57, 60, 20, MekanismUtils.localize("gui.config")); + configButton = new GuiButton(2, guiWidth + 69, guiHeight + 57, 60, 20, LangUtils.localize("gui.config")); if(tileEntity.searcher.state != State.IDLE) { @@ -164,16 +165,16 @@ public class GuiDigitalMiner extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), 69, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - fontRendererObj.drawString(tileEntity.running ? MekanismUtils.localize("gui.digitalMiner.running") : MekanismUtils.localize("gui.idle"), 9, 10, 0x00CD00); + fontRendererObj.drawString(tileEntity.running ? LangUtils.localize("gui.digitalMiner.running") : LangUtils.localize("gui.idle"), 9, 10, 0x00CD00); fontRendererObj.drawString(tileEntity.searcher.state.desc, 9, 19, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.eject") + ": " + MekanismUtils.localize("gui." + (tileEntity.doEject ? "on" : "off")), 9, 30, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.digitalMiner.pull") + ": " + MekanismUtils.localize("gui." + (tileEntity.doPull ? "on" : "off")), 9, 39, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.digitalMiner.silk") + ": " + MekanismUtils.localize("gui." + (tileEntity.silkTouch ? "on" : "off")), 9, 48, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.eject") + ": " + LangUtils.localize("gui." + (tileEntity.doEject ? "on" : "off")), 9, 30, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.digitalMiner.pull") + ": " + LangUtils.localize("gui." + (tileEntity.doPull ? "on" : "off")), 9, 39, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.digitalMiner.silk") + ": " + LangUtils.localize("gui." + (tileEntity.silkTouch ? "on" : "off")), 9, 48, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.digitalMiner.toMine") + ":", 9, 59, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.digitalMiner.toMine") + ":", 9, 59, 0x00CD00); fontRendererObj.drawString("" + tileEntity.clientToMine, 9, 68, 0x00CD00); if(tileEntity.missingStack != null) @@ -203,33 +204,33 @@ public class GuiDigitalMiner extends GuiMekanism if(xAxis >= 147 && xAxis <= 161 && yAxis >= 47 && yAxis <= 61) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.autoEject"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.autoEject"), xAxis, yAxis); } if(xAxis >= 147 && xAxis <= 161 && yAxis >= 63 && yAxis <= 77) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.autoPull"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.autoPull"), xAxis, yAxis); } if(xAxis >= 144 && xAxis <= 160 && yAxis >= 27 && yAxis <= 43) { if(tileEntity.missingStack != null) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.missingBlock"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.missingBlock"), xAxis, yAxis); } else { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.well"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.well"), xAxis, yAxis); } } if(xAxis >= 131 && xAxis <= 145 && yAxis >= 47 && yAxis <= 61) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.reset"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.reset"), xAxis, yAxis); } if(xAxis >= 131 && xAxis <= 145 && yAxis >= 63 && yAxis <= 77) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.silkTouch"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.silkTouch"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index c2ced3f1e..99b342379 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -23,6 +23,7 @@ import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; @@ -399,7 +400,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 56, guiHeight + 136, 96, 20, MekanismUtils.localize("gui.newFilter"))); + buttonList.add(new GuiButton(0, guiWidth + 56, guiHeight + 136, 96, 20, LangUtils.localize("gui.newFilter"))); String prevRad = radiusField != null ? radiusField.getText() : ""; String prevMin = minField != null ? minField.getText() : ""; @@ -435,12 +436,12 @@ public class GuiDigitalMinerConfig extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString(MekanismUtils.localize("gui.digitalMinerConfig"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.digitalMinerConfig"), 43, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.filters") + ":", 11, 19, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.filters") + ":", 11, 19, 0x00CD00); fontRendererObj.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00); - fontRendererObj.drawString("I: " + (tileEntity.inverse ? MekanismUtils.localize("gui.on") : MekanismUtils.localize("gui.off")), 11, 131, 0x00CD00); + fontRendererObj.drawString("I: " + (tileEntity.inverse ? LangUtils.localize("gui.on") : LangUtils.localize("gui.off")), 11, 131, 0x00CD00); fontRendererObj.drawString("Radi: " + tileEntity.radius, 11, 58, 0x00CD00); @@ -468,7 +469,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism GL11.glPopMatrix(); } - fontRendererObj.drawString(MekanismUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040); } else if(filter instanceof MOreDictFilter) { @@ -490,7 +491,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism } catch(Exception e) {} } - fontRendererObj.drawString(MekanismUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040); } else if(filter instanceof MMaterialFilter) { @@ -505,7 +506,7 @@ public class GuiDigitalMinerConfig extends GuiMekanism GL11.glPopMatrix(); } - fontRendererObj.drawString(MekanismUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040); } else if(filter instanceof MModIDFilter) { @@ -527,14 +528,14 @@ public class GuiDigitalMinerConfig extends GuiMekanism } catch(Exception e) {} } - fontRendererObj.drawString(MekanismUtils.localize("gui.modIDFilter"), 78, yStart + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.modIDFilter"), 78, yStart + 2, 0x404040); } } } if(xAxis >= 11 && xAxis <= 25 && yAxis >= 141 && yAxis <= 155) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.inverse"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.inverse"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index 10a568021..e35c6ed23 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -34,9 +34,9 @@ public class GuiDynamicTank extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.volume") + ": " + tileEntity.clientCapacity/TankUpdateProtocol.FLUID_PER_TANK, 53, 26, 0x00CD00); - renderScaledText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ":" : MekanismUtils.localize("gui.noFluid"), 53, 44, 0x00CD00, 74); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.volume") + ": " + tileEntity.clientCapacity/TankUpdateProtocol.FLUID_PER_TANK, 53, 26, 0x00CD00); + renderScaledText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ":" : LangUtils.localize("gui.noFluid"), 53, 44, 0x00CD00, 74); if(tileEntity.structure.fluidStored != null) { @@ -45,7 +45,7 @@ public class GuiDynamicTank extends GuiMekanism if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ": " + tileEntity.structure.fluidStored.amount + "mB" : MekanismUtils.localize("gui.empty"), xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ": " + tileEntity.structure.fluidStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index 0f1c26b5a..f3cb18b60 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -10,9 +10,9 @@ import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; @@ -59,7 +59,7 @@ public class GuiElectricChest extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 93, guiHeight + 4, 76, 20, MekanismUtils.localize("gui.electricChest.editPassword"))); + buttonList.add(new GuiButton(0, guiWidth + 93, guiHeight + 4, 76, 20, LangUtils.localize("gui.electricChest.editPassword"))); } @Override @@ -83,9 +83,9 @@ public class GuiElectricChest extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString(MekanismUtils.localize("tile.MachineBlock.ElectricChest.name"), 8, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("tile.MachineBlock.ElectricChest.name"), 8, 6, 0x404040); fontRendererObj.drawString(getLocked() ? EnumColor.DARK_RED + "Locked" : EnumColor.BRIGHT_GREEN + "Unlocked", 97, 137, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); if(xAxis >= 180 && xAxis <= 184 && yAxis >= 32 && yAxis <= 84) { diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 3e7680eb6..483be0b6b 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -18,6 +18,7 @@ import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerElectricMachine; import mekanism.common.tile.TileEntityElectricMachine; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; @@ -46,7 +47,7 @@ public class GuiElectricMachine extends GuiMekanism public List getInfo() { String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity.guiLocation)); @@ -73,7 +74,7 @@ public class GuiElectricMachine extends GuiMekanism protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 105d96f2d..9bbf12dc5 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -53,10 +53,10 @@ public class GuiElectricPump extends GuiMekanism protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - String text = tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : MekanismUtils.localize("gui.noFluid"); + String text = tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : LangUtils.localize("gui.noFluid"); renderScaledText(text, 51, 35, 0x00CD00, 74); super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index a143abbb1..5067734ac 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -27,6 +27,7 @@ import mekanism.common.inventory.container.ContainerElectrolyticSeparator; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityGasTank; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -54,7 +55,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism public List getInfo() { String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + usage + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @@ -126,10 +127,10 @@ public class GuiElectrolyticSeparator extends GuiMekanism { fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - String name = chooseByMode(tileEntity.dumpLeft, MekanismUtils.localize("gui.idle"), MekanismUtils.localize("gui.dumping"), MekanismUtils.localize("gui.dumping_excess")); + String name = chooseByMode(tileEntity.dumpLeft, LangUtils.localize("gui.idle"), LangUtils.localize("gui.dumping"), LangUtils.localize("gui.dumping_excess")); renderScaledText(name, 21, 73, 0x404040, 66); - name = chooseByMode(tileEntity.dumpRight, MekanismUtils.localize("gui.idle"), MekanismUtils.localize("gui.dumping"), MekanismUtils.localize("gui.dumping_excess")); + name = chooseByMode(tileEntity.dumpRight, LangUtils.localize("gui.idle"), LangUtils.localize("gui.dumping"), LangUtils.localize("gui.dumping_excess")); renderScaledText(name, 156-(int)(fontRendererObj.getStringWidth(name)*getNeededScale(name, 66)), 73, 0x404040, 66); super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index b9f79f285..cf2b207e6 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -14,6 +14,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerEnergyCube; import mekanism.common.tile.TileEntityEnergyCube; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -46,8 +47,8 @@ public class GuiEnergyCube extends GuiMekanism public List getInfo() { return ListUtils.asList( - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"), 16, 34).with(SlotOverlay.MINUS)); @@ -58,7 +59,7 @@ public class GuiEnergyCube extends GuiMekanism protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java index b87a7b4eb..5205709e3 100644 --- a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java +++ b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java @@ -7,9 +7,9 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityEntangledBlock; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; @@ -38,7 +38,7 @@ public class GuiEntangledBlock extends GuiMekanism protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(tileEntity.getInventoryName(), 55, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 38ba6dea0..fedb4802a 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -16,6 +16,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.Tier.FactoryTier; import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.tile.TileEntityFactory; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; @@ -47,7 +48,7 @@ public class GuiFactory extends GuiMekanism public List getInfo() { String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity.tier.guiLocation)); } @@ -59,7 +60,7 @@ public class GuiFactory extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 93) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 93) + 2, 0x404040); if(xAxis >= 165 && xAxis <= 169 && yAxis >= 17 && yAxis <= 69) { @@ -68,7 +69,7 @@ public class GuiFactory extends GuiMekanism if(xAxis >= 8 && xAxis <= 168 && yAxis >= 78 && yAxis <= 83) { - drawCreativeTabHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : MekanismUtils.localize("gui.none"), xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : LangUtils.localize("gui.none"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index c07414ae5..0e7186be5 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -50,10 +50,10 @@ public class GuiFluidicPlenisher extends GuiMekanism protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.finished") + ": " + LangUtils.transYesNo(tileEntity.finishedCalc), 51, 35, 0x00CD00); - fontRendererObj.drawString(tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : MekanismUtils.localize("gui.noFluid"), 51, 44, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.finished") + ": " + LangUtils.transYesNo(tileEntity.finishedCalc), 51, 35, 0x00CD00); + fontRendererObj.drawString(tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : LangUtils.localize("gui.noFluid"), 51, 44, 0x00CD00); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 9115014c2..eaa966d6b 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -9,6 +9,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -40,10 +41,10 @@ public class GuiGasTank extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); fontRendererObj.drawString(capacityInfo, 45, 40, 0x404040); - renderScaledText(MekanismUtils.localize("gui.gas") + ": " + (tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() : MekanismUtils.localize("gui.none")), 45, 49, 0x404040, 112); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); + renderScaledText(LangUtils.localize("gui.gas") + ": " + (tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() : LangUtils.localize("gui.none")), 45, 49, 0x404040, 112); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); - String name = chooseByMode(tileEntity.dumping, MekanismUtils.localize("gui.idle"), MekanismUtils.localize("gui.dumping"), MekanismUtils.localize("gui.dumping_excess")); + String name = chooseByMode(tileEntity.dumping, LangUtils.localize("gui.idle"), LangUtils.localize("gui.dumping"), LangUtils.localize("gui.dumping_excess")); fontRendererObj.drawString(name, 156 - fontRendererObj.getStringWidth(name), 73, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index ac6bb3550..44840f842 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -5,6 +5,7 @@ import mekanism.client.gui.element.GuiMatrixTab.MatrixTab; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerInductionMatrix; import mekanism.common.tile.TileEntityInductionCasing; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -33,10 +34,10 @@ public class GuiInductionMatrix extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.energy") + ":", 53, 26, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.energy") + ":", 53, 26, 0x00CD00); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 53, 35, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.output") + ":", 53, 44, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.output") + ":", 53, 44, 0x00CD00); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput), 53, 53, 0x00CD00); if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72) diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index fd1263f48..6e088943b 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -13,6 +13,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerLaserAmplifier; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityLaserAmplifier; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; @@ -62,7 +63,7 @@ public class GuiLaserAmplifier extends GuiMekanism @Override public String getText(double level) { - return MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(level); + return LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(level); } }, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 6, 10)); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); @@ -76,11 +77,11 @@ public class GuiLaserAmplifier extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), 55, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - fontRendererObj.drawString(tileEntity.time > 0 ? MekanismUtils.localize("gui.delay") + ": " + tileEntity.time + "t" : MekanismUtils.localize("gui.noDelay"), 26, 30, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.min") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.minThreshold), 26, 45, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.max") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.maxThreshold), 26, 60, 0x404040); + fontRendererObj.drawString(tileEntity.time > 0 ? LangUtils.localize("gui.delay") + ": " + tileEntity.time + "t" : LangUtils.localize("gui.noDelay"), 26, 30, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.min") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.minThreshold), 26, 45, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.max") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.maxThreshold), 26, 60, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java index 2823c707c..d1cc2b705 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java +++ b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java @@ -2,9 +2,9 @@ package mekanism.client.gui; import mekanism.common.inventory.container.ContainerLaserTractorBeam; import mekanism.common.tile.TileEntityLaserTractorBeam; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; @@ -23,7 +23,7 @@ public class GuiLaserTractorBeam extends GuiMekanism protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index ec59a56f5..22487318d 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -24,6 +24,7 @@ import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMess import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; @@ -417,7 +418,7 @@ public class GuiLogisticalSorter extends GuiMekanism // Add buttons to gui buttonList.clear(); - buttonList.add(new GuiButton(BUTTON_NEW, guiLeft + 56, guiTop + 136, 96, 20, MekanismUtils.localize("gui.newFilter"))); + buttonList.add(new GuiButton(BUTTON_NEW, guiLeft + 56, guiTop + 136, 96, 20, LangUtils.localize("gui.newFilter"))); } @Override @@ -441,16 +442,16 @@ public class GuiLogisticalSorter extends GuiMekanism // Write to info display fontRendererObj.drawString(tileEntity.getInventoryName(), 43, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.filters") + ":", 11, 19, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.filters") + ":", 11, 19, 0x00CD00); fontRendererObj.drawString("T: " + tileEntity.filters.size(), 11, 28, 0x00CD00); fontRendererObj.drawString("RR:", 12, 74, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui." + (tileEntity.roundRobin ? "on" : "off")), 27, 86, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui." + (tileEntity.roundRobin ? "on" : "off")), 27, 86, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.logisticalSorter.auto") + ":", 12, 100, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui." + (tileEntity.autoEject ? "on" : "off")), 27, 112, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.logisticalSorter.auto") + ":", 12, 100, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui." + (tileEntity.autoEject ? "on" : "off")), 27, 112, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.logisticalSorter.default") + ":", 12, 126, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.logisticalSorter.default") + ":", 12, 126, 0x00CD00); // Draw filters for(int i = 0; i < 4; i++) @@ -473,8 +474,8 @@ public class GuiLogisticalSorter extends GuiMekanism GL11.glPopMatrix(); } - fontRendererObj.drawString(MekanismUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040); - fontRendererObj.drawString(filter.color != null ? filter.color.getName() : MekanismUtils.localize("gui.none"), 78, yStart + 11, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040); + fontRendererObj.drawString(filter.color != null ? filter.color.getName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040); } else if(filter instanceof TOreDictFilter) { @@ -496,8 +497,8 @@ public class GuiLogisticalSorter extends GuiMekanism } catch(final Exception e) {} } - fontRendererObj.drawString(MekanismUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040); - fontRendererObj.drawString(filter.color != null ? filter.color.getName() : MekanismUtils.localize("gui.none"), 78, yStart + 11, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.oredictFilter"), 78, yStart + 2, 0x404040); + fontRendererObj.drawString(filter.color != null ? filter.color.getName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040); } else if(filter instanceof TMaterialFilter) { @@ -512,8 +513,8 @@ public class GuiLogisticalSorter extends GuiMekanism GL11.glPopMatrix(); } - fontRendererObj.drawString(MekanismUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040); - fontRendererObj.drawString(filter.color != null ? filter.color.getName() : MekanismUtils.localize("gui.none"), 78, yStart + 11, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040); + fontRendererObj.drawString(filter.color != null ? filter.color.getName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040); } else if(filter instanceof TModIDFilter) { @@ -535,8 +536,8 @@ public class GuiLogisticalSorter extends GuiMekanism } catch(final Exception e) {} } - fontRendererObj.drawString(MekanismUtils.localize("gui.modIDFilter"), 78, yStart + 2, 0x404040); - fontRendererObj.drawString(filter.color != null ? filter.color.getName() : MekanismUtils.localize("gui.none"), 78, yStart + 11, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.modIDFilter"), 78, yStart + 2, 0x404040); + fontRendererObj.drawString(filter.color != null ? filter.color.getName() : LangUtils.localize("gui.none"), 78, yStart + 11, 0x404040); } // Draw hovertext for sorting buttons @@ -546,7 +547,7 @@ public class GuiLogisticalSorter extends GuiMekanism { if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 14 && yAxis <= yStart + 20) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.moveUp"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.moveUp"), xAxis, yAxis); } } @@ -554,7 +555,7 @@ public class GuiLogisticalSorter extends GuiMekanism { if(xAxis >= arrowX && xAxis <= arrowX + 10 && yAxis >= yStart + 21 && yAxis <= yStart + 27) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.moveDown"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.moveDown"), xAxis, yAxis); } } } @@ -582,18 +583,18 @@ public class GuiLogisticalSorter extends GuiMekanism drawCreativeTabHoveringText(tileEntity.color.getName(), xAxis, yAxis); } else { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.none"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis); } } if(xAxis >= 12 && xAxis <= 26 && yAxis >= 110 && yAxis <= 124) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.autoEject"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.autoEject"), xAxis, yAxis); } if(xAxis >= 12 && xAxis <= 26 && yAxis >= 84 && yAxis <= 98) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.logisticalSorter.roundRobin"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.logisticalSorter.roundRobin"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index 8274f30f7..3f47a4bfd 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -7,9 +7,9 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.relauncher.Side; @@ -38,10 +38,10 @@ public class GuiMFilterSelect extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 24, guiHeight + 32, 128, 20, MekanismUtils.localize("gui.itemstack"))); - buttonList.add(new GuiButton(1, guiWidth + 24, guiHeight + 52, 128, 20, MekanismUtils.localize("gui.oredict"))); - buttonList.add(new GuiButton(2, guiWidth + 24, guiHeight + 72, 128, 20, MekanismUtils.localize("gui.material"))); - buttonList.add(new GuiButton(3, guiWidth + 24, guiHeight + 92, 128, 20, MekanismUtils.localize("gui.modID"))); + buttonList.add(new GuiButton(0, guiWidth + 24, guiHeight + 32, 128, 20, LangUtils.localize("gui.itemstack"))); + buttonList.add(new GuiButton(1, guiWidth + 24, guiHeight + 52, 128, 20, LangUtils.localize("gui.oredict"))); + buttonList.add(new GuiButton(2, guiWidth + 24, guiHeight + 72, 128, 20, LangUtils.localize("gui.material"))); + buttonList.add(new GuiButton(3, guiWidth + 24, guiHeight + 92, 128, 20, LangUtils.localize("gui.modID"))); } @Override @@ -73,7 +73,7 @@ public class GuiMFilterSelect extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString(MekanismUtils.localize("gui.filterSelect.title"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.filterSelect.title"), 43, 6, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 2c3aca6e1..7c7444170 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -38,7 +38,7 @@ public class GuiMItemStackFilter extends GuiMekanism public MItemStackFilter filter = new MItemStackFilter(); - public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + public String status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); public int ticker; @@ -68,8 +68,8 @@ public class GuiMItemStackFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -98,7 +98,7 @@ public class GuiMItemStackFilter extends GuiMekanism } else if(filter.itemType == null) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.itemFilter.noItem"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.itemFilter.noItem"); ticker = 20; } } @@ -115,9 +115,9 @@ public class GuiMItemStackFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.itemFilter"), 43, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00); + fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.itemFilter"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00); if(filter.itemType != null) { @@ -144,12 +144,12 @@ public class GuiMItemStackFilter extends GuiMekanism if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis); } if(xAxis >= 15 && xAxis <= 29 && yAxis >= 45 && yAxis <= 59) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.fuzzyMode") + ": " + LangUtils.transYesNo(filter.fuzzy), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.fuzzyMode") + ": " + LangUtils.transYesNo(filter.fuzzy), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -165,7 +165,7 @@ public class GuiMItemStackFilter extends GuiMekanism ticker--; } else { - status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); } } diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index c413ad65e..20ea778b8 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -38,7 +38,7 @@ public class GuiMMaterialFilter extends GuiMekanism public MMaterialFilter filter = new MMaterialFilter(); - public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + public String status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); public int ticker; @@ -68,8 +68,8 @@ public class GuiMMaterialFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -98,7 +98,7 @@ public class GuiMMaterialFilter extends GuiMekanism } else if(filter.materialItem == null) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.itemFilter.noItem"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.itemFilter.noItem"); ticker = 20; } } @@ -115,9 +115,9 @@ public class GuiMMaterialFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.materialFilter"), 43, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00); + fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.materialFilter"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00); if(filter.materialItem != null) { @@ -144,7 +144,7 @@ public class GuiMMaterialFilter extends GuiMekanism if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -160,7 +160,7 @@ public class GuiMMaterialFilter extends GuiMekanism ticker--; } else { - status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); } } diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 69a4919d5..25eadd27b 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -55,7 +55,7 @@ public class GuiMModIDFilter extends GuiMekanism public List iterStacks; - public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + public String status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); public GuiMModIDFilter(EntityPlayer player, TileEntityDigitalMiner tentity, int index) { @@ -85,8 +85,8 @@ public class GuiMModIDFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -143,7 +143,7 @@ public class GuiMModIDFilter extends GuiMekanism Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } else { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.modIDFilter.noID"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.modIDFilter.noID"); ticker = 20; } } @@ -160,9 +160,9 @@ public class GuiMModIDFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.modIDFilter"), 43, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); - renderScaledText(MekanismUtils.localize("gui.id") + ": " + filter.modID, 35, 32, 0x00CD00, 107); + fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.modIDFilter"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); + renderScaledText(LangUtils.localize("gui.id") + ": " + filter.modID, 35, 32, 0x00CD00, 107); if(renderStack != null) { @@ -186,7 +186,7 @@ public class GuiMModIDFilter extends GuiMekanism if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -260,7 +260,7 @@ public class GuiMModIDFilter extends GuiMekanism ticker--; } else { - status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); } if(stackSwitch > 0) @@ -365,12 +365,12 @@ public class GuiMModIDFilter extends GuiMekanism if(modName == null || modName.isEmpty()) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.modIDFilter.noID"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.modIDFilter.noID"); return; } else if(modName.equals(filter.modID)) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.modIDFilter.sameID"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.modIDFilter.sameID"); return; } diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index 592d02ad5..fa4037469 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -55,7 +55,7 @@ public class GuiMOreDictFilter extends GuiMekanism public List iterStacks; - public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + public String status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); public GuiMOreDictFilter(EntityPlayer player, TileEntityDigitalMiner tentity, int index) { @@ -85,8 +85,8 @@ public class GuiMOreDictFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -143,7 +143,7 @@ public class GuiMOreDictFilter extends GuiMekanism Mekanism.packetHandler.sendToServer(new DigitalMinerGuiMessage(MinerGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } else { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.oredictFilter.noKey"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.oredictFilter.noKey"); ticker = 20; } } @@ -160,9 +160,9 @@ public class GuiMOreDictFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.oredictFilter"), 43, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); - renderScaledText(MekanismUtils.localize("gui.key") + ": " + filter.oreDictName, 35, 32, 0x00CD00, 107); + fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.oredictFilter"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); + renderScaledText(LangUtils.localize("gui.key") + ": " + filter.oreDictName, 35, 32, 0x00CD00, 107); if(renderStack != null) { @@ -186,7 +186,7 @@ public class GuiMOreDictFilter extends GuiMekanism if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.digitalMiner.requireReplace") + ": " + LangUtils.transYesNo(filter.requireStack), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -260,7 +260,7 @@ public class GuiMOreDictFilter extends GuiMekanism ticker--; } else { - status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); } if(stackSwitch > 0) @@ -365,12 +365,12 @@ public class GuiMOreDictFilter extends GuiMekanism if(oreName == null || oreName.isEmpty()) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.oredictFilter.noKey"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.oredictFilter.noKey"); return; } else if(oreName.equals(filter.oreDictName)) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.oredictFilter.sameKey"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.oredictFilter.sameKey"); return; } diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index 1d453220c..342aaf4b7 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -9,6 +9,7 @@ import mekanism.client.gui.element.GuiMatrixTab.MatrixTab; import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityInductionCasing; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -41,7 +42,7 @@ public class GuiMatrixStats extends GuiMekanism @Override public String getTooltip() { - return MekanismUtils.localize("gui.outputting") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t"; + return LangUtils.localize("gui.outputting") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/t"; } @Override @@ -58,19 +59,19 @@ public class GuiMatrixStats extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - String stats = MekanismUtils.localize("gui.matrixStats"); + String stats = LangUtils.localize("gui.matrixStats"); fontRendererObj.drawString(stats, (xSize/2)-(fontRendererObj.getStringWidth(stats)/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.energy") + ":", 53, 26, 0x797979); + fontRendererObj.drawString(LangUtils.localize("gui.energy") + ":", 53, 26, 0x797979); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()), 59, 35, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.output") + ":", 53, 46, 0x797979); + fontRendererObj.drawString(LangUtils.localize("gui.output") + ":", 53, 46, 0x797979); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.structure.lastOutput) + "/" + MekanismUtils.getEnergyDisplay(tileEntity.structure.outputCap), 59, 55, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.dimensions") + ":", 8, 82, 0x797979); + fontRendererObj.drawString(LangUtils.localize("gui.dimensions") + ":", 8, 82, 0x797979); fontRendererObj.drawString(tileEntity.structure.volWidth + " x " + tileEntity.structure.volHeight + " x " + tileEntity.structure.volLength, 14, 91, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.constituents") + ":", 8, 102, 0x797979); - fontRendererObj.drawString(tileEntity.clientCells + " " + MekanismUtils.localize("gui.cells"), 14, 111, 0x404040); - fontRendererObj.drawString(tileEntity.clientProviders + " " + MekanismUtils.localize("gui.providers"), 14, 120, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.constituents") + ":", 8, 102, 0x797979); + fontRendererObj.drawString(tileEntity.clientCells + " " + LangUtils.localize("gui.cells"), 14, 111, 0x404040); + fontRendererObj.drawString(tileEntity.clientProviders + " " + LangUtils.localize("gui.providers"), 14, 120, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiMekanismConfig.java b/src/main/java/mekanism/client/gui/GuiMekanismConfig.java index 6a59d1983..546ade237 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanismConfig.java +++ b/src/main/java/mekanism/client/gui/GuiMekanismConfig.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.common.Mekanism; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; @@ -24,11 +24,11 @@ public class GuiMekanismConfig extends GuiConfig private static List getConfigElements() { List list = new ArrayList(); - list.add(new DummyCategoryElement(MekanismUtils.localize("mekanism.configgui.ctgy.general"), "mekanism.configgui.ctgy.general", GeneralEntry.class)); - list.add(new DummyCategoryElement(MekanismUtils.localize("mekanism.configgui.ctgy.machines"), "mekanism.configgui.ctgy.machines", MachinesEntry.class)); - list.add(new DummyCategoryElement(MekanismUtils.localize("mekanism.configgui.ctgy.tier"), "mekanism.configgui.ctgy.tier", TierEntry.class)); - list.add(new DummyCategoryElement(MekanismUtils.localize("mekanism.configgui.ctgy.usage"), "mekanism.configgui.ctgy.usage", UsageEntry.class)); - list.add(new DummyCategoryElement(MekanismUtils.localize("mekanism.configgui.ctgy.client"), "mekanism.configgui.ctgy.client", ClientEntry.class)); + list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.general"), "mekanism.configgui.ctgy.general", GeneralEntry.class)); + list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.machines"), "mekanism.configgui.ctgy.machines", MachinesEntry.class)); + list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.tier"), "mekanism.configgui.ctgy.tier", TierEntry.class)); + list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.usage"), "mekanism.configgui.ctgy.usage", UsageEntry.class)); + list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.client"), "mekanism.configgui.ctgy.client", ClientEntry.class)); return list; } diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index b17a879db..d78948e47 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -23,6 +23,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMetallurgicInfuser; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -52,7 +53,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism public List getInfo() { String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); @@ -78,11 +79,11 @@ public class GuiMetallurgicInfuser extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); if(xAxis >= 7 && xAxis <= 11 && yAxis >= 17 && yAxis <= 69) { - drawCreativeTabHoveringText(tileEntity.infuseStored.type != null ? tileEntity.infuseStored.type.getLocalizedName() + ": " + tileEntity.infuseStored.amount : MekanismUtils.localize("gui.empty"), xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.infuseStored.type != null ? tileEntity.infuseStored.type.getLocalizedName() + ": " + tileEntity.infuseStored.amount : LangUtils.localize("gui.empty"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index ab5bafe2b..6118d27cf 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -19,6 +19,7 @@ import mekanism.common.network.PacketOredictionificatorGui.OredictionificatorGui import mekanism.common.network.PacketOredictionificatorGui.OredictionificatorGuiPacket; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOredictionificator.OredictionificatorFilter; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; @@ -87,7 +88,7 @@ public class GuiOredictionificator extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 10, guiHeight + 86, 142, 20, MekanismUtils.localize("gui.newFilter"))); + buttonList.add(new GuiButton(0, guiWidth + 10, guiHeight + 86, 142, 20, LangUtils.localize("gui.newFilter"))); } @Override @@ -108,7 +109,7 @@ public class GuiOredictionificator extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); for(int i = 0; i < 3; i++) { @@ -133,7 +134,7 @@ public class GuiOredictionificator extends GuiMekanism GL11.glPopMatrix(); } - fontRendererObj.drawString(MekanismUtils.localize("gui.filter"), 32, yStart + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.filter"), 32, yStart + 2, 0x404040); renderScaledText(filter.filter, 32, yStart + 2 + 9, 0x404040, 117); } } diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index 56681f662..6e17fc2e0 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -12,6 +12,7 @@ import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOredictionificator.OredictionificatorFilter; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; @@ -114,8 +115,8 @@ public class GuiOredictionificatorFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 31, guiHeight + 62, 54, 20, MekanismUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 54, 20, MekanismUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 31, guiHeight + 62, 54, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 54, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -135,10 +136,10 @@ public class GuiOredictionificatorFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - String text = (isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.filter"); + String text = (isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.filter"); fontRendererObj.drawString(text, (xSize/2)-(fontRendererObj.getStringWidth(text)/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.index") + ": " + filter.index, 79, 23, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.index") + ": " + filter.index, 79, 23, 0x404040); if(filter.filter != null) { @@ -158,17 +159,17 @@ public class GuiOredictionificatorFilter extends GuiMekanism if(xAxis >= 31 && xAxis <= 43 && yAxis >= 21 && yAxis <= 33) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.lastItem"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.lastItem"), xAxis, yAxis); } if(xAxis >= 63 && xAxis <= 75 && yAxis >= 21 && yAxis <= 33) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.nextItem"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.nextItem"), xAxis, yAxis); } if(xAxis >= 33 && xAxis <= 129 && yAxis >= 48 && yAxis <= 60) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.oreDictCompat"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.oreDictCompat"), xAxis, yAxis); } if(xAxis >= 45 && xAxis <= 61 && yAxis >= 19 && yAxis <= 35) diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 6d90109da..64bd7324d 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -24,6 +24,7 @@ import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerPRC; import mekanism.common.tile.TileEntityPRC; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -54,7 +55,7 @@ public class GuiPRC extends GuiMekanism { double extra = tileEntity.getRecipe() != null ? tileEntity.getRecipe().extraEnergy : 0; String multiplier = MekanismUtils.getEnergyDisplay(MekanismUtils.getEnergyPerTick(tileEntity, tileEntity.BASE_ENERGY_PER_TICK + extra)); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + multiplier + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @@ -101,7 +102,7 @@ public class GuiPRC extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java index ea548efd9..e2268ed32 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java @@ -9,9 +9,9 @@ import mekanism.common.base.IElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; @@ -36,7 +36,7 @@ public class GuiPasswordEnter extends GuiScreen public GuiTextField passwordField; - public String displayText = EnumColor.BRIGHT_GREEN + MekanismUtils.localize("gui.password.enterPassword"); + public String displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.enterPassword"); public int ticker = 0; @@ -68,7 +68,7 @@ public class GuiPasswordEnter extends GuiScreen int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, MekanismUtils.localize("gui.open"))); + buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, LangUtils.localize("gui.open"))); passwordField = new GuiTextField(fontRendererObj, guiWidth + 45, guiHeight + 50, 80, 12); passwordField.setMaxStringLength(12); @@ -104,7 +104,7 @@ public class GuiPasswordEnter extends GuiScreen ticker--; } else { - displayText = EnumColor.BRIGHT_GREEN + MekanismUtils.localize("gui.password.enterPassword"); + displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.enterPassword"); } } @@ -121,13 +121,13 @@ public class GuiPasswordEnter extends GuiScreen { if(passwordField.getText() == null || passwordField.getText() == "") { - displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.fieldsEmpty"); + displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.fieldsEmpty"); SoundHandler.playSound("mekanism:etc.Error"); ticker = 30; } else if(!getPassword().equals(passwordField.getText())) { - displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.invalid"); + displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.invalid"); passwordField.setText(""); SoundHandler.playSound("mekanism:etc.Error"); ticker = 30; @@ -176,7 +176,7 @@ public class GuiPasswordEnter extends GuiScreen super.drawScreen(mouseX, mouseY, partialTick); - fontRendererObj.drawString(MekanismUtils.localize("gui.password"), guiWidth + 64, guiHeight + 5, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.password"), guiWidth + 64, guiHeight + 5, 0x404040); fontRendererObj.drawString("Enter:", guiWidth + 45, guiHeight + 40, 0x404040); fontRendererObj.drawString(displayText, guiWidth + 37, guiHeight + 19, 0x404040); diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java index 90e889f0e..873ab6cde 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordModify.java @@ -7,9 +7,9 @@ import mekanism.common.base.IElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; @@ -36,7 +36,7 @@ public class GuiPasswordModify extends GuiScreen public GuiTextField confirmPasswordField; - public String displayText = EnumColor.BRIGHT_GREEN + MekanismUtils.localize("gui.password.setPassword"); + public String displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.setPassword"); public int ticker = 0; @@ -61,7 +61,7 @@ public class GuiPasswordModify extends GuiScreen int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, MekanismUtils.localize("gui.confirm"))); + buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, LangUtils.localize("gui.confirm"))); newPasswordField = new GuiTextField(fontRendererObj, guiWidth + 60, guiHeight + 34, 80, 12); newPasswordField.setMaxStringLength(12); @@ -129,7 +129,7 @@ public class GuiPasswordModify extends GuiScreen ticker--; } else { - displayText = EnumColor.BRIGHT_GREEN + MekanismUtils.localize("gui.password.setPassword"); + displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.setPassword"); } } @@ -146,17 +146,17 @@ public class GuiPasswordModify extends GuiScreen { if(newPasswordField.getText() == null || newPasswordField.getText().equals("") || confirmPasswordField.getText() == null || confirmPasswordField.getText().equals("")) { - displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.fieldsEmpty"); + displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.fieldsEmpty"); ticker = 30; } else if(!newPasswordField.getText().equals(confirmPasswordField.getText())) { - displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.notMatching"); + displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.notMatching"); ticker = 30; } else if(confirmPasswordField.getText().equals(getPassword())) { - displayText = EnumColor.DARK_RED + MekanismUtils.localize("gui.password.identical"); + displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.identical"); ticker = 30; } else { @@ -197,7 +197,7 @@ public class GuiPasswordModify extends GuiScreen super.drawScreen(mouseX, mouseY, partialTick); - fontRendererObj.drawString(MekanismUtils.localize("gui.password"), guiWidth + 64, guiHeight + 5, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.password"), guiWidth + 64, guiHeight + 5, 0x404040); fontRendererObj.drawString(displayText, guiWidth + 37, guiHeight + 19, 0x404040); fontRendererObj.drawString("Enter:", guiWidth + 27, guiHeight + 37, 0x404040); fontRendererObj.drawString("Repeat:", guiWidth + 21, guiHeight + 54, 0x404040); diff --git a/src/main/java/mekanism/client/gui/GuiPortableTank.java b/src/main/java/mekanism/client/gui/GuiPortableTank.java index b7434618a..4412516a7 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTank.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTank.java @@ -8,6 +8,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerPortableTank; import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -43,7 +44,7 @@ public class GuiPortableTank extends GuiMekanism protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 2, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index dfd496b80..3a1cf193f 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -5,9 +5,9 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRobitCrafting; import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -30,8 +30,8 @@ public class GuiRobitCrafting extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(MekanismUtils.localize("gui.robit.crafting"), 8, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.robit.crafting"), 8, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index bbd9782c7..fa7d487de 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -6,9 +6,9 @@ import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitInventory; import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -30,8 +30,8 @@ public class GuiRobitInventory extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(MekanismUtils.localize("gui.robit.inventory"), 8, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.robit.inventory"), 8, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 7d359b0ac..09019d650 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -6,9 +6,9 @@ import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitMain; import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; @@ -70,7 +70,7 @@ public class GuiRobitMain extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(confirmName = new GuiButton(0, guiWidth + 58, guiHeight + 47, 60, 20, MekanismUtils.localize("gui.confirm"))); + buttonList.add(confirmName = new GuiButton(0, guiWidth + 58, guiHeight + 47, 60, 20, LangUtils.localize("gui.confirm"))); confirmName.visible = displayNameChange; nameChangeField = new GuiTextField(fontRendererObj, guiWidth + 48, guiHeight + 21, 80, 12); @@ -102,16 +102,16 @@ public class GuiRobitMain extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(MekanismUtils.localize("gui.robit"), 76, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.robit"), 76, 6, 0x404040); if(!displayNameChange) { CharSequence owner = robit.getOwnerName().length() > 14 ? robit.getOwnerName().subSequence(0, 14) : robit.getOwnerName(); - fontRendererObj.drawString(MekanismUtils.localize("gui.robit.greeting") + " " + robit.getCommandSenderName() + "!", 29, 18, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.robit.following") + ": " + robit.getFollowing(), 29, 45-4, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.robit.dropPickup") + ": " + robit.getDropPickup(), 29, 54-4, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.robit.owner") + ": " + owner, 29, 63-4, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.robit.greeting") + " " + robit.getCommandSenderName() + "!", 29, 18, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.energy") + ": " + MekanismUtils.getEnergyDisplay(robit.getEnergy()), 29, 36-4, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.robit.following") + ": " + robit.getFollowing(), 29, 45-4, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.robit.dropPickup") + ": " + robit.getDropPickup(), 29, 54-4, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.robit.owner") + ": " + owner, 29, 63-4, 0x00CD00); } int xAxis = (mouseX - (width - xSize) / 2); @@ -123,19 +123,19 @@ public class GuiRobitMain extends GuiMekanism } else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.robit.toggleFollow"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.robit.toggleFollow"), xAxis, yAxis); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 54 && yAxis <= 72) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.robit.rename"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.robit.rename"), xAxis, yAxis); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 16 && yAxis <= 34) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.robit.teleport"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.robit.teleport"), xAxis, yAxis); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 35 && yAxis <= 53) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.robit.togglePickup"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.robit.togglePickup"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index 9f7ec77e0..a9aad5289 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -7,9 +7,9 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -24,7 +24,6 @@ import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; - import org.apache.commons.io.Charsets; @SideOnly(Side.CLIENT) @@ -74,7 +73,7 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { GL11.glDisable(GL11.GL_LIGHTING); - fontRendererObj.drawString(MekanismUtils.localize("container.repair"), 60, 6, 4210752); + fontRendererObj.drawString(LangUtils.localize("container.repair"), 60, 6, 4210752); if(repairContainer.maximumCost > 0) { @@ -84,7 +83,7 @@ public class GuiRobitRepair extends GuiMekanism implements ICrafting if(repairContainer.maximumCost >= 40 && !mc.thePlayer.capabilities.isCreativeMode) { - s = MekanismUtils.localize("container.repair.expensive"); + s = LangUtils.localize("container.repair.expensive"); k = 16736352; } else if(!repairContainer.getSlot(2).getHasStack()) diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java index 272e97e31..f78d1cd21 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -6,9 +6,9 @@ import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketRobit.RobitPacketType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; @@ -27,8 +27,8 @@ public class GuiRobitSmelting extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(MekanismUtils.localize("gui.robit.smelting"), 8, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.robit.smelting"), 8, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, ySize - 96 + 3, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index ef4634f37..c298569b5 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -26,6 +26,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityRotaryCondensentrator; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -61,7 +62,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism public List getInfo() { String usage = MekanismUtils.getEnergyDisplay(tileEntity.clientEnergyUsed); - return ListUtils.asList(MekanismUtils.localize("gui.using") + ": " + usage + "/t", MekanismUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + usage + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @@ -116,7 +117,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); - fontRendererObj.drawString(tileEntity.mode == 0 ? MekanismUtils.localize("gui.condensentrating") : MekanismUtils.localize("gui.decondensentrating"), 6, (ySize - 94) + 2, 0x404040); + fontRendererObj.drawString(tileEntity.mode == 0 ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6, (ySize - 94) + 2, 0x404040); if(xAxis >= 116 && xAxis <= 168 && yAxis >= 76 && yAxis <= 80) { @@ -125,7 +126,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism if(xAxis >= 4 && xAxis <= 22 && yAxis >= 4 && yAxis <= 22) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.rotaryCondensentrator.toggleOperation"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.rotaryCondensentrator.toggleOperation"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index df6ca43e3..f685f3008 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; @@ -193,7 +194,7 @@ public class GuiSeismicReader extends GuiScreen GL11.glPushMatrix(); GL11.glTranslatef(guiWidth + 72, guiHeight + 26, 0); GL11.glScalef(0.70f, 0.70f, 0.70f); - fontRendererObj.drawString(MekanismUtils.localize("gui.abundancy") + ": " + frequency, 0, 0, 0x919191); + fontRendererObj.drawString(LangUtils.localize("gui.abundancy") + ": " + frequency, 0, 0, 0x919191); GL11.glPopMatrix(); super.drawScreen(mouseX, mouseY, partialTick); } diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index 3e4daf9c1..e8c59a1b3 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -7,6 +7,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerSeismicVibrator; import mekanism.common.tile.TileEntitySeismicVibrator; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -38,10 +39,10 @@ public class GuiSeismicVibrator extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - fontRendererObj.drawString(tileEntity.isActive ? MekanismUtils.localize("gui.vibrating") : MekanismUtils.localize("gui.idle"), 19, 26, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.chunk") + ": " + (tileEntity.xCoord >> 4) + ", " + (tileEntity.zCoord >> 4), 19, 35, 0x00CD00); + fontRendererObj.drawString(tileEntity.isActive ? LangUtils.localize("gui.vibrating") : LangUtils.localize("gui.idle"), 19, 26, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.chunk") + ": " + (tileEntity.xCoord >> 4) + ", " + (tileEntity.zCoord >> 4), 19, 35, 0x00CD00); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index b65d11076..1d4bb32a7 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -21,6 +21,7 @@ import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; @@ -158,18 +159,18 @@ public class GuiSideConfiguration extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - String title = currentType.localize() + " " + MekanismUtils.localize("gui.config"); + String title = currentType.localize() + " " + LangUtils.localize("gui.config"); fontRendererObj.drawString(title, (xSize/2)-(fontRendererObj.getStringWidth(title)/2), 5, 0x404040); if(configurable.getConfig().canEject(currentType)) { - fontRendererObj.drawString(MekanismUtils.localize("gui.eject") + ": " + (configurable.getConfig().isEjecting(currentType) ? "On" : "Off"), 53, 17, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.eject") + ": " + (configurable.getConfig().isEjecting(currentType) ? "On" : "Off"), 53, 17, 0x00CD00); } else { - fontRendererObj.drawString(MekanismUtils.localize("gui.noEject"), 53, 17, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.noEject"), 53, 17, 0x00CD00); } - fontRendererObj.drawString(MekanismUtils.localize("gui.slots"), 77, 81, 0x787878); + fontRendererObj.drawString(LangUtils.localize("gui.slots"), 77, 81, 0x787878); for(int i = 0; i < slotPosMap.size(); i++) { @@ -186,7 +187,7 @@ public class GuiSideConfiguration extends GuiMekanism if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.autoEject"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.autoEject"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java b/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java index aac23a6c3..0d64293bb 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiSolarEvaporationController.java @@ -33,22 +33,22 @@ public class GuiSolarEvaporationController extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); fontRendererObj.drawString(getStruct(), 50, 21, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.height") + ": " + tileEntity.height, 50, 30, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.mult") + ": " + getTempMult(), 50, 39, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.max") + ": " + getMaxTemp(), 50, 48, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.height") + ": " + tileEntity.height, 50, 30, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.mult") + ": " + getTempMult(), 50, 39, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.max") + ": " + getMaxTemp(), 50, 48, 0x00CD00); if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.inputTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.inputTank.getFluid()) + ": " + tileEntity.inputTank.getFluidAmount() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.inputTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.inputTank.getFluid()) + ": " + tileEntity.inputTank.getFluidAmount() : LangUtils.localize("gui.empty"), xAxis, yAxis); } if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.outputTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.outputTank.getFluid()) + ": " + tileEntity.outputTank.getFluidAmount() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.outputTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.outputTank.getFluid()) + ": " + tileEntity.outputTank.getFluidAmount() : LangUtils.localize("gui.empty"), xAxis, yAxis); } if(xAxis >= 49 && xAxis <= 127 && yAxis >= 64 && yAxis <= 72) @@ -63,15 +63,15 @@ public class GuiSolarEvaporationController extends GuiMekanism { if(tileEntity.structured) { - return MekanismUtils.localize("gui.formed"); + return LangUtils.localize("gui.formed"); } else { if(tileEntity.controllerConflict) { - return MekanismUtils.localize("gui.conflict"); + return LangUtils.localize("gui.conflict"); } else { - return MekanismUtils.localize("gui.incomplete"); + return LangUtils.localize("gui.incomplete"); } } } diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java index 0e9245213..afe63c4b3 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; import mekanism.common.tile.TileEntitySolarNeutronActivator; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -68,7 +69,7 @@ public class GuiSolarNeutronActivator extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), 26, 4, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index 3946abaa9..dbeb6e0b1 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -7,9 +7,9 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.relauncher.Side; @@ -38,10 +38,10 @@ public class GuiTFilterSelect extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 24, guiHeight + 32, 128, 20, MekanismUtils.localize("gui.itemstack"))); - buttonList.add(new GuiButton(1, guiWidth + 24, guiHeight + 52, 128, 20, MekanismUtils.localize("gui.oredict"))); - buttonList.add(new GuiButton(2, guiWidth + 24, guiHeight + 72, 128, 20, MekanismUtils.localize("gui.material"))); - buttonList.add(new GuiButton(3, guiWidth + 24, guiHeight + 92, 128, 20, MekanismUtils.localize("gui.modID"))); + buttonList.add(new GuiButton(0, guiWidth + 24, guiHeight + 32, 128, 20, LangUtils.localize("gui.itemstack"))); + buttonList.add(new GuiButton(1, guiWidth + 24, guiHeight + 52, 128, 20, LangUtils.localize("gui.oredict"))); + buttonList.add(new GuiButton(2, guiWidth + 24, guiHeight + 72, 128, 20, LangUtils.localize("gui.material"))); + buttonList.add(new GuiButton(3, guiWidth + 24, guiHeight + 92, 128, 20, LangUtils.localize("gui.modID"))); } @Override @@ -73,7 +73,7 @@ public class GuiTFilterSelect extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString(MekanismUtils.localize("gui.filterSelect.title"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.filterSelect.title"), 43, 6, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 812c2ebdc..63e67eaca 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -12,10 +12,10 @@ import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMess import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; @@ -38,7 +38,7 @@ public class GuiTItemStackFilter extends GuiMekanism public TItemStackFilter filter = new TItemStackFilter(); - public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + public String status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); public int ticker; @@ -71,8 +71,8 @@ public class GuiTItemStackFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -165,13 +165,13 @@ public class GuiTItemStackFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.itemFilter"), 43, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00); + fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.itemFilter"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.details") + ":", 35, 32, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.itemFilter.min") + ":", 128, 20, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.itemFilter.max") + ":", 128, 32, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui." + (filter.sizeMode ? "on" : "off")), 141, 46, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.min") + ":", 128, 20, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.max") + ":", 128, 32, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui." + (filter.sizeMode ? "on" : "off")), 141, 46, 0x404040); if(filter.itemType != null) { @@ -208,7 +208,7 @@ public class GuiTItemStackFilter extends GuiMekanism drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis); } else { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.none"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis); } } @@ -228,7 +228,7 @@ public class GuiTItemStackFilter extends GuiMekanism ticker--; } else { - status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); } } diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 096c124e1..7037bad0c 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -12,10 +12,10 @@ import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMess import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; - import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; @@ -40,7 +40,7 @@ public class GuiTMaterialFilter extends GuiMekanism public TMaterialFilter filter = new TMaterialFilter(); - public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + public String status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); public int ticker; @@ -70,8 +70,8 @@ public class GuiTMaterialFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -100,7 +100,7 @@ public class GuiTMaterialFilter extends GuiMekanism } else if(filter.materialItem == null) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.itemFilter.noItem"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.itemFilter.noItem"); ticker = 20; } } @@ -117,9 +117,9 @@ public class GuiTMaterialFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.materialFilter"), 43, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00); + fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.materialFilter"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00); if(filter.materialItem != null) { @@ -156,7 +156,7 @@ public class GuiTMaterialFilter extends GuiMekanism drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis); } else { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.none"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis); } } @@ -173,7 +173,7 @@ public class GuiTMaterialFilter extends GuiMekanism ticker--; } else { - status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); } } diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 37a715fba..112ffe817 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -16,6 +16,7 @@ import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMess import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; @@ -54,7 +55,7 @@ public class GuiTModIDFilter extends GuiMekanism public List iterStacks; - public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + public String status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); public GuiTModIDFilter(EntityPlayer player, TileEntityLogisticalSorter tentity, int index) { @@ -84,8 +85,8 @@ public class GuiTModIDFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -142,7 +143,7 @@ public class GuiTModIDFilter extends GuiMekanism Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } else { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.modIDFilter.noKey"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.modIDFilter.noKey"); ticker = 20; } } @@ -159,9 +160,9 @@ public class GuiTModIDFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.modIDFilter"), 43, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); - renderScaledText(MekanismUtils.localize("gui.id") + ": " + filter.modID, 35, 32, 0x00CD00, 107); + fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.modIDFilter"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); + renderScaledText(LangUtils.localize("gui.id") + ": " + filter.modID, 35, 32, 0x00CD00, 107); if(renderStack != null) { @@ -195,7 +196,7 @@ public class GuiTModIDFilter extends GuiMekanism drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis); } else { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.none"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis); } } @@ -247,7 +248,7 @@ public class GuiTModIDFilter extends GuiMekanism ticker--; } else { - status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); } if(stackSwitch > 0) @@ -339,12 +340,12 @@ public class GuiTModIDFilter extends GuiMekanism if(modName == null || modName.isEmpty()) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.modIDFilter.noID"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.modIDFilter.noID"); return; } else if(modName.equals(filter.modID)) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.modIDFilter.sameID"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.modIDFilter.sameID"); return; } diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index 0822b4f99..ebcda29c7 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -16,6 +16,7 @@ import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMess import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; @@ -53,7 +54,7 @@ public class GuiTOreDictFilter extends GuiMekanism public List iterStacks; - public String status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + public String status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); public GuiTOreDictFilter(EntityPlayer player, TileEntityLogisticalSorter tentity, int index) { @@ -83,8 +84,8 @@ public class GuiTOreDictFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, MekanismUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -141,7 +142,7 @@ public class GuiTOreDictFilter extends GuiMekanism Mekanism.packetHandler.sendToServer(new LogisticalSorterGuiMessage(SorterGuiPacket.SERVER, Coord4D.get(tileEntity), 0, 0, 0)); } else { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.oredictFilter.noKey"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.oredictFilter.noKey"); ticker = 20; } } @@ -158,9 +159,9 @@ public class GuiTOreDictFilter extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString((isNew ? MekanismUtils.localize("gui.new") : MekanismUtils.localize("gui.edit")) + " " + MekanismUtils.localize("gui.oredictFilter"), 43, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); - renderScaledText(MekanismUtils.localize("gui.key") + ": " + filter.oreDictName, 35, 32, 0x00CD00, 107); + fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.oredictFilter"), 43, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); + renderScaledText(LangUtils.localize("gui.key") + ": " + filter.oreDictName, 35, 32, 0x00CD00, 107); if(renderStack != null) { @@ -194,7 +195,7 @@ public class GuiTOreDictFilter extends GuiMekanism drawCreativeTabHoveringText(filter.color.getName(), xAxis, yAxis); } else { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.none"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis); } } @@ -246,7 +247,7 @@ public class GuiTOreDictFilter extends GuiMekanism ticker--; } else { - status = EnumColor.DARK_GREEN + MekanismUtils.localize("gui.allOK"); + status = EnumColor.DARK_GREEN + LangUtils.localize("gui.allOK"); } if(stackSwitch > 0) @@ -338,12 +339,12 @@ public class GuiTOreDictFilter extends GuiMekanism if(oreName == null || oreName.isEmpty()) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.oredictFilter.noKey"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.oredictFilter.noKey"); return; } else if(oreName.equals(filter.oreDictName)) { - status = EnumColor.DARK_RED + MekanismUtils.localize("gui.oredictFilter.sameKey"); + status = EnumColor.DARK_RED + LangUtils.localize("gui.oredictFilter.sameKey"); return; } diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 49113f725..e40ac8acb 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -21,6 +21,7 @@ import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessag import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterPacketType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityTeleporter; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; @@ -133,15 +134,15 @@ public class GuiTeleporter extends GuiMekanism buttonList.clear(); - publicButton = new GuiButton(0, guiWidth + 27, guiHeight + 14, 60, 20, MekanismUtils.localize("gui.public")); - privateButton = new GuiButton(1, guiWidth + 89, guiHeight + 14, 60, 20, MekanismUtils.localize("gui.private")); + publicButton = new GuiButton(0, guiWidth + 27, guiHeight + 14, 60, 20, LangUtils.localize("gui.public")); + privateButton = new GuiButton(1, guiWidth + 89, guiHeight + 14, 60, 20, LangUtils.localize("gui.private")); - setButton = new GuiButton(2, guiWidth + 27, guiHeight + 116, 60, 20, MekanismUtils.localize("gui.set")); - deleteButton = new GuiButton(3, guiWidth + 89, guiHeight + 116, 60, 20, MekanismUtils.localize("gui.delete")); + setButton = new GuiButton(2, guiWidth + 27, guiHeight + 116, 60, 20, LangUtils.localize("gui.set")); + deleteButton = new GuiButton(3, guiWidth + 89, guiHeight + 116, 60, 20, LangUtils.localize("gui.delete")); if(itemStack != null) { - teleportButton = new GuiButton(4, guiWidth + 42, guiHeight + 140, 92, 20, MekanismUtils.localize("gui.teleport")); + teleportButton = new GuiButton(4, guiWidth + 42, guiHeight + 140, 92, 20, LangUtils.localize("gui.teleport")); } frequencyField = new GuiTextField(fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); @@ -188,7 +189,7 @@ public class GuiTeleporter extends GuiMekanism public String getSecurity(Frequency freq) { - return !freq.publicFreq ? EnumColor.DARK_RED + MekanismUtils.localize("gui.private") : MekanismUtils.localize("gui.public"); + return !freq.publicFreq ? EnumColor.DARK_RED + LangUtils.localize("gui.private") : LangUtils.localize("gui.public"); } public void updateButtons() @@ -388,22 +389,22 @@ public class GuiTeleporter extends GuiMekanism int yAxis = (mouseY-(height-ySize)/2); fontRendererObj.drawString(getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(getInventoryName())/2), 4, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.owner") + ": " + (getOwner() != null ? getOwner() : MekanismUtils.localize("gui.none")), 8, itemStack != null ? ySize-12 : (ySize-96)+4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (getOwner() != null ? getOwner() : LangUtils.localize("gui.none")), 8, itemStack != null ? ySize-12 : (ySize-96)+4, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.freq") + ":", 32, 81, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.security") + ":", 32, 91, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040); - fontRendererObj.drawString(" " + (getFrequency() != null ? getFrequency().name : EnumColor.DARK_RED + MekanismUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(MekanismUtils.localize("gui.freq") + ":"), 81, 0x797979); - fontRendererObj.drawString(" " + (getFrequency() != null ? getSecurity(getFrequency()) : EnumColor.DARK_RED + MekanismUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(MekanismUtils.localize("gui.security") + ":"), 91, 0x797979); + fontRendererObj.drawString(" " + (getFrequency() != null ? getFrequency().name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979); + fontRendererObj.drawString(" " + (getFrequency() != null ? getSecurity(getFrequency()) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979); - String str = MekanismUtils.localize("gui.set") + ":"; + String str = LangUtils.localize("gui.set") + ":"; renderScaledText(str, 27, 104, 0x404040, 20); if(xAxis >= 6 && xAxis <= 24 && yAxis >= 6 && yAxis <= 24) { if(getFrequency() == null) { - drawCreativeTabHoveringText(EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.noFreq"), xAxis, yAxis); + drawCreativeTabHoveringText(EnumColor.DARK_RED + LangUtils.localize("gui.teleporter.noFreq"), xAxis, yAxis); } else { drawCreativeTabHoveringText(getStatusDisplay(), xAxis, yAxis); @@ -448,16 +449,16 @@ public class GuiTeleporter extends GuiMekanism switch(getStatus()) { case 1: - return EnumColor.DARK_GREEN + MekanismUtils.localize("gui.teleporter.ready"); + return EnumColor.DARK_GREEN + LangUtils.localize("gui.teleporter.ready"); case 2: - return EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.noFrame"); + return EnumColor.DARK_RED + LangUtils.localize("gui.teleporter.noFrame"); case 3: - return EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.noLink"); + return EnumColor.DARK_RED + LangUtils.localize("gui.teleporter.noLink"); case 4: - return EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.needsEnergy"); + return EnumColor.DARK_RED + LangUtils.localize("gui.teleporter.needsEnergy"); } - return EnumColor.DARK_RED + MekanismUtils.localize("gui.teleporter.noLink"); + return EnumColor.DARK_RED + LangUtils.localize("gui.teleporter.noLink"); } private String getOwner() diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 87d4f1ff4..a5c288aee 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -117,13 +117,13 @@ public class GuiTransporterConfig extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - String text = MekanismUtils.localize("gui.configuration.transporter"); + String text = LangUtils.localize("gui.configuration.transporter"); fontRendererObj.drawString(text, (xSize/2)-(fontRendererObj.getStringWidth(text)/2), 5, 0x404040); - text = MekanismUtils.localize("gui.strictInput") + " (" + LangUtils.transOnOff(configurable.getEjector().hasStrictInput()) + ")"; + text = LangUtils.localize("gui.strictInput") + " (" + LangUtils.transOnOff(configurable.getEjector().hasStrictInput()) + ")"; renderScaledText(text, 53, 17, 0x00CD00, 70); - fontRendererObj.drawString(MekanismUtils.localize("gui.input"), 48, 81, 0x787878); - fontRendererObj.drawString(MekanismUtils.localize("gui.output"), 114, 68, 0x787878); + fontRendererObj.drawString(LangUtils.localize("gui.input"), 48, 81, 0x787878); + fontRendererObj.drawString(LangUtils.localize("gui.output"), 114, 68, 0x787878); if(configurable.getEjector().getOutputColor() != null) { @@ -148,7 +148,7 @@ public class GuiTransporterConfig extends GuiMekanism if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { - drawCreativeTabHoveringText(color != null ? color.getName() : MekanismUtils.localize("gui.none"), xAxis, yAxis); + drawCreativeTabHoveringText(color != null ? color.getName() : LangUtils.localize("gui.none"), xAxis, yAxis); } } @@ -159,13 +159,13 @@ public class GuiTransporterConfig extends GuiMekanism drawCreativeTabHoveringText(configurable.getEjector().getOutputColor().getName(), xAxis, yAxis); } else { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.none"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.none"), xAxis, yAxis); } } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.configuration.strictInput"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.configuration.strictInput"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index 4730e8a8b..53d863684 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -12,9 +12,9 @@ import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerUpgradeManagement; import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.relauncher.Side; @@ -70,18 +70,18 @@ public class GuiUpgradeManagement extends GuiMekanism GL11.glColor4f(1, 1, 1, 1); drawTexturedModalRect(84, 8+getScroll(), 202, 0, 4, 4); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.upgrades.supported") + ":", 26, 59, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.upgrades.supported") + ":", 26, 59, 0x404040); if(selectedType == null) { - renderText(MekanismUtils.localize("gui.upgrades.noSelection") + ".", 92, 8, 0.8F, true); + renderText(LangUtils.localize("gui.upgrades.noSelection") + ".", 92, 8, 0.8F, true); } else { int amount = tileEntity.getComponent().getUpgrades(selectedType); - renderText(selectedType.getName() + " " + MekanismUtils.localize("gui.upgrade"), 92, 8, 0.6F, true); - renderText(MekanismUtils.localize("gui.upgrades.amount") + ": " + amount + "/" + selectedType.getMax(), 92, 16, 0.6F, true); + renderText(selectedType.getName() + " " + LangUtils.localize("gui.upgrade"), 92, 8, 0.6F, true); + renderText(LangUtils.localize("gui.upgrades.amount") + ": " + amount + "/" + selectedType.getMax(), 92, 16, 0.6F, true); int text = 0; diff --git a/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java b/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java index beb5134ca..e83778fba 100644 --- a/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java @@ -61,7 +61,7 @@ public class GuiDetectionTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160) { String text = LangUtils.transOnOff(((TileEntityLaserAmplifier)tileEntity).entityDetection); - displayTooltip(MekanismUtils.localize("gui.entityDetection") + ": " + text, xAxis, yAxis); + displayTooltip(LangUtils.localize("gui.entityDetection") + ": " + text, xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java index 9ba152c18..d46f497d5 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java @@ -4,6 +4,7 @@ import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -47,7 +48,7 @@ public class GuiEnergyGauge extends GuiGauge @Override public String getTooltipText() { - return infoHandler.getEnergyStorage().getEnergy() > 0 ? MekanismUtils.getEnergyDisplay(infoHandler.getEnergyStorage().getEnergy()) : MekanismUtils.localize("gui.empty"); + return infoHandler.getEnergyStorage().getEnergy() > 0 ? MekanismUtils.getEnergyDisplay(infoHandler.getEnergyStorage().getEnergy()) : LangUtils.localize("gui.empty"); } public static interface IEnergyInfoHandler diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index 7d7de11bf..e41845271 100644 --- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -11,7 +11,6 @@ import mekanism.common.base.ITankManager; import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketDropperUse.DropperUseMessage; import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -98,7 +97,7 @@ public class GuiFluidGauge extends GuiGauge return dummyType.getLocalizedName(null); } - return infoHandler.getTank().getFluid() != null ? LangUtils.localizeFluidStack(infoHandler.getTank().getFluid()) + ": " + infoHandler.getTank().getFluidAmount() + "mB" : MekanismUtils.localize("gui.empty"); + return infoHandler.getTank().getFluid() != null ? LangUtils.localizeFluidStack(infoHandler.getTank().getFluid()) + ": " + infoHandler.getTank().getFluidAmount() + "mB" : LangUtils.localize("gui.empty"); } public static interface IFluidInfoHandler diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index 27b33ecad..5f6aed665 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -12,7 +12,7 @@ import mekanism.common.Mekanism; import mekanism.common.base.ITankManager; import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketDropperUse.DropperUseMessage; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -97,7 +97,7 @@ public class GuiGasGauge extends GuiGauge return dummyType.getLocalizedName(); } - return (infoHandler.getTank().getGas() != null) ? infoHandler.getTank().getGas().getGas().getLocalizedName() + ": " + infoHandler.getTank().getStored() : MekanismUtils.localize("gui.empty"); + return (infoHandler.getTank().getGas() != null) ? infoHandler.getTank().getGas().getGas().getLocalizedName() + ": " + infoHandler.getTank().getStored() : LangUtils.localize("gui.empty"); } public static interface IGasInfoHandler diff --git a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java index 65c8f9031..4166ca8b8 100644 --- a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java @@ -5,6 +5,7 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; @@ -110,7 +111,7 @@ public class GuiMatrixTab extends GuiElement public String getDesc() { - return MekanismUtils.localize(desc); + return LangUtils.localize(desc); } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java index a4cbc14d1..a09df11d9 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java @@ -5,6 +5,7 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; @@ -56,7 +57,7 @@ public class GuiSideConfigurationTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { - displayTooltip(MekanismUtils.localize("gui.configuration.side"), xAxis, yAxis); + displayTooltip(LangUtils.localize("gui.configuration.side"), xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java index 0d16b23ec..69400f688 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -61,7 +61,7 @@ public class GuiSortingTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84) { - displayTooltip(MekanismUtils.localize("gui.factory.autoSort"), xAxis, yAxis); + displayTooltip(LangUtils.localize("gui.factory.autoSort"), xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java index dc7070ead..f1e128ae9 100644 --- a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java @@ -5,6 +5,7 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; @@ -58,7 +59,7 @@ public class GuiTransporterConfigTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) { - displayTooltip(MekanismUtils.localize("gui.configuration.transporter"), xAxis, yAxis); + displayTooltip(LangUtils.localize("gui.configuration.transporter"), xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java b/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java index 99f4595cb..b25dc1e9e 100644 --- a/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java @@ -5,6 +5,7 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; @@ -53,7 +54,7 @@ public class GuiUpgradeTab extends GuiElement if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { - displayTooltip(MekanismUtils.localize("gui.upgrades"), xAxis, yAxis); + displayTooltip(LangUtils.localize("gui.upgrades"), xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java b/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java index 0123ef594..a638548b3 100644 --- a/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java @@ -51,7 +51,7 @@ public class GuiVisualsTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { - displayTooltip(MekanismUtils.localize("gui.visuals") + ": " + LangUtils.transOnOff(tileEntity.clientRendering), xAxis, yAxis); + displayTooltip(LangUtils.localize("gui.visuals") + ": " + LangUtils.transOnOff(tileEntity.clientRendering), xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java index 7edccba7d..72821cc56 100644 --- a/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java @@ -37,7 +37,7 @@ public class ChemicalCrystallizerRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock2.ChemicalCrystallizer.name"); + return LangUtils.localize("tile.MachineBlock2.ChemicalCrystallizer.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java index fea3499af..2dc3b302f 100644 --- a/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java @@ -38,7 +38,7 @@ public class ChemicalDissolutionChamberRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("gui.chemicalDissolutionChamber.short"); + return LangUtils.localize("gui.chemicalDissolutionChamber.short"); } @Override diff --git a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java index 51dbb9a33..e11247265 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java @@ -34,7 +34,7 @@ public class ChemicalInfuserRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock2.ChemicalInfuser.name"); + return LangUtils.localize("tile.MachineBlock2.ChemicalInfuser.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 33d71f97d..7bd17aeb0 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -11,6 +11,7 @@ import mekanism.client.gui.GuiChemicalInjectionChamber; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.InjectionRecipe; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -20,7 +21,7 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe @Override public String getRecipeName() { - return MekanismUtils.localize("nei.chemicalInjectionChamber"); + return LangUtils.localize("nei.chemicalInjectionChamber"); } @Override diff --git a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java index 1bae72cd3..731042785 100644 --- a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java @@ -68,7 +68,7 @@ public class ChemicalOxidizerRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock2.ChemicalOxidizer.name"); + return LangUtils.localize("tile.MachineBlock2.ChemicalOxidizer.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java index f808592e8..808029516 100644 --- a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java @@ -37,7 +37,7 @@ public class ChemicalWasherRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock2.ChemicalWasher.name"); + return LangUtils.localize("tile.MachineBlock2.ChemicalWasher.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java index 632030535..c6e052620 100644 --- a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java @@ -9,7 +9,7 @@ import mekanism.client.gui.GuiCombiner; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CombinerRecipe; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -18,7 +18,7 @@ public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock.Combiner.name"); + return LangUtils.localize("tile.MachineBlock.Combiner.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java index d6bebc443..0b695e98a 100644 --- a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java @@ -6,14 +6,14 @@ import mekanism.client.gui.GuiCrusher; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CrusherRecipe; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; public class CrusherRecipeHandler extends MachineRecipeHandler { @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock.Crusher.name"); + return LangUtils.localize("tile.MachineBlock.Crusher.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java index 445a06500..565ae0d47 100644 --- a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java @@ -85,7 +85,7 @@ public class ElectrolyticSeparatorRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock2.ElectrolyticSeparator.name"); + return LangUtils.localize("tile.MachineBlock2.ElectrolyticSeparator.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java index 5a40ca74e..f32986f6b 100644 --- a/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java @@ -6,14 +6,14 @@ import mekanism.client.gui.GuiEnrichmentChamber; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.EnrichmentRecipe; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler { @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock.EnrichmentChamber.name"); + return LangUtils.localize("tile.MachineBlock.EnrichmentChamber.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java b/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java index 70902037f..19771a322 100644 --- a/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MekanismRecipeHandler.java @@ -11,7 +11,7 @@ import mekanism.common.base.IFactory; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.item.ItemBlockBasic; import mekanism.common.recipe.MekanismRecipe; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -24,7 +24,7 @@ public class MekanismRecipeHandler extends ShapedRecipeHandler @Override public String getRecipeName() { - return "Mekanism " + MekanismUtils.localize("recipe.mekanismShaped"); + return "Mekanism " + LangUtils.localize("recipe.mekanismShaped"); } @Override diff --git a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java index 07dbff5af..4bb26edad 100644 --- a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java @@ -21,6 +21,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.item.ItemStack; @@ -64,7 +65,7 @@ public class MetallurgicInfuserRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock.MetallurgicInfuser.name"); + return LangUtils.localize("tile.MachineBlock.MetallurgicInfuser.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java index 0665ae7ae..2b6fb30a6 100644 --- a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java @@ -10,7 +10,7 @@ import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.MekanismItems; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.OsmiumCompressorRecipe; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.item.ItemStack; public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler @@ -18,7 +18,7 @@ public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock.OsmiumCompressor.name"); + return LangUtils.localize("tile.MachineBlock.OsmiumCompressor.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java index 7c4bc1de1..ba320a47d 100644 --- a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java @@ -122,7 +122,7 @@ public class PRCRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock2.PressurizedReactionChamber.short.name"); + return LangUtils.localize("tile.MachineBlock2.PressurizedReactionChamber.short.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java b/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java index 5f282315c..9d3442119 100644 --- a/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java @@ -6,14 +6,14 @@ import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.SawmillRecipe; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; public class PrecisionSawmillRecipeHandler extends ChanceMachineRecipeHandler { @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock2.PrecisionSawmill.name"); + return LangUtils.localize("tile.MachineBlock2.PrecisionSawmill.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java index 528d5fe1f..0643f41dd 100644 --- a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -11,6 +11,7 @@ import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.GuiPurificationChamber; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.PurificationRecipe; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -20,7 +21,7 @@ public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandl @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock.PurificationChamber.name"); + return LangUtils.localize("tile.MachineBlock.PurificationChamber.name"); } @Override diff --git a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java index a51a356c7..8f99dc790 100644 --- a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java @@ -36,7 +36,7 @@ public class RotaryCondensentratorRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("nei.rotaryCondensentrator"); + return LangUtils.localize("nei.rotaryCondensentrator"); } @Override @@ -93,7 +93,7 @@ public class RotaryCondensentratorRecipeHandler extends BaseRecipeHandler displayGauge(58, 134-xOffset, 14-yOffset, 176, 40, 58, recipe.fluidStack, null); } - drawString(recipe.type ? MekanismUtils.localize("gui.condensentrating") : MekanismUtils.localize("gui.decondensentrating"), 6-xOffset, 74-yOffset, 0x404040, false); + drawString(recipe.type ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6-xOffset, 74-yOffset, 0x404040, false); } @Override diff --git a/src/main/java/mekanism/client/nei/SolarEvaporationRecipeHandler.java b/src/main/java/mekanism/client/nei/SolarEvaporationRecipeHandler.java index a7256c2c0..d034f0b44 100644 --- a/src/main/java/mekanism/client/nei/SolarEvaporationRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SolarEvaporationRecipeHandler.java @@ -36,7 +36,7 @@ public class SolarEvaporationRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("gui.solarEvaporationController.short"); + return LangUtils.localize("gui.solarEvaporationController.short"); } @Override diff --git a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java b/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java index 1b7ec8209..d62fe0da1 100644 --- a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java @@ -38,7 +38,7 @@ public class SolarNeutronRecipeHandler extends BaseRecipeHandler @Override public String getRecipeName() { - return MekanismUtils.localize("tile.MachineBlock3.SolarNeutronActivator.name"); + return LangUtils.localize("tile.MachineBlock3.SolarNeutronActivator.name"); } @Override diff --git a/src/main/java/mekanism/common/SideData.java b/src/main/java/mekanism/common/SideData.java index 983ec7b08..926de49e3 100644 --- a/src/main/java/mekanism/common/SideData.java +++ b/src/main/java/mekanism/common/SideData.java @@ -6,7 +6,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.gas.GasTank; import mekanism.common.base.ITankManager; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; @@ -40,7 +40,7 @@ public class SideData public String localize() { - return MekanismUtils.localize("sideData." + name); + return LangUtils.localize("sideData." + name); } public boolean hasSlot(int... slots) diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 5d3dc155b..bc2731f03 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -3,7 +3,7 @@ package mekanism.common; import io.netty.buffer.ByteBuf; import mekanism.api.EnumColor; import mekanism.common.multipart.TransmitterType; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.util.ResourceLocation; /** @@ -31,7 +31,7 @@ public final class Tier public String getLocalizedName() { - return MekanismUtils.localize("tier." + getName()); + return LangUtils.localize("tier." + getName()); } public EnumColor getColor() diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index 8265261cb..c7ff4eec9 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -8,7 +8,7 @@ import java.util.Map; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.common.base.IUpgradeTile; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -35,12 +35,12 @@ public enum Upgrade public String getName() { - return MekanismUtils.localize("upgrade." + name); + return LangUtils.localize("upgrade." + name); } public String getDescription() { - return MekanismUtils.localize("upgrade." + name + ".desc"); + return LangUtils.localize("upgrade." + name + ".desc"); } public int getMax() @@ -101,7 +101,7 @@ public enum Upgrade { double effect = Math.pow(general.maxUpgradeMultiplier, (float)tile.getComponent().getUpgrades(this)/(float)getMax()); - ret.add(MekanismUtils.localize("gui.upgrades.effect") + ": " + (Math.round(effect*100)/100F) + "x"); + ret.add(LangUtils.localize("gui.upgrades.effect") + ": " + (Math.round(effect*100)/100F) + "x"); } return ret; @@ -115,7 +115,7 @@ public enum Upgrade { double effect = Math.pow(2, (float)tile.getComponent().getUpgrades(this)); - ret.add(MekanismUtils.localize("gui.upgrades.effect") + ": " + effect + "x"); + ret.add(LangUtils.localize("gui.upgrades.effect") + ": " + effect + "x"); } return ret; diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 2ac91b89e..425f529ce 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -14,8 +14,7 @@ import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.recipe.machines.MachineRecipe; import mekanism.common.tile.TileEntityAdvancedElectricMachine; -import mekanism.common.util.MekanismUtils; - +import mekanism.common.util.LangUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -193,7 +192,7 @@ public interface IFactory public String getLocalizedName() { - return MekanismUtils.localize("gui.factory." + name); + return LangUtils.localize("gui.factory." + name); } public ResourceLocation getSound() diff --git a/src/main/java/mekanism/common/base/IRedstoneControl.java b/src/main/java/mekanism/common/base/IRedstoneControl.java index 975db5c9c..709ed0d66 100644 --- a/src/main/java/mekanism/common/base/IRedstoneControl.java +++ b/src/main/java/mekanism/common/base/IRedstoneControl.java @@ -1,6 +1,6 @@ package mekanism.common.base; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; public interface IRedstoneControl { @@ -15,7 +15,7 @@ public interface IRedstoneControl public String getDisplay() { - return MekanismUtils.localize(display); + return LangUtils.localize(display); } private RedstoneControl(String s) diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 30f1d4df5..d9e193850 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -80,6 +80,7 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityTeleporter; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -662,7 +663,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); } else { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("gui.teleporter.noAccess"))); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.teleporter.noAccess"))); } return true; @@ -1314,7 +1315,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer public String getDescription() { - return MekanismUtils.localize("tooltip." + name); + return LangUtils.localize("tooltip." + name); } public ItemStack getStack() diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 14baa4662..d06d9a204 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -10,6 +10,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.util.ListUtils; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -49,8 +50,8 @@ public class ItemAtomicDisassembler extends ItemEnergized { super.addInformation(itemstack, entityplayer, list, flag); - list.add(MekanismUtils.localize("tooltip.mode") + ": " + EnumColor.INDIGO + getModeName(itemstack)); - list.add(MekanismUtils.localize("tooltip.efficiency") + ": " + EnumColor.INDIGO + getEfficiency(itemstack)); + list.add(LangUtils.localize("tooltip.mode") + ": " + EnumColor.INDIGO + getModeName(itemstack)); + list.add(LangUtils.localize("tooltip.efficiency") + ": " + EnumColor.INDIGO + getEfficiency(itemstack)); } @Override @@ -157,7 +158,7 @@ public class ItemAtomicDisassembler extends ItemEnergized if(!world.isRemote && entityplayer.isSneaking()) { toggleMode(itemstack); - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.modeToggle") + " " + EnumColor.INDIGO + getModeName(itemstack) + EnumColor.AQUA + " (" + getEfficiency(itemstack) + ")")); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.modeToggle") + " " + EnumColor.INDIGO + getModeName(itemstack) + EnumColor.AQUA + " (" + getEfficiency(itemstack) + ")")); } return itemstack; @@ -291,15 +292,15 @@ public class ItemAtomicDisassembler extends ItemEnergized switch(mode) { case 0: - return MekanismUtils.localize("tooltip.disassembler.normal"); + return LangUtils.localize("tooltip.disassembler.normal"); case 1: - return MekanismUtils.localize("tooltip.disassembler.slow"); + return LangUtils.localize("tooltip.disassembler.slow"); case 2: - return MekanismUtils.localize("tooltip.disassembler.fast"); + return LangUtils.localize("tooltip.disassembler.fast"); case 3: - return MekanismUtils.localize("tooltip.disassembler.vein"); + return LangUtils.localize("tooltip.disassembler.vein"); case 4: - return MekanismUtils.localize("tooltip.disassembler.off"); + return LangUtils.localize("tooltip.disassembler.off"); } return null; diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index ecca7257a..5ed5dd718 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -6,8 +6,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; import mekanism.common.entity.EntityBalloon; -import mekanism.common.util.MekanismUtils; - +import mekanism.common.util.LangUtils; import net.minecraft.block.BlockDispenser; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -82,7 +81,7 @@ public class ItemBalloon extends ItemMekanism color = EnumColor.DARK_GREY + getColor(stack).getDyeName(); } - return color + " " + MekanismUtils.localize("tooltip.balloon"); + return color + " " + LangUtils.localize("tooltip.balloon"); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index e6f26897e..f337e1840 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -19,6 +19,7 @@ import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityMultiblock; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -137,19 +138,19 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem { InductionCellTier tier = InductionCellTier.values()[getTier(itemstack).ordinal()]; - list.add(tier.getBaseTier().getColor() + MekanismUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.maxEnergy)); + list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.maxEnergy)); } else if(itemstack.getItemDamage() == 4) { InductionProviderTier tier = InductionProviderTier.values()[getTier(itemstack).ordinal()]; - list.add(tier.getBaseTier().getColor() + MekanismUtils.localize("tooltip.outputRate") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.output)); + list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.outputRate") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.output)); } } if(getMaxEnergy(itemstack) > 0) { - list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 7938488ef..2473f140c 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -8,8 +8,6 @@ import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockCardboardBox.BlockData; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -45,16 +43,16 @@ public class ItemBlockCardboardBox extends ItemBlock @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.blockData") + ": " + LangUtils.transYesNo(getBlockData(itemstack) != null)); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.blockData") + ": " + LangUtils.transYesNo(getBlockData(itemstack) != null)); if(getBlockData(itemstack) != null) { - list.add(MekanismUtils.localize("tooltip.block") + ": " + new ItemStack(getBlockData(itemstack).block, getBlockData(itemstack).meta).getDisplayName()); - list.add(MekanismUtils.localize("tooltip.meta") + ": " + getBlockData(itemstack).meta); + list.add(LangUtils.localize("tooltip.block") + ": " + new ItemStack(getBlockData(itemstack).block, getBlockData(itemstack).meta).getDisplayName()); + list.add(LangUtils.localize("tooltip.meta") + ": " + getBlockData(itemstack).meta); if(getBlockData(itemstack).tileTag != null) { - list.add(MekanismUtils.localize("tooltip.tile") + ": " + getBlockData(itemstack).tileTag.getString("id")); + list.add(LangUtils.localize("tooltip.tile") + ": " + getBlockData(itemstack).tileTag.getString("id")); } } } diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 0c4ab67ef..23f7ca534 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -63,11 +63,11 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE { if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { - list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); - list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } } @@ -82,7 +82,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @Override public String getItemStackDisplayName(ItemStack itemstack) { - return MekanismUtils.localize("tile.EnergyCube" + getEnergyCubeTier(itemstack).getBaseTier().getName() + ".name"); + return LangUtils.localize("tile.EnergyCube" + getEnergyCubeTier(itemstack).getBaseTier().getName() + ".name"); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 7f17e1fd1..e7b8629c2 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -13,8 +13,6 @@ import mekanism.common.Mekanism; import mekanism.common.base.ISustainedInventory; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; import net.minecraft.creativetab.CreativeTabs; @@ -90,18 +88,18 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(gasStack == null) { - list.add(MekanismUtils.localize("tooltip.noGas") + "."); + list.add(LangUtils.localize("tooltip.noGas") + "."); } else { - list.add(MekanismUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); + list.add(LangUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); } if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { - list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 61afb3bc2..a9eba4951 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -176,30 +176,30 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " and " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.and") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDesc") + "."); } else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey)) { if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) { - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.recipeType") + ": " + EnumColor.GREY + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName()); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.recipeType") + ": " + EnumColor.GREY + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName()); } if(type == MachineType.ELECTRIC_CHEST) { - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.auth") + ": " + EnumColor.GREY + LangUtils.transYesNo(getAuthenticated(itemstack))); - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.locked") + ": " + EnumColor.GREY + LangUtils.transYesNo(getLocked(itemstack))); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.auth") + ": " + EnumColor.GREY + LangUtils.transYesNo(getAuthenticated(itemstack))); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.locked") + ": " + EnumColor.GREY + LangUtils.transYesNo(getLocked(itemstack))); } if(type == MachineType.PORTABLE_TANK) { - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.portableTank.bucketMode") + ": " + EnumColor.GREY + LangUtils.transYesNo(getBucketMode(itemstack))); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + EnumColor.GREY + LangUtils.transYesNo(getBucketMode(itemstack))); } if(type.isElectric) { - list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); } if(hasTank(itemstack) && type != MachineType.PORTABLE_TANK) @@ -214,7 +214,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(type != MachineType.CHARGEPAD && type != MachineType.LOGISTICAL_SORTER) { - list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } if(type.supportsUpgrades && itemstack.stackTagCompound != null && itemstack.stackTagCompound.hasKey("upgrades")) diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 28500ce36..cd24ccc5a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -5,8 +5,8 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; @@ -41,10 +41,10 @@ public class ItemBlockOre extends ItemBlock { if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " for details."); + list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + LangUtils.localize("tooltip.forDetails") + "."); } else { - list.addAll(MekanismUtils.splitLines(MekanismUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", "")))); + list.addAll(MekanismUtils.splitLines(LangUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", "")))); } } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 0e1deb40f..4d3a9edfe 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -18,6 +18,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; @@ -56,7 +57,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { super.addInformation(itemstack, entityplayer, list, flag); - list.add(EnumColor.PINK + MekanismUtils.localize("gui.state") + ": " + getColor(getState(itemstack)) + getStateDisplay(getState(itemstack))); + list.add(EnumColor.PINK + LangUtils.localize("gui.state") + ": " + getColor(getState(itemstack)) + getStateDisplay(getState(itemstack))); } @Override @@ -165,7 +166,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool return true; } else { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.configurator.unauth"))); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.unauth"))); return true; } } @@ -197,13 +198,13 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool public String getViewModeText(TransmissionType type) { - String base = MekanismUtils.localize("tooltip.configurator.viewMode"); + String base = LangUtils.localize("tooltip.configurator.viewMode"); return String.format(base, type.localize().toLowerCase()); } public String getToggleModeText(TransmissionType type) { - String base = MekanismUtils.localize("tooltip.configurator.toggleMode"); + String base = LangUtils.localize("tooltip.configurator.toggleMode"); return String.format(base, type.localize()); } @@ -305,7 +306,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool public String getName() { - return MekanismUtils.localize("tooltip.configurator." + name) + " " + info; + return LangUtils.localize("tooltip.configurator." + name) + " " + info; } public EnumColor getColor() diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 2f8af5b31..88cd564dc 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -4,8 +4,8 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -36,7 +36,7 @@ public class ItemDictionary extends ItemMekanism if(!names.isEmpty()) { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.keysFound") + ":")); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.keysFound") + ":")); for(String name : names) { @@ -44,7 +44,7 @@ public class ItemDictionary extends ItemMekanism } } else { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.noKey") + ".")); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.noKey") + ".")); } } diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 0e7220702..1a30b9acc 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -4,7 +4,6 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; @@ -28,7 +27,7 @@ public class ItemElectricBow extends ItemEnergized { super.addInformation(itemstack, entityplayer, list, flag); - list.add(EnumColor.PINK + MekanismUtils.localize("tooltip.fireMode") + ": " + EnumColor.GREY + LangUtils.transOnOff(getFireState(itemstack))); + list.add(EnumColor.PINK + LangUtils.localize("tooltip.fireMode") + ": " + EnumColor.GREY + LangUtils.transOnOff(getFireState(itemstack))); } @Override diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 0a28b4720..0a0fdf657 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -7,8 +7,8 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; - import cofh.api.energy.IEnergyContainerItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; @@ -44,7 +43,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); } public ItemStack getUnchargedItem() diff --git a/src/main/java/mekanism/common/item/ItemFilterCard.java b/src/main/java/mekanism/common/item/ItemFilterCard.java index d5f20c75b..4579e3cb3 100644 --- a/src/main/java/mekanism/common/item/ItemFilterCard.java +++ b/src/main/java/mekanism/common/item/ItemFilterCard.java @@ -4,8 +4,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.IFilterAccess; -import mekanism.common.util.MekanismUtils; - +import mekanism.common.util.LangUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -27,7 +26,7 @@ public class ItemFilterCard extends ItemMekanism { super.addInformation(itemstack, entityplayer, list, flag); - list.add(EnumColor.GREY + MekanismUtils.localize("gui.data") + ": " + EnumColor.INDIGO + MekanismUtils.localize(getDataType(itemstack))); + list.add(EnumColor.GREY + LangUtils.localize("gui.data") + ": " + EnumColor.INDIGO + LangUtils.localize(getDataType(itemstack))); } @Override @@ -47,7 +46,7 @@ public class ItemFilterCard extends ItemMekanism { data.setString("dataType", ((IFilterAccess)tileEntity).getDataType()); setData(stack, data); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + MekanismUtils.localize("tooltip.filterCard.got").replaceAll("%s", EnumColor.INDIGO + MekanismUtils.localize(data.getString("dataType")) + EnumColor.GREY))); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.filterCard.got").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(data.getString("dataType")) + EnumColor.GREY))); } return true; @@ -57,11 +56,11 @@ public class ItemFilterCard extends ItemMekanism if(((IFilterAccess)tileEntity).getDataType().equals(getDataType(stack))) { ((IFilterAccess)tileEntity).setFilterData(getData(stack)); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + MekanismUtils.localize("tooltip.filterCard.set").replaceAll("%s", EnumColor.INDIGO + MekanismUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + LangUtils.localize("tooltip.filterCard.set").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); setData(stack, null); } else { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + MekanismUtils.localize("tooltip.filterCard.unequal") + ".")); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.filterCard.unequal") + ".")); } return true; diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index f4220bcd6..b39af518b 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -6,7 +6,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -36,10 +36,10 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem if(gasStack == null) { - list.add(MekanismUtils.localize("tooltip.noGas") + "."); + list.add(LangUtils.localize("tooltip.noGas") + "."); } else { - list.add(MekanismUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); + list.add(LangUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); } } diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 743946ad1..b206c66d7 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -9,8 +9,8 @@ import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -30,7 +30,6 @@ import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import cofh.api.energy.IEnergyContainerItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; @@ -81,7 +80,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); } public ItemStack getUnchargedItem() diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index ddf5b6a77..7a1a8be6c 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -7,7 +7,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityPortableTank; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -89,15 +89,15 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo if(gasStack == null && fluidStack == null) { - list.add(MekanismUtils.localize("gui.empty") + "."); + list.add(LangUtils.localize("gui.empty") + "."); } else if(gasStack != null) { - list.add(MekanismUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); + list.add(LangUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); } else if(fluidStack != null) { - list.add(MekanismUtils.localize("tooltip.stored") + " " + fluidStack.getFluid().getLocalizedName(fluidStack) + ": " + fluidStack.amount); + list.add(LangUtils.localize("tooltip.stored") + " " + fluidStack.getFluid().getLocalizedName(fluidStack) + ": " + fluidStack.amount); } } diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 878a278b3..3d57cd270 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -12,7 +12,7 @@ import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -53,13 +53,13 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor if(gasStack == null) { - list.add(MekanismUtils.localize("tooltip.noGas") + "."); + list.add(LangUtils.localize("tooltip.noGas") + "."); } else { - list.add(MekanismUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); + list.add(LangUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); } - list.add(EnumColor.GREY + MekanismUtils.localize("tooltip.mode") + ": " + EnumColor.GREY + getMode(itemstack).getName()); + list.add(EnumColor.GREY + LangUtils.localize("tooltip.mode") + ": " + EnumColor.GREY + getMode(itemstack).getName()); } @Override @@ -268,7 +268,7 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor public String getName() { - return color + MekanismUtils.localize(unlocalized); + return color + LangUtils.localize(unlocalized); } } diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index 7a830f887..84bdbe9ec 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -7,8 +7,7 @@ import mekanism.api.EnumColor; import mekanism.common.base.ISustainedInventory; import mekanism.common.entity.EntityRobit; import mekanism.common.tile.TileEntityChargepad; -import mekanism.common.util.MekanismUtils; - +import mekanism.common.util.LangUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -36,8 +35,8 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory { super.addInformation(itemstack, entityplayer, list, flag); - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.name") + ": " + EnumColor.GREY + getName(itemstack)); - list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.name") + ": " + EnumColor.GREY + getName(itemstack)); + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + (getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index f524c49e7..6a4b68208 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -10,7 +10,7 @@ import mekanism.api.gas.IGasItem; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -45,13 +45,13 @@ public class ItemScubaTank extends ItemArmor implements IGasItem if(gasStack == null) { - list.add(MekanismUtils.localize("tooltip.noGas") + "."); + list.add(LangUtils.localize("tooltip.noGas") + "."); } else { - list.add(MekanismUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); + list.add(LangUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); } - list.add(EnumColor.GREY + MekanismUtils.localize("tooltip.flowing") + ": " + (getFlowing(itemstack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + getFlowingStr(itemstack)); + list.add(EnumColor.GREY + LangUtils.localize("tooltip.flowing") + ": " + (getFlowing(itemstack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + getFlowingStr(itemstack)); } @Override @@ -156,7 +156,7 @@ public class ItemScubaTank extends ItemArmor implements IGasItem { boolean flowing = getFlowing(stack); - return MekanismUtils.localize("tooltip." + (flowing ? "yes" : "no")); + return LangUtils.localize("tooltip." + (flowing ? "yes" : "no")); } public void setFlowing(ItemStack stack, boolean flowing) diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index 4244bb50c..1292d7b4c 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -3,8 +3,8 @@ package mekanism.common.item; import mekanism.api.Chunk3D; import mekanism.api.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; @@ -34,7 +34,7 @@ public class ItemSeismicReader extends ItemEnergized { if(!world.isRemote) { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + MekanismUtils.localize("tooltip.seismicReader.needsEnergy"))); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.seismicReader.needsEnergy"))); } return itemstack; @@ -43,7 +43,7 @@ public class ItemSeismicReader extends ItemEnergized { if(!world.isRemote) { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + MekanismUtils.localize("tooltip.seismicReader.noVibrations"))); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.seismicReader.noVibrations"))); } return itemstack; diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index 8ef86e8b2..b8b5e67aa 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -5,8 +5,8 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Upgrade; import mekanism.common.base.IUpgradeItem; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; @@ -31,7 +31,7 @@ public class ItemUpgrade extends ItemMekanism implements IUpgradeItem { if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails")); } else { list.addAll(MekanismUtils.splitLines(getUpgradeType(itemstack).getDescription())); diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index 89402f7da..08110cd29 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -3,8 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; -import mekanism.common.util.MekanismUtils; - +import mekanism.common.util.LangUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -27,8 +26,8 @@ public class ItemWalkieTalkie extends ItemMekanism { super.addInformation(itemstack, entityplayer, list, flag); - list.add((getOn(itemstack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + MekanismUtils.localize("gui." + (getOn(itemstack) ? "on" : "off"))); - list.add(EnumColor.DARK_AQUA + MekanismUtils.localize("tooltip.channel") + ": " + EnumColor.GREY + getChannel(itemstack)); + list.add((getOn(itemstack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.localize("gui." + (getOn(itemstack) ? "on" : "off"))); + list.add(EnumColor.DARK_AQUA + LangUtils.localize("tooltip.channel") + ": " + EnumColor.GREY + getChannel(itemstack)); } @Override diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 258f3dc25..21d6e9eec 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -13,6 +13,7 @@ import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.settings.GameSettings; @@ -93,32 +94,32 @@ public class ItemPartTransmitter extends JItemMultiPart if(transmission == TransmissionType.ENERGY) { - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(Tier.CableTier.values()[itemstack.getItemDamage()].cableCapacity) + "/t"); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(Tier.CableTier.values()[itemstack.getItemDamage()].cableCapacity) + "/t"); } else if(transmission == TransmissionType.FLUID) { - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + Tier.PipeTier.get(tier).pipeCapacity + "mB/t"); - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.pumpRate") + ": " + EnumColor.GREY + Tier.PipeTier.get(tier).pipePullAmount + "mB/t"); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + Tier.PipeTier.get(tier).pipeCapacity + "mB/t"); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.pumpRate") + ": " + EnumColor.GREY + Tier.PipeTier.get(tier).pipePullAmount + "mB/t"); } else if(transmission == TransmissionType.GAS) { - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + Tier.TubeTier.get(tier).tubeCapacity + "mB/t"); - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.pumpRate") + ": " + EnumColor.GREY + Tier.TubeTier.get(tier).tubePullAmount + "mB/t"); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + Tier.TubeTier.get(tier).tubeCapacity + "mB/t"); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.pumpRate") + ": " + EnumColor.GREY + Tier.TubeTier.get(tier).tubePullAmount + "mB/t"); } else if(transmission == TransmissionType.ITEM) { - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.speed") + ": " + EnumColor.GREY + (Tier.TransporterTier.get(tier).speed/(100/20)) + " m/s"); - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.pumpRate") + ": " + EnumColor.GREY + Tier.TransporterTier.get(tier).pullAmount*2 + "/s"); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.speed") + ": " + EnumColor.GREY + (Tier.TransporterTier.get(tier).speed/(100/20)) + " m/s"); + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.pumpRate") + ": " + EnumColor.GREY + Tier.TransporterTier.get(tier).pullAmount*2 + "/s"); } - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails")); } else { switch(itemstack.getItemDamage()) { case 0: case 1: case 2: case 3: { - list.add(EnumColor.DARK_GREY + MekanismUtils.localize("tooltip.capableTrans") + ":"); + list.add(EnumColor.DARK_GREY + LangUtils.localize("tooltip.capableTrans") + ":"); list.add("- " + EnumColor.PURPLE + "RF " + EnumColor.GREY + "(ThermalExpansion)"); list.add("- " + EnumColor.PURPLE + "EU " + EnumColor.GREY + "(IndustrialCraft)"); list.add("- " + EnumColor.PURPLE + "Joules " + EnumColor.GREY + "(Mekanism)"); @@ -126,37 +127,37 @@ public class ItemPartTransmitter extends JItemMultiPart } case 4: case 5: case 6: case 7: { - list.add(EnumColor.DARK_GREY + MekanismUtils.localize("tooltip.capableTrans") + ":"); - list.add("- " + EnumColor.PURPLE + MekanismUtils.localize("tooltip.fluids") + " " + EnumColor.GREY + "(MinecraftForge)"); + list.add(EnumColor.DARK_GREY + LangUtils.localize("tooltip.capableTrans") + ":"); + list.add("- " + EnumColor.PURPLE + LangUtils.localize("tooltip.fluids") + " " + EnumColor.GREY + "(MinecraftForge)"); break; } case 8: case 9: case 10: case 11: { - list.add(EnumColor.DARK_GREY + MekanismUtils.localize("tooltip.capableTrans") + ":"); - list.add("- " + EnumColor.PURPLE + MekanismUtils.localize("tooltip.gasses") + " (Mekanism)"); + list.add(EnumColor.DARK_GREY + LangUtils.localize("tooltip.capableTrans") + ":"); + list.add("- " + EnumColor.PURPLE + LangUtils.localize("tooltip.gasses") + " (Mekanism)"); break; } case 12: case 13: case 14: case 15: { - list.add(EnumColor.DARK_GREY + MekanismUtils.localize("tooltip.capableTrans") + ":"); - list.add("- " + EnumColor.PURPLE + MekanismUtils.localize("tooltip.items") + " (" + MekanismUtils.localize("tooltip.universal") + ")"); - list.add("- " + EnumColor.PURPLE + MekanismUtils.localize("tooltip.blocks") + " (" + MekanismUtils.localize("tooltip.universal") + ")"); + list.add(EnumColor.DARK_GREY + LangUtils.localize("tooltip.capableTrans") + ":"); + list.add("- " + EnumColor.PURPLE + LangUtils.localize("tooltip.items") + " (" + LangUtils.localize("tooltip.universal") + ")"); + list.add("- " + EnumColor.PURPLE + LangUtils.localize("tooltip.blocks") + " (" + LangUtils.localize("tooltip.universal") + ")"); break; } case 16: { - list.add(EnumColor.DARK_GREY + MekanismUtils.localize("tooltip.capableTrans") + ":"); - list.add("- " + EnumColor.PURPLE + MekanismUtils.localize("tooltip.items") + " (" + MekanismUtils.localize("tooltip.universal") + ")"); - list.add("- " + EnumColor.PURPLE + MekanismUtils.localize("tooltip.blocks") + " (" + MekanismUtils.localize("tooltip.universal") + ")"); - list.add("- " + EnumColor.DARK_RED + MekanismUtils.localize("tooltip.restrictiveDesc")); + list.add(EnumColor.DARK_GREY + LangUtils.localize("tooltip.capableTrans") + ":"); + list.add("- " + EnumColor.PURPLE + LangUtils.localize("tooltip.items") + " (" + LangUtils.localize("tooltip.universal") + ")"); + list.add("- " + EnumColor.PURPLE + LangUtils.localize("tooltip.blocks") + " (" + LangUtils.localize("tooltip.universal") + ")"); + list.add("- " + EnumColor.DARK_RED + LangUtils.localize("tooltip.restrictiveDesc")); break; } case 17: { - list.add(EnumColor.DARK_GREY + MekanismUtils.localize("tooltip.capableTrans") + ":"); - list.add("- " + EnumColor.PURPLE + MekanismUtils.localize("tooltip.items") + " (" + MekanismUtils.localize("tooltip.universal") + ")"); - list.add("- " + EnumColor.PURPLE + MekanismUtils.localize("tooltip.blocks") + " (" + MekanismUtils.localize("tooltip.universal") + ")"); - list.add("- " + EnumColor.DARK_RED + MekanismUtils.localize("tooltip.diversionDesc")); + list.add(EnumColor.DARK_GREY + LangUtils.localize("tooltip.capableTrans") + ":"); + list.add("- " + EnumColor.PURPLE + LangUtils.localize("tooltip.items") + " (" + LangUtils.localize("tooltip.universal") + ")"); + list.add("- " + EnumColor.PURPLE + LangUtils.localize("tooltip.blocks") + " (" + LangUtils.localize("tooltip.universal") + ")"); + list.add("- " + EnumColor.DARK_RED + LangUtils.localize("tooltip.diversionDesc")); break; } } diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index 42f08dad2..4f163883f 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -9,14 +9,12 @@ import mekanism.common.Mekanism; import mekanism.common.Tier.TransporterTier; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.util.MekanismUtils; - +import mekanism.common.util.LangUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; - import io.netty.buffer.ByteBuf; public class PartDiversionTransporter extends PartLogisticalTransporter @@ -129,20 +127,20 @@ public class PartDiversionTransporter extends PartLogisticalTransporter switch(newMode) { case 0: - description = MekanismUtils.localize("control.disabled.desc"); + description = LangUtils.localize("control.disabled.desc"); break; case 1: - description = MekanismUtils.localize("control.high.desc"); + description = LangUtils.localize("control.high.desc"); break; case 2: - description = MekanismUtils.localize("control.low.desc"); + description = LangUtils.localize("control.low.desc"); break; } refreshConnections(); tile().notifyPartChange(this); notifyTileChange(); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tile()), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tile()))); return true; diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index eb11521be..cfed8e9ce 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -21,9 +21,8 @@ import mekanism.common.content.transporter.TransporterStack; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.InventoryUtils; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import mekanism.common.util.TransporterUtils; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -37,9 +36,7 @@ import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import io.netty.buffer.ByteBuf; - import codechicken.lib.vec.Vector3; public class PartLogisticalTransporter extends PartTransmitter implements ITransporterTile @@ -384,7 +381,7 @@ public class PartLogisticalTransporter extends PartTransmitter getInfo() { return ListUtils.asList( - MekanismUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.bioGeneration : 0) + "/t", - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.bioGeneration : 0) + "/t", + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"), 164, 15)); @@ -54,10 +55,10 @@ public class GuiBioGenerator extends GuiMekanism super.drawGuiContainerForegroundLayer(mouseX, mouseY); fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.bioGenerator.bioFuel") + ": " + tileEntity.bioFuelSlot.fluidStored, 51, 35, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.bioGenerator.bioFuel") + ": " + tileEntity.bioFuelSlot.fluidStored, 51, 35, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java b/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java index 2d8e097d5..c346d5891 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java @@ -4,6 +4,7 @@ import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; @@ -57,7 +58,7 @@ public class GuiFuelTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 38 && yAxis <= 56) { - displayTooltip(MekanismUtils.localize("gui.fuel"), xAxis, yAxis); + displayTooltip(LangUtils.localize("gui.fuel"), xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index ed4978a04..140cc889f 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -15,6 +15,7 @@ import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerGasGenerator; @@ -40,9 +41,9 @@ public class GuiGasGenerator extends GuiMekanism public List getInfo() { return ListUtils.asList( - MekanismUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.generationRate) + "/t", - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.generationRate) + "/t", + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); guiElements.add(new GuiGasGauge(new IGasInfoHandler() { @@ -63,7 +64,7 @@ public class GuiGasGenerator extends GuiMekanism super.drawGuiContainerForegroundLayer(mouseX, mouseY); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index 95300c274..d9d9c8160 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -15,6 +15,7 @@ import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerHeatGenerator; @@ -42,9 +43,9 @@ public class GuiHeatGenerator extends GuiMekanism public List getInfo() { return ListUtils.asList( - MekanismUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.producingEnergy) + "/t", - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.producingEnergy) + "/t", + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @@ -65,7 +66,7 @@ public class GuiHeatGenerator extends GuiMekanism super.drawGuiContainerForegroundLayer(mouseX, mouseY); fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java b/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java index e37763465..de136a874 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java @@ -4,6 +4,7 @@ import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; @@ -57,7 +58,7 @@ public class GuiHeatTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 10 && yAxis <= 28) { - displayTooltip(MekanismUtils.localize("gui.heat"), xAxis, yAxis); + displayTooltip(LangUtils.localize("gui.heat"), xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java index 2de0e60f9..575a2063e 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java +++ b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java @@ -11,6 +11,7 @@ import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerNeutronCapture; @@ -37,8 +38,8 @@ public class GuiNeutronCapture extends GuiMekanism public List getInfo() { return ListUtils.asList( - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 164, 15)); @@ -51,7 +52,7 @@ public class GuiNeutronCapture extends GuiMekanism super.drawGuiContainerForegroundLayer(mouseX, mouseY); fontRendererObj.drawString(tileEntity.getInventoryName(), 30, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 8d0be1261..52022b484 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -9,6 +9,7 @@ import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerReactorController; @@ -36,8 +37,8 @@ public class GuiReactorController extends GuiMekanism public List getInfo() { return tileEntity.isFormed() ? ListUtils.asList( - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 79, 38)); @@ -54,10 +55,10 @@ public class GuiReactorController extends GuiMekanism if(tileEntity.getActive()) { - fontRendererObj.drawString(MekanismUtils.localize("gui.formed"), 8, 16, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.formed"), 8, 16, 0x404040); } else { - fontRendererObj.drawString(MekanismUtils.localize("gui.incomplete"), 8, 16, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.incomplete"), 8, 16, 0x404040); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index cc93dc42e..fea5a94c2 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -19,6 +19,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; @@ -50,8 +51,8 @@ public class GuiReactorFuel extends GuiMekanism public List getInfo() { return tileEntity.isFormed() ? ListUtils.asList( - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiGasGauge(new IGasInfoHandler() @@ -104,7 +105,7 @@ public class GuiReactorFuel extends GuiMekanism super.drawGuiContainerForegroundLayer(mouseX, mouseY); fontRendererObj.drawString(tileEntity.getInventoryName(), 46, 6, 0x404040); - String str = MekanismUtils.localize("gui.reactor.injectionRate") + ": " + (tileEntity.getReactor() == null ? "None" : tileEntity.getReactor().getInjectionRate()); + String str = LangUtils.localize("gui.reactor.injectionRate") + ": " + (tileEntity.getReactor() == null ? "None" : tileEntity.getReactor().getInjectionRate()); fontRendererObj.drawString(str, (xSize / 2) - (fontRendererObj.getStringWidth(str) / 2), 35, 0x404040); fontRendererObj.drawString("Edit Rate" + ":", 50, 117, 0x404040); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index 60b2f921a..e06baa379 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -22,6 +22,7 @@ import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; @@ -51,8 +52,8 @@ public class GuiReactorHeat extends GuiMekanism public List getInfo() { return tileEntity.isFormed() ? ListUtils.asList( - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiNumberGauge(new INumberInfoHandler() diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index dfcabb630..4c0be034c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -41,10 +41,10 @@ public class GuiReactorLogicAdapter extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); - renderScaledText(MekanismUtils.localize("gui.coolingMeasurements") + ": " + EnumColor.RED + LangUtils.transOnOff(tileEntity.activeCooled), 36, 20, 0x404040, 117); - renderScaledText(MekanismUtils.localize("gui.redstoneOutputMode") + ": " + EnumColor.RED + tileEntity.logicType.getLocalizedName(), 23, 123, 0x404040, 130); + renderScaledText(LangUtils.localize("gui.coolingMeasurements") + ": " + EnumColor.RED + LangUtils.transOnOff(tileEntity.activeCooled), 36, 20, 0x404040, 117); + renderScaledText(LangUtils.localize("gui.redstoneOutputMode") + ": " + EnumColor.RED + tileEntity.logicType.getLocalizedName(), 23, 123, 0x404040, 130); - String text = MekanismUtils.localize("gui.status") + ": " + EnumColor.RED + MekanismUtils.localize("gui." + (tileEntity.checkMode() ? "outputting" : "idle")); + String text = LangUtils.localize("gui.status") + ": " + EnumColor.RED + LangUtils.localize("gui." + (tileEntity.checkMode() ? "outputting" : "idle")); fontRendererObj.drawString(text, (xSize/2)-(fontRendererObj.getStringWidth(text)/2), 136, 0x404040); for(ReactorLogic type : ReactorLogic.values()) @@ -65,7 +65,7 @@ public class GuiReactorLogicAdapter extends GuiMekanism if(xAxis >= 23 && xAxis <= 34 && yAxis >= 19 && yAxis <= 30) { - drawCreativeTabHoveringText(MekanismUtils.localize("gui.toggleCooling"), xAxis, yAxis); + drawCreativeTabHoveringText(LangUtils.localize("gui.toggleCooling"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index 8a5defd2a..4b7732071 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; @@ -40,8 +41,8 @@ public class GuiReactorStats extends GuiMekanism public List getInfo() { return tileEntity.isFormed() ? ListUtils.asList( - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, true)) + "/t") : new ArrayList(); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); guiElements.add(new GuiHeatTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTall.png"))); @@ -55,20 +56,20 @@ public class GuiReactorStats extends GuiMekanism if(tileEntity.isFormed()) { - fontRendererObj.drawString(EnumColor.DARK_GREEN + MekanismUtils.localize("gui.passive"), 6, 26, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(false)), 16, 36, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.ignition") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getIgnitionTemperature(false), TemperatureUnit.AMBIENT)), 16, 46, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.maxPlasma") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxPlasmaTemperature(false), TemperatureUnit.AMBIENT)), 16, 56, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.maxCasing") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxCasingTemperature(false), TemperatureUnit.AMBIENT)), 16, 66, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.passiveGeneration") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, false))+"/t", 16, 76, 0x404040); + fontRendererObj.drawString(EnumColor.DARK_GREEN + LangUtils.localize("gui.passive"), 6, 26, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(false)), 16, 36, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.ignition") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getIgnitionTemperature(false), TemperatureUnit.AMBIENT)), 16, 46, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.maxPlasma") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxPlasmaTemperature(false), TemperatureUnit.AMBIENT)), 16, 56, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.maxCasing") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxCasingTemperature(false), TemperatureUnit.AMBIENT)), 16, 66, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.passiveGeneration") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(false, false))+"/t", 16, 76, 0x404040); - fontRendererObj.drawString(EnumColor.DARK_BLUE + MekanismUtils.localize("gui.active"), 6, 92, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(true)), 16, 102, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.ignition") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getIgnitionTemperature(true), TemperatureUnit.AMBIENT)), 16, 112, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.maxPlasma") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxPlasmaTemperature(true), TemperatureUnit.AMBIENT)), 16, 122, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.maxCasing") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxCasingTemperature(true), TemperatureUnit.AMBIENT)), 16, 132, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.passiveGeneration") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(true, false))+"/t", 16, 142, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.steamProduction") + ": " + nf.format(tileEntity.getReactor().getSteamPerTick(false)) + "mB/t", 16, 152, 0x404040); + fontRendererObj.drawString(EnumColor.DARK_BLUE + LangUtils.localize("gui.active"), 6, 92, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.minInject") + ": " + (tileEntity.getReactor().getMinInjectionRate(true)), 16, 102, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.ignition") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getIgnitionTemperature(true), TemperatureUnit.AMBIENT)), 16, 112, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.maxPlasma") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxPlasmaTemperature(true), TemperatureUnit.AMBIENT)), 16, 122, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.maxCasing") + ": " + (MekanismUtils.getTemperatureDisplay(tileEntity.getReactor().getMaxCasingTemperature(true), TemperatureUnit.AMBIENT)), 16, 132, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.passiveGeneration") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getReactor().getPassiveGeneration(true, false))+"/t", 16, 142, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.steamProduction") + ": " + nf.format(tileEntity.getReactor().getSteamPerTick(false)) + "mB/t", 16, 152, 0x404040); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index be54e249e..c93d6718f 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -11,6 +11,7 @@ import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; @@ -37,9 +38,9 @@ public class GuiSolarGenerator extends GuiMekanism public List getInfo() { return ListUtils.asList( - MekanismUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? tileEntity.getProduction() : 0) + "/t", - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? tileEntity.getProduction() : 0) + "/t", + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"), 164, 15)); @@ -55,10 +56,10 @@ public class GuiSolarGenerator extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(tileEntity.getInventoryName(), !tileEntity.fullName.contains("Advanced") ? 45 : 30, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.solarGenerator.sun") + ": " + tileEntity.seesSun, 51, 35, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.solarGenerator.sun") + ": " + tileEntity.seesSun, 51, 35, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiStatTab.java b/src/main/java/mekanism/generators/client/gui/GuiStatTab.java index 52a804e2c..db1cc9308 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiStatTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiStatTab.java @@ -4,6 +4,7 @@ import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; @@ -57,7 +58,7 @@ public class GuiStatTab extends GuiElement if(xAxis >= -21 && xAxis <= -3 && yAxis >= 66 && yAxis <= 84) { - displayTooltip(MekanismUtils.localize("gui.stats"), xAxis, yAxis); + displayTooltip(LangUtils.localize("gui.stats"), xAxis, yAxis); } mc.renderEngine.bindTexture(defaultLocation); diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java index e5a6cb91a..2cbd08946 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java @@ -14,6 +14,7 @@ import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerWindTurbine; @@ -42,9 +43,9 @@ public class GuiWindTurbine extends GuiMekanism public List getInfo() { return ListUtils.asList( - MekanismUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.windGenerationMin*tileEntity.getMultiplier() : 0) + "/t", - MekanismUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), - MekanismUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.windGenerationMin*tileEntity.getMultiplier() : 0) + "/t", + LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), + LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"), 164, 15)); @@ -57,17 +58,17 @@ public class GuiWindTurbine extends GuiMekanism super.drawGuiContainerForegroundLayer(mouseX, mouseY); fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.power") + ": " + powerFormat.format(MekanismUtils.convertToDisplay(generators.windGenerationMin*tileEntity.getMultiplier())), 51, 35, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.power") + ": " + powerFormat.format(MekanismUtils.convertToDisplay(generators.windGenerationMin*tileEntity.getMultiplier())), 51, 35, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); int size = 44; if(!tileEntity.getWorldObj().canBlockSeeTheSky(tileEntity.xCoord, tileEntity.yCoord+4, tileEntity.zCoord)) { size += 9; - fontRendererObj.drawString(EnumColor.DARK_RED + MekanismUtils.localize("gui.skyBlocked"), 51, size, 0x00CD00); + fontRendererObj.drawString(EnumColor.DARK_RED + LangUtils.localize("gui.skyBlocked"), 51, size, 0x00CD00); } } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 5abd29118..532134836 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -15,6 +15,7 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.MekanismGenerators; @@ -573,7 +574,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP public String getDescription() { - return MekanismUtils.localize("tooltip." + name); + return LangUtils.localize("tooltip." + name); } public ItemStack getStack() diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 21d3a32ce..25baf34f0 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -11,6 +11,7 @@ import mekanism.common.Mekanism; import mekanism.common.base.IBlockCTM; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.MekanismGenerators; @@ -416,7 +417,7 @@ public class BlockReactor extends BlockContainer implements IBlockCTM public String getDescription() { - return MekanismUtils.localize("tooltip." + name); + return LangUtils.localize("tooltip." + name); } public ItemStack getStack() diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 1ccda30bd..634c4df71 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -97,12 +97,12 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " and " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.and") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDesc") + "."); } else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey)) { - list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); if(hasTank(itemstack)) { @@ -112,7 +112,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } } - list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } else { list.addAll(MekanismUtils.splitLines(type.getDescription())); diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java index 4af39d0b6..e59f664c4 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java @@ -3,9 +3,9 @@ package mekanism.generators.common.item; import java.util.List; import mekanism.api.EnumColor; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.BlockReactor.ReactorBlockType; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -53,7 +53,7 @@ public class ItemBlockReactor extends ItemBlock if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { list.addAll(MekanismUtils.splitLines(type.getDescription())); diff --git a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java index 6eda61da6..b830d81fd 100644 --- a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java +++ b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java @@ -8,7 +8,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.item.ItemMekanism; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -35,18 +35,18 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem if(gasStack == null) { - list.add(MekanismUtils.localize("tooltip.noGas") + "."); - list.add(EnumColor.DARK_RED + MekanismUtils.localize("tooltip.insufficientFuel")); + list.add(LangUtils.localize("tooltip.noGas") + "."); + list.add(EnumColor.DARK_RED + LangUtils.localize("tooltip.insufficientFuel")); } else { - list.add(MekanismUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); + list.add(LangUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); if(gasStack.amount == getMaxGas(itemstack)) { - list.add(EnumColor.DARK_GREEN + MekanismUtils.localize("tooltip.readyForReaction") + "!"); + list.add(EnumColor.DARK_GREEN + LangUtils.localize("tooltip.readyForReaction") + "!"); } else { - list.add(EnumColor.DARK_RED + MekanismUtils.localize("tooltip.insufficientFuel")); + list.add(EnumColor.DARK_RED + LangUtils.localize("tooltip.insufficientFuel")); } } } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index 7686faf8e..905282dc9 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.common.Mekanism; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -234,12 +234,12 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem public String getLocalizedName() { - return MekanismUtils.localize("reactor." + name); + return LangUtils.localize("reactor." + name); } public String getDescription() { - return MekanismUtils.localize("reactor." + name + ".desc"); + return LangUtils.localize("reactor." + name + ".desc"); } } } diff --git a/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java b/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java index 29a3dedfb..1f165cc13 100644 --- a/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java +++ b/src/main/java/mekanism/tools/client/gui/GuiToolsConfig.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.common.Mekanism; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; @@ -28,9 +28,9 @@ public class GuiToolsConfig extends GuiConfig private static List getConfigElements() { List list = new ArrayList(); - list.add(new DummyCategoryElement(MekanismUtils.localize("mekanism.configgui.ctgy.tools.general"), "mekanism.configgui.ctgy.tools.general", GeneralEntry.class)); - list.add(new DummyCategoryElement(MekanismUtils.localize("mekanism.configgui.ctgy.tools.armor"), "mekanism.configgui.ctgy.tools.armor", ArmorEntry.class)); - list.add(new DummyCategoryElement(MekanismUtils.localize("mekanism.configgui.ctgy.tools.tools"), "mekanism.configgui.ctgy.tools.tools", ToolsEntry.class)); + list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.tools.general"), "mekanism.configgui.ctgy.tools.general", GeneralEntry.class)); + list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.tools.armor"), "mekanism.configgui.ctgy.tools.armor", ArmorEntry.class)); + list.add(new DummyCategoryElement(LangUtils.localize("mekanism.configgui.ctgy.tools.tools"), "mekanism.configgui.ctgy.tools.tools", ToolsEntry.class)); return list; } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 78c18f0f8..7b9574edb 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -6,10 +6,9 @@ import mekanism.api.util.StackUtils; import mekanism.client.render.ModelCustomArmor; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import mekanism.tools.common.MekanismTools; import mekanism.tools.common.ToolsItems; - import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -32,7 +31,7 @@ public class ItemMekanismArmor extends ItemArmor @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(MekanismUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); + list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } @Override diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index a0f447174..16979370f 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -4,8 +4,7 @@ import java.util.List; import mekanism.api.util.StackUtils; import mekanism.common.item.ItemMekanism; -import mekanism.common.util.MekanismUtils; - +import mekanism.common.util.LangUtils; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -85,7 +84,7 @@ public class ItemMekanismHoe extends ItemMekanism @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(MekanismUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); + list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } @Override diff --git a/src/main/java/mekanism/tools/item/ItemMekanismSword.java b/src/main/java/mekanism/tools/item/ItemMekanismSword.java index 9a8ddd366..d5f77e355 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismSword.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismSword.java @@ -3,8 +3,7 @@ package mekanism.tools.item; import java.util.List; import mekanism.common.Mekanism; -import mekanism.common.util.MekanismUtils; - +import mekanism.common.util.LangUtils; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,7 +20,7 @@ public class ItemMekanismSword extends ItemSword @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(MekanismUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); + list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } @Override diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index 9a40f1c24..9bac0d63f 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -7,9 +7,8 @@ import java.util.List; import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; -import mekanism.common.util.MekanismUtils; +import mekanism.common.util.LangUtils; import mekanism.tools.common.MekanismTools; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -28,7 +27,7 @@ public class ItemMekanismTool extends ItemTool @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add(MekanismUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); + list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } @Override diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 6ca897193..04d9fe0f6 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -660,6 +660,7 @@ tooltip.outputRate=Output Rate tooltip.insufficientFuel=Insufficient Fuel tooltip.readyForReaction=Ready for Reaction tooltip.speed=Speed +tooltip.and=and tooltip.portableTank.bucketMode=Bucket Mode