diff --git a/resources/assets/enderio/lang/cs_CZ.lang b/resources/assets/enderio/lang/cs_CZ.lang index 1f10eb8c..05f12700 100644 --- a/resources/assets/enderio/lang/cs_CZ.lang +++ b/resources/assets/enderio/lang/cs_CZ.lang @@ -269,7 +269,7 @@ enderio.trans.power=Energie enderio.trans.item=Předmět enderio.trans.fluid=Tekutina -enderio.trans.recieving=Přijímám +enderio.trans.receiving=Přijímám enderio.trans.sending=Odesílám tile.blockPowerMonitor.name=Monitor energie @@ -587,8 +587,8 @@ enderio.darksteel.upgrade.nightVision.disabled=Noční vidění zakázáno enderio.gui.enabled=Povoleno enderio.gui.disabled=Zakázáno enderio.gui.send=Posílat -enderio.gui.recieve=Přijímat -enderio.gui.sendRecieve=Posílat & Přijímat +enderio.gui.receive=Přijímat +enderio.gui.sendReceive=Posílat & Přijímat //Redstone controls enderio.gui.tooltip.redstoneControlMode=Ruditový mód diff --git a/resources/assets/enderio/lang/de_DE.lang b/resources/assets/enderio/lang/de_DE.lang index 33bd812c..7745e140 100644 --- a/resources/assets/enderio/lang/de_DE.lang +++ b/resources/assets/enderio/lang/de_DE.lang @@ -432,8 +432,8 @@ enderio.darksteel.upgrade.nightVision.disabled=Nachtsicht Inaktiv enderio.gui.enabled=Aktiviert enderio.gui.disabled=Deaktiviert enderio.gui.send=Senden -enderio.gui.recieve=Empfangen -enderio.gui.sendRecieve=Senden & Empfangen +enderio.gui.receive=Empfangen +enderio.gui.sendReceive=Senden & Empfangen //Redstone controls enderio.gui.tooltip.redstoneControlMode=Redstone-Modus diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 7f68d73d..8f31c093 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -2,6 +2,7 @@ //Power enderio.power.rf=RF +enderio.power.tmb=t/mB enderio.power.tick=/t enderio.power.maxOutput=Max Output enderio.power.generates=Generates @@ -334,7 +335,7 @@ enderio.trans.item=Item enderio.trans.fluid=Fluid enderio.trans.rail=Rail -enderio.trans.recieving=Recieving +enderio.trans.receiving=Receiving enderio.trans.sending=Sending tile.blockPowerMonitor.name=Power Monitor @@ -414,6 +415,7 @@ tile.blockVacuumChest.tooltip.detailed.line2=into its inventory tile.blockPoweredSpawner.name=Powered Spawner tile.blockPoweredSpawner.tooltip.empty=Empty +enderio.tile.blockPoweredSpawner.tooltip.none=None tile.blockPoweredSpawner.empty.tooltip.detailed.line1=Combine with a broken tile.blockPoweredSpawner.empty.tooltip.detailed.line2=spawner in an anvil tile.blockPoweredSpawner.tooltip.detailed.line1=Supply with power to @@ -689,12 +691,14 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Generates power from enderio.gui.simple.in=Max In: enderio.gui.simple.out=Max Out: -enderio.gui.enabled=Enabled +enderio.gui.available=Available enderio.gui.disabled=Disabled -enderio.gui.send=Send -enderio.gui.recieve=Receive -enderio.gui.sendRecieve=Send & Receive +enderio.gui.enabled=Enabled +enderio.gui.max=Max: enderio.gui.progress=Progress {0,number}% +enderio.gui.receive=Receive +enderio.gui.send=Send +enderio.gui.sendReceive=Send & Receive //Redstone controls enderio.gui.tooltip.redstoneControlMode=Redstone Mode @@ -703,6 +707,17 @@ enderio.gui.tooltip.redstoneControlMode.on=Active with signal enderio.gui.tooltip.redstoneControlMode.off=Active without signal enderio.gui.tooltip.redstoneControlMode.never=Never active +enderio.gui.machine.button.storelevel=Store 1 +enderio.gui.machine.tooltip.storelevel=level of player XP +enderio.gui.machine.button.storelevels=Store 10 +enderio.gui.machine.tooltip.storelevels=levels of player XP +enderio.gui.machine.button.storeall=Store all +enderio.gui.machine.tooltip.storeall=player XP +enderio.gui.machine.button.retrievelevel=Retrieve 1 +enderio.gui.machine.tooltip.retrievelevel=player XP level +enderio.gui.machine.button.retrievelevels=Retrieve 10 +enderio.gui.machine.tooltip.retrievelevels=player XP levels +enderio.gui.machine.button.retrieveall=Retrieve all enderio.gui.machine.ioMode.overlay.tooltip=Configure IO enderio.gui.machine.ioMode.none=None enderio.gui.machine.ioMode.pull=Pull @@ -711,6 +726,16 @@ enderio.gui.machine.ioMode.disabled=Disabled enderio.gui.machine.ioMode.pullPush=Push / Pull enderio.gui.machine.ioMode.pullPush.colored=%sPush %s/ %sPull enderio.gui.machine.ioMode=Mode: %s +enderio.gui.machine.poweredspawner.capture=Capture +enderio.gui.machine.poweredspawner.spawn=Spawn +enderio.gui.machine.receivefilter=Receive Filter +enderio.gui.machine.sendfilter=Send Filter +enderio.gui.machine.sendReceivebuffer=Send/Receive Buffer +enderio.gui.machine.localbuffer=Local Buffer +enderio.gui.machine.upkeep=Upkeep: +enderio.gui.machine.bufferingstacks=Buffering item stacks +enderio.gui.machine.bufferingsingle=Buffering single items +enderio.gui.machine.percraft=Per Craft enderio.gui.machine.side=Side: %s enderio.gui.machine.side.north=North enderio.gui.machine.side.south=South diff --git a/resources/assets/enderio/lang/fr_FR.lang b/resources/assets/enderio/lang/fr_FR.lang index 452239fe..347ea3e7 100644 --- a/resources/assets/enderio/lang/fr_FR.lang +++ b/resources/assets/enderio/lang/fr_FR.lang @@ -117,8 +117,8 @@ enderio.itemEnderface.noSync=Le Masque d'Ender n'est pas synchronisé avec l'End enderio.gui.enabled=Activé enderio.gui.disabled=Désactivé enderio.gui.send=Envoyer -enderio.gui.recieve=Recevoir -enderio.gui.sendRecieve=Envoyer & Recevoir +enderio.gui.receive=Recevoir +enderio.gui.sendReceive=Envoyer & Recevoir //Redstone controls enderio.gui.tooltip.redstoneControlMode=Mode Redstone diff --git a/resources/assets/enderio/lang/ko_KR.lang b/resources/assets/enderio/lang/ko_KR.lang index 3413f989..f2d968fd 100644 --- a/resources/assets/enderio/lang/ko_KR.lang +++ b/resources/assets/enderio/lang/ko_KR.lang @@ -300,7 +300,7 @@ enderio.trans.power=전력 enderio.trans.item=아이템 enderio.trans.fluid=유체 -enderio.trans.recieving=수신 +enderio.trans.receiving=수신 enderio.trans.sending=송신 tile.blockPowerMonitor.name=전력 모니터 @@ -625,8 +625,8 @@ enderio.darksteel.upgrade.nightVision.disabled=Night Vision Disabled enderio.gui.enabled=활성화 enderio.gui.disabled=비활성화 enderio.gui.send=발신 -enderio.gui.recieve=수신 -enderio.gui.sendRecieve=수신 & 발신 +enderio.gui.receive=수신 +enderio.gui.sendReceive=수신 & 발신 //Redstone controls enderio.gui.tooltip.redstoneControlMode=레드스톤 모드 diff --git a/resources/assets/enderio/lang/pl_PL.lang b/resources/assets/enderio/lang/pl_PL.lang index cdf8c466..8e5870c3 100644 --- a/resources/assets/enderio/lang/pl_PL.lang +++ b/resources/assets/enderio/lang/pl_PL.lang @@ -140,8 +140,8 @@ enderio.color.white=Biały enderio.gui.enabled=Włączony enderio.gui.disabled=Wyłączony enderio.gui.send=Wysyłaj -enderio.gui.recieve=Odbieraj -enderio.gui.sendRecieve=Wysyłaj i odbieraj +enderio.gui.receive=Odbieraj +enderio.gui.sendReceive=Wysyłaj i odbieraj //Redstone controls enderio.gui.tooltip.redstoneControlMode=Tryb włącznika diff --git a/resources/assets/enderio/lang/pt_BR.lang b/resources/assets/enderio/lang/pt_BR.lang index 8ff1692a..00a692c9 100644 --- a/resources/assets/enderio/lang/pt_BR.lang +++ b/resources/assets/enderio/lang/pt_BR.lang @@ -331,7 +331,7 @@ enderio.trans.item=Item enderio.trans.fluid=Fluido enderio.trans.rail=Trilho -enderio.trans.recieving=Recebendo +enderio.trans.receiving=Recebendo enderio.trans.sending=Enviando tile.blockPowerMonitor.name=Monitor de Força @@ -672,8 +672,8 @@ enderio.gui.simple.out=Saída Máxima: enderio.gui.enabled=Ativado enderio.gui.disabled=Desativado enderio.gui.send=Enviar -enderio.gui.recieve=Receber -enderio.gui.sendRecieve=Enviar & Receber +enderio.gui.receive=Receber +enderio.gui.sendReceive=Enviar & Receber //Redstone controls enderio.gui.tooltip.redstoneControlMode=Modo de Redstone diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang index 705eddc9..0a1f53be 100644 --- a/resources/assets/enderio/lang/ru_RU.lang +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -2,6 +2,7 @@ //Power enderio.power.rf=RF +enderio.power.tmb=тик/мВ enderio.power.tick=/тик enderio.power.maxOutput=Макс. выход enderio.power.generates=Генерирует @@ -334,7 +335,7 @@ enderio.trans.item=Предмет enderio.trans.fluid=Жидкость enderio.trans.rail=Рельс -enderio.trans.recieving=Получение +enderio.trans.receiving=Получение enderio.trans.sending=Отправка tile.blockPowerMonitor.name=Индикатор мощности @@ -414,6 +415,7 @@ tile.blockVacuumChest.tooltip.detailed.line2=в свой инвентарь tile.blockPoweredSpawner.name=Электрический спаунер tile.blockPoweredSpawner.tooltip.empty=Пустой +enderio.tile.blockPoweredSpawner.tooltip.none=Нет tile.blockPoweredSpawner.empty.tooltip.detailed.line1=Объедините со сломанным tile.blockPoweredSpawner.empty.tooltip.detailed.line2=спаунером в наковальне tile.blockPoweredSpawner.tooltip.detailed.line1=Подайте питание, чтобы @@ -689,12 +691,14 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1==Генерирует enderio.gui.simple.in=Макс. вход: enderio.gui.simple.out=Макс. выход: -enderio.gui.enabled=Включено +enderio.gui.available=Доступно enderio.gui.disabled=Выключено -enderio.gui.send=Отправлять -enderio.gui.recieve=Получать -enderio.gui.sendRecieve=Отправлять и получать +enderio.gui.enabled=Включено +enderio.gui.max=Макс: enderio.gui.progress=Прогресс {0,number}% +enderio.gui.receive=Получать +enderio.gui.send=Отправлять +enderio.gui.sendReceive=Отправлять и получать //Redstone controls enderio.gui.tooltip.redstoneControlMode=Режим красного камня @@ -703,6 +707,17 @@ enderio.gui.tooltip.redstoneControlMode.on=Активен по сигналу enderio.gui.tooltip.redstoneControlMode.off=Активен без сигнала enderio.gui.tooltip.redstoneControlMode.never=Всегда выключен +enderio.gui.machine.button.storelevel=Отдать 1 +enderio.gui.machine.tooltip.storelevel=уровень опыта игрока +enderio.gui.machine.button.storelevels=Отдать 10 +enderio.gui.machine.tooltip.storelevels=уровней опыта игрока +enderio.gui.machine.button.storeall=Отдать весь +enderio.gui.machine.tooltip.storeall=опыт игрока +enderio.gui.machine.button.retrievelevel=Забрать 1 +enderio.gui.machine.tooltip.retrievelevel=уровень опыта игрока +enderio.gui.machine.button.retrievelevels=Забрать 10 +enderio.gui.machine.tooltip.retrievelevels=уровней опыта игрока +enderio.gui.machine.button.retrieveall=Забрать весь опыт enderio.gui.machine.ioMode.overlay.tooltip=Настроить вход/выход enderio.gui.machine.ioMode.none=Нет enderio.gui.machine.ioMode.pull=Тянуть @@ -711,6 +726,16 @@ enderio.gui.machine.ioMode.disabled=Отключен enderio.gui.machine.ioMode.pullPush=Толкать/Тянуть enderio.gui.machine.ioMode.pullPush.colored=%sТолкать %s/ %sТянуть enderio.gui.machine.ioMode=Режим: %s +enderio.gui.machine.poweredspawner.capture=Захватить +enderio.gui.machine.poweredspawner.spawn=Призывать +enderio.gui.machine.receivefilter=Фильтр приёма +enderio.gui.machine.sendfilter=Фильтр отправки +enderio.gui.machine.sendReceivebuffer=Буфер отправки/приёма +enderio.gui.machine.localbuffer=Местный буфер +enderio.gui.machine.upkeep=Upkeep: +enderio.gui.machine.bufferingstacks=Буферизация стаков +enderio.gui.machine.bufferingsingle=Буферизация одиночных предметов +enderio.gui.machine.percraft=за создание enderio.gui.machine.side=Сторона: %s enderio.gui.machine.side.north=Север enderio.gui.machine.side.south=Юг diff --git a/resources/assets/enderio/lang/zh_CN.lang b/resources/assets/enderio/lang/zh_CN.lang index 30363e9a..6ea0dc99 100644 --- a/resources/assets/enderio/lang/zh_CN.lang +++ b/resources/assets/enderio/lang/zh_CN.lang @@ -624,8 +624,8 @@ enderio.enderio.gui.disabled=禁用 enderio.gui.enabled=启用 enderio.gui.disabled=禁用 enderio.gui.send=发送 -enderio.gui.recieve=接收 -enderio.gui.sendRecieve=发送和接收 +enderio.gui.receive=接收 +enderio.gui.sendReceive=发送和接收 //Redstone controls enderio.gui.tooltip.redstoneControlMode=红石模式 diff --git a/resources/assets/enderio/lang/zh_TW.lang b/resources/assets/enderio/lang/zh_TW.lang index 2307a540..3259511d 100644 --- a/resources/assets/enderio/lang/zh_TW.lang +++ b/resources/assets/enderio/lang/zh_TW.lang @@ -644,8 +644,8 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=太陽能發電產生 enderio.gui.enabled=啟用 enderio.gui.disabled=停用 enderio.gui.send=發送 -enderio.gui.recieve=接收 -enderio.gui.sendRecieve=發送和接收 +enderio.gui.receive=接收 +enderio.gui.sendReceive=發送和接收 //Redstone controls enderio.gui.tooltip.redstoneControlMode=紅石模式 diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index 773eda83..d2c1a6f7 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -263,7 +263,7 @@ public class LiquidSettings extends BaseSettingsPanel { if(isEnder && isFilterVisible()) { if(conduit.getConnectionMode(gui.getDir()) == ConnectionMode.IN_OUT) { - String inOutStr = inOutShowIn ? "Extract" : "Insert"; + String inOutStr = inOutShowIn ? Lang.localize("gui.conduit.ioMode.input") : Lang.localize("gui.conduit.ioMode.output"); int x = gui.getGuiLeft() + gui.getXSize() - 20 - 5 - gui.getFontRenderer().getStringWidth(inOutStr); int y = top; gui.getFontRenderer().drawString(inOutStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY)); diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index a74f1307..a1832193 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -573,22 +573,22 @@ public final class Config { "The range of the wireless charger").getInt(wirelessChargerRange); fluidConduitExtractRate = config.get(sectionEfficiency.name, "fluidConduitExtractRate", fluidConduitExtractRate, - "Number of millibuckects per tick extracted by a fluid conduits auto extracting").getInt(fluidConduitExtractRate); + "Number of millibuckets per tick extracted by a fluid conduits auto extracting").getInt(fluidConduitExtractRate); fluidConduitMaxIoRate = config.get(sectionEfficiency.name, "fluidConduitMaxIoRate", fluidConduitMaxIoRate, - "Number of millibuckects per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate); + "Number of millibuckets per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate); advancedFluidConduitExtractRate = config.get(sectionEfficiency.name, "advancedFluidConduitExtractRate", advancedFluidConduitExtractRate, - "Number of millibuckects per tick extracted by pressurised fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate); + "Number of millibuckets per tick extracted by pressurised fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate); advancedFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "advancedFluidConduitMaxIoRate", advancedFluidConduitMaxIoRate, - "Number of millibuckects per tick that can pass through a single connection to an pressurised fluid conduit.").getInt(advancedFluidConduitMaxIoRate); + "Number of millibuckets per tick that can pass through a single connection to an pressurised fluid conduit.").getInt(advancedFluidConduitMaxIoRate); enderFluidConduitExtractRate = config.get(sectionEfficiency.name, "enderFluidConduitExtractRate", enderFluidConduitExtractRate, - "Number of millibuckects per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate); + "Number of millibuckets per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate); enderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "enderFluidConduitMaxIoRate", enderFluidConduitMaxIoRate, - "Number of millibuckects per tick that can pass through a single connection to an ender fluid conduit.").getInt(enderFluidConduitMaxIoRate); + "Number of millibuckets per tick that can pass through a single connection to an ender fluid conduit.").getInt(enderFluidConduitMaxIoRate); gasConduitExtractRate = config.get(sectionEfficiency.name, "gasConduitExtractRate", gasConduitExtractRate, "Amount of gas per tick extracted by gas conduits auto extracting").getInt(gasConduitExtractRate); @@ -604,7 +604,7 @@ public final class Config { transceiverUpkeepCostRF = config.get(sectionPower.name, "transceiverUpkeepCostRF", transceiverUpkeepCostRF, "Number of RF/t required to keep a Dimensional Transceiver connection open").getInt(transceiverUpkeepCostRF); transceiverMaxIoRF = config.get(sectionPower.name, "transceiverMaxIoRF", transceiverMaxIoRF, - "Maximum RF/t sent and recieved by a Dimensional Transceiver per tick. Input and output limits are not cumulative").getInt(transceiverMaxIoRF); + "Maximum RF/t sent and received by a Dimensional Transceiver per tick. Input and output limits are not cumulative").getInt(transceiverMaxIoRF); transceiverBucketTransmissionCostRF = config.get(sectionEfficiency.name, "transceiverBucketTransmissionCostRF", transceiverBucketTransmissionCostRF, "The cost in RF of transporting a bucket of fluid via a Dimensional Transceiver.").getInt(transceiverBucketTransmissionCostRF); @@ -690,7 +690,7 @@ public final class Config { enderIoRange = config.get(sectionEfficiency.name, "enderIoRange", enderIoRange, - "Range accessable (in blocks) when using the Ender IO.").getInt(enderIoRange); + "Range accessible (in blocks) when using the Ender IO.").getInt(enderIoRange); enderIoMeAccessEnabled = config.get(sectionPersonal.name, "enderIoMeAccessEnabled", enderIoMeAccessEnabled, "If false: you will not be able to access a ME access or crafting terminal using the Ender IO.").getBoolean(enderIoMeAccessEnabled); @@ -703,7 +703,7 @@ public final class Config { darkSteelPowerDamgeAbsorptionRatios = config .get(sectionDarkSteel.name, "darkSteelPowerDamgeAbsorptionRatios", darkSteelPowerDamgeAbsorptionRatios, - "A list of the amount of durabilty damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durablity damage when powered.") + "A list of the amount of durability damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durability damage when powered.") .getDoubleList(); darkSteelPowerStorageBase = config.get(sectionDarkSteel.name, "darkSteelPowerStorageBase", darkSteelPowerStorageBase, "Base amount of power stored by dark steel items.").getInt(darkSteelPowerStorageBase); @@ -761,9 +761,9 @@ public final class Config { darkSteelWalkPowerCost = config.get(sectionDarkSteel.name, "darkSteelWalkPowerCost", darkSteelWalkPowerCost, "Amount of power stored (RF) per block walked when wearing the dark steel boots.").getInt(darkSteelWalkPowerCost); darkSteelSprintPowerCost = config.get(sectionDarkSteel.name, "darkSteelSprintPowerCost", darkSteelWalkPowerCost, - "Amount of power stored (RF) per block walked when wearing the dark stell boots.").getInt(darkSteelSprintPowerCost); + "Amount of power stored (RF) per block walked when wearing the dark steel boots.").getInt(darkSteelSprintPowerCost); darkSteelDrainPowerFromInventory = config.get(sectionDarkSteel.name, "darkSteelDrainPowerFromInventory", darkSteelDrainPowerFromInventory, - "If true, dark steel armor will drain power stored (RF) in power containers in the players invenotry.").getBoolean(darkSteelDrainPowerFromInventory); + "If true, dark steel armor will drain power stored (RF) in power containers in the players inventory.").getBoolean(darkSteelDrainPowerFromInventory); darkSteelBootsJumpPowerCost = config.get(sectionDarkSteel.name, "darkSteelBootsJumpPowerCost", darkSteelBootsJumpPowerCost, "Base amount of power used per jump (RF) dark steel boots. The second jump in a 'double jump' uses 2x this etc").getInt(darkSteelBootsJumpPowerCost); @@ -840,7 +840,7 @@ public final class Config { vanillaSwordSkullLootingModifier); ticCleaverSkullDropChance = (float) config.get(sectionDarkSteel.name, "ticCleaverSkullDropChance", ticCleaverSkullDropChance, - "The base chance that an enderman skull will be dropped when using TiC Cleaver").getDouble( + "The base chance that an Enderman Skull will be dropped when using TiC Cleaver").getDouble( ticCleaverSkullDropChance); ticBeheadingSkullModifier = (float) config.get(sectionPersonal.name, "ticBeheadingSkullModifier", ticBeheadingSkullModifier, "The chance per level of Beheading that a skull will be dropped when using a TiC weapon").getDouble( @@ -869,7 +869,7 @@ public final class Config { darkSteelPickPowerUseObsidian = config.get(sectionDarkSteel.name, "darkSteelPickPowerUseObsidian", darkSteelPickPowerUseObsidian, "The amount of power (RF) used to break an obsidian block.").getInt(darkSteelPickPowerUseObsidian); darkSteelPickEffeciencyObsidian = config.get(sectionDarkSteel.name, "darkSteelPickEffeciencyObsidian", darkSteelPickEffeciencyObsidian, - "The effeciency when breaking obsidian with a powered Dark Pickaxe.").getInt(darkSteelPickEffeciencyObsidian); + "The efficiency when breaking obsidian with a powered Dark Pickaxe.").getInt(darkSteelPickEffeciencyObsidian); darkSteelPickApplyObsidianEffeciencyAtHardess = (float) config.get(sectionDarkSteel.name, "darkSteelPickApplyObsidianEffeciencyAtHardess", darkSteelPickApplyObsidianEffeciencyAtHardess, "If set to a value > 0, the obsidian speed and power use will be used for all blocks with hardness >= to this value.").getDouble( @@ -877,7 +877,7 @@ public final class Config { darkSteelPickPowerUsePerDamagePoint = config.get(sectionDarkSteel.name, "darkSteelPickPowerUsePerDamagePoint", darkSteelPickPowerUsePerDamagePoint, "Power use (RF) per damage/durability point avoided.").getInt(darkSteelPickPowerUsePerDamagePoint); darkSteelPickEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelPickEffeciencyBoostWhenPowered", - darkSteelPickEffeciencyBoostWhenPowered, "The increase in effciency when powered.").getDouble(darkSteelPickEffeciencyBoostWhenPowered); + darkSteelPickEffeciencyBoostWhenPowered, "The increase in efficiency when powered.").getDouble(darkSteelPickEffeciencyBoostWhenPowered); darkSteelPickMinesTiCArdite = config.getBoolean("darkSteelPickMinesTiCArdite", sectionDarkSteel.name, darkSteelPickMinesTiCArdite, "When true the dark steel pick will be able to mine TiC Ardite and Cobalt"); @@ -890,7 +890,7 @@ public final class Config { darkSteelAxeSpeedPenaltyMultiHarvest, "How much slower shift-harvesting logs is.").getDouble(darkSteelAxeSpeedPenaltyMultiHarvest); darkSteelAxeEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelAxeEffeciencyBoostWhenPowered", - darkSteelAxeEffeciencyBoostWhenPowered, "The increase in effciency when powered.").getDouble(darkSteelAxeEffeciencyBoostWhenPowered); + darkSteelAxeEffeciencyBoostWhenPowered, "The increase in efficiency when powered.").getDouble(darkSteelAxeEffeciencyBoostWhenPowered); darkSteelAnvilDamageChance = (float) config.get(sectionDarkSteel.name, "darkSteelAnvilDamageChance", darkSteelAnvilDamageChance, "Chance that the dark steel anvil will take damage after repairing something.").getDouble(); @@ -1100,7 +1100,7 @@ public final class Config { spawnGuardPowerPerTickLevelThree = config.get(sectionAttractor.name, "spawnGuardPowerPerTickLevelThree", spawnGuardPowerPerTickLevelThree, "The RF/t power use of a levele 3 spawn guard").getInt(spawnGuardPowerPerTickLevelThree); spawnGuardStopAllSlimesDebug = config.getBoolean("spawnGuardStopAllSlimesDebug", sectionAttractor.name, spawnGuardStopAllSlimesDebug, - "When true slimes wont be alowed to spawn at all. Only added to aid testing in super flat worlds."); + "When true slimes wont be allowed to spawn at all. Only added to aid testing in super flat worlds."); spawnGuardStopAllSquidSpawning = config.getBoolean("spawnGuardStopAllSquidSpawning", sectionAttractor.name, spawnGuardStopAllSquidSpawning, "When true no squid will be spawned."); @@ -1120,9 +1120,9 @@ public final class Config { enderRailEnabled = config.getBoolean("enderRailEnabled", sectionRailConfig.name, enderRailEnabled, "Wether Ender Rails are enabled"); enderRailPowerRequireCrossDimensions = config.get(sectionRailConfig.name, "enderRailPowerRequireCrossDimensions", enderRailPowerRequireCrossDimensions, - "The amount of power required to transpoer a cart accross dimensions").getInt(enderRailPowerRequireCrossDimensions); + "The amount of power required to transport a cart across dimensions").getInt(enderRailPowerRequireCrossDimensions); enderRailPowerRequiredPerBlock = config.get(sectionRailConfig.name, "enderRailPowerRequiredPerBlock", enderRailPowerRequiredPerBlock, - "The amout of power required to teleport a cart per block in the same dimension").getInt(enderRailPowerRequiredPerBlock); + "The amount of power required to teleport a cart per block in the same dimension").getInt(enderRailPowerRequiredPerBlock); enderRailCapSameDimensionPowerAtCrossDimensionCost = config.getBoolean("enderRailCapSameDimensionPowerAtCrossDimensionCost", sectionRailConfig.name, enderRailCapSameDimensionPowerAtCrossDimensionCost, "When set to true the RF cost of sending a cart within the same dimension will be capped to the cross dimension cost"); enderRailTicksBeforeForceSpawningLinkedCarts = config.get(sectionRailConfig.name, "enderRailTicksBeforeForceSpawningLinkedCarts", enderRailTicksBeforeForceSpawningLinkedCarts, diff --git a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java index 37eef4ed..bb501738 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java @@ -16,6 +16,7 @@ import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GuiCrafter extends GuiPoweredMachineBase { @@ -28,8 +29,8 @@ public class GuiCrafter extends GuiPoweredMachineBase { int x = getXSize() - 5 - 16; int y = 43; bufferSizeB = new ToggleButtonEIO(this, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); - bufferSizeB.setSelectedToolTip("Buffering item stacks"); - bufferSizeB.setUnselectedToolTip("Buffering single items"); + bufferSizeB.setSelectedToolTip(Lang.localize("gui.machine.bufferingstacks")); + bufferSizeB.setUnselectedToolTip(Lang.localize("gui.machine.bufferingsingle")); bufferSizeB.setSelected(te.isBufferStacks()); } @@ -71,7 +72,7 @@ public class GuiCrafter extends GuiPoweredMachineBase { @Override protected void updatePowerBarTooltip(List text) { text.add(PowerDisplayUtil.formatPower(Config.crafterRfPerCraft) + " " + PowerDisplayUtil.abrevation() - + " Per Craft"); + + " " + Lang.localize("gui.machine.percraft")); super.updatePowerBarTooltip(text); } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java index 35428f72..fecb14b4 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java @@ -102,7 +102,7 @@ public class GuiCombustionGenerator extends GuiPoweredMachineBase { @@ -151,7 +152,7 @@ public class BlockZombieGenerator extends AbstractMachineBlock tooltip, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); if(te != null && te instanceof TileZombieGenerator) { - tooltip.add(((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " mB"); + tooltip.add(((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " " + Lang.localize("fluid.millibucket.abr")); } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java index d26d2137..1678ca74 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java @@ -81,7 +81,7 @@ public class GuiZombieGenerator extends GuiPoweredMachineBase extends Gu protected GuiMachineBase(T machine, Container par1Container) { super(par1Container); tileEntity = machine; - + + xSize = getXSize(); + ySize = getYSize(); int x = getXSize() - 5 - BUTTON_SIZE; int y = 5; redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java index 0620a769..65ffbb90 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.gui; import java.awt.Rectangle; import java.util.List; +import net.minecraft.util.StatCollector; import net.minecraft.inventory.Container; @@ -37,7 +38,7 @@ public abstract class GuiPoweredMachineBase { @@ -58,9 +59,9 @@ public class GuiPoweredSpawner extends GuiPoweredMachineBase int left = getGuiLeft(); int top = getGuiTop(); - String txt = "Spawn"; + String txt = Lang.localize("gui.machine.poweredspawner.spawn"); if(!spawner.isSpawnMode()) { - txt = "Capture"; + txt = Lang.localize("gui.machine.poweredspawner.capture"); } FontRenderer fr = getFontRenderer(); int x = left + xSize / 2 - fr.getStringWidth(txt) / 2; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index c88be3c8..9b27db4c 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -136,7 +136,7 @@ public class BlockTransceiver extends AbstractMachineBlock { tooltip.add(EnumChatFormatting.WHITE + Lang.localize("trans." + type.name().toLowerCase())); if(!isEmpty(recieve)) { - tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.recieving"), Util.TAB + Util.ALIGNRIGHT + tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.receiving"), Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, recieve)); } if(!isEmpty(send)) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java index 80988e6c..9a6e5573 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java @@ -186,13 +186,13 @@ public class ChannelTab implements ITabPanel { int top = parent.getGuiTop(); int x = left + 59; int y = top + 36; - parent.drawCenteredString(parent.getFontRenderer(), "Available", x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.available"), x, y, ColorUtil.getRGB(Color.white)); x = left + 199; - parent.drawCenteredString(parent.getFontRenderer(), "Send", x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.send"), x, y, ColorUtil.getRGB(Color.white)); y += 56; - parent.drawCenteredString(parent.getFontRenderer(), "Recieve", x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.receive"), x, y, ColorUtil.getRGB(Color.white)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java index ebe1eafe..4a405306 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java @@ -19,6 +19,7 @@ import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class FilterTab implements ITabPanel { @@ -98,9 +99,9 @@ public class FilterTab implements ITabPanel { recGui.renderCustomOptions(0, par1, par2, par3); } - String txt = "Send Filter"; + String txt = Lang.localize("gui.machine.sendfilter"); if(!showSend) { - txt = "Receive Filter"; + txt = Lang.localize("gui.machine.receivefilter"); } FontRenderer fr = parent.getFontRenderer(); int x = left + container.getFilterOffset().x; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java index 09bd41d5..33fe9e2b 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -20,6 +20,7 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GeneralTab implements ITabPanel { @@ -37,8 +38,8 @@ public class GeneralTab implements ITabPanel { int x = parent.getXSize() - 5 - 16; int y = 43; bufferSizeB = new ToggleButtonEIO(parent, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); - bufferSizeB.setSelectedToolTip("Buffering item stacks"); - bufferSizeB.setUnselectedToolTip("Buffering single items"); + bufferSizeB.setSelectedToolTip(Lang.localize("gui.machine.bufferingstacks")); + bufferSizeB.setUnselectedToolTip(Lang.localize("gui.machine.bufferingsingle")); bufferSizeB.setSelected(parent.getTransciever().isBufferStacks()); sendPowerBarTT = new GuiToolTip(new Rectangle(parent.getPowerX() + SEND_BAR_OFFSET, parent.getPowerY(), parent.getPowerWidth(), parent.getPowerHeight()), "") { @@ -89,11 +90,11 @@ public class GeneralTab implements ITabPanel { parent.drawTexturedModalRect(left + invRoot.x - 1 + (18 * 4) + container.getItemBufferSpacing(), top + invRoot.y - 1, 24, 180, 72, 36); FontRenderer fr = parent.getFontRenderer(); - String sendTxt = "Send"; + String sendTxt = Lang.localize("gui.send"); int x = left + invRoot.x + 36 - fr.getStringWidth(sendTxt)/2; int y = top + invRoot.y - fr.FONT_HEIGHT - 3; fr.drawStringWithShadow(sendTxt, x, y, ColorUtil.getRGB(Color.WHITE)); - String recText = "Receive"; + String recText = Lang.localize("gui.receive"); x = left + invRoot.x + 72 + container.getItemBufferSpacing() + 36 - fr.getStringWidth(recText)/2; fr.drawStringWithShadow(recText, x, y, ColorUtil.getRGB(Color.WHITE)); @@ -125,16 +126,16 @@ public class GeneralTab implements ITabPanel { } public void updatePowerBarTooltip(List text) { - text.add("Local Buffer"); - text.add("Upkeep: " + PowerDisplayUtil.formatPowerPerTick(parent.getPowerOutputValue())); + text.add(Lang.localize("gui.machine.localbuffer")); + text.add(Lang.localize("gui.machine.upkeep") + " " + PowerDisplayUtil.formatPowerPerTick(parent.getPowerOutputValue())); int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored()/2; int energyStored = Math.min(parent.getTransciever().getEnergyStored(), maxEnergy); text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); } private void updateSendPowerBarTooltip(List text) { - text.add("Send/Recieve Buffer"); - text.add("Max IO: " + PowerDisplayUtil.formatPowerPerTick(Config.transceiverMaxIoRF)); + text.add(Lang.localize("gui.machine.sendReceivebuffer")); + text.add(Lang.localize("itemGasConduit.tooltip.maxIo") + " " + PowerDisplayUtil.formatPowerPerTick(Config.transceiverMaxIoRF)); int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored()/2; int energyStored = Math.max(0, parent.getTransciever().getEnergyStored() - maxEnergy); text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); diff --git a/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java b/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java index a57455e0..67b4b6d8 100644 --- a/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java @@ -15,6 +15,7 @@ import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketDrainPlayerXP; import crazypants.enderio.xp.PacketGivePlayerXP; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GuiExperianceObelisk extends GuiMachineBase { @@ -42,38 +43,38 @@ public class GuiExperianceObelisk extends GuiMachineBase { p = new IconButtonEIO(this, 800, x, y, IconEIO.SINGLE_PLUS); p.setSize(bw, bw); p.setIconMargin(2, 2); - p.setToolTip("Store 1", "level of player XP"); + p.setToolTip(Lang.localize("gui.machine.button.storelevel"), Lang.localize("gui.machine.tooltip.storelevel")); x += spacing + bw; pp = new IconButtonEIO(this, 801, x, y, IconEIO.DOUBLE_PLUS); pp.setSize(bw, bw); pp.setIconMargin(2, 2); - pp.setToolTip("Store 10", "levels of player XP"); + pp.setToolTip(Lang.localize("gui.machine.button.storelevels"), Lang.localize("gui.machine.tooltip.storelevels")); x += spacing + bw; ppp = new IconButtonEIO(this, 802, x, y, IconEIO.TRIPLE_PLUS); ppp.setSize(bw, bw); ppp.setIconMargin(2, 2); - ppp.setToolTip("Store all", "player XP"); + ppp.setToolTip(Lang.localize("gui.machine.button.storeall"), Lang.localize("gui.machine.tooltip.storeall")); x = startX; y = 75; m = new IconButtonEIO(this, 803, x, y, IconEIO.SINGLE_MINUS); m.setSize(bw, bw); m.setIconMargin(2, 2); - m.setToolTip("Retrieve 1", "player XP level"); + m.setToolTip(Lang.localize("gui.machine.button.retrievelevel"), Lang.localize("gui.machine.tooltip.retrievelevel")); x += spacing + bw; mm = new IconButtonEIO(this, 804, x, y, IconEIO.DOUBLE_MINUS); mm.setSize(bw, bw); mm.setIconMargin(2, 2); - mm.setToolTip("Retrieve 10", "player XP levels"); + mm.setToolTip(Lang.localize("gui.machine.button.retrievelevels"), Lang.localize("gui.machine.tooltip.retrievelevels")); x += spacing + bw; mmm = new IconButtonEIO(this, 805, x, y, IconEIO.TRIPLE_MINUS); mmm.setSize(bw, bw); mmm.setIconMargin(2, 2); - mmm.setToolTip("Retrieve all"); + mmm.setToolTip(Lang.localize("gui.machine.button.retrieveall")); } @Override