diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 056bba70a..751345e2f 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 -e7f1b8936615740097ac1104733b4a07e7778653 assets/create/lang/en_us.json -c7648afaddb071fa781b341ada4cc246efd13ebe assets/create/lang/unfinished/de_de.json -be902a94314922103460c7f299aa66aacf0b9ab6 assets/create/lang/unfinished/es_cl.json -d21e553df8120d658acf1de99e2fb1ed38133659 assets/create/lang/unfinished/es_es.json -d358cfb91006a018d80906c983a96df1564ae032 assets/create/lang/unfinished/fr_fr.json -f1356bd4507e49751126446bdc607f29c1dd80c3 assets/create/lang/unfinished/it_it.json -c3a30c7f396e79039c6d16f2787bb68ebaa8c3ac assets/create/lang/unfinished/ja_jp.json -711c41782772ab9d0de06d76c70600ba37412542 assets/create/lang/unfinished/ko_kr.json -022e7d040a6fa1ab11edeb9dc0c4dbb530a85564 assets/create/lang/unfinished/nl_nl.json -1b8fe7bbf2a312d3cbc1680116dab2b620d08c4d assets/create/lang/unfinished/pl_pl.json -90fd5500247f22dbed498b350e6331b1d5dadd81 assets/create/lang/unfinished/pt_br.json -4ebb68c5eb6964ca5081f74416d8a624fdeaef60 assets/create/lang/unfinished/pt_pt.json -b7f314a1ac2595651ec4578add55525387c734db assets/create/lang/unfinished/ro_ro.json -7b72045f7f9de2f80ba78eb9caad7d081e7ee38f assets/create/lang/unfinished/ru_ru.json -2ef4e37bf007e3cf6e5b14819048cb80e6d84628 assets/create/lang/unfinished/zh_cn.json -ebc88d8b1f6115b6c3303ec4357c565049888a96 assets/create/lang/unfinished/zh_tw.json +7af10a14db169232d2bc4a564e7e2f204f7de8fc assets/create/lang/en_us.json +603af7f8a80b09da7ef5765f2aa863bbef1fc8ea assets/create/lang/unfinished/de_de.json +83e92f5c2516919b59b4d015814ce3f0cdaca948 assets/create/lang/unfinished/es_cl.json +ee47168049448ffa0959210d8f06b8f4b7219c85 assets/create/lang/unfinished/es_es.json +ceea8ef9caee6d0eafa27f0d6c959d732a544f52 assets/create/lang/unfinished/fr_fr.json +d4266c22c1265a2ef0784a13b223e4bb17ec11d0 assets/create/lang/unfinished/it_it.json +b17fe248508a55a47ab7b685ee72f5aec199bd48 assets/create/lang/unfinished/ja_jp.json +f642160ce3c6ffe0ded12c7e05a15cb6536c4def assets/create/lang/unfinished/ko_kr.json +b63513673554b0ed939ef66f65896be678e8c0d2 assets/create/lang/unfinished/nl_nl.json +c498bb7eb6f030b7b4934882e8bfc418dd8f6174 assets/create/lang/unfinished/pl_pl.json +b9e51c59ae50ae274d0c56f60803d8a397524547 assets/create/lang/unfinished/pt_br.json +bb1b327b6a0ffd6fb416f78a276b4269071d50c0 assets/create/lang/unfinished/pt_pt.json +823a9e54460d3840a089ea04ed8c97b9d62ca4d5 assets/create/lang/unfinished/ro_ro.json +eb144197fc255fef12b57c8aa82789d93737f144 assets/create/lang/unfinished/ru_ru.json +1fba9ab348aa9cbae212657aeec53f577aca19ab assets/create/lang/unfinished/zh_cn.json +fadbc9906e1859f62e451d3b89e210c9b8b7a4c4 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 6d17dc086..0e9bf4a3a 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1366,9 +1366,9 @@ "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.deployer.using": "Mode: Use", + "create.tooltip.deployer.punching": "Mode: Attack", + "create.tooltip.deployer.contains": "Item: %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 bce4a8e5c..4cfa2ea3a 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 d9424802f..7e64c3997 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_cl.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_cl.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 3f0479c16..cd7858cf6 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 8d03f7623..d1a89c2a2 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 1f1a1476a..0f3874f03 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1367,9 +1367,9 @@ "create.tooltip.chute.fans_pull_down": "Il ventilatore tira 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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "Sta distribuendo:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s", "create.tooltip.brass_tunnel.retrieve": "Click destro per recuperare", 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 7540c6563..8acd5879b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 14699ff3c..0731039b0 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 84bec7652..97dd84710 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 303390521..43ab34a65 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 b78ded95a..4a8761223 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 4a770c853..945cd07c0 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 3896b6c1c..7bd844304 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json +++ b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 959f61ca1..23607e4da 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 84718ce7c..84ca18922 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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 681ff3a59..e47e95c21 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1367,9 +1367,9 @@ "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.deployer.using": "UNLOCALIZED: Mode: Use", + "create.tooltip.deployer.punching": "UNLOCALIZED: Mode: Attack", + "create.tooltip.deployer.contains": "UNLOCALIZED: Item: %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/base/KineticTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java index 4f875beb6..3996a5ab3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java @@ -35,6 +35,7 @@ import net.minecraft.core.Direction.AxisDirection; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.Mth; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; @@ -396,28 +397,32 @@ public class KineticTileEntity extends SmartTileEntity implements IHaveGoggleInf boolean notFastEnough = !isSpeedRequirementFulfilled() && getSpeed() != 0; if (overStressed && AllConfigs.CLIENT.enableOverstressedTooltip.get()) { - tooltip.add(componentSpacing.plainCopy() - .append(Lang.translateDirect("gui.stressometer.overstressed") - .withStyle(GOLD))); + Lang.translate("gui.stressometer.overstressed") + .style(GOLD) + .forGoggles(tooltip); Component hint = Lang.translateDirect("gui.contraptions.network_overstressed"); List cutString = TooltipHelper.cutTextComponent(hint, GRAY, ChatFormatting.WHITE); for (int i = 0; i < cutString.size(); i++) - tooltip.add(componentSpacing.plainCopy() - .append(cutString.get(i))); + Lang.builder() + .add(cutString.get(i) + .copy()) + .forGoggles(tooltip); return true; } if (notFastEnough) { - tooltip.add(componentSpacing.plainCopy() - .append(Lang.translateDirect("tooltip.speedRequirement") - .withStyle(GOLD))); - Component hint = + Lang.translate("tooltip.speedRequirement") + .style(GOLD) + .forGoggles(tooltip); + MutableComponent hint = Lang.translateDirect("gui.contraptions.not_fast_enough", I18n.get(getBlockState().getBlock() .getDescriptionId())); List cutString = TooltipHelper.cutTextComponent(hint, GRAY, ChatFormatting.WHITE); for (int i = 0; i < cutString.size(); i++) - tooltip.add(componentSpacing.plainCopy() - .append(cutString.get(i))); + Lang.builder() + .add(cutString.get(i) + .copy()) + .forGoggles(tooltip); return true; } @@ -436,6 +441,14 @@ public class KineticTileEntity extends SmartTileEntity implements IHaveGoggleInf Lang.translate("gui.goggles.kinetic_stats") .forGoggles(tooltip); + + addStressImpactStats(tooltip, stressAtBase); + + return true; + + } + + protected void addStressImpactStats(List tooltip, float stressAtBase) { Lang.translate("tooltip.stressImpact") .style(GRAY) .forGoggles(tooltip); @@ -449,9 +462,6 @@ public class KineticTileEntity extends SmartTileEntity implements IHaveGoggleInf .add(Lang.translate("gui.goggles.at_current_speed") .style(ChatFormatting.DARK_GRAY)) .forGoggles(tooltip, 1); - - return true; - } public void clearKineticInformation() { 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 d3973d07b..78a68da21 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 @@ -466,34 +466,22 @@ public class DeployerTileEntity extends KineticTileEntity { @Override public boolean addToGoggleTooltip(List tooltip, boolean isPlayerSneaking) { Lang.translate("tooltip.deployer.header") + .forGoggles(tooltip); + + 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); float stressAtBase = calculateStressApplied(); - if (StressImpact.isEnabled() && !Mth.equal(stressAtBase, 0)) { - Lang.translate("tooltip.stressImpact") - .style(ChatFormatting.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); + tooltip.add(Lang.empty()); + addStressImpactStats(tooltip, stressAtBase); } return true; diff --git a/src/main/resources/assets/create/lang/default/interface.json b/src/main/resources/assets/create/lang/default/interface.json index 98678bfbc..c8a052b74 100644 --- a/src/main/resources/assets/create/lang/default/interface.json +++ b/src/main/resources/assets/create/lang/default/interface.json @@ -530,9 +530,9 @@ "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.deployer.using": "Mode: Use", + "create.tooltip.deployer.punching": "Mode: Attack", + "create.tooltip.deployer.contains": "Item: %1$s x%2$s", "create.tooltip.brass_tunnel.contains": "Currently distributing:", "create.tooltip.brass_tunnel.contains_entry": "> %1$s x%2$s",