diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 3164f5b02..9fb68c5d6 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 -efcc37e1504c7957148bc9b33d1555bcaa25a5c8 assets/create/lang/en_us.json -6219d0aaa2052e70f0e771a4a0d7ef1632385349 assets/create/lang/unfinished/de_de.json -bff5d4942361058aa64e0c3d392147737cfc97f8 assets/create/lang/unfinished/es_cl.json -8bfe3cbbad689ce2b26e14c478ba5880e14cf90c assets/create/lang/unfinished/es_es.json -fd1135168c86d993fb78b75db825b6c904d0e3e8 assets/create/lang/unfinished/fr_fr.json -e25416e5242c4e550800ff520efba50e0d58e1d8 assets/create/lang/unfinished/it_it.json -9205910df97aa6e4aea120cca85d4e33780bd75e assets/create/lang/unfinished/ja_jp.json -4f3ad52803d9f17ff696f8a88c97250141d06bfc assets/create/lang/unfinished/ko_kr.json -49b7b92915b027c9a325f9e1e854e0445eb8bb80 assets/create/lang/unfinished/nl_nl.json -ef988ae065a25e2b5891ed886bf1fd5bac44691c assets/create/lang/unfinished/pl_pl.json -0453e06ffad988b02b52f411992cbedd8ab122d6 assets/create/lang/unfinished/pt_br.json -6057e494ca897d53561ef27fa6afcc578e1d443d assets/create/lang/unfinished/pt_pt.json -0b35dc0f8eb8ca53deaa70b52c89b2907fd15479 assets/create/lang/unfinished/ro_ro.json -5b8a7be0d7ac8c9641c5e0fc9fbc1238cc1ae12f assets/create/lang/unfinished/ru_ru.json -1780c03e020ca55dab9f1f390ad2a2dbe914e54e assets/create/lang/unfinished/zh_cn.json -b0d7d436e7ff61cee949ed0e88de6268ec1ca67a assets/create/lang/unfinished/zh_tw.json +b0ae33dcf2591beea513e0844a40a16e06f6b2d2 assets/create/lang/en_us.json +96f398b6b1637c2c5f17629a2f4ed30c9a971465 assets/create/lang/unfinished/de_de.json +b1d2dc1cfa9e3cc712a8bd2ac2bd582a2390274e assets/create/lang/unfinished/es_cl.json +aed94ed3482ad57469d36c9ae2c98fbd27bd0895 assets/create/lang/unfinished/es_es.json +224895ac6e5d9d3de525e053b3303c07bd85943a assets/create/lang/unfinished/fr_fr.json +4b70d6837b14199f750fcde7317947c7329dcb89 assets/create/lang/unfinished/it_it.json +5371238a87b0474f9a73cc6e4a282b9fa4214cba assets/create/lang/unfinished/ja_jp.json +bc3bc42af14ea68690f7e75623501404ac8b0bfd assets/create/lang/unfinished/ko_kr.json +82567d426c1ff6847c49021d37f76b5cc5ec6975 assets/create/lang/unfinished/nl_nl.json +8feedfe2057dd336dbca9e94024c6bd3fd317e55 assets/create/lang/unfinished/pl_pl.json +c22d1ced7a13dfdf145fd9d38166061ff0d15ca7 assets/create/lang/unfinished/pt_br.json +ec475c078178d0b7a81fbd9c43558913bda3a87f assets/create/lang/unfinished/pt_pt.json +64bb5d22f8d84d739ffbcd4cc5c4b947393123fb assets/create/lang/unfinished/ro_ro.json +c59de15228bbdaab6630c7172b0c1a0541c8b581 assets/create/lang/unfinished/ru_ru.json +4dcae7592d23a22deba0a328840feeb49a940196 assets/create/lang/unfinished/zh_cn.json +b80cc2eac8733fcc9158060086d47b6a07fb4e23 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 5d7c9b299..733282528 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1441,6 +1441,10 @@ "create.schedule.instruction.name_edit_box": "Schedule Title", "create.schedule.instruction.name_edit_box_1": "Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "Defaults to next destination's name", + "create.schedule.instruction.throttle": "Change Throttle", + "create.schedule.instruction.throttle.summary": "Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "Throttle", + "create.schedule.instruction.throttle_edit_box_1": "Affects the top speed of the Train", "create.schedule.condition_type": "Continue if/after:", "create.schedule.condition.editor": "Condition Editor", "create.schedule.condition.delay": "Scheduled Delay", @@ -2902,17 +2906,19 @@ "create.ponder.train_assembly.header": "Assembling Trains", "create.ponder.train_assembly.text_1": "Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "Controlling Trains", "create.ponder.train_controls.text_1": "Train Controls are required on every train contraption", 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 4075d7dd7..953acd348 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: 1322", + "_": "Missing Localizations: 1328", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 4dcde9594..663000fa5 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: 972", + "_": "Missing Localizations: 978", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 66490423e..d36b932cd 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: 636", + "_": "Missing Localizations: 642", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 0c37cf669..021d76111 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: 2124", + "_": "Missing Localizations: 2130", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 5688904eb..5c8af4f08 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: 1895", + "_": "Missing Localizations: 1901", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 e61663d0b..cc245af8b 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: 638", + "_": "Missing Localizations: 644", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 113a0c809..5773e695c 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: 638", + "_": "Missing Localizations: 644", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 20f40288f..4eb0a4645 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: 2472", + "_": "Missing Localizations: 2478", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 a88d1c395..586d88b78 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: 1011", + "_": "Missing Localizations: 1017", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 cd5300a7b..dbf1ea621 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: 1505", + "_": "Missing Localizations: 1511", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 c08a44665..07a652b79 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: 2181", + "_": "Missing Localizations: 2187", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 140bb99d9..527b773d8 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: 639", + "_": "Missing Localizations: 645", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 4576f6e4e..c606c3ce0 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: 1016", + "_": "Missing Localizations: 1022", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 1536adde0..9902233c6 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: 636", + "_": "Missing Localizations: 642", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", 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 95a2c5396..0a60fa390 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: 1030", + "_": "Missing Localizations: 1036", "_": "->------------------------] Game Elements [------------------------<-", @@ -1442,6 +1442,10 @@ "create.schedule.instruction.name_edit_box": "UNLOCALIZED: Schedule Title", "create.schedule.instruction.name_edit_box_1": "UNLOCALIZED: Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "UNLOCALIZED: Defaults to next destination's name", + "create.schedule.instruction.throttle": "UNLOCALIZED: Change Throttle", + "create.schedule.instruction.throttle.summary": "UNLOCALIZED: Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "UNLOCALIZED: Throttle", + "create.schedule.instruction.throttle_edit_box_1": "UNLOCALIZED: Affects the top speed of the Train", "create.schedule.condition_type": "UNLOCALIZED: Continue if/after:", "create.schedule.condition.editor": "UNLOCALIZED: Condition Editor", "create.schedule.condition.delay": "UNLOCALIZED: Scheduled Delay", @@ -2903,17 +2907,19 @@ "create.ponder.train_assembly.header": "UNLOCALIZED: Assembling Trains", "create.ponder.train_assembly.text_1": "UNLOCALIZED: Select a Train Track then place the Station nearby", - "create.ponder.train_assembly.text_10": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", - "create.ponder.train_assembly.text_11": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", - "create.ponder.train_assembly.text_12": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", + "create.ponder.train_assembly.text_10": "UNLOCALIZED: Every Train requires Train Controls on board", + "create.ponder.train_assembly.text_11": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_12": "UNLOCALIZED: Open the Station UI and confirm the Assembly process", + "create.ponder.train_assembly.text_13": "UNLOCALIZED: Trains can be disassembled back into blocks at stations only", + "create.ponder.train_assembly.text_14": "UNLOCALIZED: Assembled Trains can be relocated to nearby Tracks using the Wrench", "create.ponder.train_assembly.text_2": "UNLOCALIZED: Stations are the Waypoints of your Track Network", "create.ponder.train_assembly.text_3": "UNLOCALIZED: To create a new Train, open the UI and switch to Assembly Mode", "create.ponder.train_assembly.text_4": "UNLOCALIZED: During Assembly no scheduled trains will approach this station", "create.ponder.train_assembly.text_5": "UNLOCALIZED: Create new bogeys by using Train Casing on Tracks", "create.ponder.train_assembly.text_6": "UNLOCALIZED: Click the track again to cycle between bogey designs", "create.ponder.train_assembly.text_7": "UNLOCALIZED: Attach blocks with the help of Super Glue", - "create.ponder.train_assembly.text_8": "UNLOCALIZED: Every Train requires Train Controls on board", - "create.ponder.train_assembly.text_9": "UNLOCALIZED: An optional second one allows departure from Stations in both directions", + "create.ponder.train_assembly.text_8": "UNLOCALIZED: Assembled Trains will move faster if they can find fuel in assembled chests or barrels", + "create.ponder.train_assembly.text_9": "UNLOCALIZED: Fuel stored in Vaults will not be consumed by the train", "create.ponder.train_controls.header": "UNLOCALIZED: Controlling Trains", "create.ponder.train_controls.text_1": "UNLOCALIZED: Train Controls are required on every train contraption", diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index a6ba9ddc5..959846643 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -137,6 +137,7 @@ public class AllBlockPartials { SIGNAL_RED = block("track_signal/red_tube"), SIGNAL_YELLOW_CUBE = block("track_signal/yellow_cube"), SIGNAL_YELLOW_GLOW = block("track_signal/yellow_glow"), SIGNAL_YELLOW = block("track_signal/yellow_tube"), + BLAZE_INERT = block("blaze_burner/blaze/inert"), BLAZE_SUPER_ACTIVE = block("blaze_burner/blaze/super_active"), BLAZE_GOGGLES = block("blaze_burner/goggles"), BLAZE_IDLE = block("blaze_burner/blaze/idle"), BLAZE_ACTIVE = block("blaze_burner/blaze/active"), BLAZE_SUPER = block("blaze_burner/blaze/super"), BLAZE_BURNER_FLAME = block("blaze_burner/flame"), BLAZE_BURNER_RODS = block("blaze_burner/rods_small"), diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerInteractionBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerInteractionBehaviour.java index c6b4371d4..5af8de637 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerInteractionBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerInteractionBehaviour.java @@ -56,7 +56,7 @@ public class BlazeBurnerInteractionBehaviour extends MovingInteractionBehaviour return true; if (train.runtime.getSchedule() != null) { - if (train.runtime.paused) { + if (train.runtime.paused && !train.runtime.completed) { train.runtime.paused = false; AllSoundEvents.CONFIRM.playOnServer(player.level, player.blockPosition(), 1, 1); player.displayClientMessage(Lang.translate("schedule.continued"), true); diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java index 129b37759..d9938f360 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java @@ -64,6 +64,7 @@ public class BlazeBurnerRenderer extends SafeTileEntityRenderer 0.125f; HeatLevel heatLevel = BlazeBurnerBlock.getHeatLevelOf(blockState); float time = AnimationTickHolder.getRenderTime(level); float renderTick = time + (hashCode % 13) * 16f; @@ -77,7 +78,7 @@ public class BlazeBurnerRenderer extends SafeTileEntityRenderer line = lines.get(j) .getSections(); int color = flapTe.getLineColor(j); + int lineLight = flapTe.isLineGlowing(j) ? 0xf000f0 : light; ms.pushPose(); float w = 0; @@ -85,8 +86,8 @@ public class FlapDisplayRenderer extends KineticTileEntityRenderer { ms.translate(flapTe.xSize * 16 - w / 2 + 1, 4.5f, 0); Pose transform = ms.last(); - FlapDisplayRenderOutput renderOutput = new FlapDisplayRenderOutput(buffer, color, transform.pose(), light, - j, !te.isSpeedRequirementFulfilled(), te.getLevel()); + FlapDisplayRenderOutput renderOutput = new FlapDisplayRenderOutput(buffer, color, transform.pose(), + lineLight, j, !te.isSpeedRequirementFulfilled(), te.getLevel()); for (int i = 0; i < line.size(); i++) { FlapDisplaySection section = line.get(i); @@ -95,9 +96,6 @@ public class FlapDisplayRenderer extends KineticTileEntityRenderer { String text = section.renderCharsIndividually() || !section.spinning[0] ? section.text : section.cyclingOptions[((ticks / 3) + i * 13) % section.cyclingOptions.length]; StringDecomposer.iterateFormatted(text, Style.EMPTY, renderOutput); -// ms.translate(0, 0, -1 / 4f); -// renderOutput.finish(0x55000000); -// ms.translate(0, 0, 1 / 4f); ms.translate(section.size + (section.hasGap ? 8 : 1), 0, 0); } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayTileEntity.java index e0811b8c7..37b7abb9a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayTileEntity.java @@ -35,6 +35,7 @@ public class FlapDisplayTileEntity extends KineticTileEntity { public boolean isRunning; public int xSize, ySize; public DyeColor[] colour; + public boolean[] glowingLines; public boolean[] manualLines; public FlapDisplayTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { @@ -45,6 +46,7 @@ public class FlapDisplayTileEntity extends KineticTileEntity { ySize = 1; colour = new DyeColor[2]; manualLines = new boolean[2]; + glowingLines = new boolean[2]; } @Override @@ -96,6 +98,7 @@ public class FlapDisplayTileEntity extends KineticTileEntity { xSize = newXSize; ySize = newYSize; colour = Arrays.copyOf(colour, ySize * 2); + glowingLines = Arrays.copyOf(glowingLines, ySize * 2); manualLines = new boolean[ySize * 2]; lines = null; sendData(); @@ -165,6 +168,11 @@ public class FlapDisplayTileEntity extends KineticTileEntity { colour[lineIndex] = color == DyeColor.WHITE ? null : color; notifyUpdate(); } + + public void setGlowing(int lineIndex) { + glowingLines[lineIndex] = true; + notifyUpdate(); + } public List getLines() { if (lines == null) @@ -197,6 +205,10 @@ public class FlapDisplayTileEntity extends KineticTileEntity { for (int j = 0; j < manualLines.length; j++) if (manualLines[j]) NBTHelper.putMarker(tag, "CustomLine" + j); + + for (int j = 0; j < glowingLines.length; j++) + if (glowingLines[j]) + NBTHelper.putMarker(tag, "GlowingLine" + j); for (int j = 0; j < colour.length; j++) if (colour[j] != null) @@ -222,6 +234,10 @@ public class FlapDisplayTileEntity extends KineticTileEntity { manualLines = new boolean[ySize * 2]; for (int i = 0; i < ySize * 2; i++) manualLines[i] = tag.contains("CustomLine" + i); + + glowingLines = new boolean[ySize * 2]; + for (int i = 0; i < ySize * 2; i++) + glowingLines[i] = tag.contains("GlowingLine" + i); colour = new DyeColor[ySize * 2]; for (int i = 0; i < ySize * 2; i++) @@ -305,4 +321,9 @@ public class FlapDisplayTileEntity extends KineticTileEntity { : DyeHelper.DYE_TABLE.get(color) .getFirst() | 0xFF_000000; } + + public boolean isLineGlowing(int line) { + return glowingLines[line]; + } + } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/Schedule.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/Schedule.java index 90c49d7bd..dfc6b1f94 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/Schedule.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/Schedule.java @@ -15,6 +15,7 @@ import com.simibubi.create.content.logistics.trains.management.schedule.conditio import com.simibubi.create.content.logistics.trains.management.schedule.condition.StationPoweredCondition; import com.simibubi.create.content.logistics.trains.management.schedule.condition.StationUnloadedCondition; import com.simibubi.create.content.logistics.trains.management.schedule.condition.TimeOfDayCondition; +import com.simibubi.create.content.logistics.trains.management.schedule.destination.ChangeThrottleInstruction; import com.simibubi.create.content.logistics.trains.management.schedule.destination.ChangeTitleInstruction; import com.simibubi.create.content.logistics.trains.management.schedule.destination.DestinationInstruction; import com.simibubi.create.content.logistics.trains.management.schedule.destination.ScheduleInstruction; @@ -38,6 +39,7 @@ public class Schedule { static { registerInstruction("destination", DestinationInstruction::new); registerInstruction("rename", ChangeTitleInstruction::new); + registerInstruction("throttle", ChangeThrottleInstruction::new); registerCondition("delay", ScheduledDelay::new); registerCondition("time_of_day", TimeOfDayCondition::new); registerCondition("fluid_threshold", FluidThresholdCondition::new); diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItemRetrieval.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItemRetrieval.java index bdd55da50..089227b0d 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItemRetrieval.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleItemRetrieval.java @@ -65,8 +65,8 @@ public class ScheduleItemRetrieval { Couple directions = cc.conductorSeats.get(seatPos); if (directions == null) return; - - if (train.runtime.paused) { + + if (train.runtime.paused && !train.runtime.completed) { train.runtime.paused = false; AllSoundEvents.CONFIRM.playOnServer(player.level, player.blockPosition(), 1, 1); player.displayClientMessage(Lang.translate("schedule.continued"), true); diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleRuntime.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleRuntime.java index b9522f175..476d65322 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleRuntime.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/ScheduleRuntime.java @@ -13,6 +13,7 @@ import com.simibubi.create.content.logistics.trains.management.edgePoint.EdgePoi import com.simibubi.create.content.logistics.trains.management.edgePoint.station.GlobalStation; import com.simibubi.create.content.logistics.trains.management.schedule.condition.ScheduleWaitCondition; import com.simibubi.create.content.logistics.trains.management.schedule.condition.ScheduledDelay; +import com.simibubi.create.content.logistics.trains.management.schedule.destination.ChangeThrottleInstruction; import com.simibubi.create.content.logistics.trains.management.schedule.destination.ChangeTitleInstruction; import com.simibubi.create.content.logistics.trains.management.schedule.destination.DestinationInstruction; import com.simibubi.create.content.logistics.trains.management.schedule.destination.ScheduleInstruction; @@ -37,6 +38,7 @@ public class ScheduleRuntime { public boolean isAutoSchedule; public boolean paused; + public boolean completed; public int currentEntry; public State state; @@ -101,8 +103,10 @@ public class ScheduleRuntime { } if (currentEntry >= schedule.entries.size()) { currentEntry = 0; - if (!schedule.cyclic) + if (!schedule.cyclic) { paused = true; + completed = true; + } return; } @@ -209,6 +213,13 @@ public class ScheduleRuntime { return null; } + if (instruction instanceof ChangeThrottleInstruction throttle) { + train.throttle = throttle.getThrottle(); + state = State.PRE_TRANSIT; + currentEntry++; + return null; + } + return null; } @@ -235,6 +246,7 @@ public class ScheduleRuntime { private void reset() { paused = true; + completed = false; isAutoSchedule = false; currentEntry = 0; currentTitle = ""; @@ -263,7 +275,8 @@ public class ScheduleRuntime { } else { GlobalStation destination = train.navigation.destination; if (destination != null) { - double speed = (train.maxSpeed() + train.maxTurnSpeed()) / 2; + double speed = + Math.min(train.throttle * train.maxSpeed(), (train.maxSpeed() + train.maxTurnSpeed()) / 2); int timeRemaining = (int) (train.navigation.distanceToDestination / speed) * 2; if (predictionTicks.size() > current && train.navigation.distanceStartedAt != 0) { @@ -384,6 +397,7 @@ public class ScheduleRuntime { tag.putInt("CurrentEntry", currentEntry); tag.putBoolean("AutoSchedule", isAutoSchedule); tag.putBoolean("Paused", paused); + tag.putBoolean("Completed", completed); if (schedule != null) tag.put("Schedule", schedule.write()); NBTHelper.writeEnum(tag, "State", state); @@ -396,6 +410,7 @@ public class ScheduleRuntime { public void read(CompoundTag tag) { reset(); paused = tag.getBoolean("Paused"); + completed = tag.getBoolean("Completed"); isAutoSchedule = tag.getBoolean("AutoSchedule"); currentEntry = tag.getInt("CurrentEntry"); if (tag.contains("Schedule")) diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeThrottleInstruction.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeThrottleInstruction.java new file mode 100644 index 000000000..624ee0ce0 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/destination/ChangeThrottleInstruction.java @@ -0,0 +1,85 @@ +package com.simibubi.create.content.logistics.trains.management.schedule.destination; + +import java.util.List; + +import com.google.common.collect.ImmutableList; +import com.simibubi.create.AllBlocks; +import com.simibubi.create.Create; +import com.simibubi.create.foundation.gui.ModularGuiLineBuilder; +import com.simibubi.create.foundation.utility.Lang; +import com.simibubi.create.foundation.utility.Pair; + +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +public class ChangeThrottleInstruction extends ScheduleInstruction { + + public ChangeThrottleInstruction() { + super(); + data.putInt("Value", 100); + } + + @Override + public Pair getSummary() { + return Pair.of(icon(), formatted()); + } + + private TextComponent formatted() { + return new TextComponent(intData("Value") + "%"); + } + + @Override + public ResourceLocation getId() { + return Create.asResource("throttle"); + } + + @Override + public ItemStack getSecondLineIcon() { + return icon(); + } + + @Override + public boolean supportsConditions() { + return false; + } + + @Override + public List getTitleAs(String type) { + return ImmutableList.of(Lang + .translate("schedule." + type + "." + getId().getPath() + ".summary", + formatted().withStyle(ChatFormatting.WHITE)) + .withStyle(ChatFormatting.GOLD)); + } + + @Override + @OnlyIn(Dist.CLIENT) + public void initConfigurationWidgets(ModularGuiLineBuilder builder) { + builder.addScrollInput(0, 50, (si, l) -> { + si.withRange(5, 101) + .withStepFunction(c -> c.shift ? 25 : 5) + .titled(Lang.translate("schedule.instruction.throttle_edit_box")); + l.withSuffix("%"); + }, "Value"); + } + + public float getThrottle() { + return intData("Value") / 100f; + } + + private ItemStack icon() { + return AllBlocks.CONTROLS.asStack(); + } + + @Override + public List getSecondLineTooltip(int slot) { + return ImmutableList.of(Lang.translate("schedule.instruction.throttle_edit_box"), + Lang.translate("schedule.instruction.throttle_edit_box_1") + .withStyle(ChatFormatting.GRAY)); + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java index 27d3024ad..5cc5aa8af 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java @@ -22,8 +22,6 @@ import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.VecHelper; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -63,7 +61,7 @@ public class TrackRenderer extends SafeTileEntityRenderer { TransformStack.cast(ms) .nudge((int) tePosition.asLong()); - renderGirder(bc, ms, vb, tePosition); + renderGirder(level, bc, ms, vb, tePosition); for (int i = 1; i < segments.length; i++) { SegmentAngles segment = segments[i]; @@ -88,12 +86,12 @@ public class TrackRenderer extends SafeTileEntityRenderer { ms.popPose(); } - private static void renderGirder(BezierConnection bc, PoseStack ms, VertexConsumer vb, BlockPos tePosition) { + private static void renderGirder(Level level, BezierConnection bc, PoseStack ms, VertexConsumer vb, + BlockPos tePosition) { if (!bc.hasGirder) return; BlockState air = Blocks.AIR.defaultBlockState(); - ClientLevel level = Minecraft.getInstance().level; GirderAngles[] girders = bc.getBakedGirders(); for (int i = 1; i < girders.length; i++) { diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainStationScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainStationScenes.java index 80c14f870..3c58e502a 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainStationScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainStationScenes.java @@ -206,6 +206,23 @@ public class TrainStationScenes { .withItem(AllItems.SUPER_GLUE.asStack()), 40); scene.idle(55); + scene.overlay.showControls(new InputWindowElement(util.vector.topOf(util.grid.at(5, 3, 5)), Pointing.DOWN) + .withItem(new ItemStack(Items.CHARCOAL)), 40); + scene.idle(10); + scene.overlay.showText(90) + .pointAt(util.vector.blockSurface(util.grid.at(5, 3, 5), Direction.WEST)) + .placeNearTarget() + .attachKeyFrame() + .colored(PonderPalette.BLUE) + .text("Assembled Trains will move faster if they can find fuel in assembled chests or barrels"); + scene.idle(100); + scene.overlay.showSelectionWithText(util.select.fromTo(4, 3, 6, 5, 4, 7), 60) + .pointAt(util.vector.blockSurface(util.grid.at(5, 4, 6), Direction.UP)) + .colored(PonderPalette.RED) + .placeNearTarget() + .text("Fuel stored in Vaults will not be consumed by the train"); + scene.idle(75); + ElementLink controlsElement = scene.world.showIndependentSection(controls, Direction.DOWN); scene.idle(15); scene.overlay.showText(60) diff --git a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderProgressBar.java b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderProgressBar.java index 437a9df43..1fcf41414 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderProgressBar.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderProgressBar.java @@ -104,8 +104,8 @@ public class PonderProgressBar extends AbstractSimiWidget { ms.scale((width + 4) * progress.getValue(partialTicks), 1, 1); int c1 = Theme.i(Theme.Key.PONDER_PROGRESSBAR, true); int c2 = Theme.i(Theme.Key.PONDER_PROGRESSBAR, false); - GuiUtils.drawGradientRect(ms.last().pose(), 110, 0, 3, 1, 4, c1, c1); - GuiUtils.drawGradientRect(ms.last().pose(), 110, 0, 4, 1, 5, c2, c2); + GuiUtils.drawGradientRect(ms.last().pose(), 310, 0, 3, 1, 4, c1, c1); + GuiUtils.drawGradientRect(ms.last().pose(), 310, 0, 4, 1, 5, c2, c2); ms.popPose(); renderKeyframes(ms, mouseX, partialTicks); diff --git a/src/main/resources/assets/create/lang/default/interface.json b/src/main/resources/assets/create/lang/default/interface.json index e7585d23c..fc66959ea 100644 --- a/src/main/resources/assets/create/lang/default/interface.json +++ b/src/main/resources/assets/create/lang/default/interface.json @@ -606,6 +606,10 @@ "create.schedule.instruction.name_edit_box": "Schedule Title", "create.schedule.instruction.name_edit_box_1": "Affects text shown on displays", "create.schedule.instruction.name_edit_box_2": "Defaults to next destination's name", + "create.schedule.instruction.throttle": "Change Throttle", + "create.schedule.instruction.throttle.summary": "Change Throttle to %1$s", + "create.schedule.instruction.throttle_edit_box": "Throttle", + "create.schedule.instruction.throttle_edit_box_1": "Affects the top speed of the Train", "create.schedule.condition_type": "Continue if/after:", "create.schedule.condition.editor": "Condition Editor", diff --git a/src/main/resources/assets/create/models/block/blaze_burner/blaze/inert.json b/src/main/resources/assets/create/models/block/blaze_burner/blaze/inert.json new file mode 100644 index 000000000..55ed5cfb4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/blaze_burner/blaze/inert.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "2": "create:block/blaze_inert", + "particle": "create:block/blaze_inert" + }, + "elements": [ + { + "name": "Blaze 3", + "from": [5, 6, 5], + "to": [11, 12, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 7, 7]}, + "faces": { + "north": {"uv": [6, 0, 12, 6], "texture": "#2"}, + "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, + "up": {"uv": [0, 6, 6, 12], "texture": "#2"}, + "down": {"uv": [6, 6, 12, 12], "texture": "#2"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/blaze_burner/blaze/super_active.json b/src/main/resources/assets/create/models/block/blaze_burner/blaze/super_active.json new file mode 100644 index 000000000..1a3f7a187 --- /dev/null +++ b/src/main/resources/assets/create/models/block/blaze_burner/blaze/super_active.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "create:block/blaze_super_active" + }, + "elements": [ + { + "name": "Blaze 5", + "from": [4, 6, 4], + "to": [12, 14, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 6, 6]}, + "faces": { + "north": {"uv": [8, 0, 16, 8], "texture": "#1"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#1"}, + "down": {"uv": [8, 8, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/blaze_inert.png b/src/main/resources/assets/create/textures/block/blaze_inert.png new file mode 100644 index 000000000..0370811e6 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/blaze_inert.png differ diff --git a/src/main/resources/assets/create/textures/block/blaze_super_active.png b/src/main/resources/assets/create/textures/block/blaze_super_active.png new file mode 100644 index 000000000..861e96176 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/blaze_super_active.png differ