diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index e392b0dfb..01e48dd16 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 -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 +dff2b402dc2e38dde8785d6f4ee80000ac230141 assets/create/lang/en_us.json +f1002564e959d1dc5edf6a739782c319cffc437a assets/create/lang/unfinished/de_de.json +960b0699e1dbe96e459ad46cd43430e91f8a79e3 assets/create/lang/unfinished/es_cl.json +b844ff061fee1e6c412439665d493b5e1751a6c4 assets/create/lang/unfinished/es_es.json +5aac07ac13847fa3c9db4ffa5059a951bc2d0373 assets/create/lang/unfinished/fr_fr.json +e00aca2c6766f0c4dfe9ccc9632b9ff2afa962f1 assets/create/lang/unfinished/it_it.json +74f4404346a2fe74c560a2c094550011987f7b8d assets/create/lang/unfinished/ja_jp.json +9ed3abafcf8fe7727d1f4a41156aacd9804bca3b assets/create/lang/unfinished/ko_kr.json +01c228314baeae81e7d239dfe4cf63dfd82cbd4c assets/create/lang/unfinished/nl_nl.json +cd4582d9ff37368fa96383ab8c1d6f4fec97ab03 assets/create/lang/unfinished/pl_pl.json +3ed6a71519f09dd71040fe2ad1b42e7193f1712d assets/create/lang/unfinished/pt_br.json +1f2c4929bc86ee70779df04fa2ab2b45e38c010e assets/create/lang/unfinished/pt_pt.json +13de2129305b64e31de7c0fdef639c0331fb7483 assets/create/lang/unfinished/ro_ro.json +0a2629874641ed3602a0766b66df3a3e167df78b assets/create/lang/unfinished/ru_ru.json +f6010e62d1c5ca74c7d0f78450be30f665cbc826 assets/create/lang/unfinished/zh_cn.json +ba2edb3aff216e1a779d60f3a5d033f244d32c7c 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 @@ -5726,8 +5726,8 @@ e16d74571ae10007f06f3b86ddf05d3ca9b73559 data/minecraft/tags/blocks/doors.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/dripstone_replaceable_blocks.json 69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/lush_ground_replaceable.json -1472ec62e43355273f0699743ccdb65324c02475 data/minecraft/tags/blocks/mineable/axe.json -cb3c434a11ce83b673d09b1c60a91530a89aaadf data/minecraft/tags/blocks/mineable/pickaxe.json +71480793b5e5ac5eb33c5271118c62227a2769d8 data/minecraft/tags/blocks/mineable/axe.json +77511f0fca91aa40c8b2566bf9bfb78964a56db3 data/minecraft/tags/blocks/mineable/pickaxe.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/moss_replaceable.json e157c1d3af30e409e34bbefbe15a037e6e1c8daa data/minecraft/tags/blocks/needs_iron_tool.json a08f67865337f62601c5e333b4011382d10020e4 data/minecraft/tags/blocks/needs_stone_tool.json diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index bc59fea92..7e2b1bd66 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -2912,7 +2912,8 @@ "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_14": "When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 14fd570a1..202bcf929 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: 1329", + "_": "Missing Localizations: 1330", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 44a86483c..f7325b720 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: 979", + "_": "Missing Localizations: 980", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 2f5c4347b..c091aaf84 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: 643", + "_": "Missing Localizations: 644", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 838baa244..622068974 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2131", + "_": "Missing Localizations: 2132", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 362dd4c7d..8a42fe923 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1902", + "_": "Missing Localizations: 1903", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 9398cb725..1c95e2383 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: 645", + "_": "Missing Localizations: 646", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 16a494164..594712a33 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: 645", + "_": "Missing Localizations: 646", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 a8f6717a4..03827d93b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2479", + "_": "Missing Localizations: 2480", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 c3a438904..8c7a1460c 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: 1018", + "_": "Missing Localizations: 1019", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 165f72c3a..14874ca35 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: 1512", + "_": "Missing Localizations: 1513", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 3f2abcb8f..9ece221ac 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2188", + "_": "Missing Localizations: 2189", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 c9d11eacb..0f50dd274 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: 646", + "_": "Missing Localizations: 647", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 da7f8fdb8..7d601fbab 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: 1023", + "_": "Missing Localizations: 1024", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 4a3e335be..97127b717 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: 643", + "_": "Missing Localizations: 644", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", 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 dc9720a78..4f907a1cb 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: 1037", + "_": "Missing Localizations: 1038", "_": "->------------------------] Game Elements [------------------------<-", @@ -2913,7 +2913,8 @@ "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_14": "UNLOCALIZED: When used on a station, maps will add a labeled marker at the location", + "create.ponder.train_assembly.text_15": "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", diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index 69017d17a..3dfa8509f 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -100,22 +100,7 @@ "create:content_observer", "create:stockpile_switch", "create:creative_crate", - "create:nixie_tube", - "create:white_nixie_tube", - "create:magenta_nixie_tube", - "create:light_blue_nixie_tube", - "create:yellow_nixie_tube", - "create:lime_nixie_tube", - "create:pink_nixie_tube", - "create:gray_nixie_tube", - "create:light_gray_nixie_tube", - "create:cyan_nixie_tube", - "create:purple_nixie_tube", - "create:blue_nixie_tube", - "create:brown_nixie_tube", - "create:green_nixie_tube", - "create:red_nixie_tube", - "create:black_nixie_tube", + "create:display_link", "create:redstone_link", "create:analog_lever", "create:lectern_controller" diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 2a235fd46..3394d19b5 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -134,6 +134,7 @@ "create:content_observer", "create:stockpile_switch", "create:creative_crate", + "create:display_link", "create:display_board", "create:nixie_tube", "create:white_nixie_tube", diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 5f0b7b519..59c0e0679 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -1745,6 +1745,7 @@ public class AllBlocks { .initialProperties(SharedProperties::softMetal) .properties(p -> p.color(MaterialColor.TERRACOTTA_BROWN)) .addLayer(() -> RenderType::translucent) + .transform(axeOrPickaxe()) .blockstate((c, p) -> p.directionalBlock(c.get(), AssetLookup.forPowered(c, p))) .item(DisplayLinkBlockItem::new) .transform(customItemModel("_", "block")) @@ -1769,7 +1770,7 @@ public class AllBlocks { .initialProperties(SharedProperties::softMetal) .properties(p -> p.lightLevel($ -> 5)) .properties(p -> p.color(DyeColor.ORANGE.getMaterialColor())) - .transform(axeOrPickaxe()) + .transform(pickaxeOnly()) .blockstate(new NixieTubeGenerator()::generate) .addLayer(() -> RenderType::translucent) .item() @@ -1784,7 +1785,7 @@ public class AllBlocks { .initialProperties(SharedProperties::softMetal) .properties(p -> p.color(colour.getMaterialColor())) .properties(p -> p.lightLevel($ -> 5)) - .transform(axeOrPickaxe()) + .transform(pickaxeOnly()) .blockstate(new NixieTubeGenerator()::generate) .loot((p, b) -> p.dropOther(b, ORANGE_NIXIE_TUBE.get())) .addLayer(() -> RenderType::translucent) diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java index 7930e4417..e87875809 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java @@ -129,6 +129,7 @@ public class PotatoCannonItem extends ProjectileWeaponItem { Vec3 lookVec = player.getLookAngle(); Vec3 motion = lookVec.add(correction) .normalize() + .scale(2) .scale(projectileType.getVelocityMultiplier()); float soundPitch = projectileType.getSoundPitch() + (Create.RANDOM.nextFloat() - .5f) / 4f; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java index 591a5ab6e..f4902659b 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/display/FlapDisplayRenderer.java @@ -127,7 +127,7 @@ public class FlapDisplayRenderer extends KineticTileEntityRenderer { this.bufferSource = buffer; this.lineIndex = lineIndex; this.level = level; - this.a = glowing ? .975f : .75f; + this.a = glowing ? .975f : .85f; this.r = (color >> 16 & 255) / 255f; this.g = (color >> 8 & 255) / 255f; this.b = (color & 255) / 255f; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationRenderer.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationRenderer.java index 396bc5ccc..e71fdf1ed 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationRenderer.java @@ -46,9 +46,10 @@ public class StationRenderer extends SafeTileEntityRenderer { return; GlobalStation station = te.getStation(); - - if (!te.getBlockState() - .getValue(StationBlock.ASSEMBLING) || station == null || station.getPresentTrain() != null) { + boolean isAssembling = te.getBlockState() + .getValue(StationBlock.ASSEMBLING); + + if (!isAssembling || (station == null || station.getPresentTrain() != null) && !te.isVirtual()) { renderFlag( te.flag.getValue(partialTicks) > 0.75f ? AllBlockPartials.STATION_ON : AllBlockPartials.STATION_OFF, te, partialTicks, ms, buffer, light, overlay); @@ -65,6 +66,9 @@ public class StationRenderer extends SafeTileEntityRenderer { ITrackBlock track = (ITrackBlock) block; Direction direction = te.assemblyDirection; + if (te.isVirtual() && te.bogeyLocations == null) + te.refreshAssemblyInfo(); + if (direction == null || te.assemblyLength == 0 || te.bogeyLocations == null) return; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java index fded7e314..1c9edc2bd 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationTileEntity.java @@ -345,9 +345,11 @@ public class StationTileEntity extends SmartTileEntity implements ITransformable if (!edgePoint.hasValidTrack()) return; - GlobalStation station = getStation(); - if (station == null || station.getPresentTrain() != null) - return; + if (!isVirtual()) { + GlobalStation station = getStation(); + if (station == null || station.getPresentTrain() != null) + return; + } int prevLength = assemblyLength; BlockPos targetPosition = edgePoint.getGlobalPosition(); @@ -398,6 +400,8 @@ public class StationTileEntity extends SmartTileEntity implements ITransformable return; if (prevLength == assemblyLength) return; + if (isVirtual()) + return; Map map = assemblyAreas.get(level); BlockPos startPosition = targetPosition.relative(assemblyDirection); diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackTileEntity.java index 6fd5663d0..80cae8969 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackTileEntity.java @@ -90,7 +90,7 @@ public class TrackTileEntity extends SmartTileEntity implements ITransformableTE } BlockState blockState = level.getBlockState(key); - if (blockState.getBlock() instanceof ITrackBlock trackBlock && !blockState.getValue(TrackBlock.HAS_TE)) + if (blockState.getBlock()instanceof ITrackBlock trackBlock && !blockState.getValue(TrackBlock.HAS_TE)) for (Vec3 v : trackBlock.getTrackAxes(level, key, blockState)) { Vec3 bcEndAxis = bc.axes.getSecond(); if (v.distanceTo(bcEndAxis) < 1 / 1024f || v.distanceTo(bcEndAxis.scale(-1)) < 1 / 1024f) @@ -382,9 +382,9 @@ public class TrackTileEntity extends SmartTileEntity implements ITransformableTE } FluidState fluidState = stateAtPos.getFluidState(); - if (!fluidState.isSourceOfType(Fluids.WATER)) + if (!fluidState.isEmpty() && !fluidState.isSourceOfType(Fluids.WATER)) continue; - + if (!present && stateAtPos.getMaterial() .isReplaceable()) level.setBlock(targetPos, diff --git a/src/main/java/com/simibubi/create/foundation/mixin/MapItemSavedDataMixinClient.java b/src/main/java/com/simibubi/create/foundation/mixin/MapItemSavedDataMixinClient.java new file mode 100644 index 000000000..2898b7023 --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/mixin/MapItemSavedDataMixinClient.java @@ -0,0 +1,31 @@ +package com.simibubi.create.foundation.mixin; + +import java.util.List; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationMarker; + +import net.minecraft.world.level.saveddata.maps.MapDecoration; +import net.minecraft.world.level.saveddata.maps.MapDecoration.Type; +import net.minecraft.world.level.saveddata.maps.MapItemSavedData; + +@Mixin(MapItemSavedData.class) +public class MapItemSavedDataMixinClient { + + @Inject(method = "addClientSideDecorations(Ljava/util/List;)V", at = @At("HEAD")) + private void addClientSideDecorations(List pDecorations, CallbackInfo ci) { + for (int i = 0; i < pDecorations.size(); i++) { + MapDecoration deco = pDecorations.get(i); + if (deco.getType() != Type.MANSION) + continue; + if (deco.getName() == null) + continue; + pDecorations.set(i, new StationMarker.Decoration(deco.getX(), deco.getY(), deco.getName())); + } + } + +} diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java index 5444c09a8..061b59b5d 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java @@ -478,8 +478,10 @@ public class PonderScene { public SceneTransform() { xRotation = LerpedFloat.angular() + .disableSmartAngleChasing() .startWithValue(-35); yRotation = LerpedFloat.angular() + .disableSmartAngleChasing() .startWithValue(55 + 90); } diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrackScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrackScenes.java index 93247beb7..4087a6a7e 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrackScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrackScenes.java @@ -3,6 +3,7 @@ package com.simibubi.create.foundation.ponder.content.trains; import java.util.List; import com.simibubi.create.AllBlocks; +import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock; import com.simibubi.create.foundation.ponder.ElementLink; import com.simibubi.create.foundation.ponder.PonderPalette; import com.simibubi.create.foundation.ponder.SceneBuilder; @@ -347,6 +348,9 @@ public class TrackScenes { scene.configureBasePlate(0, 0, 9); scene.scaleSceneView(.65f); scene.setSceneOffsetY(-1); + + scene.world.cycleBlockProperty(util.grid.at(5, 3, 4), BlazeBurnerBlock.HEAT_LEVEL); + ElementLink stationElement = scene.world.showIndependentSection(util.select.fromTo(0, 0, 0, 8, 0, 8), Direction.UP); ElementLink stationTrackElement = diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainScenes.java index 8f130edf5..fc7bd93b4 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/trains/TrainScenes.java @@ -1,6 +1,7 @@ package com.simibubi.create.foundation.ponder.content.trains; import com.simibubi.create.AllItems; +import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock; import com.simibubi.create.content.logistics.trains.management.edgePoint.station.StationBlock; import com.simibubi.create.foundation.ponder.ElementLink; import com.simibubi.create.foundation.ponder.PonderPalette; @@ -165,6 +166,8 @@ public class TrainScenes { scene.setSceneOffsetY(-1); scene.showBasePlate(); + scene.world.cycleBlockProperty(util.grid.at(3, 3, 4), BlazeBurnerBlock.HEAT_LEVEL); + for (int i = 10; i >= 0; i--) { scene.world.showSection(util.select.position(i, 1, 4), Direction.DOWN); scene.idle(1); 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 3c58e502a..3e9402552 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 @@ -285,7 +285,18 @@ public class TrainStationScenes { .placeNearTarget() .attachKeyFrame() .text("Trains can be disassembled back into blocks at stations only"); - scene.idle(60); + scene.idle(85); + + scene.overlay.showControls(new InputWindowElement(stationTop, Pointing.DOWN).rightClick() + .withItem(new ItemStack(Items.FILLED_MAP)), 75); + scene.idle(15); + scene.overlay.showText(70) + .pointAt(stationTop) + .placeNearTarget() + .attachKeyFrame() + .colored(PonderPalette.BLUE) + .text("When used on a station, maps will add a labeled marker at the location"); + scene.idle(70); for (int i = 8; i >= 3; i--) { scene.world.showSection(util.select.position(i, 1, 2), Direction.DOWN); diff --git a/src/main/java/com/simibubi/create/foundation/utility/animation/LerpedFloat.java b/src/main/java/com/simibubi/create/foundation/utility/animation/LerpedFloat.java index 0ae289f46..bb9e24ef1 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/animation/LerpedFloat.java +++ b/src/main/java/com/simibubi/create/foundation/utility/animation/LerpedFloat.java @@ -48,6 +48,11 @@ public class LerpedFloat { this.chaseFunction = chaseFunction; return this; } + + public LerpedFloat disableSmartAngleChasing() { + angularChase = false; + return this; + } public void updateChaseTarget(float target) { if (angularChase) diff --git a/src/main/resources/create.mixins.json b/src/main/resources/create.mixins.json index 4c218ef46..f3af76190 100644 --- a/src/main/resources/create.mixins.json +++ b/src/main/resources/create.mixins.json @@ -15,6 +15,7 @@ "accessor.ServerLevelAccessor" ], "client": [ + "MapItemSavedDataMixinClient", "CameraMixin", "DestroyProgressMixin", "EntityContraptionInteractionMixin",