diff --git a/src/main/java/thaumicenergistics/client/gui/GuiDistillationPatternEncoder.java b/src/main/java/thaumicenergistics/client/gui/GuiDistillationPatternEncoder.java index 82289b8b..ec90267c 100644 --- a/src/main/java/thaumicenergistics/client/gui/GuiDistillationPatternEncoder.java +++ b/src/main/java/thaumicenergistics/client/gui/GuiDistillationPatternEncoder.java @@ -111,7 +111,7 @@ public class GuiDistillationPatternEncoder extends ThEBaseGui implements IInvent super(new ContainerDistillationPatternEncoder(player, world, x, y, z)); // Set the title - this.title = ThEStrings.Block_DistillationEncoder.getLocalized(); + this.title = ThEStrings.Gui_TitleDistillationPatternEncoder.getLocalized(); // Set the GUI size this.xSize = GuiDistillationPatternEncoder.GUI_WIDTH; diff --git a/src/main/java/thaumicenergistics/client/gui/GuiEssentiaCellTerminal.java b/src/main/java/thaumicenergistics/client/gui/GuiEssentiaCellTerminal.java index d1123d5a..62b6ac5b 100644 --- a/src/main/java/thaumicenergistics/client/gui/GuiEssentiaCellTerminal.java +++ b/src/main/java/thaumicenergistics/client/gui/GuiEssentiaCellTerminal.java @@ -242,7 +242,7 @@ public class GuiEssentiaCellTerminal extends GuiConstants_ECT implements IAspect return new GuiEssentiaCellTerminal( player, new ContainerEssentiaTerminal(terminal, player), - ThEStrings.Part_EssentiaTerminal.getLocalized()); + ThEStrings.Gui_TitleEssentiaTerminal.getLocalized()); } /** @@ -286,7 +286,7 @@ public class GuiEssentiaCellTerminal extends GuiConstants_ECT implements IAspect return new GuiEssentiaCellTerminal( player, new ContainerWirelessEssentiaTerminal(player, handler), - ThEStrings.Part_EssentiaTerminal.getLocalized()); + ThEStrings.Gui_TitleEssentiaTerminal.getLocalized()); } /** diff --git a/src/main/java/thaumicenergistics/client/gui/GuiEssentiaIO.java b/src/main/java/thaumicenergistics/client/gui/GuiEssentiaIO.java index 434b7315..13e607aa 100644 --- a/src/main/java/thaumicenergistics/client/gui/GuiEssentiaIO.java +++ b/src/main/java/thaumicenergistics/client/gui/GuiEssentiaIO.java @@ -24,10 +24,10 @@ import thaumicenergistics.client.textures.GuiTextureManager; import thaumicenergistics.common.container.ContainerPartEssentiaIOBus; import thaumicenergistics.common.integration.tc.EssentiaItemContainerHelper; import thaumicenergistics.common.network.packet.server.Packet_S_EssentiaIOBus; -import thaumicenergistics.common.parts.AEPartsEnum; import thaumicenergistics.common.parts.PartEssentiaExportBus; import thaumicenergistics.common.parts.PartEssentiaImportBus; import thaumicenergistics.common.parts.ThEPartEssentiaIOBus_Base; +import thaumicenergistics.common.registries.ThEStrings; /** * {@link PartEssentiaExportBus} and {@link PartEssentiaImportBus} GUI @@ -204,10 +204,10 @@ public class GuiEssentiaIO extends ThEBaseGui implements WidgetAspectSlot.IConfi // Set the title if (partBus instanceof PartEssentiaImportBus) { // Import - this.guiTitle = AEPartsEnum.EssentiaImportBus.getLocalizedName(); + this.guiTitle = ThEStrings.Gui_TitleEssentiaImportBus.getLocalized(); } else if (partBus instanceof PartEssentiaExportBus) { // Export - this.guiTitle = AEPartsEnum.EssentiaExportBus.getLocalizedName(); + this.guiTitle = ThEStrings.Gui_TitleEssentiaExportBus.getLocalized(); } else { this.guiTitle = ""; } diff --git a/src/main/java/thaumicenergistics/client/gui/GuiEssentiaLevelEmitter.java b/src/main/java/thaumicenergistics/client/gui/GuiEssentiaLevelEmitter.java index 4a44ea03..54de6fd5 100644 --- a/src/main/java/thaumicenergistics/client/gui/GuiEssentiaLevelEmitter.java +++ b/src/main/java/thaumicenergistics/client/gui/GuiEssentiaLevelEmitter.java @@ -22,8 +22,8 @@ import thaumicenergistics.client.textures.GuiTextureManager; import thaumicenergistics.common.container.ContainerPartEssentiaLevelEmitter; import thaumicenergistics.common.integration.tc.EssentiaItemContainerHelper; import thaumicenergistics.common.network.packet.server.Packet_S_EssentiaEmitter; -import thaumicenergistics.common.parts.AEPartsEnum; import thaumicenergistics.common.parts.PartEssentiaLevelEmitter; +import thaumicenergistics.common.registries.ThEStrings; /** * {@link PartEssentiaLevelEmitter} GUI @@ -236,7 +236,7 @@ public class GuiEssentiaLevelEmitter extends ThEBaseGui implements IAspectSlotGu protected void drawGuiContainerForegroundLayer(final int mouseX, final int mouseY) { // Draw the title this.fontRendererObj.drawString( - AEPartsEnum.EssentiaLevelEmitter.getLocalizedName(), + ThEStrings.Gui_TitleEssentiaLevelEmitter.getLocalized(), GuiEssentiaLevelEmitter.TITLE_POS_X, GuiEssentiaLevelEmitter.TITLE_POS_Y, 0); diff --git a/src/main/java/thaumicenergistics/client/gui/GuiEssentiaStorageBus.java b/src/main/java/thaumicenergistics/client/gui/GuiEssentiaStorageBus.java index 1aef5367..112ea733 100644 --- a/src/main/java/thaumicenergistics/client/gui/GuiEssentiaStorageBus.java +++ b/src/main/java/thaumicenergistics/client/gui/GuiEssentiaStorageBus.java @@ -27,8 +27,8 @@ import thaumicenergistics.common.container.ContainerPartEssentiaStorageBus; import thaumicenergistics.common.integration.tc.EssentiaItemContainerHelper; import thaumicenergistics.common.network.packet.server.Packet_S_ChangeGui; import thaumicenergistics.common.network.packet.server.Packet_S_EssentiaStorageBus; -import thaumicenergistics.common.parts.AEPartsEnum; import thaumicenergistics.common.parts.PartEssentiaStorageBus; +import thaumicenergistics.common.registries.ThEStrings; /** * {@link PartEssentiaStorageBus} GUI @@ -133,7 +133,7 @@ public class GuiEssentiaStorageBus extends ThEBaseGui implements IAspectSlotGui /** * Title of the gui */ - private final String guiTitle = AEPartsEnum.EssentiaStorageBus.getLocalizedName(); + private final String guiTitle = ThEStrings.Gui_TitleEssentiaStorageBus.getLocalized(); /** * Is the storage buss allowed to void excess essentia? diff --git a/src/main/java/thaumicenergistics/client/gui/GuiKnowledgeInscriber.java b/src/main/java/thaumicenergistics/client/gui/GuiKnowledgeInscriber.java index 0b4cc8f4..213a1e25 100644 --- a/src/main/java/thaumicenergistics/client/gui/GuiKnowledgeInscriber.java +++ b/src/main/java/thaumicenergistics/client/gui/GuiKnowledgeInscriber.java @@ -117,7 +117,7 @@ public class GuiKnowledgeInscriber extends ThEBaseGui { this.ySize = GuiKnowledgeInscriber.GUI_HEIGHT; // Set title - this.title = ThEStrings.Block_KnowledgeInscriber.getLocalized(); + this.title = ThEStrings.Gui_TitleKnowledgeInscriber.getLocalized(); // Setup the particles this.particles = new GuiParticleAnimator[ContainerKnowledgeInscriber.CRAFTING_COLS diff --git a/src/main/java/thaumicenergistics/client/gui/GuiPriority.java b/src/main/java/thaumicenergistics/client/gui/GuiPriority.java index 6f55916d..dfda94ed 100644 --- a/src/main/java/thaumicenergistics/client/gui/GuiPriority.java +++ b/src/main/java/thaumicenergistics/client/gui/GuiPriority.java @@ -8,7 +8,6 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import appeng.core.localization.GuiText; import appeng.helpers.IPriorityHost; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -21,6 +20,7 @@ import thaumicenergistics.common.container.ContainerPriority; import thaumicenergistics.common.network.packet.server.Packet_S_ChangeGui; import thaumicenergistics.common.network.packet.server.Packet_S_Priority; import thaumicenergistics.common.parts.ThEPartBase; +import thaumicenergistics.common.registries.ThEStrings; /** * Gui for the priority window @@ -223,7 +223,7 @@ public class GuiPriority extends ThEBaseGui { this.ySize = GuiPriority.GUI_HEIGHT; // Set the title - this.title = GuiText.Priority.getLocal(); + this.title = ThEStrings.Gui_TitlePriority.getLocalized(); } @Override diff --git a/src/main/java/thaumicenergistics/common/registries/ThEStrings.java b/src/main/java/thaumicenergistics/common/registries/ThEStrings.java index 05895088..b1528324 100644 --- a/src/main/java/thaumicenergistics/common/registries/ThEStrings.java +++ b/src/main/java/thaumicenergistics/common/registries/ThEStrings.java @@ -99,11 +99,20 @@ public enum ThEStrings { // GUI Gui_TitleArcaneCraftingTerminal("gui.arcane.crafting.terminal.title", false), Gui_TitleEssentiaCell("gui.essentia.cell.title", false), + Gui_TitleEssentiaCellWorkbench("gui.essentia.cell.workbench.title", false), + Gui_TitleArcaneAssembler("gui.arcane.assembler.title", false), + Gui_TitleKnowledgeInscriber("gui.knowledge.inscriber.title", false), + Gui_TitleDistillationPatternEncoder("gui.distillation.encoder.title", false), + Gui_TitleEssentiaImportBus("gui.essentia.ImportBus.title", false), + Gui_TitleEssentiaExportBus("gui.essentia.ExportBus.title", false), + Gui_TitleEssentiaLevelEmitter("gui.essentia.levelemitter.title", false), + Gui_TitleEssentiaStorageBus("gui.essentia.StorageBus.title", false), + Gui_TitleEssentiaTerminal("gui.essentia.terminal.title", false), + Gui_TitlePriority("gui.priority.title", false), + Gui_SelectedAmount("gui.selected.amount", false), Gui_SelectedAspect("gui.selected.aspect", false), Gui_DigiVisSource("gui.digivis.source", true), - Gui_TitleEssentiaCellWorkbench("gui.essentia.cell.workbench.title", false), - Gui_TitleArcaneAssembler("gui.arcane.assembler.title", false), GUi_VibrationChamber_Stored("gui.vibration.chamber.stored", false), GUi_VibrationChamber_Processing("gui.vibration.chamber.processing", false); diff --git a/src/main/resources/assets/thaumicenergistics/lang/de_DE.lang b/src/main/resources/assets/thaumicenergistics/lang/de_DE.lang index 7613cd83..42ca589e 100644 --- a/src/main/resources/assets/thaumicenergistics/lang/de_DE.lang +++ b/src/main/resources/assets/thaumicenergistics/lang/de_DE.lang @@ -42,6 +42,17 @@ thaumicenergistics.tooltip.button.void.note=Nur bei Leeren-Gläsern möglich. #GUI thaumicenergistics.gui.arcane.crafting.terminal.title=Arkane Konsole thaumicenergistics.gui.essentia.cell.title=Essentia-Zelle +thaumicenergistics.gui.essentia.cell.workbench.title=Essentia Cell Workbench +thaumicenergistics.gui.arcane.assembler.title=Arcane Assembler +thaumicenergistics.gui.knowledge.inscriber.title=Knowledge Inscriber +thaumicenergistics.gui.distillation.encoder.title=Distillation Pattern Encoder +thaumicenergistics.gui.essentia.ImportBus.title=Essentia Import Bus +thaumicenergistics.gui.essentia.ExportBus.title=Essentia Export Bus +thaumicenergistics.gui.essentia.levelemitter.title=Essentia Level Emitter +thaumicenergistics.gui.essentia.StorageBus.title=Essentia Storage Bus +thaumicenergistics.gui.essentia.terminal.title=Essentia Terminal +thaumicenergistics.gui.priority.title=Priorität + thaumicenergistics.gui.selected.amount=Menge thaumicenergistics.gui.selected.aspect=Aspekt diff --git a/src/main/resources/assets/thaumicenergistics/lang/en_US.lang b/src/main/resources/assets/thaumicenergistics/lang/en_US.lang index 3d912b23..dc141f9c 100644 --- a/src/main/resources/assets/thaumicenergistics/lang/en_US.lang +++ b/src/main/resources/assets/thaumicenergistics/lang/en_US.lang @@ -89,15 +89,23 @@ thaumicenergistics.tooltip.advanced.infusion.provider.normal=Normal Provider thaumicenergistics.tooltip.advanced.infusion.provider.advanced=Advanced Provider thaumicenergistics.tooltip.advanced.infusion.provider.totalbind=Total bound to %d matrices - #GUI thaumicenergistics.gui.arcane.crafting.terminal.title=Arcane Terminal thaumicenergistics.gui.essentia.cell.title=Essentia Cell +thaumicenergistics.gui.essentia.cell.workbench.title=Essentia Cell Workbench +thaumicenergistics.gui.arcane.assembler.title=Arcane Assembler +thaumicenergistics.gui.knowledge.inscriber.title=Knowledge Inscriber +thaumicenergistics.gui.distillation.encoder.title=Distillation Pattern Encoder +thaumicenergistics.gui.essentia.ImportBus.title=Essentia Import Bus +thaumicenergistics.gui.essentia.ExportBus.title=Essentia Export Bus +thaumicenergistics.gui.essentia.levelemitter.title=Essentia Level Emitter +thaumicenergistics.gui.essentia.StorageBus.title=Essentia Storage Bus +thaumicenergistics.gui.essentia.terminal.title=Essentia Terminal +thaumicenergistics.gui.priority.title=Priority + thaumicenergistics.gui.selected.amount=Amount thaumicenergistics.gui.selected.aspect=Aspect thaumicenergistics.gui.digivis.source.name=DigiVis Source -thaumicenergistics.gui.essentia.cell.workbench.title=Essentia Cell Workbench -thaumicenergistics.gui.arcane.assembler.title=Arcane Assembler thaumicenergistics.gui.vibration.chamber.stored=Stored: %d %s thaumicenergistics.gui.vibration.chamber.processing=Processing: %s diff --git a/src/main/resources/assets/thaumicenergistics/lang/ko_KR.lang b/src/main/resources/assets/thaumicenergistics/lang/ko_KR.lang index 97d2d357..b05594a5 100644 --- a/src/main/resources/assets/thaumicenergistics/lang/ko_KR.lang +++ b/src/main/resources/assets/thaumicenergistics/lang/ko_KR.lang @@ -49,10 +49,20 @@ thaumicenergistics.tooltip.button.void.note=Only applies to void jars #GUI thaumicenergistics.gui.arcane.crafting.terminal.title=아케인 조합 단말기 thaumicenergistics.gui.essentia.cell.title=에센시아 셀 +thaumicenergistics.gui.essentia.cell.workbench.title=에센시아 셀 워크벤치 +thaumicenergistics.gui.arcane.assembler.title=Arcane Assembler +thaumicenergistics.gui.knowledge.inscriber.title=Knowledge Inscriber +thaumicenergistics.gui.distillation.encoder.title=Distillation Pattern Encoder +thaumicenergistics.gui.essentia.ImportBus.title=에센시아 입력 버스 +thaumicenergistics.gui.essentia.ExportBus.title=에센시아 출력 버스 +thaumicenergistics.gui.essentia.levelemitter.title=에센시아 레벨 방출기 +thaumicenergistics.gui.essentia.StorageBus.title=에센시아 저장 버스 +thaumicenergistics.gui.essentia.terminal.title=에센시아 단말기 +thaumicenergistics.gui.priority.title=우선순위 + thaumicenergistics.gui.selected.amount=양 thaumicenergistics.gui.selected.aspect=위상 thaumicenergistics.gui.digivis.source.name=디지센시아 소스 -thaumicenergistics.gui.essentia.cell.workbench.title.name=에센시아 셀 워크벤치 #Research Tab tc.research_category.thaumicenergistics=[TE] 사우믹 에너지스틱즈 diff --git a/src/main/resources/assets/thaumicenergistics/lang/ru_RU.lang b/src/main/resources/assets/thaumicenergistics/lang/ru_RU.lang index 343a2971..8360f21c 100644 --- a/src/main/resources/assets/thaumicenergistics/lang/ru_RU.lang +++ b/src/main/resources/assets/thaumicenergistics/lang/ru_RU.lang @@ -89,15 +89,23 @@ thaumicenergistics.tooltip.advanced.infusion.provider.normal=Нормальны thaumicenergistics.tooltip.advanced.infusion.provider.advanced=Улучшенный поставщик thaumicenergistics.tooltip.advanced.infusion.provider.totalbind=Всего привязано к %d матрицам - #GUI thaumicenergistics.gui.arcane.crafting.terminal.title=Магический терминал thaumicenergistics.gui.essentia.cell.title=Ячейка эссенции +thaumicenergistics.gui.essentia.cell.workbench.title=Верстак для ячеек эссенции +thaumicenergistics.gui.arcane.assembler.title=Магический сборщик +thaumicenergistics.gui.knowledge.inscriber.title=Высекатель знаний +thaumicenergistics.gui.distillation.encoder.title=Дистилляционный кодировщик шаблонов +thaumicenergistics.gui.essentia.ImportBus.title=Шина импорта эссенции +thaumicenergistics.gui.essentia.ExportBus.title=Шина экспорта эссенции +thaumicenergistics.gui.essentia.levelemitter.title=Излучатель уровня эссенции +thaumicenergistics.gui.essentia.StorageBus.title=Шина хранения эссенции +thaumicenergistics.gui.essentia.terminal.title=Терминал эссенции +thaumicenergistics.gui.priority.title=Приоритет + thaumicenergistics.gui.selected.amount=Количество thaumicenergistics.gui.selected.aspect=Аспект thaumicenergistics.gui.digivis.source.name=Источник ЦифроВис -thaumicenergistics.gui.essentia.cell.workbench.title=Верстак для ячеек эссенции -thaumicenergistics.gui.arcane.assembler.title=Магический сборщик thaumicenergistics.gui.vibration.chamber.stored=Хранится: %d %s thaumicenergistics.gui.vibration.chamber.processing=Прогресс: %s @@ -224,4 +232,4 @@ thaumicenergistics.research_page.TEGOLEMWIFIBACKPACK.ADVANCEDGOLEM=§nУлучш # Research Cell Microscope tc.research_name.thaumicenergistics.TECELLMICROSCOPE=Микроскопия ячеек tc.research_text.thaumicenergistics.TECELLMICROSCOPE=Воздушные кварки и Терра-кварки -thaumicenergistics.research_page.TECELLMICROSCOPE.1=Благодаря тщательному изучению и экспериментам вы разработали микроскопическое сканирующее устройство, которое может создавать детальное изображение энергии, содержащейся в ячейке хранения. Это сложная задача, требующая чтобы во время процесса камера находилась на земле.Все содержимое будет сканироваться так, как будто на неё смотрят через §lТаумометр§r. \ No newline at end of file +thaumicenergistics.research_page.TECELLMICROSCOPE.1=Благодаря тщательному изучению и экспериментам вы разработали микроскопическое сканирующее устройство, которое может создавать детальное изображение энергии, содержащейся в ячейке хранения. Это сложная задача, требующая чтобы во время процесса камера находилась на земле.Все содержимое будет сканироваться так, как будто на неё смотрят через §lТаумометр§r. diff --git a/src/main/resources/assets/thaumicenergistics/lang/zh_CN.lang b/src/main/resources/assets/thaumicenergistics/lang/zh_CN.lang index b53fa264..12ba73da 100644 --- a/src/main/resources/assets/thaumicenergistics/lang/zh_CN.lang +++ b/src/main/resources/assets/thaumicenergistics/lang/zh_CN.lang @@ -84,15 +84,23 @@ thaumicenergistics.tooltip.advanced.infusion.provider.normal=普通供应器 thaumicenergistics.tooltip.advanced.infusion.provider.advanced=进阶供应器 thaumicenergistics.tooltip.advanced.infusion.provider.totalbind=已绑定 %d 个矩阵 - #GUI thaumicenergistics.gui.arcane.crafting.terminal.title=奥术终端 thaumicenergistics.gui.essentia.cell.title=源质元件 +thaumicenergistics.gui.essentia.cell.workbench.title=源质元件工作台 +thaumicenergistics.gui.arcane.assembler.title=奥术装配室 +thaumicenergistics.gui.knowledge.inscriber.title=知识记录仪 +thaumicenergistics.gui.distillation.encoder.title=蒸馏编码台 +thaumicenergistics.gui.essentia.ImportBus.title=源质输入总线 +thaumicenergistics.gui.essentia.ExportBus.title=源质输出总线 +thaumicenergistics.gui.essentia.levelemitter.title=源质发信器 +thaumicenergistics.gui.essentia.StorageBus.title=源质存储总线 +thaumicenergistics.gui.essentia.terminal.title=源质终端 +thaumicenergistics.gui.priority.title=优先级 + thaumicenergistics.gui.selected.amount=数量 thaumicenergistics.gui.selected.aspect=要素 thaumicenergistics.gui.digivis.source.name=数位魔力源 -thaumicenergistics.gui.essentia.cell.workbench.title=源质元件工作台 -thaumicenergistics.gui.arcane.assembler.title=奥术装配室 thaumicenergistics.gui.vibration.chamber.stored=存储:%d %s thaumicenergistics.gui.vibration.chamber.processing=正在处理:%s