From 64dc6fcabbdd65b7a158b97bd7bac960819156c2 Mon Sep 17 00:00:00 2001 From: SuperCoder79 <25208576+SuperCoder7979@users.noreply.github.com> Date: Tue, 19 Jul 2022 11:03:28 -0400 Subject: [PATCH 1/2] Improve deployer goggle tooltip --- src/generated/resources/.cache/cache | 32 +++++++-------- .../resources/assets/create/lang/en_us.json | 4 ++ .../assets/create/lang/unfinished/de_de.json | 6 ++- .../assets/create/lang/unfinished/es_cl.json | 6 ++- .../assets/create/lang/unfinished/es_es.json | 6 ++- .../assets/create/lang/unfinished/fr_fr.json | 6 ++- .../assets/create/lang/unfinished/it_it.json | 6 ++- .../assets/create/lang/unfinished/ja_jp.json | 6 ++- .../assets/create/lang/unfinished/ko_kr.json | 6 ++- .../assets/create/lang/unfinished/nl_nl.json | 6 ++- .../assets/create/lang/unfinished/pl_pl.json | 6 ++- .../assets/create/lang/unfinished/pt_br.json | 6 ++- .../assets/create/lang/unfinished/pt_pt.json | 6 ++- .../assets/create/lang/unfinished/ro_ro.json | 6 ++- .../assets/create/lang/unfinished/ru_ru.json | 6 ++- .../assets/create/lang/unfinished/zh_cn.json | 6 ++- .../assets/create/lang/unfinished/zh_tw.json | 6 ++- .../deployer/DeployerTileEntity.java | 40 +++++++++++++++++++ .../assets/create/lang/default/interface.json | 5 +++ 19 files changed, 140 insertions(+), 31 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 5bf871ea3..4bad4631f 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -559,22 +559,22 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json f85edc574ee6de0de7693ffb031266643db6724a assets/create/lang/en_ud.json -f9fcf3163210806f6cea642b13d36632f3f3c533 assets/create/lang/en_us.json -fcf6c0723f89de67ab5f30e01305522b236bd824 assets/create/lang/unfinished/de_de.json -9083ade329d6b2c7469339f2c7ab54d7866f90ff assets/create/lang/unfinished/es_cl.json -db21f76f89573602c77b988371453013bac530cb assets/create/lang/unfinished/es_es.json -b1ed4fc7258f6fb93127e84ed4364f7cc224be2b assets/create/lang/unfinished/fr_fr.json -7cf94dae2536d27f32cfe7aad3a9a9eb7b9978ac assets/create/lang/unfinished/it_it.json -b8252343025f1555ae717e03b7503bfd9c1069f7 assets/create/lang/unfinished/ja_jp.json -bcc01ee88c1877e46f280c967d92b506d328b08d assets/create/lang/unfinished/ko_kr.json -4fd2bf884f18bf833d9819aed2f6fe83cc8ea9a6 assets/create/lang/unfinished/nl_nl.json -e32d5b48ca498b97e036f5cdf0f3b4192b478adf assets/create/lang/unfinished/pl_pl.json -f9d8fdca30725e5e340f7c2727eb3da197081a25 assets/create/lang/unfinished/pt_br.json -f5648cf550a440d2c60dcb7f8b4605d89f0f9713 assets/create/lang/unfinished/pt_pt.json -6f283e7589df6c2293be271846535887bf5a288c assets/create/lang/unfinished/ro_ro.json -119f9953874f07d016fd9602510221de0cd1730b assets/create/lang/unfinished/ru_ru.json -6a5ab805701021b67b4585f0ae014e4b509d8c45 assets/create/lang/unfinished/zh_cn.json -a6eff86622e24eda8f490587734c19526d0c6ecf assets/create/lang/unfinished/zh_tw.json +e7f1b8936615740097ac1104733b4a07e7778653 assets/create/lang/en_us.json +4489bc5eb72bee06f3b69063da1d20e3fd553f78 assets/create/lang/unfinished/de_de.json +be902a94314922103460c7f299aa66aacf0b9ab6 assets/create/lang/unfinished/es_cl.json +b50b0ce3d361177557d4c040f0d59968a1a1a0cb assets/create/lang/unfinished/es_es.json +d358cfb91006a018d80906c983a96df1564ae032 assets/create/lang/unfinished/fr_fr.json +4e37b4a1558189162e871d90e7e7b8a91309097f assets/create/lang/unfinished/it_it.json +c3a30c7f396e79039c6d16f2787bb68ebaa8c3ac assets/create/lang/unfinished/ja_jp.json +5c8ef3dfab9f3e9b6a29d2cab2823b18ee4e1ce0 assets/create/lang/unfinished/ko_kr.json +022e7d040a6fa1ab11edeb9dc0c4dbb530a85564 assets/create/lang/unfinished/nl_nl.json +e9f67952f6c3715fed3b0fcdc76400cc84ee7cb0 assets/create/lang/unfinished/pl_pl.json +fa073688fdee7c92e5e3affc28afc329652b54cb assets/create/lang/unfinished/pt_br.json +4ebb68c5eb6964ca5081f74416d8a624fdeaef60 assets/create/lang/unfinished/pt_pt.json +b7f314a1ac2595651ec4578add55525387c734db assets/create/lang/unfinished/ro_ro.json +e4e579dd51ed56332d638de3c737e917780a18e5 assets/create/lang/unfinished/ru_ru.json +008b8c52a59d08e0e8f26a09521be9e5d93ff8aa assets/create/lang/unfinished/zh_cn.json +ebc88d8b1f6115b6c3303ec4357c565049888a96 assets/create/lang/unfinished/zh_tw.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index a0116afcb..6d17dc086 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1365,6 +1365,10 @@ "create.tooltip.chute.fans_pull_up": "Fans pull from Above", "create.tooltip.chute.fans_pull_down": "Fans pull from Below", "create.tooltip.chute.contains": "Contains: %1$s x%2$s", + "create.tooltip.deployer.header": "Deployer Information", + "create.tooltip.deployer.using": "Deployer is Using", + "create.tooltip.deployer.punching": "Deployer is Punching", + "create.tooltip.deployer.contains": "Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "Currently distributing:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "Right-Click to retrieve", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index 20c218374..01dce59f8 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1330", + "_": "Missing Localizations: 1334", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "Propeller ziehen von oberhalb", "create.tooltip.chute.fans_pull_down": "Propeller ziehen von unterhalb", "create.tooltip.chute.contains": "Enthält: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "Verteilt derzeit:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "Rechtsklicken, um zu entnehmen", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_cl.json b/src/generated/resources/assets/create/lang/unfinished/es_cl.json index ca1351047..d9424802f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_cl.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_cl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 980", + "_": "Missing Localizations: 984", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "Ventiladores tirando desde arriba", "create.tooltip.chute.fans_pull_down": "Ventiladores tirando desde abajo", "create.tooltip.chute.contains": "Contiene: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "Actualmente distribuyendo:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "Click-Derecho para recuperar", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index fb4a2413d..6efa96981 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 644", + "_": "Missing Localizations: 648", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "Los ventiladores tiran desde arriba", "create.tooltip.chute.fans_pull_down": "Los ventiladores tiran desde abajo", "create.tooltip.chute.contains": "Contiene: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "Actualmente distribuye:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "Haga clic derecho para recuperar", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index ee1c3f676..8d03f7623 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2131", + "_": "Missing Localizations: 2135", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "UNLOCALIZED: Fans pull from Above", "create.tooltip.chute.fans_pull_down": "UNLOCALIZED: Fans pull from Below", "create.tooltip.chute.contains": "UNLOCALIZED: Contains: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "UNLOCALIZED: Currently distributing:", "create.tooltip.brass_tunnel.contains_entry": "UNLOCALIZED: > %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "UNLOCALIZED: Right-Click to retrieve", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 626ff0dd5..898644760 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1902", + "_": "Missing Localizations: 1906", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "I ventilatori tirano da sopra", "create.tooltip.chute.fans_pull_down": "I ventilatori tirano da sotto", "create.tooltip.chute.contains": "Contiene: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "UNLOCALIZED: Currently distributing:", "create.tooltip.brass_tunnel.contains_entry": "UNLOCALIZED: > %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "UNLOCALIZED: Right-Click to retrieve", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index 12107c8c9..7540c6563 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 646", + "_": "Missing Localizations: 650", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "ファンが上から吸い込んでいます", "create.tooltip.chute.fans_pull_down": "ファンが下から吸い込んでいます", "create.tooltip.chute.contains": "内容物: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "配布中", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "右クリックで取り出し", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index ce10bb801..ea19c5d03 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 646", + "_": "Missing Localizations: 650", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "선풍기가 위에서 당김", "create.tooltip.chute.fans_pull_down": "선풍기가 아래에서 당김", "create.tooltip.chute.contains": "들어있는 아이템: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "분배 중인 아이템:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "우클릭하여 회수", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index 573e6a3f5..84bec7652 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2479", + "_": "Missing Localizations: 2483", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "UNLOCALIZED: Fans pull from Above", "create.tooltip.chute.fans_pull_down": "UNLOCALIZED: Fans pull from Below", "create.tooltip.chute.contains": "UNLOCALIZED: Contains: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "UNLOCALIZED: Currently distributing:", "create.tooltip.brass_tunnel.contains_entry": "UNLOCALIZED: > %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "UNLOCALIZED: Right-Click to retrieve", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index 7e184a856..16357e187 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1019", + "_": "Missing Localizations: 1023", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "Wiatraki ciągną od góry", "create.tooltip.chute.fans_pull_down": "Wiatraki ciągną od dołu", "create.tooltip.chute.contains": "Zawiera: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "Aktualnie przenosi:", "create.tooltip.brass_tunnel.contains_entry": "> %2$sx %1$s", "create.tooltip.brass_tunnel.retrieve": "Kliknij prawym przyciskiem aby zabrać", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index 070e9be01..902967806 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1513", + "_": "Missing Localizations: 1517", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "Ventiladores sugam de cima", "create.tooltip.chute.fans_pull_down": "Ventiladores sugam de baixo", "create.tooltip.chute.contains": "Contem: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "Distribuindo:", "create.tooltip.brass_tunnel.contains_entry": " > %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "Clique direito para recuperar item", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json index 495bcb454..4a770c853 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2188", + "_": "Missing Localizations: 2192", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "UNLOCALIZED: Fans pull from Above", "create.tooltip.chute.fans_pull_down": "UNLOCALIZED: Fans pull from Below", "create.tooltip.chute.contains": "UNLOCALIZED: Contains: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "UNLOCALIZED: Currently distributing:", "create.tooltip.brass_tunnel.contains_entry": "UNLOCALIZED: > %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "UNLOCALIZED: Right-Click to retrieve", diff --git a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json index ca47740a9..3896b6c1c 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json +++ b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 647", + "_": "Missing Localizations: 651", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "Ventilatoarele trag de Sus", "create.tooltip.chute.fans_pull_down": "Ventilatoarele trag de Jos", "create.tooltip.chute.contains": "Conține: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "Distribuie Curent:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "Click Dreapta pentru a recupera", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index a36d7059d..e5820ce26 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1", + "_": "Missing Localizations: 5", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "Вентилятор тянет сверху", "create.tooltip.chute.fans_pull_down": "Вентилятор тянет снизу", "create.tooltip.chute.contains": "Содержит: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "В данный момент раздает(выдает):", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "ПКМ, чтобы получить", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index 84c200c7a..242d853c7 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 644", + "_": "Missing Localizations: 648", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "鼓风机从上方进行吸引", "create.tooltip.chute.fans_pull_down": "鼓风机从下方进行吸引", "create.tooltip.chute.contains": "内含物品：%1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "目前分配：", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "右击取出", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json index b5c7bb1c5..681ff3a59 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1038", + "_": "Missing Localizations: 1042", "_": "->------------------------] Game Elements [------------------------<-", @@ -1366,6 +1366,10 @@ "create.tooltip.chute.fans_pull_up": "鼓風機從下方進行吸引", "create.tooltip.chute.fans_pull_down": "鼓風機從上方進行吸引", "create.tooltip.chute.contains": "物品: %1$s x%2$s", + "create.tooltip.deployer.header": "UNLOCALIZED: Deployer Information", + "create.tooltip.deployer.using": "UNLOCALIZED: Deployer is Using", + "create.tooltip.deployer.punching": "UNLOCALIZED: Deployer is Punching", + "create.tooltip.deployer.contains": "UNLOCALIZED: Holding: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "正在處理", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "右鍵取回", diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java index 72ad80ce4..5a56f7761 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java @@ -12,6 +12,7 @@ import com.jozufozu.flywheel.core.PartialModel; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.content.contraptions.base.IRotate.StressImpact; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.itemAssembly.SequencedAssemblyRecipe; import com.simibubi.create.content.curiosities.tools.SandPaperItem; @@ -22,16 +23,19 @@ import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProcessingBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; +import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.animation.LerpedFloat; +import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -459,6 +463,42 @@ public class DeployerTileEntity extends KineticTileEntity { return true; } + @Override + public boolean addToGoggleTooltip(List tooltip, boolean isPlayerSneaking) { + Lang.translate("tooltip.deployer.header") + .forGoggles(tooltip); + + float stressAtBase = calculateStressApplied(); + + if (StressImpact.isEnabled() && !Mth.equal(stressAtBase, 0)) { + Lang.translate("tooltip.stressImpact") + .style(GRAY) + .forGoggles(tooltip); + + float stressTotal = stressAtBase * Math.abs(getTheoreticalSpeed()); + + Lang.number(stressTotal) + .translate("generic.unit.stress") + .style(ChatFormatting.AQUA) + .space() + .add(Lang.translate("gui.goggles.at_current_speed") + .style(ChatFormatting.DARK_GRAY)) + .forGoggles(tooltip, 1); + } + + Lang.translate("tooltip.deployer." + (mode == Mode.USE ? "using" : "punching")) + .style(ChatFormatting.YELLOW) + .forGoggles(tooltip); + + if (!heldItem.isEmpty()) { + Lang.translate("tooltip.deployer.contains", new TranslatableComponent(heldItem.getDescriptionId()).getString(), heldItem.getCount()) + .style(ChatFormatting.GREEN) + .forGoggles(tooltip); + } + + return true; + } + @OnlyIn(Dist.CLIENT) public float getHandOffset(float partialTicks) { if (isVirtual()) diff --git a/src/main/resources/assets/create/lang/default/interface.json b/src/main/resources/assets/create/lang/default/interface.json index 84cb246e4..98678bfbc 100644 --- a/src/main/resources/assets/create/lang/default/interface.json +++ b/src/main/resources/assets/create/lang/default/interface.json @@ -529,6 +529,11 @@ "create.tooltip.chute.fans_pull_down": "Fans pull from Below", "create.tooltip.chute.contains": "Contains: %1$s x%2$s", + "create.tooltip.deployer.header": "Deployer Information", + "create.tooltip.deployer.using": "Deployer is Using", + "create.tooltip.deployer.punching": "Deployer is Punching", + "create.tooltip.deployer.contains": "Holding: %1$s x%2$s", + "create.tooltip.brass_tunnel.contains": "Currently distributing:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "Right-Click to retrieve", From ca9e30889135d7ac0875e1f884490cac63c85432 Mon Sep 17 00:00:00 2001 From: SuperCoder79 <25208576+SuperCoder7979@users.noreply.github.com> Date: Tue, 19 Jul 2022 11:12:04 -0400 Subject: [PATCH 2/2] Fix import --- .../contraptions/components/deployer/DeployerTileEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java index 5a56f7761..d3973d07b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java @@ -472,7 +472,7 @@ public class DeployerTileEntity extends KineticTileEntity { if (StressImpact.isEnabled() && !Mth.equal(stressAtBase, 0)) { Lang.translate("tooltip.stressImpact") - .style(GRAY) + .style(ChatFormatting.GRAY) .forGoggles(tooltip); float stressTotal = stressAtBase * Math.abs(getTheoreticalSpeed());