From f5f210641a62cbed7e050db3b5c2b28edfc56097 Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Tue, 2 Apr 2024 21:21:38 +0200 Subject: [PATCH] Added lang keys --- .../compass/nodes/generation/andesite.json | 2 +- .../compass/nodes/generation/basalt.json | 2 +- .../compass/nodes/generation/deepslate.json | 2 +- .../compass/nodes/generation/diorite.json | 2 +- .../compass/nodes/generation/endstone.json | 2 +- .../compass/nodes/generation/granite.json | 2 +- .../compass/nodes/generation/gravel.json | 4 +- .../compass/nodes/generation/red_sand.json | 4 +- .../gtceu/compass/nodes/generation/sand.json | 4 +- .../gtceu/compass/nodes/generation/stone.json | 2 +- .../gtceu/compass/nodes/generation/tuff.json | 4 +- .../resources/assets/gtceu/lang/en_ud.json | 82 +++++++++++-------- .../resources/assets/gtceu/lang/en_us.json | 82 +++++++++++-------- .../common/item/PortableScannerBehavior.java | 2 +- .../gtceu/data/lang/LangHandler.java | 82 +++++++++++-------- 15 files changed, 160 insertions(+), 118 deletions(-) diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/andesite.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/andesite.json index 163c386bad..c8ed09b96b 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/andesite.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/andesite.json @@ -117,7 +117,7 @@ ], "page": "gtceu:generation/andesite", "position": [ - -200, + -150, 150 ], "pre_nodes": [ diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/basalt.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/basalt.json index 2317afcc68..878fa0682d 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/basalt.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/basalt.json @@ -117,7 +117,7 @@ ], "page": "gtceu:generation/basalt", "position": [ - -150, + -100, 100 ], "pre_nodes": [ diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/deepslate.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/deepslate.json index 3b154d948e..e60fed8b1e 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/deepslate.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/deepslate.json @@ -117,7 +117,7 @@ ], "page": "gtceu:generation/deepslate", "position": [ - -100, + -50, 150 ], "pre_nodes": [ diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/diorite.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/diorite.json index 79f170447f..81c9b126c8 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/diorite.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/diorite.json @@ -117,7 +117,7 @@ ], "page": "gtceu:generation/diorite", "position": [ - -150, + -50, 50 ], "pre_nodes": [ diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/endstone.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/endstone.json index d8351ff6f0..ae8d8fec67 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/endstone.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/endstone.json @@ -117,7 +117,7 @@ ], "page": "gtceu:generation/endstone", "position": [ - -100, + -50, 100 ], "pre_nodes": [ diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/granite.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/granite.json index 9b4a15e9e8..74152de990 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/granite.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/granite.json @@ -117,7 +117,7 @@ ], "page": "gtceu:generation/granite", "position": [ - -200, + -150, 100 ], "pre_nodes": [ diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/gravel.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/gravel.json index 0e3993017d..82c47fecdc 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/gravel.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/gravel.json @@ -117,8 +117,8 @@ ], "page": "gtceu:generation/gravel", "position": [ - -50, - 150 + -150, + 50 ], "pre_nodes": [ "gtceu:generation/ore" diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/red_sand.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/red_sand.json index c227a98bd8..76ef30e78d 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/red_sand.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/red_sand.json @@ -117,8 +117,8 @@ ], "page": "gtceu:generation/red_sand", "position": [ - -50, - 50 + -100, + 150 ], "pre_nodes": [ "gtceu:generation/ore" diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/sand.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/sand.json index 9aeea21686..31aadcc6af 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/sand.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/sand.json @@ -117,8 +117,8 @@ ], "page": "gtceu:generation/sand", "position": [ - -100, - 50 + -200, + 100 ], "pre_nodes": [ "gtceu:generation/ore" diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/stone.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/stone.json index 6902f7991d..ed750f4803 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/stone.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/stone.json @@ -117,7 +117,7 @@ ], "page": "gtceu:generation/stone", "position": [ - -150, + -200, 150 ], "pre_nodes": [ diff --git a/src/generated/resources/assets/gtceu/compass/nodes/generation/tuff.json b/src/generated/resources/assets/gtceu/compass/nodes/generation/tuff.json index 05dfec8ae4..7c2615166b 100644 --- a/src/generated/resources/assets/gtceu/compass/nodes/generation/tuff.json +++ b/src/generated/resources/assets/gtceu/compass/nodes/generation/tuff.json @@ -117,8 +117,8 @@ ], "page": "gtceu:generation/tuff", "position": [ - -50, - 100 + -100, + 50 ], "pre_nodes": [ "gtceu:generation/ore" diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index a99108f602..3e020508cc 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -1,42 +1,49 @@ { "behavior.item_magnet.disabled": "pǝןqɐsıᗡ pןǝıℲ ɔıʇǝubɐWɔ§", "behavior.item_magnet.enabled": "pǝןqɐuƎ pןǝıℲ ɔıʇǝubɐWɐ§", + "behavior.portable_scanner.amp_per_sec": "Ɐ %s puoɔǝS ʇsɐꞀ", + "behavior.portable_scanner.bedrock_fluid.amount": "%s%% - %s %s :ʇısodǝᗡ uI pınןℲ", + "behavior.portable_scanner.bedrock_fluid.amount_unknown": "%s%% :ʇısodǝᗡ uI pınןℲ", + "behavior.portable_scanner.bedrock_fluid.nothing": "ɹ§buıɥʇoN9§ :ʇısodǝᗡ uI pınןℲ", + "behavior.portable_scanner.block_hardness": "%s :ǝɔuɐʇsısǝᴚ ʇsɐןᗺ %s :ssǝupɹɐH", + "behavior.portable_scanner.block_name": "%s :ɐʇɐᗡɐʇǝW %s :ǝɯɐN", + "behavior.portable_scanner.debug_cpu_load": "˙su%s ɟo ǝɯıʇ ʇsɹoʍ ɥʇıʍ sʞɔıʇ %s ɹǝʌo su%s~ ɟo pɐoן ∩ԀƆ ǝbɐɹǝʌⱯ", + "behavior.portable_scanner.debug_cpu_load_seconds": "˙spuoɔǝs %s sı sıɥ⟘", + "behavior.portable_scanner.debug_lag_count": "˙ɹǝʌɹǝS ǝɥʇ uo )sɯ%s uɐɥʇ ɹǝbuoן buıʞɐʇ buıɥʇʎuɐ( sbuıuɹɐM ǝʞıdS bɐꞀ %s pǝsnɐƆ", + "behavior.portable_scanner.debug_machine": "%s :ᗡI-ɐʇǝW", + "behavior.portable_scanner.debug_machine_invalid": "¡pıןɐʌuı ", + "behavior.portable_scanner.debug_machine_invalid_null=invalid! MetaTileEntity =": "¡ןןnu ", + "behavior.portable_scanner.debug_machine_valid": "pıןɐʌ ", + "behavior.portable_scanner.divider": "=========================", + "behavior.portable_scanner.energy_container_in": "Ɐ %s ʇɐ ∩Ǝ )%s( %s :NI xɐW", + "behavior.portable_scanner.energy_container_out": "Ɐ %s ʇɐ ∩Ǝ )%s( %s :⟘∩O xɐW", + "behavior.portable_scanner.energy_container_storage": "∩Ǝ %s / ∩Ǝ %s :ʎbɹǝuƎ", + "behavior.portable_scanner.eu_per_sec": "∩Ǝ %s puoɔǝS ʇsɐꞀ", + "behavior.portable_scanner.machine_disabled": "˙pǝןqɐsıᗡ", + "behavior.portable_scanner.machine_power_loss": "˙ssoן ɹǝʍod oʇ ǝnp uʍop ʇnɥS", + "behavior.portable_scanner.machine_progress": "%s / %s :pɐoꞀ/ssǝɹboɹԀ", + "behavior.portable_scanner.mode.caption": "%s :ǝpoɯ ʎɐןdsıᗡ", + "behavior.portable_scanner.mode.show_all_info": "oɟuı ןןɐ ʍoɥS", + "behavior.portable_scanner.mode.show_block_info": "oɟuı ʞɔoןq ʍoɥS", + "behavior.portable_scanner.mode.show_electrical_info": "oɟuı ןɐɔıɹʇɔǝןǝ ʍoɥS", + "behavior.portable_scanner.mode.show_environmental_info": "oɟuı ןɐʇuǝɯuoɹıʌuǝ ʍoɥS", + "behavior.portable_scanner.mode.show_machine_info": "oɟuı ǝuıɥɔɐɯ ʍoɥS", + "behavior.portable_scanner.mode.show_recipe_info": "oɟuı ǝdıɔǝɹ ʍoɥS", + "behavior.portable_scanner.muffled": "˙pǝןɟɟnW", + "behavior.portable_scanner.multiblock_energy_input": "%s :ɹǝı⟘ ʇ/∩Ǝ %s :ǝɯoɔuI ʎbɹǝuƎ xɐW", + "behavior.portable_scanner.multiblock_energy_output": "%s :ɹǝı⟘ ʇ/∩Ǝ %s :ʇndʇnO ʎbɹǝuƎ xɐW", + "behavior.portable_scanner.multiblock_maintenance": "%s :sɯǝןqoɹԀ", + "behavior.portable_scanner.multiblock_parallel": "%s :buıssǝɔoɹԀ ıʇןnW", + "behavior.portable_scanner.position": "----- %s :ᗡ %s :Z %s :ʎ %s :X -----", + "behavior.portable_scanner.state": "%s :%s", + "behavior.portable_scanner.tank": "%s Ꞁ %s / Ꞁ %s :%s ʞuɐ⟘", + "behavior.portable_scanner.tanks_empty": "ʎʇdɯƎ sʞuɐ⟘ ןןⱯ", + "behavior.portable_scanner.workable_consumption": "Ɐ %s ʇɐ ʇ/∩Ǝ %s :sǝs∩ ʎןqɐqoɹԀ", + "behavior.portable_scanner.workable_production": "Ɐ %s ʇɐ ʇ/∩Ǝ %s :sǝɔnpoɹԀ ʎןqɐqoɹԀ", + "behavior.portable_scanner.workable_progress": "s %s / s %s :ssǝɹboɹԀ", + "behavior.portable_scanner.workable_stored_energy": "∩Ǝ %s / ∩Ǝ %s :ʎbɹǝuƎ pǝɹoʇS", "behavior.prospector.not_enough_energy": "¡ʎbɹǝuƎ ɥbnouƎ ʇoN", "behavior.toggle_energy_consumer.tooltip": "ǝpoɯ ǝןbboʇ oʇ ǝs∩", - "behavior.tricorder.amp_per_sec": "Ɐ %s puoɔǝS ʇsɐꞀ", - "behavior.tricorder.bedrock_fluid.amount": "%s%% - %s %s :ʇısodǝᗡ uI pınןℲ", - "behavior.tricorder.bedrock_fluid.amount_unknown": "%s%% :ʇısodǝᗡ uI pınןℲ", - "behavior.tricorder.bedrock_fluid.nothing": "ɹ§buıɥʇoN9§ :ʇısodǝᗡ uI pınןℲ", - "behavior.tricorder.block_hardness": "%s :ǝɔuɐʇsısǝᴚ ʇsɐןᗺ %s :ssǝupɹɐH", - "behavior.tricorder.block_name": "%s :ɐʇɐᗡɐʇǝW %s :ǝɯɐN", - "behavior.tricorder.debug_cpu_load": "˙su%s ɟo ǝɯıʇ ʇsɹoʍ ɥʇıʍ sʞɔıʇ %s ɹǝʌo su%s~ ɟo pɐoן ∩ԀƆ ǝbɐɹǝʌⱯ", - "behavior.tricorder.debug_cpu_load_seconds": "˙spuoɔǝs %s sı sıɥ⟘", - "behavior.tricorder.debug_lag_count": "˙ɹǝʌɹǝS ǝɥʇ uo )sɯ%s uɐɥʇ ɹǝbuoן buıʞɐʇ buıɥʇʎuɐ( sbuıuɹɐM ǝʞıdS bɐꞀ %s pǝsnɐƆ", - "behavior.tricorder.debug_machine": "%s :ᗡI-ɐʇǝW", - "behavior.tricorder.debug_machine_invalid": "¡pıןɐʌuı ", - "behavior.tricorder.debug_machine_invalid_null=invalid! MetaTileEntity =": "¡ןןnu ", - "behavior.tricorder.debug_machine_valid": "pıןɐʌ ", - "behavior.tricorder.divider=========================": "", - "behavior.tricorder.energy_container_in": "Ɐ %s ʇɐ ∩Ǝ )%s( %s :NI xɐW", - "behavior.tricorder.energy_container_out": "Ɐ %s ʇɐ ∩Ǝ )%s( %s :⟘∩O xɐW", - "behavior.tricorder.energy_container_storage": "∩Ǝ %s / ∩Ǝ %s :ʎbɹǝuƎ", - "behavior.tricorder.eut_per_sec": "ʇ/∩Ǝ %s puoɔǝS ʇsɐꞀ", - "behavior.tricorder.machine_disabled": "˙pǝןqɐsıᗡ", - "behavior.tricorder.machine_power_loss": "˙ssoן ɹǝʍod oʇ ǝnp uʍop ʇnɥS", - "behavior.tricorder.machine_progress": "%s / %s :pɐoꞀ/ssǝɹboɹԀ", - "behavior.tricorder.muffled": "˙pǝןɟɟnW", - "behavior.tricorder.multiblock_energy_input": "%s :ɹǝı⟘ ʇ/∩Ǝ %s :ǝɯoɔuI ʎbɹǝuƎ xɐW", - "behavior.tricorder.multiblock_energy_output": "%s :ɹǝı⟘ ʇ/∩Ǝ %s :ʇndʇnO ʎbɹǝuƎ xɐW", - "behavior.tricorder.multiblock_maintenance": "%s :sɯǝןqoɹԀ", - "behavior.tricorder.multiblock_parallel": "%s :buıssǝɔoɹԀ ıʇןnW", - "behavior.tricorder.position": "----- %s :ᗡ %s :Z %s :ʎ %s :X -----", - "behavior.tricorder.state": "%s :%s", - "behavior.tricorder.tank": "%s Ꞁ %s / Ꞁ %s :%s ʞuɐ⟘", - "behavior.tricorder.tanks_empty": "ʎʇdɯƎ sʞuɐ⟘ ןןⱯ", - "behavior.tricorder.workable_consumption": "Ɐ %s ʇɐ ʇ/∩Ǝ %s :sǝs∩ ʎןqɐqoɹԀ", - "behavior.tricorder.workable_production": "Ɐ %s ʇɐ ʇ/∩Ǝ %s :sǝɔnpoɹԀ ʎןqɐqoɹԀ", - "behavior.tricorder.workable_progress": "s %s / s %s :ssǝɹboɹԀ", - "behavior.tricorder.workable_stored_energy": "∩Ǝ %s / ∩Ǝ %s :ʎbɹǝuƎ pǝɹoʇS", "behaviour.boor.by": "%s ʎq", "behaviour.hammer": ")ɯǝɥʇ buıʇʇıɥ ʎq( sǝuıɥɔɐW ɹoɟ buıןɟɟnW ɟɟo puɐ uo suɹn⟘", "behaviour.hoe": "ʇɹıp ןןıʇ uɐƆ", @@ -416,6 +423,13 @@ "block.gtceu.long_distance_fluid_pipeline_endpoint": "ʇuıodpuƎ ǝuıןǝdıԀ pınןℲ ǝɔuɐʇsıᗡ buoꞀ", "block.gtceu.long_distance_item_pipeline": "ǝuıןǝdıԀ ɯǝʇI ǝɔuɐʇsıᗡ buoꞀ", "block.gtceu.long_distance_item_pipeline_endpoint": "ʇuıodpuƎ ǝuıןǝdıԀ ɯǝʇI ǝɔuɐʇsıᗡ buoꞀ", + "block.gtceu.long_distance_item_pipeline_input_endpoint": "ʇuıodpuƎ ʇnduI", + "block.gtceu.long_distance_item_pipeline_input_pos": "%s :ʇnduI - ", + "block.gtceu.long_distance_item_pipeline_network_header": ":ʞɹoʍʇǝN", + "block.gtceu.long_distance_item_pipeline_no_network": "punoɟ ʞɹoʍʇǝu oN", + "block.gtceu.long_distance_item_pipeline_output_endpoint": "ʇuıodpuƎ ʇndʇnO", + "block.gtceu.long_distance_item_pipeline_output_pos": "%s :ʇndʇnO - ", + "block.gtceu.long_distance_item_pipeline_pipe_count": "%s :sǝdıԀ - ", "block.gtceu.lp_steam_alloy_smelter": "ɹǝʇןǝɯS ʎoןןⱯ ɯɐǝʇS ǝɹnssǝɹԀ ʍoꞀ", "block.gtceu.lp_steam_compressor": "ɹossǝɹdɯoƆ ɯɐǝʇS ǝɹnssǝɹԀ ʍoꞀ", "block.gtceu.lp_steam_extractor": "ɹoʇɔɐɹʇxƎ ɯɐǝʇS ǝɹnssǝɹԀ ʍoꞀ", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index 4ed15c2f37..ad7fc7e235 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -1,42 +1,49 @@ { "behavior.item_magnet.disabled": "§cMagnetic Field Disabled", "behavior.item_magnet.enabled": "§aMagnetic Field Enabled", + "behavior.portable_scanner.amp_per_sec": "Last Second %s A", + "behavior.portable_scanner.bedrock_fluid.amount": "Fluid In Deposit: %s %s - %s%%", + "behavior.portable_scanner.bedrock_fluid.amount_unknown": "Fluid In Deposit: %s%%", + "behavior.portable_scanner.bedrock_fluid.nothing": "Fluid In Deposit: §6Nothing§r", + "behavior.portable_scanner.block_hardness": "Hardness: %s Blast Resistance: %s", + "behavior.portable_scanner.block_name": "Name: %s MetaData: %s", + "behavior.portable_scanner.debug_cpu_load": "Average CPU load of ~%sns over %s ticks with worst time of %sns.", + "behavior.portable_scanner.debug_cpu_load_seconds": "This is %s seconds.", + "behavior.portable_scanner.debug_lag_count": "Caused %s Lag Spike Warnings (anything taking longer than %sms) on the Server.", + "behavior.portable_scanner.debug_machine": "Meta-ID: %s", + "behavior.portable_scanner.debug_machine_invalid": " invalid!", + "behavior.portable_scanner.debug_machine_invalid_null=invalid! MetaTileEntity =": " null!", + "behavior.portable_scanner.debug_machine_valid": " valid", + "behavior.portable_scanner.divider": "=========================", + "behavior.portable_scanner.energy_container_in": "Max IN: %s (%s) EU at %s A", + "behavior.portable_scanner.energy_container_out": "Max OUT: %s (%s) EU at %s A", + "behavior.portable_scanner.energy_container_storage": "Energy: %s EU / %s EU", + "behavior.portable_scanner.eu_per_sec": "Last Second %s EU", + "behavior.portable_scanner.machine_disabled": "Disabled.", + "behavior.portable_scanner.machine_power_loss": "Shut down due to power loss.", + "behavior.portable_scanner.machine_progress": "Progress/Load: %s / %s", + "behavior.portable_scanner.mode.caption": "Display mode: %s", + "behavior.portable_scanner.mode.show_all_info": "Show all info", + "behavior.portable_scanner.mode.show_block_info": "Show block info", + "behavior.portable_scanner.mode.show_electrical_info": "Show electrical info", + "behavior.portable_scanner.mode.show_environmental_info": "Show environmental info", + "behavior.portable_scanner.mode.show_machine_info": "Show machine info", + "behavior.portable_scanner.mode.show_recipe_info": "Show recipe info", + "behavior.portable_scanner.muffled": "Muffled.", + "behavior.portable_scanner.multiblock_energy_input": "Max Energy Income: %s EU/t Tier: %s", + "behavior.portable_scanner.multiblock_energy_output": "Max Energy Output: %s EU/t Tier: %s", + "behavior.portable_scanner.multiblock_maintenance": "Problems: %s", + "behavior.portable_scanner.multiblock_parallel": "Multi Processing: %s", + "behavior.portable_scanner.position": "----- X: %s Y: %s Z: %s D: %s -----", + "behavior.portable_scanner.state": "%s: %s", + "behavior.portable_scanner.tank": "Tank %s: %s L / %s L %s", + "behavior.portable_scanner.tanks_empty": "All Tanks Empty", + "behavior.portable_scanner.workable_consumption": "Probably Uses: %s EU/t at %s A", + "behavior.portable_scanner.workable_production": "Probably Produces: %s EU/t at %s A", + "behavior.portable_scanner.workable_progress": "Progress: %s s / %s s", + "behavior.portable_scanner.workable_stored_energy": "Stored Energy: %s EU / %s EU", "behavior.prospector.not_enough_energy": "Not Enough Energy!", "behavior.toggle_energy_consumer.tooltip": "Use to toggle mode", - "behavior.tricorder.amp_per_sec": "Last Second %s A", - "behavior.tricorder.bedrock_fluid.amount": "Fluid In Deposit: %s %s - %s%%", - "behavior.tricorder.bedrock_fluid.amount_unknown": "Fluid In Deposit: %s%%", - "behavior.tricorder.bedrock_fluid.nothing": "Fluid In Deposit: §6Nothing§r", - "behavior.tricorder.block_hardness": "Hardness: %s Blast Resistance: %s", - "behavior.tricorder.block_name": "Name: %s MetaData: %s", - "behavior.tricorder.debug_cpu_load": "Average CPU load of ~%sns over %s ticks with worst time of %sns.", - "behavior.tricorder.debug_cpu_load_seconds": "This is %s seconds.", - "behavior.tricorder.debug_lag_count": "Caused %s Lag Spike Warnings (anything taking longer than %sms) on the Server.", - "behavior.tricorder.debug_machine": "Meta-ID: %s", - "behavior.tricorder.debug_machine_invalid": " invalid!", - "behavior.tricorder.debug_machine_invalid_null=invalid! MetaTileEntity =": " null!", - "behavior.tricorder.debug_machine_valid": " valid", - "behavior.tricorder.divider=========================": "", - "behavior.tricorder.energy_container_in": "Max IN: %s (%s) EU at %s A", - "behavior.tricorder.energy_container_out": "Max OUT: %s (%s) EU at %s A", - "behavior.tricorder.energy_container_storage": "Energy: %s EU / %s EU", - "behavior.tricorder.eut_per_sec": "Last Second %s EU/t", - "behavior.tricorder.machine_disabled": "Disabled.", - "behavior.tricorder.machine_power_loss": "Shut down due to power loss.", - "behavior.tricorder.machine_progress": "Progress/Load: %s / %s", - "behavior.tricorder.muffled": "Muffled.", - "behavior.tricorder.multiblock_energy_input": "Max Energy Income: %s EU/t Tier: %s", - "behavior.tricorder.multiblock_energy_output": "Max Energy Output: %s EU/t Tier: %s", - "behavior.tricorder.multiblock_maintenance": "Problems: %s", - "behavior.tricorder.multiblock_parallel": "Multi Processing: %s", - "behavior.tricorder.position": "----- X: %s Y: %s Z: %s D: %s -----", - "behavior.tricorder.state": "%s: %s", - "behavior.tricorder.tank": "Tank %s: %s L / %s L %s", - "behavior.tricorder.tanks_empty": "All Tanks Empty", - "behavior.tricorder.workable_consumption": "Probably Uses: %s EU/t at %s A", - "behavior.tricorder.workable_production": "Probably Produces: %s EU/t at %s A", - "behavior.tricorder.workable_progress": "Progress: %s s / %s s", - "behavior.tricorder.workable_stored_energy": "Stored Energy: %s EU / %s EU", "behaviour.boor.by": "by %s", "behaviour.hammer": "Turns on and off Muffling for Machines (by hitting them)", "behaviour.hoe": "Can till dirt", @@ -416,6 +423,13 @@ "block.gtceu.long_distance_fluid_pipeline_endpoint": "Long Distance Fluid Pipeline Endpoint", "block.gtceu.long_distance_item_pipeline": "Long Distance Item Pipeline", "block.gtceu.long_distance_item_pipeline_endpoint": "Long Distance Item Pipeline Endpoint", + "block.gtceu.long_distance_item_pipeline_input_endpoint": "Input Endpoint", + "block.gtceu.long_distance_item_pipeline_input_pos": " - Input: %s", + "block.gtceu.long_distance_item_pipeline_network_header": "Network:", + "block.gtceu.long_distance_item_pipeline_no_network": "No network found", + "block.gtceu.long_distance_item_pipeline_output_endpoint": "Output Endpoint", + "block.gtceu.long_distance_item_pipeline_output_pos": " - Output: %s", + "block.gtceu.long_distance_item_pipeline_pipe_count": " - Pipes: %s", "block.gtceu.lp_steam_alloy_smelter": "Low Pressure Steam Alloy Smelter", "block.gtceu.lp_steam_compressor": "Low Pressure Steam Compressor", "block.gtceu.lp_steam_extractor": "Low Pressure Steam Extractor", diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/PortableScannerBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/PortableScannerBehavior.java index 9b80be573f..fd9085553d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/PortableScannerBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/PortableScannerBehavior.java @@ -57,7 +57,7 @@ public class PortableScannerBehavior implements IInteractionItem, IAddInformatio @Getter public enum DisplayMode { - SHOW_ALL("behavior.portable_scanner.mode.show_block_info"), + SHOW_ALL("behavior.portable_scanner.mode.show_all_info"), SHOW_BLOCK_INFO("behavior.portable_scanner.mode.show_block_info"), SHOW_MACHINE_INFO("behavior.portable_scanner.mode.show_machine_info"), SHOW_ELECTRICAL_INFO("behavior.portable_scanner.mode.show_electrical_info"), diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java index 1e71f21b1e..a4b8869c6e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java @@ -645,40 +645,47 @@ public static void init(RegistrateLangProvider provider) { provider.add("behavior.prospector.not_enough_energy", "Not Enough Energy!"); provider.add("metaitem.tricorder_scanner.tooltip", "Tricorder"); provider.add("metaitem.debug_scanner.tooltip", "Tricorder"); - provider.add("behavior.tricorder.position", "----- X: %s Y: %s Z: %s D: %s -----"); - provider.add("behavior.tricorder.block_hardness", "Hardness: %s Blast Resistance: %s"); - provider.add("behavior.tricorder.block_name", "Name: %s MetaData: %s"); - provider.add("behavior.tricorder.state", "%s: %s"); - provider.add("behavior.tricorder.divider=========================", ""); - provider.add("behavior.tricorder.tank", "Tank %s: %s L / %s L %s"); - provider.add("behavior.tricorder.tanks_empty", "All Tanks Empty"); - provider.add("behavior.tricorder.muffled", "Muffled."); - provider.add("behavior.tricorder.machine_disabled", "Disabled."); - provider.add("behavior.tricorder.machine_power_loss", "Shut down due to power loss."); - provider.add("behavior.tricorder.machine_progress", "Progress/Load: %s / %s"); - provider.add("behavior.tricorder.energy_container_in", "Max IN: %s (%s) EU at %s A"); - provider.add("behavior.tricorder.energy_container_out", "Max OUT: %s (%s) EU at %s A"); - provider.add("behavior.tricorder.energy_container_storage", "Energy: %s EU / %s EU"); - provider.add("behavior.tricorder.bedrock_fluid.amount", "Fluid In Deposit: %s %s - %s%%"); - provider.add("behavior.tricorder.bedrock_fluid.amount_unknown", "Fluid In Deposit: %s%%"); - provider.add("behavior.tricorder.bedrock_fluid.nothing", "Fluid In Deposit: §6Nothing§r"); - provider.add("behavior.tricorder.eut_per_sec", "Last Second %s EU/t"); - provider.add("behavior.tricorder.amp_per_sec", "Last Second %s A"); - provider.add("behavior.tricorder.workable_progress", "Progress: %s s / %s s"); - provider.add("behavior.tricorder.workable_stored_energy", "Stored Energy: %s EU / %s EU"); - provider.add("behavior.tricorder.workable_consumption", "Probably Uses: %s EU/t at %s A"); - provider.add("behavior.tricorder.workable_production", "Probably Produces: %s EU/t at %s A"); - provider.add("behavior.tricorder.multiblock_energy_input", "Max Energy Income: %s EU/t Tier: %s"); - provider.add("behavior.tricorder.multiblock_energy_output", "Max Energy Output: %s EU/t Tier: %s"); - provider.add("behavior.tricorder.multiblock_maintenance", "Problems: %s"); - provider.add("behavior.tricorder.multiblock_parallel", "Multi Processing: %s"); - provider.add("behavior.tricorder.debug_machine", "Meta-ID: %s"); - provider.add("behavior.tricorder.debug_machine_valid", " valid"); - provider.add("behavior.tricorder.debug_machine_invalid", " invalid!"); - provider.add("behavior.tricorder.debug_machine_invalid_null=invalid! MetaTileEntity =", " null!"); - provider.add("behavior.tricorder.debug_cpu_load", "Average CPU load of ~%sns over %s ticks with worst time of %sns."); - provider.add("behavior.tricorder.debug_cpu_load_seconds", "This is %s seconds."); - provider.add("behavior.tricorder.debug_lag_count", "Caused %s Lag Spike Warnings (anything taking longer than %sms) on the Server."); + provider.add("behavior.portable_scanner.amp_per_sec", "Last Second %s A"); + provider.add("behavior.portable_scanner.bedrock_fluid.amount", "Fluid In Deposit: %s %s - %s%%"); + provider.add("behavior.portable_scanner.bedrock_fluid.amount_unknown", "Fluid In Deposit: %s%%"); + provider.add("behavior.portable_scanner.bedrock_fluid.nothing", "Fluid In Deposit: §6Nothing§r"); + provider.add("behavior.portable_scanner.block_hardness", "Hardness: %s Blast Resistance: %s"); + provider.add("behavior.portable_scanner.block_name", "Name: %s MetaData: %s"); + provider.add("behavior.portable_scanner.debug_cpu_load", "Average CPU load of ~%sns over %s ticks with worst time of %sns."); + provider.add("behavior.portable_scanner.debug_cpu_load_seconds", "This is %s seconds."); + provider.add("behavior.portable_scanner.debug_lag_count", "Caused %s Lag Spike Warnings (anything taking longer than %sms) on the Server."); + provider.add("behavior.portable_scanner.debug_machine", "Meta-ID: %s"); + provider.add("behavior.portable_scanner.debug_machine_invalid", " invalid!"); + provider.add("behavior.portable_scanner.debug_machine_invalid_null=invalid! MetaTileEntity =", " null!"); + provider.add("behavior.portable_scanner.debug_machine_valid", " valid"); + provider.add("behavior.portable_scanner.divider", "========================="); + provider.add("behavior.portable_scanner.energy_container_in", "Max IN: %s (%s) EU at %s A"); + provider.add("behavior.portable_scanner.energy_container_out", "Max OUT: %s (%s) EU at %s A"); + provider.add("behavior.portable_scanner.energy_container_storage", "Energy: %s EU / %s EU"); + provider.add("behavior.portable_scanner.eu_per_sec", "Last Second %s EU"); + provider.add("behavior.portable_scanner.machine_disabled", "Disabled."); + provider.add("behavior.portable_scanner.machine_power_loss", "Shut down due to power loss."); + provider.add("behavior.portable_scanner.machine_progress", "Progress/Load: %s / %s"); + provider.add("behavior.portable_scanner.muffled", "Muffled."); + provider.add("behavior.portable_scanner.multiblock_energy_input", "Max Energy Income: %s EU/t Tier: %s"); + provider.add("behavior.portable_scanner.multiblock_energy_output", "Max Energy Output: %s EU/t Tier: %s"); + provider.add("behavior.portable_scanner.multiblock_maintenance", "Problems: %s"); + provider.add("behavior.portable_scanner.multiblock_parallel", "Multi Processing: %s"); + provider.add("behavior.portable_scanner.position", "----- X: %s Y: %s Z: %s D: %s -----"); + provider.add("behavior.portable_scanner.state", "%s: %s"); + provider.add("behavior.portable_scanner.tank", "Tank %s: %s L / %s L %s"); + provider.add("behavior.portable_scanner.tanks_empty", "All Tanks Empty"); + provider.add("behavior.portable_scanner.workable_consumption", "Probably Uses: %s EU/t at %s A"); + provider.add("behavior.portable_scanner.workable_production", "Probably Produces: %s EU/t at %s A"); + provider.add("behavior.portable_scanner.workable_progress", "Progress: %s s / %s s"); + provider.add("behavior.portable_scanner.workable_stored_energy", "Stored Energy: %s EU / %s EU"); + provider.add("behavior.portable_scanner.mode.caption", "Display mode: %s"); + provider.add("behavior.portable_scanner.mode.show_all_info", "Show all info"); + provider.add("behavior.portable_scanner.mode.show_block_info", "Show block info"); + provider.add("behavior.portable_scanner.mode.show_machine_info", "Show machine info"); + provider.add("behavior.portable_scanner.mode.show_electrical_info", "Show electrical info"); + provider.add("behavior.portable_scanner.mode.show_recipe_info", "Show recipe info"); + provider.add("behavior.portable_scanner.mode.show_environmental_info", "Show environmental info"); provider.add("behavior.item_magnet.enabled", "§aMagnetic Field Enabled"); provider.add("behavior.item_magnet.disabled", "§cMagnetic Field Disabled"); provider.add("metaitem.terminal.tooltip", "Sharp tools make good work"); @@ -814,6 +821,13 @@ public static void init(RegistrateLangProvider provider) { "Connect with §fLong Distance Pipe§7 blocks to create a pipeline.", "Pipelines must have exactly §f1 Input§7 and §f1 Output§7 endpoint.", "Only pipeline endpoints need to be §fchunk-loaded§7."); + provider.add("block.gtceu.long_distance_item_pipeline_no_network", "No network found"); + provider.add("block.gtceu.long_distance_item_pipeline_input_endpoint", "Input Endpoint"); + provider.add("block.gtceu.long_distance_item_pipeline_output_endpoint", "Output Endpoint"); + provider.add("block.gtceu.long_distance_item_pipeline_network_header", "Network:"); + provider.add("block.gtceu.long_distance_item_pipeline_pipe_count", " - Pipes: %s"); + provider.add("block.gtceu.long_distance_item_pipeline_input_pos", " - Input: %s"); + provider.add("block.gtceu.long_distance_item_pipeline_output_pos", " - Output: %s"); provider.add("gtceu.machine.endpoint.tooltip.min_length", "§bMinimum Endpoint Distance: §f%d Blocks"); provider.add("gtceu.universal.disabled", "Multiblock Sharing §4Disabled");