From da7ed8ecda07e8fd658411ff819a581ae515863b Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Mon, 4 Jul 2022 14:21:19 +0200 Subject: [PATCH] The Ultimate Contraption --- src/generated/resources/.cache/cache | 32 +++++----- .../resources/assets/create/lang/en_us.json | 2 + .../assets/create/lang/unfinished/de_de.json | 4 +- .../assets/create/lang/unfinished/es_cl.json | 4 +- .../assets/create/lang/unfinished/es_es.json | 4 +- .../assets/create/lang/unfinished/fr_fr.json | 4 +- .../assets/create/lang/unfinished/it_it.json | 4 +- .../assets/create/lang/unfinished/ja_jp.json | 4 +- .../assets/create/lang/unfinished/ko_kr.json | 4 +- .../assets/create/lang/unfinished/nl_nl.json | 4 +- .../assets/create/lang/unfinished/pl_pl.json | 4 +- .../assets/create/lang/unfinished/pt_br.json | 4 +- .../assets/create/lang/unfinished/pt_pt.json | 4 +- .../assets/create/lang/unfinished/ro_ro.json | 4 +- .../assets/create/lang/unfinished/ru_ru.json | 4 +- .../assets/create/lang/unfinished/zh_cn.json | 4 +- .../assets/create/lang/unfinished/zh_tw.json | 4 +- .../ponder/content/KineticsScenes.java | 57 ++++++++++++++++++ .../ponder/content/PonderIndex.java | 5 +- .../create/foundation/ponder/ui/PonderUI.java | 3 +- .../create/ponder/creative_motor_mojang.nbt | Bin 0 -> 2938 bytes 21 files changed, 125 insertions(+), 34 deletions(-) create mode 100644 src/main/resources/assets/create/ponder/creative_motor_mojang.nbt diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 5535c2b31..b058bc380 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 -81efc69970d3c148f96da87f002c22ef6d31cadc assets/create/lang/en_us.json -ca7d42dcc171b2469f970c8e3e127c578b957f60 assets/create/lang/unfinished/de_de.json -4546ca6adf334b78e248bc9a49f7f1b00a435b69 assets/create/lang/unfinished/es_cl.json -afda676294958a031f1418531e4b0fab88573134 assets/create/lang/unfinished/es_es.json -8ae850ef9c7c9b61e2a961f6be0393cd2ee2bf03 assets/create/lang/unfinished/fr_fr.json -5581c624b6dcce010d035673662ce6ebadd40bf7 assets/create/lang/unfinished/it_it.json -27d5f7c0f72717aa1fa56a1d369ed6265055b649 assets/create/lang/unfinished/ja_jp.json -ab5858e81ee94771f2c6568eda6dbcc53d8f6348 assets/create/lang/unfinished/ko_kr.json -08a4ff9916f57631500a15f97a413521a1d21836 assets/create/lang/unfinished/nl_nl.json -e9d309cfb46630bddced8ff2cdee7e8d546eb7a6 assets/create/lang/unfinished/pl_pl.json -7059d1c3b099e5682e2023980af077c612c595e0 assets/create/lang/unfinished/pt_br.json -5106a24eab9452ccc284b49d16426fe9b947af1b assets/create/lang/unfinished/pt_pt.json -d4a554220c43bfe44d2c2a89b38ab372941c077c assets/create/lang/unfinished/ro_ro.json -55fe46d635566e6a6772c0c0f57027eb2025c79e assets/create/lang/unfinished/ru_ru.json -5f0f9403c74a6c29700c943cce5f2a8ea0651d25 assets/create/lang/unfinished/zh_cn.json -e99b2cf4d9414b22ae148c635b6dad2a8dd9534b assets/create/lang/unfinished/zh_tw.json +fa365e6a6ce14162a585723ec27393a5c65151e3 assets/create/lang/en_us.json +58d68269e7d11acf1d95579e188d802ea4b0a797 assets/create/lang/unfinished/de_de.json +5a85f1e2c3f57a666d326526fd3e29b52d3ae4a6 assets/create/lang/unfinished/es_cl.json +576b158b7eafef6f55895c61a99dead7596b2963 assets/create/lang/unfinished/es_es.json +fca8b04e271d0e4151818fd9e9e86c27614105d0 assets/create/lang/unfinished/fr_fr.json +6fbaea65ca35104834eb184f6df8d2ff874670e9 assets/create/lang/unfinished/it_it.json +e990f228ba097fb8145921a95c8920ce2984724a assets/create/lang/unfinished/ja_jp.json +92d1ec9a1ec748c9f452b2ec5fba197249f61c18 assets/create/lang/unfinished/ko_kr.json +98bfc50260177f0cac6c59845747e1b196456f55 assets/create/lang/unfinished/nl_nl.json +f188c2bea52fa01dabaf93975142942ec13cb09e assets/create/lang/unfinished/pl_pl.json +52dce74c17a734f0ceefe9202200ded289822daf assets/create/lang/unfinished/pt_br.json +540eecc05fa9301ce0d83a626b22bab3b2cb41fa assets/create/lang/unfinished/pt_pt.json +12d3295cbe6e18eac1e87d65385af758e3e95209 assets/create/lang/unfinished/ro_ro.json +80bc9e347322ddc5a2f9c314428d41f94e0df79d assets/create/lang/unfinished/ru_ru.json +e888bc0c30af01a413460224aa101025f2472ca5 assets/create/lang/unfinished/zh_cn.json +205171903c209e197461340191c8273cd2504918 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 a6bafada3..bc59fea92 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -2288,6 +2288,8 @@ "create.ponder.creative_motor.text_1": "Creative motors are a compact and configurable source of Rotational Force", "create.ponder.creative_motor.text_2": "Scrolling on the back panel changes the RPM of the motors' rotational output", + "create.ponder.creative_motor_mojang.header": "Mojang's Enigma", + "create.ponder.crushing_wheels.header": "Processing Items with Crushing Wheels", "create.ponder.crushing_wheels.text_1": "A pair of Crushing Wheels can grind items very effectively", "create.ponder.crushing_wheels.text_2": "Their Rotational Input has to make them spin into each other", 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 46da1be9a..14fd570a1 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: 1328", + "_": "Missing Localizations: 1329", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "UNLOCALIZED: Creative motors are a compact and configurable source of Rotational Force", "create.ponder.creative_motor.text_2": "UNLOCALIZED: Scrolling on the back panel changes the RPM of the motors' rotational output", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "UNLOCALIZED: Processing Items with Crushing Wheels", "create.ponder.crushing_wheels.text_1": "UNLOCALIZED: A pair of Crushing Wheels can grind items very effectively", "create.ponder.crushing_wheels.text_2": "UNLOCALIZED: Their Rotational Input has to make them spin into each other", 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 f7148a3e0..44a86483c 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: 978", + "_": "Missing Localizations: 979", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "Los Motores del Creativo son una fuente compacta y configurable de fuerza rotacional.", "create.ponder.creative_motor.text_2": "Rodar por el panel posterior cambia las RPM de salida de rotación de los motores", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "Procesando Objetos usando Ruedas Trituradoras", "create.ponder.crushing_wheels.text_1": "Un par de Ruedas Trituradoras pueden triturar objetos muy efectivamente", "create.ponder.crushing_wheels.text_2": "Su ingreso rotacional tiene que hacerlas girar la una contra la otra", 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 1b2714388..2f5c4347b 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: 642", + "_": "Missing Localizations: 643", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "Los motores creativos son una fuente compacta y configurable de fuerza rotacional", "create.ponder.creative_motor.text_2": "Usar la rueda de desplazamiento del ratón en su parte trasera cambia las RPM de la salida rotacional", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "Procesar objetos con las ruedas trituradoras", "create.ponder.crushing_wheels.text_1": "Un par de ruedas trituradoras pueden moler objetos de forma muy eficaz", "create.ponder.crushing_wheels.text_2": "Su fuerza rotacional tiene que hacerlas girar una contra otra", 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 a1ae361aa..838baa244 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: 2130", + "_": "Missing Localizations: 2131", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "UNLOCALIZED: Creative motors are a compact and configurable source of Rotational Force", "create.ponder.creative_motor.text_2": "UNLOCALIZED: Scrolling on the back panel changes the RPM of the motors' rotational output", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "UNLOCALIZED: Processing Items with Crushing Wheels", "create.ponder.crushing_wheels.text_1": "UNLOCALIZED: A pair of Crushing Wheels can grind items very effectively", "create.ponder.crushing_wheels.text_2": "UNLOCALIZED: Their Rotational Input has to make them spin into each other", 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 ac6b1d894..362dd4c7d 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: 1901", + "_": "Missing Localizations: 1902", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "UNLOCALIZED: Creative motors are a compact and configurable source of Rotational Force", "create.ponder.creative_motor.text_2": "UNLOCALIZED: Scrolling on the back panel changes the RPM of the motors' rotational output", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "UNLOCALIZED: Processing Items with Crushing Wheels", "create.ponder.crushing_wheels.text_1": "UNLOCALIZED: A pair of Crushing Wheels can grind items very effectively", "create.ponder.crushing_wheels.text_2": "UNLOCALIZED: Their Rotational Input has to make them spin into each other", 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 aae41c99e..9398cb725 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: 644", + "_": "Missing Localizations: 645", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "クリエイティブモーターは、コンパクトで出力を調整できる原動機です", "create.ponder.creative_motor.text_2": "背面パネルを見ながらスクロールすると、モーターの回転速度を変更できます", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "破砕ホイールによるアイテム加工", "create.ponder.crushing_wheels.text_1": "一対の破砕ホイールは、非常に効果的にアイテムを粉砕できます", "create.ponder.crushing_wheels.text_2": "動作には、互いに逆方向で回転させる必要があります", 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 8ce599711..16a494164 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: 644", + "_": "Missing Localizations: 645", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "크리에이티브 모터는 동력을 쉽게 생산, 조절합니다.", "create.ponder.creative_motor.text_2": "모터 후면을 스크롤해서 모터의 RPM을 조절합니다.", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "분쇄 휠을 이용해 아이템 가공하기", "create.ponder.crushing_wheels.text_1": "한 쌍의 분쇄 휠은 아이템을 매우 효과적으로 갈아버립니다.", "create.ponder.crushing_wheels.text_2": "동력을 전달하여 서로 맞물리게 해야합니다.", 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 6c8d087a3..a8f6717a4 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: 2478", + "_": "Missing Localizations: 2479", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "UNLOCALIZED: Creative motors are a compact and configurable source of Rotational Force", "create.ponder.creative_motor.text_2": "UNLOCALIZED: Scrolling on the back panel changes the RPM of the motors' rotational output", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "UNLOCALIZED: Processing Items with Crushing Wheels", "create.ponder.crushing_wheels.text_1": "UNLOCALIZED: A pair of Crushing Wheels can grind items very effectively", "create.ponder.crushing_wheels.text_2": "UNLOCALIZED: Their Rotational Input has to make them spin into each other", 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 421412157..c3a438904 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: 1017", + "_": "Missing Localizations: 1018", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "Kreatywny silnik to kompaktowe i regulowane źródło siły obrotowej", "create.ponder.creative_motor.text_2": "Przewijanie patrząc na tylny panel zmienia prędkość obrotu", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "Kruszenie przedmiotów", "create.ponder.crushing_wheels.text_1": "Para kół kruszących kruszy przedmioty niezwykle efektywnie", "create.ponder.crushing_wheels.text_2": "Powinny się one kręcić w przeciwnych kierunkach", 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 8fc160518..165f72c3a 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: 1511", + "_": "Missing Localizations: 1512", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "UNLOCALIZED: Creative motors are a compact and configurable source of Rotational Force", "create.ponder.creative_motor.text_2": "UNLOCALIZED: Scrolling on the back panel changes the RPM of the motors' rotational output", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "UNLOCALIZED: Processing Items with Crushing Wheels", "create.ponder.crushing_wheels.text_1": "UNLOCALIZED: A pair of Crushing Wheels can grind items very effectively", "create.ponder.crushing_wheels.text_2": "UNLOCALIZED: Their Rotational Input has to make them spin into each other", 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 f36b5b4fc..3f2abcb8f 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: 2187", + "_": "Missing Localizations: 2188", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "UNLOCALIZED: Creative motors are a compact and configurable source of Rotational Force", "create.ponder.creative_motor.text_2": "UNLOCALIZED: Scrolling on the back panel changes the RPM of the motors' rotational output", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "UNLOCALIZED: Processing Items with Crushing Wheels", "create.ponder.crushing_wheels.text_1": "UNLOCALIZED: A pair of Crushing Wheels can grind items very effectively", "create.ponder.crushing_wheels.text_2": "UNLOCALIZED: Their Rotational Input has to make them spin into each other", 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 694bf5675..c9d11eacb 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: 645", + "_": "Missing Localizations: 646", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "Motoarele Creativ sunt o sursă compactă și configurabilă de Forță de Rotație", "create.ponder.creative_motor.text_2": "Derulând pe panoul din spate schimbă RPM a ieșirii rotaționale a motorului", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "Procesarea Obiectectelor cu Roți de Zdrobit", "create.ponder.crushing_wheels.text_1": "O pereche de Roți de Zdrobit poate pisa obiecte foarte eficient", "create.ponder.crushing_wheels.text_2": "Intrarea lor Rotațională trebuie să le facă să se rotească între ele", 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 078901219..da7f8fdb8 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: 1022", + "_": "Missing Localizations: 1023", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "Творческие моторы - это компактные и настраиваемые источники Силы Вращения", "create.ponder.creative_motor.text_2": "Прокрутка по задней панели изменяет кол-во об./мин. у вращающегося вала мотора", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "Обработке предметов Колёсами дробления", "create.ponder.crushing_wheels.text_1": "Пара Колёс дробления может молоть предметы очень эффективно", "create.ponder.crushing_wheels.text_2": "Сила вращения должна вращать их друг в друга", 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 ad12c572d..4a3e335be 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: 642", + "_": "Missing Localizations: 643", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "创造马达是一种紧凑且可配置的旋转力源", "create.ponder.creative_motor.text_2": "对其后面板滑动滚轮，可以改变马达的输出旋转转速", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "使用粉碎轮处理物品", "create.ponder.crushing_wheels.text_1": "一对粉碎轮，磨物快又准", "create.ponder.crushing_wheels.text_2": "接入的旋转必须使得这两个轮子从上到下啮合转动", 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 15eab95d5..dc9720a78 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: 1036", + "_": "Missing Localizations: 1037", "_": "->------------------------] Game Elements [------------------------<-", @@ -2289,6 +2289,8 @@ "create.ponder.creative_motor.text_1": "創造馬達不僅能夠手動設定輸出動能，而且體積相當小巧", "create.ponder.creative_motor.text_2": "對其背後面板滾動滾輪，可以改變馬達的轉速", + "create.ponder.creative_motor_mojang.header": "UNLOCALIZED: Mojang's Enigma", + "create.ponder.crushing_wheels.header": "使用粉碎輪處理物品", "create.ponder.crushing_wheels.text_1": "一對粉碎輪，磨物快又準", "create.ponder.crushing_wheels.text_2": "接入的動能必須使這兩個輪子契合轉動", diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/KineticsScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/KineticsScenes.java index 3fd3e89a1..71cac5317 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/KineticsScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/KineticsScenes.java @@ -1134,4 +1134,61 @@ public class KineticsScenes { scene.markAsFinished(); } + public static void creativeMotorMojang(SceneBuilder scene, SceneBuildingUtil util) { + scene.title("creative_motor_mojang", "Mojang's Enigma"); + scene.configureBasePlate(0, 0, 15); + scene.scaleSceneView(.55f); + scene.showBasePlate(); + scene.idle(15); + scene.world.showSection(util.select.fromTo(12, 1, 7, 12, 1, 2), Direction.WEST); + scene.idle(3); + scene.world.showSection(util.select.fromTo(5, 1, 2, 7, 2, 1), Direction.EAST); + scene.idle(3); + scene.world.showSection(util.select.fromTo(7, 1, 3, 7, 1, 8), Direction.NORTH); + scene.idle(3); + scene.world.showSection(util.select.position(7, 2, 8), Direction.DOWN); + scene.idle(3); + scene.world.showSection(util.select.position(4, 1, 4), Direction.DOWN); + scene.idle(3); + scene.world.showSection(util.select.position(4, 1, 6), Direction.DOWN); + scene.idle(3); + scene.world.showSection(util.select.position(3, 1, 10), Direction.SOUTH); + scene.idle(3); + scene.world.showSection(util.select.position(1, 1, 11), Direction.EAST); + scene.idle(3); + scene.world.showSection(util.select.position(11, 1, 3), Direction.DOWN); + scene.idle(3); + scene.world.showSection(util.select.fromTo(11, 2, 3, 11, 2, 7), Direction.NORTH); + scene.idle(3); + scene.world.showSection(util.select.fromTo(8, 1, 2, 10, 1, 2), Direction.DOWN); + scene.idle(3); + scene.world.showSection(util.select.position(11, 1, 2), Direction.SOUTH); + scene.idle(3); + scene.world.showSection(util.select.fromTo(6, 1, 8, 5, 1, 8), Direction.EAST); + scene.rotateCameraY(-90); + scene.idle(3); + scene.world.showSection(util.select.position(12, 1, 10), Direction.DOWN); + scene.idle(3); + scene.world.showSection(util.select.position(11, 1, 12), Direction.DOWN); + scene.idle(3); + scene.world.showSection(util.select.fromTo(8, 1, 8, 11, 1, 8), Direction.WEST); + scene.idle(3); + scene.world.showSection(util.select.fromTo(5, 2, 8, 5, 3, 8), Direction.DOWN); + scene.idle(3); + scene.world.showSection(util.select.fromTo(8, 1, 5, 8, 2, 7), Direction.WEST); + scene.idle(3); + scene.world.showSection(util.select.fromTo(7, 3, 9, 8, 3, 8), Direction.UP); + scene.idle(3); + scene.world.showSection(util.select.fromTo(6, 3, 7, 9, 3, 7) + .add(util.select.fromTo(6, 3, 8, 6, 3, 10)) + .add(util.select.fromTo(7, 3, 10, 9, 3, 10)) + .add(util.select.fromTo(9, 3, 7, 9, 3, 9)), Direction.DOWN); + scene.idle(3); + scene.world.showSection(util.select.fromTo(10, 4, 7, 6, 4, 10), Direction.DOWN); + scene.idle(3); + scene.world.showSection(util.select.fromTo(8, 1, 13, 8, 2, 11), Direction.NORTH); + scene.idle(3); + scene.idle(20); + } + } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java index 473873192..06735ca4e 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java @@ -72,8 +72,9 @@ public class PonderIndex { .addStoryBoard("fan/direction", FanScenes::direction, PonderTag.KINETIC_APPLIANCES) .addStoryBoard("fan/processing", FanScenes::processing); - HELPER.addStoryBoard(AllBlocks.CREATIVE_MOTOR, "creative_motor", KineticsScenes::creativeMotor, - PonderTag.KINETIC_SOURCES); + HELPER.forComponents(AllBlocks.CREATIVE_MOTOR) + .addStoryBoard("creative_motor", KineticsScenes::creativeMotor, PonderTag.KINETIC_SOURCES) + .addStoryBoard("creative_motor_mojang", KineticsScenes::creativeMotorMojang); HELPER.addStoryBoard(AllBlocks.WATER_WHEEL, "water_wheel", KineticsScenes::waterWheel, PonderTag.KINETIC_SOURCES); HELPER.addStoryBoard(AllBlocks.HAND_CRANK, "hand_crank", KineticsScenes::handCrank, PonderTag.KINETIC_SOURCES); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java index cde7f89d8..12a74f1b5 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderUI.java @@ -692,7 +692,8 @@ public class PonderUI extends NavigatableSimiScreen { boolean finished = activeScene.isFinished(); // Next up: - if (finished && nextScene != null && nextUp.getValue() > 1 / 16f) { + if (finished && nextScene != null && nextUp.getValue() > 1 / 16f && !nextScene.getId() + .equals(Create.asResource("creative_motor_mojang"))) { ms.pushPose(); ms.translate(right.x + 10, right.y - 6 + nextUp.getValue(partialTicks) * 5, 400); int boxWidth = (Math.max(font.width(nextScene.getTitle()), font.width(Lang.translate(NEXT_UP))) + 5); diff --git a/src/main/resources/assets/create/ponder/creative_motor_mojang.nbt b/src/main/resources/assets/create/ponder/creative_motor_mojang.nbt new file mode 100644 index 0000000000000000000000000000000000000000..547163457f558cbd8a8b8467d9c50d8364ce6d39 GIT binary patch literal 2938 zcmb7?3pCUHAIFv4lS&ywrFu}P(U@x#Ju0^_G({M>TW*hX4Mk$ExouiSHZ-}U{9P8= z-#q4)VHz_%G1=V8W!c>RqjUcMbN=Uap7Z?9_nhDNyndh0=lg!YzrUlYq5?b5)?85+ z;-u4I62iEmiRYeit`H!WDbiPcJ68w@zx_x_H_=eqHPx|UtZAhfsFt$`^FcFBU=0Woh-l{g{nAX9|>D-h{Yhu^*%%~Zs@^* z2ac)}5tEvSC9xGB1`k@6-Y@qDB?%9Fyl!KksHt6$M~WN)TAC-a{P5mZi7*vQp-f?W zC4XUJ-L52GK}#370#*`aDer~?PJjaMyN?JAP-T;S1@{gJ7ic4c3v?=W3#oY*Ahy43 zw{V4Jf7bsB>2d(IM?l?>R;YFXiWJE&(*zeJ{oL%R;S-h*$OX9q8W(tDUC?Oqfh;#A z?^dAGx_$opZB_ikWq*bC#wX;S`GeUyZQ;XIsc0IV4Lq0 z;>G@%D!9u(%qpqCD93_IKzRUxmi%8Dt_-Vk-Ze1jmOWAi0Cg$=g)Fs_kqTIpvkl|s z5Y%dEssc;R!MuvUncdJ@0JOA7^p(bz*I=+D-JON9LN+)9L*w1`0(|kf(i#kZ{#?hKUnehdH0^16J6Z};dLSh{Pb*_g=$mTtB?2V*`aC}$|)FFib zysM8WJVKpmvT>D5BBk@-ppACIcayBFm9e+x6u>|*us%@b$@^0k91}b;z=;#%ZyY^T zyYU$GuGtiVFZ&JHGyp@5)9CM;2utDigDp(Smt|w41PAFcnk>5Hk<375asQc>m~zH4 z+az6a;c~@yR77*i@(=||s2{6;DId9+RS?_L;gr&n;~LI_A3Ew`Nxgd_z3N1F)awnR zX@la!>n#NC{L$pNs12zF!s5cMn2EwBMBkKa#@BsDeYB+`b<#^iW--IDvdC2ri?I6U z{!fd;o+n20)WNGk$ar=o{APgG1Q&XJVFYH&+-k zJ&JPHhFkBIx;6X*R_4C>MCpUX-GCl}p`c8`=IAwBu(x)_tOa|eCED!~DQLRO?Oii! zdX^K@7tE+DBC_7Dv;w*9X4KwGBGN@+6|wf~9Hd}MO$ zEvgx_=`lBp$0c-R9F2P(8yn}GkZ{aOX7XV8aqU8lEx+dV)+0zoT2ob>%*aNV0s{AC zdeX?=3NS;Hfa2Adk*1<=&r#%I^T$h9g9~5oPwu>`nG20D__Rm|k#ibpQ{z1ODvJo& zBW9&8b_hSc(Rq{ex?=y57HL*_TCFjn;(toiVa&t~-X$Iop~^Nu%+jwi6sKmZk5lLG z#w(5>Iw9*91{4n+#G1?D&n4K0FYz{TF# zBr=)uXVqXE{Uo~7AD{*q3MKbA+XkhjqR}II%-aN22$H|$=`pA5Y=ck$2!zC^C906l z-p{;tf1Nk=8wrB+$x1G1%N=)nYVd?~2aGyF(@lR-S{E@Wv2RfMoMO8TxuTz3PEzT8 z1H`2qw@-Dn*1$B~9VXdyRrL3kla>GrBbPg}%FPXMM+$Xi$~*isvV)FWjmKl>8g8^~vCodjY}({+ajRyG z??$ROw85_oDsgp}?bUSAe=hXe4NDN30b|guXfJPRn$?Pdm-2W|a9%f7A5F5?X;|{b zvr274?JKiLT)OA@wM;Z{RG`QeAZQYWu?G zT2IwFc58S{{#GMr6j#|UenWzcds>JzArZ(62(u zu4GF9);k0HJ3EqtGv}JUp|+X1l*)dOq}n!bC@%W+H9yr-+>M?hdb8|Ttg_BLFHe5f zBF=)=-irR$MW49SxNnIN|KQBEN2J5)IB74>gyD-mVR=L(pO}^6Ui(szt;+T_EJ!qN~Zj_d!seJ z)#cJZttP}Ku`l@EF)=K$HR^N3n#RU?64Wr?3ms7yvC*IGyB|oF%uaX z7&?b1q9rPEz80e}x77Z_A$PPxFDIbLGUPL|LyK^`JA2(^5#V?}wNSbXaCkuBM*3b; zxj-pb&D;=t)*&ZrVTqdv3VO2xxx0#?doMi1ExC61$4v)m?Uxjm;<$Z|`PNKHxw0MN z{6W%t=AOmXIVT&&`Q^%EmyxkXnm;}n&vr3B)zH^2M1Jcv6Z*@5aYt3;`ysza-+a_B z!TTgk5l@;7_u##kl+?v=!kn7YtC=3rW>YW0 zcBQhk(OBgNw6yPjfMjRdjHGW%;oIXl!JB922_hrML;3Sp)@a)s9x2xI9_%%Yx z-04CNDG%LG4Dd^PX&kX$&%{w5@m8yBqS@RuoAEeTv0Jo3iLL-IE>#RQ#7kQu@SKS< z70Kil9lXdNAKxhSDRMZuVxA#|o5|9bN_z6pkk9MKyGUIs8(^QN{(ienWiU0<%+e@Vi79*cdCT^@IyG4SO!zOwww}&|MHk@lTUg} zX!UXW(tq1!`uIet9%4ee(K$VIq%rr?kuhnOSe8FV0TP91cI|r=?8ORpS#UJ;;q