diff --git a/src/generated/resources/assets/expandedgt/lang/en_ud.json b/src/generated/resources/assets/expandedgt/lang/en_ud.json index 0343d41..de39f9b 100644 --- a/src/generated/resources/assets/expandedgt/lang/en_ud.json +++ b/src/generated/resources/assets/expandedgt/lang/en_ud.json @@ -16,6 +16,7 @@ "gui.expandedgt.Wildcard": "pɹɐɔpןıM ɐ sǝʇɐɔıpuIɹ§ *q§", "gui.expandedgt.XorNot": "⟘ONɐ§ =ɹ§ ¡q§ ᴚOXɐ§ =ɹ§ ^q§", "gui.tooltips.expandedgt.BoundTo": "%s oʇ punoᗺ", + "gui.tooltips.expandedgt.DualHatch": "8§%sq§ puɐ 8§%sq§ ǝɥʇ ɟo uoısɹǝʌ pǝuıqɯoɔ Ɐ8§", "gui.tooltips.expandedgt.EvenBigger": "sʇoןs 8§%sɐ§ ɥʇıʍ ʍou '8§%sq§ ɹǝbbıᗺ uǝʌƎ8§", "gui.tooltips.expandedgt.LinkedTermHint": "ʎɹoʇuǝʌuı ɹnoʎ ʇou 'ʞɹoʍʇǝu ƎW ɹnoʎ ɯoɹɟ sʞɔoןq ןןnd ʎןuo ןןıʍ sıɥ⟘ :ǝʇoNo§ɔ§", "gui.tooltips.expandedgt.ShiftInfo": "oɟuı ǝɹoɯ ɹoɟㄥ§ɹ§ ]⟘ℲIHS[o§ ssǝɹԀㄥ§", diff --git a/src/generated/resources/assets/expandedgt/lang/en_us.json b/src/generated/resources/assets/expandedgt/lang/en_us.json index 6a300fb..846a252 100644 --- a/src/generated/resources/assets/expandedgt/lang/en_us.json +++ b/src/generated/resources/assets/expandedgt/lang/en_us.json @@ -16,6 +16,7 @@ "gui.expandedgt.Wildcard": "§b* §rIndicates a Wildcard", "gui.expandedgt.XorNot": "§b^ §r= §aXOR §b! §r= §aNOT", "gui.tooltips.expandedgt.BoundTo": "Bound to %s", + "gui.tooltips.expandedgt.DualHatch": "§8A combined version of the §b%s§8 and §b%s§8", "gui.tooltips.expandedgt.EvenBigger": "§8Even Bigger §b%s§8, now with §a%s§8 slots", "gui.tooltips.expandedgt.LinkedTermHint": "§c§oNote: This will only pull blocks from your ME network, not your inventory", "gui.tooltips.expandedgt.ShiftInfo": "§7Press §o[SHIFT] §r§7for more info", diff --git a/src/main/kotlin/lu/kolja/expandedgt/definiton/ExpandedGTMachines.kt b/src/main/kotlin/lu/kolja/expandedgt/definiton/ExpandedGTMachines.kt index 2ddb308..2eb52e3 100644 --- a/src/main/kotlin/lu/kolja/expandedgt/definiton/ExpandedGTMachines.kt +++ b/src/main/kotlin/lu/kolja/expandedgt/definiton/ExpandedGTMachines.kt @@ -2,7 +2,6 @@ package lu.kolja.expandedgt.definiton import com.gregtechceu.gtceu.api.GTValues.UV import com.gregtechceu.gtceu.api.GTValues.ZPM -import com.gregtechceu.gtceu.api.capability.recipe.IO import com.gregtechceu.gtceu.api.data.RotationState import com.gregtechceu.gtceu.api.machine.MachineDefinition import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility @@ -10,6 +9,7 @@ import lu.kolja.expandedgt.ExpandedGT import lu.kolja.expandedgt.ExpandedGT.Companion.REGISTRATE import lu.kolja.expandedgt.lang.ExpTooltips import lu.kolja.expandedgt.util.sharedPart +import lu.kolja.expandedgt.util.translate import lu.kolja.expandedgt.xmod.* import lu.kolja.expandedgt.xmod.dual.DualMEInputHatchPartMachine import lu.kolja.expandedgt.xmod.dual.DualMEOutputHatchPartMachine @@ -26,7 +26,7 @@ object ExpandedGTMachines { .rotationState(RotationState.ALL) .abilities(PartAbility.IMPORT_FLUIDS) .colorOverlayTieredHullModel(ExpandedGT.makeId("block/overlay/ae2/expanded_me_input_hatch")) - .tooltips(ExpTooltips.EvenBigger.text("ME Input Hatch", 32)) + .tooltips(ExpTooltips.EvenBigger.text("block.gtceu.me_input_hatch".translate(), 32)) .sharedPart() .register() @@ -37,7 +37,7 @@ object ExpandedGTMachines { .rotationState(RotationState.ALL) .abilities(PartAbility.IMPORT_ITEMS) .colorOverlayTieredHullModel(ExpandedGT.makeId("block/overlay/ae2/expanded_me_input_bus")) - .tooltips(ExpTooltips.EvenBigger.text("ME Input Bus", 32)) + .tooltips(ExpTooltips.EvenBigger.text("block.gtceu.me_input_bus".translate(), 32)) .sharedPart() .register() @@ -48,7 +48,7 @@ object ExpandedGTMachines { .rotationState(RotationState.ALL) .abilities(PartAbility.IMPORT_FLUIDS) .colorOverlayTieredHullModel(ExpandedGT.makeId("block/overlay/ae2/expanded_me_stocking_input_hatch")) - .tooltips(ExpTooltips.EvenBigger.text("ME Stocking Input Hatch", 32)) + .tooltips(ExpTooltips.EvenBigger.text("block.gtceu.me_stocking_input_hatch".translate(), 32)) .sharedPart() .register() @@ -59,7 +59,7 @@ object ExpandedGTMachines { .rotationState(RotationState.ALL) .abilities(PartAbility.IMPORT_ITEMS) .colorOverlayTieredHullModel(ExpandedGT.makeId("block/overlay/ae2/expanded_me_stocking_input_bus")) - .tooltips(ExpTooltips.EvenBigger.text("ME Stocking Input Bus", 32)) + .tooltips(ExpTooltips.EvenBigger.text("block.gtceu.me_stocking_input_bus".translate(), 32)) .sharedPart() .register() @@ -70,7 +70,7 @@ object ExpandedGTMachines { .rotationState(RotationState.ALL) .abilities(PartAbility.IMPORT_ITEMS) .colorOverlayTieredHullModel(ExpandedGT.makeId("block/overlay/ae2/me_tag_filter_stocking_bus")) - .tooltips(ExpTooltips.TagFilterMachineTooltip.text("ME Stocking Input Bus")) + .tooltips(ExpTooltips.TagFilterMachineTooltip.text("block.gtceu.me_stocking_input_bus".translate())) .sharedPart() .register() @@ -81,7 +81,7 @@ object ExpandedGTMachines { .rotationState(RotationState.ALL) .abilities(PartAbility.IMPORT_FLUIDS) .colorOverlayTieredHullModel(ExpandedGT.makeId("block/overlay/ae2/me_tag_filter_stocking_hatch")) - .tooltips(ExpTooltips.TagFilterMachineTooltip.text("ME Stocking Input Hatch")) + .tooltips(ExpTooltips.TagFilterMachineTooltip.text("block.gtceu.me_stocking_input_hatch".translate())) .sharedPart() .register() @@ -93,7 +93,7 @@ object ExpandedGTMachines { .rotationState(RotationState.ALL) .abilities(PartAbility.EXPORT_FLUIDS, PartAbility.EXPORT_ITEMS) .colorOverlayTieredHullModel(ExpandedGT.makeId("block/overlay/ae2/dual_me_output_hatch")) - .tooltips(ExpTooltips.EvenBigger.text("Dual ME Output Hatch", 32)) + .tooltips(ExpTooltips.DualHatch.text("block.gtceu.me_output_bus".translate(), "block.gtceu.me_output_hatch".translate())) .sharedPart() .register() @@ -105,7 +105,7 @@ object ExpandedGTMachines { .rotationState(RotationState.ALL) .abilities(PartAbility.IMPORT_FLUIDS, PartAbility.IMPORT_ITEMS) .colorOverlayTieredHullModel(ExpandedGT.makeId("block/overlay/ae2/dual_me_input_hatch")) - .tooltips(ExpTooltips.EvenBigger.text("Dual ME Input Hatch", 32)) + .tooltips(ExpTooltips.DualHatch.text("block.gtceu.me_input_bus".translate(), "block.gtceu.me_input_hatch".translate())) .sharedPart() .register() } \ No newline at end of file diff --git a/src/main/kotlin/lu/kolja/expandedgt/lang/ExpTooltips.kt b/src/main/kotlin/lu/kolja/expandedgt/lang/ExpTooltips.kt index 9005260..0fe0f62 100644 --- a/src/main/kotlin/lu/kolja/expandedgt/lang/ExpTooltips.kt +++ b/src/main/kotlin/lu/kolja/expandedgt/lang/ExpTooltips.kt @@ -3,6 +3,7 @@ package lu.kolja.expandedgt.lang import appeng.core.localization.LocalizationEnum enum class ExpTooltips(var text: String): LocalizationEnum { + DualHatch("§8A combined version of the §b%s§8 and §b%s§8"), EvenBigger("§8Even Bigger §b%s§8, now with §a%s§8 slots"), TagFilterMachineTooltip("§8A better version of the §b%s§8, allowing you to also filter by tags"), TagFilterInfo("Left-click to add tags to the filter, right-click to copy tags to the clipboard"),