diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index d8783eed8..e240cc4ea 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -551,22 +551,22 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json c7b048548ba737df7efee5731a064c8ee960bdaa assets/create/lang/en_ud.json -36b99098c2c1e74ea354e6029c793e60d0f4ae59 assets/create/lang/en_us.json -7dcf9e632b044ab669dd6f6ad3e54631c3d6139c assets/create/lang/unfinished/de_de.json -cfadcedb96c76afcbb40588d79c0349f82e47460 assets/create/lang/unfinished/es_cl.json -b4ff075c0f41ccb984b0d607cae9b418753c9be2 assets/create/lang/unfinished/es_es.json -a5f32e9f82cebf81078080f08a7d4c34c57e83ed assets/create/lang/unfinished/fr_fr.json -14604d102012db3d5d7d73704068757327e36be2 assets/create/lang/unfinished/it_it.json -f303c569fc4d5948b0114875fb5f51107fd1206b assets/create/lang/unfinished/ja_jp.json -450c9f26a1e9e69dea4f560b98038713e455d8ff assets/create/lang/unfinished/ko_kr.json -6b27dd10cdf70a887f92bd6e07727ecdb353fe05 assets/create/lang/unfinished/nl_nl.json -c7654bc1bae61f4a082c5c192aee77eb20420524 assets/create/lang/unfinished/pl_pl.json -21fdbb74b8ec7985a6b28007dea9e89573185aee assets/create/lang/unfinished/pt_br.json -b1e1b5c9bbe8edf74a7ea065419c163a498705d5 assets/create/lang/unfinished/pt_pt.json -475bee61ea113f82c28d160a1e0a878497c70294 assets/create/lang/unfinished/ro_ro.json -8e7bbcc121f75d9624912b9b973c97e06e513ee9 assets/create/lang/unfinished/ru_ru.json -98e166139f6b34fc5b3b3f82e847e45fa76dde3d assets/create/lang/unfinished/zh_cn.json -ac0c777b32535ea8d87c6812cacb54b56f824c25 assets/create/lang/unfinished/zh_tw.json +0870bf282b75f8126166ed6f9a5ece80dd71b64b assets/create/lang/en_us.json +cc9ca507f0679d21193d3e9ea38ea2da63690538 assets/create/lang/unfinished/de_de.json +ac841d318a6df832c6de0daf4f9309c11aa46a3e assets/create/lang/unfinished/es_cl.json +2874f436add4c9ff52f6cce5180cb8c30c2dd203 assets/create/lang/unfinished/es_es.json +b1a3ae3a464bd5f2321a53666fe124e6cdee7bba assets/create/lang/unfinished/fr_fr.json +adcc4aab4338cc21e89fd92208d0d50cd00be109 assets/create/lang/unfinished/it_it.json +7cab2dd7377cc08087ecefd94f20d169f11ad7ed assets/create/lang/unfinished/ja_jp.json +cc00931dba01292bf0d407ba958bafa0add11128 assets/create/lang/unfinished/ko_kr.json +143a9297fc06a5e5d6ef5b458b8d4d7f888ebf42 assets/create/lang/unfinished/nl_nl.json +46495cff5c50b4f81b8075a90d85da06f55153bb assets/create/lang/unfinished/pl_pl.json +33de68ff95c6c281a530101160086e9367fac086 assets/create/lang/unfinished/pt_br.json +a1b28b1203acca0ea3d4a84c2945e25aed073eba assets/create/lang/unfinished/pt_pt.json +89a8daa6b5665bd1f63855fc07c3dbe238bf2995 assets/create/lang/unfinished/ro_ro.json +6744c0236c63458700c7a70607c00ca57e0a8473 assets/create/lang/unfinished/ru_ru.json +faad944cb89c9dce81cfabaaaa3fb53e354c64e2 assets/create/lang/unfinished/zh_cn.json +6176afefd864926e69f5e6a7935527674f535a77 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 @@ -2189,7 +2189,7 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear 866fbb0ce2878a73e0440d1caf6534c8bd7c384f assets/create/models/item/zinc_ingot.json a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json -56f5b100aa98b37efb44b85856ff4bfeaa7a89ec assets/create/sounds.json +40db9034dcb721eb07630d8a300f899dedd6e2f3 assets/create/sounds.json 0f1b4b980afba9bf2caf583b88e261bba8b10313 data/create/advancements/aesthetics.json 613e64b44bed959da899fdd54c1cacb227fb33f2 data/create/advancements/andesite_alloy.json 81885c6bfb85792c88aaa7c9b70f58832945d31f data/create/advancements/andesite_casing.json diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 5843fd87b..c77626d63 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1590,46 +1590,50 @@ "create.subtitle.contraption_disassemble": "Contraption stops", "create.subtitle.peculiar_bell_use": "Peculiar Bell tolls", - "create.subtitle.mixing": "Mixing noises", - "create.subtitle.mechanical_press_activation_belt": "Mechanical Press bonks", - "create.subtitle.fwoomp": "Potato Launcher fwoomps", "create.subtitle.worldshaper_place": "Worldshaper zaps", - "create.subtitle.sanding_long": "Sanding noises", - "create.subtitle.crushing_1": "Crushing noises", - "create.subtitle.depot_slide": "Item slides", + "create.subtitle.steam": "Steam noises", "create.subtitle.saw_activate_stone": "Mechanical Saw activates", - "create.subtitle.blaze_munch": "Blaze Burner munches", - "create.subtitle.funnel_flap": "Funnel flaps", "create.subtitle.schematicannon_finish": "Schematicannon dings", - "create.subtitle.haunted_bell_use": "Haunted Bell tolls", - "create.subtitle.scroll_value": "Scroll-input clicks", "create.subtitle.crafter_craft": "Crafter crafts", - "create.subtitle.controller_put": "Controller thumps", - "create.subtitle.cranking": "Hand Crank turns", "create.subtitle.wrench_remove": "Component breaks", - "create.subtitle.sanding_short": "Sanding noises", + "create.subtitle.train2": "Bogey wheels rumble", + "create.subtitle.train3": "Bogey wheels rumble muffled", "create.subtitle.whistle": "Whistling", "create.subtitle.cogs": "Cogwheels rumble", "create.subtitle.slime_added": "Slime squishes", + "create.subtitle.whistle_train_low": "Low whistling", + "create.subtitle.schematicannon_launch_block": "Schematicannon fires", + "create.subtitle.controller_take": "Lectern empties", + "create.subtitle.crafter_click": "Crafter clicks", + "create.subtitle.depot_plop": "Item lands", + "create.subtitle.confirm": "Affirmative ding", + "create.subtitle.mixing": "Mixing noises", + "create.subtitle.mechanical_press_activation_belt": "Mechanical Press bonks", + "create.subtitle.fwoomp": "Potato Launcher fwoomps", + "create.subtitle.sanding_long": "Sanding noises", + "create.subtitle.crushing_1": "Crushing noises", + "create.subtitle.depot_slide": "Item slides", + "create.subtitle.blaze_munch": "Blaze Burner munches", + "create.subtitle.funnel_flap": "Funnel flaps", + "create.subtitle.haunted_bell_use": "Haunted Bell tolls", + "create.subtitle.scroll_value": "Scroll-input clicks", + "create.subtitle.controller_put": "Controller thumps", + "create.subtitle.cranking": "Hand Crank turns", + "create.subtitle.sanding_short": "Sanding noises", "create.subtitle.wrench_rotate": "Wrench used", "create.subtitle.potato_hit": "Vegetable impacts", "create.subtitle.saw_activate_wood": "Mechanical Saw activates", "create.subtitle.whistle_high": "High whistling", "create.subtitle.whistle_train": "Whistling", "create.subtitle.haunted_bell_convert": "Haunted Bell awakens", + "create.subtitle.train": "Bogey wheels rumble", "create.subtitle.whistle_train_high": "High whistling", - "create.subtitle.whistle_train_low": "Low whistling", "create.subtitle.deny": "Declining boop", "create.subtitle.controller_click": "Controller clicks", "create.subtitle.whistle_low": "Low whistling", - "create.subtitle.schematicannon_launch_block": "Schematicannon fires", "create.subtitle.copper_armor_equip": "Diving equipment clinks", - "create.subtitle.controller_take": "Lectern empties", "create.subtitle.mechanical_press_activation": "Mechanical Press clangs", "create.subtitle.contraption_assemble": "Contraption moves", - "create.subtitle.crafter_click": "Crafter clicks", - "create.subtitle.depot_plop": "Item lands", - "create.subtitle.confirm": "Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", 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 c1f4baf1d..00d886933 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: 934", + "_": "Missing Localizations: 938", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "Apparat stoppt", "create.subtitle.peculiar_bell_use": "Eigenartige Glockenschläge", - "create.subtitle.mixing": "Mix-Geräusche", - "create.subtitle.mechanical_press_activation_belt": "Mechanische Presse klingt", - "create.subtitle.fwoomp": "Kartoffel-Kanone macht fwumps", "create.subtitle.worldshaper_place": "Geländeformer zippt", - "create.subtitle.sanding_long": "Schleifgeräusche", - "create.subtitle.crushing_1": "Zermahlgeräusche", - "create.subtitle.depot_slide": "Gegenstand gleitet", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "Mechanische Säge wird aktiviert", - "create.subtitle.blaze_munch": "Lohe kaut glücklich", - "create.subtitle.funnel_flap": "Klappe klappert", "create.subtitle.schematicannon_finish": "Bauplankanone endet", - "create.subtitle.haunted_bell_use": "Spukglocke läutet", - "create.subtitle.scroll_value": "Klick bei der Bildlauf-Eingabe", "create.subtitle.crafter_craft": "Hersteller stellt her", - "create.subtitle.controller_put": "Kontroller stößt auf", - "create.subtitle.cranking": "Handkurbel dreht", "create.subtitle.wrench_remove": "Teil entfernt", - "create.subtitle.sanding_short": "Schleifgeräusche", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "Zahnräder rattern", "create.subtitle.slime_added": "Schleim matscht", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "Bauplankanone schießt", + "create.subtitle.controller_take": "Lesepult geleert", + "create.subtitle.crafter_click": "Hersteller klickt", + "create.subtitle.depot_plop": "Gegenstand landet", + "create.subtitle.confirm": "Bestätigendes Klick", + "create.subtitle.mixing": "Mix-Geräusche", + "create.subtitle.mechanical_press_activation_belt": "Mechanische Presse klingt", + "create.subtitle.fwoomp": "Kartoffel-Kanone macht fwumps", + "create.subtitle.sanding_long": "Schleifgeräusche", + "create.subtitle.crushing_1": "Zermahlgeräusche", + "create.subtitle.depot_slide": "Gegenstand gleitet", + "create.subtitle.blaze_munch": "Lohe kaut glücklich", + "create.subtitle.funnel_flap": "Klappe klappert", + "create.subtitle.haunted_bell_use": "Spukglocke läutet", + "create.subtitle.scroll_value": "Klick bei der Bildlauf-Eingabe", + "create.subtitle.controller_put": "Kontroller stößt auf", + "create.subtitle.cranking": "Handkurbel dreht", + "create.subtitle.sanding_short": "Schleifgeräusche", "create.subtitle.wrench_rotate": "Schraubenschlüssel benutzt", "create.subtitle.potato_hit": "Gemüse schlägt ein", "create.subtitle.saw_activate_wood": "Mechanische Säge wird aktiviert", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "Spukglocke erwacht", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "Ablehnendes boop", "create.subtitle.controller_click": "Kontroller klickt", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "Bauplankanone schießt", "create.subtitle.copper_armor_equip": "Taucherausrüstung klirrt", - "create.subtitle.controller_take": "Lesepult geleert", "create.subtitle.mechanical_press_activation": "Mechanische Presse wird aktiviert", "create.subtitle.contraption_assemble": "Apparat bewegt sich", - "create.subtitle.crafter_click": "Hersteller klickt", - "create.subtitle.depot_plop": "Gegenstand landet", - "create.subtitle.confirm": "Bestätigendes Klick", "_": "->------------------------] Item Descriptions [------------------------<-", 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 9a4a406a7..035912153 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: 584", + "_": "Missing Localizations: 588", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "Contrapción se detiene", "create.subtitle.peculiar_bell_use": "Campana Peculiar tañe", - "create.subtitle.mixing": "Sonidos de mezcla", - "create.subtitle.mechanical_press_activation_belt": "Prensa Mecánica hace bonk", - "create.subtitle.fwoomp": "Lanza Patatas hace fwoom", "create.subtitle.worldshaper_place": "El Forma Mundos zapea", - "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", - "create.subtitle.crushing_1": "Sonidos de Trituración", - "create.subtitle.depot_slide": "Objeto se desliza", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "Sierra Mecánica se activa", - "create.subtitle.blaze_munch": "Quemador Blaze mastica", - "create.subtitle.funnel_flap": "Ingreso aletea", "create.subtitle.schematicannon_finish": "Esquemacañón campanea", - "create.subtitle.haunted_bell_use": "Campana Embrujada tañe", - "create.subtitle.scroll_value": "Sonidos de Clic", "create.subtitle.crafter_craft": "Crafteador craftea", - "create.subtitle.controller_put": "Controlador golpetea", - "create.subtitle.cranking": "Manivela gira", "create.subtitle.wrench_remove": "Componente se rompe", - "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "Engranajes suenan", "create.subtitle.slime_added": "Slime chapotea", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "Esquemacañón dispara", + "create.subtitle.controller_take": "Atril se Vacía", + "create.subtitle.crafter_click": "Crafteador cliquea", + "create.subtitle.depot_plop": "Objeto aterriza", + "create.subtitle.confirm": "Ding afirmativo", + "create.subtitle.mixing": "Sonidos de mezcla", + "create.subtitle.mechanical_press_activation_belt": "Prensa Mecánica hace bonk", + "create.subtitle.fwoomp": "Lanza Patatas hace fwoom", + "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", + "create.subtitle.crushing_1": "Sonidos de Trituración", + "create.subtitle.depot_slide": "Objeto se desliza", + "create.subtitle.blaze_munch": "Quemador Blaze mastica", + "create.subtitle.funnel_flap": "Ingreso aletea", + "create.subtitle.haunted_bell_use": "Campana Embrujada tañe", + "create.subtitle.scroll_value": "Sonidos de Clic", + "create.subtitle.controller_put": "Controlador golpetea", + "create.subtitle.cranking": "Manivela gira", + "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", "create.subtitle.wrench_rotate": "Llave Inglesa usada", "create.subtitle.potato_hit": "Impactos vegetales", "create.subtitle.saw_activate_wood": "Sierra Mecánica se activa", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "Campana Embrujada despierta", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "Boop denegante", "create.subtitle.controller_click": "Controlador cliquea", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "Esquemacañón dispara", "create.subtitle.copper_armor_equip": "Equipo de Buceo tintinea", - "create.subtitle.controller_take": "Atril se Vacía", "create.subtitle.mechanical_press_activation": "Prensa Mecánica aplasta", "create.subtitle.contraption_assemble": "Contración se mueve", - "create.subtitle.crafter_click": "Crafteador cliquea", - "create.subtitle.depot_plop": "Objeto aterriza", - "create.subtitle.confirm": "Ding afirmativo", "_": "->------------------------] Item Descriptions [------------------------<-", 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 526549650..74c6c888b 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: 248", + "_": "Missing Localizations: 252", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "Artefacto animado se para", "create.subtitle.peculiar_bell_use": "Campana peculiar suena", - "create.subtitle.mixing": "Mezclando", - "create.subtitle.mechanical_press_activation_belt": "Prensa mecánica apisona", - "create.subtitle.fwoomp": "Cañón de patatas sonando", "create.subtitle.worldshaper_place": "Moldeador de mundos coloca bloques", - "create.subtitle.sanding_long": "Lijando", - "create.subtitle.crushing_1": "Triturando", - "create.subtitle.depot_slide": "Objeto desliza", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "Sierra mecánica activada", - "create.subtitle.blaze_munch": "Quemador de blaze masca", - "create.subtitle.funnel_flap": "Embudo aletea", "create.subtitle.schematicannon_finish": "Esquematicañón suena", - "create.subtitle.haunted_bell_use": "Campana maldita suena", - "create.subtitle.scroll_value": "", "create.subtitle.crafter_craft": "Ensamblador mecánico acaba", - "create.subtitle.controller_put": "", - "create.subtitle.cranking": "Manivela gira", "create.subtitle.wrench_remove": "Componente se rompe", - "create.subtitle.sanding_short": "Lijando", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "Engranajes retumban", "create.subtitle.slime_added": "Pegamento chapotea", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "Esquematicañón dispara", + "create.subtitle.controller_take": "Atril vaciándose", + "create.subtitle.crafter_click": "Ensamblador mecánico suena", + "create.subtitle.depot_plop": "Objeto aterriza", + "create.subtitle.confirm": "Campaneo afirmativo", + "create.subtitle.mixing": "Mezclando", + "create.subtitle.mechanical_press_activation_belt": "Prensa mecánica apisona", + "create.subtitle.fwoomp": "Cañón de patatas sonando", + "create.subtitle.sanding_long": "Lijando", + "create.subtitle.crushing_1": "Triturando", + "create.subtitle.depot_slide": "Objeto desliza", + "create.subtitle.blaze_munch": "Quemador de blaze masca", + "create.subtitle.funnel_flap": "Embudo aletea", + "create.subtitle.haunted_bell_use": "Campana maldita suena", + "create.subtitle.scroll_value": "", + "create.subtitle.controller_put": "", + "create.subtitle.cranking": "Manivela gira", + "create.subtitle.sanding_short": "Lijando", "create.subtitle.wrench_rotate": "Llave inglesa usada", "create.subtitle.potato_hit": "Impacto de vegetal", "create.subtitle.saw_activate_wood": "Sierra mecánica activada", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "Campana maldita se despierta", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "Pitido denegante", "create.subtitle.controller_click": "", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "Esquematicañón dispara", "create.subtitle.copper_armor_equip": "Equipo de buceo tintinea", - "create.subtitle.controller_take": "Atril vaciándose", "create.subtitle.mechanical_press_activation": "Prensa mecánica apisona", "create.subtitle.contraption_assemble": "Artefacto animado se mueve", - "create.subtitle.crafter_click": "Ensamblador mecánico suena", - "create.subtitle.depot_plop": "Objeto aterriza", - "create.subtitle.confirm": "Campaneo afirmativo", "_": "->------------------------] Item Descriptions [------------------------<-", 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 f7ab59113..818e071ad 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: 1822", + "_": "Missing Localizations: 1826", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", - "create.subtitle.mixing": "UNLOCALIZED: Mixing noises", - "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", - "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", - "create.subtitle.crushing_1": "UNLOCALIZED: Crushing noises", - "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "UNLOCALIZED: Mechanical Saw activates", - "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", - "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel flaps", "create.subtitle.schematicannon_finish": "Fin de schémacanon", - "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", - "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", - "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", - "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.slime_added": "Bruit de slime", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "Tir de schémacanon", + "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", + "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", + "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", + "create.subtitle.mixing": "UNLOCALIZED: Mixing noises", + "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", + "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", + "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", + "create.subtitle.crushing_1": "UNLOCALIZED: Crushing noises", + "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", + "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", + "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel flaps", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", + "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", + "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", + "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", + "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "Tir de schémacanon", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", - "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "Activation de la presse mechanique", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", - "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", - "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", - "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", 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 1d930c0fc..270ffda71 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: 1511", + "_": "Missing Localizations: 1515", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", - "create.subtitle.mixing": "UNLOCALIZED: Mixing noises", - "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", - "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", - "create.subtitle.crushing_1": "UNLOCALIZED: Crushing noises", - "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "UNLOCALIZED: Mechanical Saw activates", - "create.subtitle.blaze_munch": "Il blaze lo gusta felicemente", - "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel flaps", "create.subtitle.schematicannon_finish": "Finiture cannoneschematico", - "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", - "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", - "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", - "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.slime_added": "Slime schiacciato", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "Tiri del cannoneschematico", + "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", + "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", + "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", + "create.subtitle.mixing": "UNLOCALIZED: Mixing noises", + "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", + "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", + "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", + "create.subtitle.crushing_1": "UNLOCALIZED: Crushing noises", + "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", + "create.subtitle.blaze_munch": "Il blaze lo gusta felicemente", + "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel flaps", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", + "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", + "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", + "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", + "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "Tiri del cannoneschematico", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", - "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "Pressa meccanica attiva", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", - "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", - "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", - "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", 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 f7ac41819..c5ab57767 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: 250", + "_": "Missing Localizations: 254", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "からくりが止まる", "create.subtitle.peculiar_bell_use": "風変わりな鐘が鳴る", - "create.subtitle.mixing": "混ぜる音", - "create.subtitle.mechanical_press_activation_belt": "メカニカルプレスがボンと鳴る", - "create.subtitle.fwoomp": "ポテトランチャーがバキューンと鳴る", "create.subtitle.worldshaper_place": "ワールドシェーパーが設置する", - "create.subtitle.sanding_long": "研磨音", - "create.subtitle.crushing_1": "粉砕音", - "create.subtitle.depot_slide": "アイテムが滑る", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "メカニカルソーが動作する", - "create.subtitle.blaze_munch": "ブレイズの咀嚼音", - "create.subtitle.funnel_flap": "ファンネルがはためく", "create.subtitle.schematicannon_finish": "概略図砲が作業を終える", - "create.subtitle.haunted_bell_use": "憑りつかれた鐘が鳴る", - "create.subtitle.scroll_value": "スクロールのカチカチ音", "create.subtitle.crafter_craft": "メカニカルクラフターがクラフトする", - "create.subtitle.controller_put": "コントローラのトントン音", - "create.subtitle.cranking": "ハンドクランクが回る", "create.subtitle.wrench_remove": "機械を壊す", - "create.subtitle.sanding_short": "研磨音", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "歯車がゴロゴロと鳴る", "create.subtitle.slime_added": "スライムがぐしゃっとつぶれる", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "概略図砲が発射する", + "create.subtitle.controller_take": "書見台が空になる", + "create.subtitle.crafter_click": "メカニカルクラフターのカチカチ音", + "create.subtitle.depot_plop": "デプロイヤーにアイテムが入れられる", + "create.subtitle.confirm": "成功音", + "create.subtitle.mixing": "混ぜる音", + "create.subtitle.mechanical_press_activation_belt": "メカニカルプレスがボンと鳴る", + "create.subtitle.fwoomp": "ポテトランチャーがバキューンと鳴る", + "create.subtitle.sanding_long": "研磨音", + "create.subtitle.crushing_1": "粉砕音", + "create.subtitle.depot_slide": "アイテムが滑る", + "create.subtitle.blaze_munch": "ブレイズの咀嚼音", + "create.subtitle.funnel_flap": "ファンネルがはためく", + "create.subtitle.haunted_bell_use": "憑りつかれた鐘が鳴る", + "create.subtitle.scroll_value": "スクロールのカチカチ音", + "create.subtitle.controller_put": "コントローラのトントン音", + "create.subtitle.cranking": "ハンドクランクが回る", + "create.subtitle.sanding_short": "研磨音", "create.subtitle.wrench_rotate": "レンチが使用される", "create.subtitle.potato_hit": "野菜の衝撃", "create.subtitle.saw_activate_wood": "メカニカルソーが動作する", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "憑りつかれた鐘が目覚める", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "失敗音", "create.subtitle.controller_click": "コントローラーのカチカチ音", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "概略図砲が発射する", "create.subtitle.copper_armor_equip": "潜水服がチャリンと鳴る", - "create.subtitle.controller_take": "書見台が空になる", "create.subtitle.mechanical_press_activation": "メカニカルプレスがガーンと鳴る", "create.subtitle.contraption_assemble": "からくりが動く", - "create.subtitle.crafter_click": "メカニカルクラフターのカチカチ音", - "create.subtitle.depot_plop": "デプロイヤーにアイテムが入れられる", - "create.subtitle.confirm": "成功音", "_": "->------------------------] Item Descriptions [------------------------<-", 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 48ba4d08b..f6a17dbef 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: 250", + "_": "Missing Localizations: 254", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "구조물이 멈춤", "create.subtitle.peculiar_bell_use": "황동 종이 울림", - "create.subtitle.mixing": "섞는 소리", - "create.subtitle.mechanical_press_activation_belt": "압착기가 작동함", - "create.subtitle.fwoomp": "감자포를 쏨", "create.subtitle.worldshaper_place": "세계편집기가 쏨", - "create.subtitle.sanding_long": "사포를 사용함", - "create.subtitle.crushing_1": "분쇄되는 소리", - "create.subtitle.depot_slide": "아이템이 미끄러짐", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "톱이 작동함", - "create.subtitle.blaze_munch": "블레이즈 버너가 섭취함", - "create.subtitle.funnel_flap": "퍼널이 펄럭거림", "create.subtitle.schematicannon_finish": "청사진 대포가 끝남", - "create.subtitle.haunted_bell_use": "귀신들린 종이 울림", - "create.subtitle.scroll_value": "스크롤 소리", "create.subtitle.crafter_craft": "조합기가 조합함", - "create.subtitle.controller_put": "조작기를 놓음", - "create.subtitle.cranking": "크랭크가 돌아감", "create.subtitle.wrench_remove": "장치가 부숴짐", - "create.subtitle.sanding_short": "사포를 사용함", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "톱니바퀴가 돌아감", "create.subtitle.slime_added": "슬라임이 철퍽거림", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "청사진 대포가 발사함", + "create.subtitle.controller_take": "독서대가 비워짐", + "create.subtitle.crafter_click": "조합기가 작동함", + "create.subtitle.depot_plop": "아이템이 놓임", + "create.subtitle.confirm": "확인음", + "create.subtitle.mixing": "섞는 소리", + "create.subtitle.mechanical_press_activation_belt": "압착기가 작동함", + "create.subtitle.fwoomp": "감자포를 쏨", + "create.subtitle.sanding_long": "사포를 사용함", + "create.subtitle.crushing_1": "분쇄되는 소리", + "create.subtitle.depot_slide": "아이템이 미끄러짐", + "create.subtitle.blaze_munch": "블레이즈 버너가 섭취함", + "create.subtitle.funnel_flap": "퍼널이 펄럭거림", + "create.subtitle.haunted_bell_use": "귀신들린 종이 울림", + "create.subtitle.scroll_value": "스크롤 소리", + "create.subtitle.controller_put": "조작기를 놓음", + "create.subtitle.cranking": "크랭크가 돌아감", + "create.subtitle.sanding_short": "사포를 사용함", "create.subtitle.wrench_rotate": "렌치를 사용함", "create.subtitle.potato_hit": "채소가 부딫힘", "create.subtitle.saw_activate_wood": "톱이 작동함", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "종에 귀신이 들림", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "취소음", "create.subtitle.controller_click": "조작기를 누름", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "청사진 대포가 발사함", "create.subtitle.copper_armor_equip": "잠수용 장비가 철커덕거림", - "create.subtitle.controller_take": "독서대가 비워짐", "create.subtitle.mechanical_press_activation": "압착기가 작동함", "create.subtitle.contraption_assemble": "구조물이 움직임", - "create.subtitle.crafter_click": "조합기가 작동함", - "create.subtitle.depot_plop": "아이템이 놓임", - "create.subtitle.confirm": "확인음", "_": "->------------------------] Item Descriptions [------------------------<-", 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 7d3fd6d3c..21a78e558 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: 2174", + "_": "Missing Localizations: 2178", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", - "create.subtitle.mixing": "UNLOCALIZED: Mixing noises", - "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", - "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", - "create.subtitle.crushing_1": "UNLOCALIZED: Crushing noises", - "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "UNLOCALIZED: Mechanical Saw activates", - "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", - "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel flaps", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", - "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", - "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", - "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", - "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.slime_added": "UNLOCALIZED: Slime squishes", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", + "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", + "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", + "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", + "create.subtitle.mixing": "UNLOCALIZED: Mixing noises", + "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", + "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", + "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", + "create.subtitle.crushing_1": "UNLOCALIZED: Crushing noises", + "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", + "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", + "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel flaps", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", + "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", + "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", + "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", + "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", - "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", - "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", - "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", - "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", 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 3f5e61c16..21fe4d5b0 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: 623", + "_": "Missing Localizations: 627", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "Maszyna staje", "create.subtitle.peculiar_bell_use": "Dziwny dzwon dzwoni", - "create.subtitle.mixing": "Dźwięki mieszania", - "create.subtitle.mechanical_press_activation_belt": "Mechaniczna prasa stuka", - "create.subtitle.fwoomp": "Armata na ziemniaki strzela", "create.subtitle.worldshaper_place": "Kształter strzela", - "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", - "create.subtitle.crushing_1": "Dźwięki kruszenia", - "create.subtitle.depot_slide": "Przedmiot ślizga się", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "Mechaniczna piła aktywuje się", - "create.subtitle.blaze_munch": "Płomyk szczęśliwie przeżuwa", - "create.subtitle.funnel_flap": "Lejek trzepocze", "create.subtitle.schematicannon_finish": "Schematoarmata skończyła", - "create.subtitle.haunted_bell_use": "Nawiedzony dzwoń dzwoni", - "create.subtitle.scroll_value": "Kliknięcie", "create.subtitle.crafter_craft": "Mechaniczny stół rzemieślniczy konstruuje", - "create.subtitle.controller_put": "Sterownik klika", - "create.subtitle.cranking": "Ręczna korba obraca się", "create.subtitle.wrench_remove": "Komponent niszczy się", - "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "Koła zębate terkoczą", "create.subtitle.slime_added": "Szlam plaska", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "Schematoarmata strzela", + "create.subtitle.controller_take": "Pulpit opróżnia się", + "create.subtitle.crafter_click": "Mechaniczny stół rzemieślniczy stuka", + "create.subtitle.depot_plop": "Przedmiot ląduje", + "create.subtitle.confirm": "Dźwięk potwierdzenia", + "create.subtitle.mixing": "Dźwięki mieszania", + "create.subtitle.mechanical_press_activation_belt": "Mechaniczna prasa stuka", + "create.subtitle.fwoomp": "Armata na ziemniaki strzela", + "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", + "create.subtitle.crushing_1": "Dźwięki kruszenia", + "create.subtitle.depot_slide": "Przedmiot ślizga się", + "create.subtitle.blaze_munch": "Płomyk szczęśliwie przeżuwa", + "create.subtitle.funnel_flap": "Lejek trzepocze", + "create.subtitle.haunted_bell_use": "Nawiedzony dzwoń dzwoni", + "create.subtitle.scroll_value": "Kliknięcie", + "create.subtitle.controller_put": "Sterownik klika", + "create.subtitle.cranking": "Ręczna korba obraca się", + "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", "create.subtitle.wrench_rotate": "Klucz skrzypi", "create.subtitle.potato_hit": "Warzywo ląduje", "create.subtitle.saw_activate_wood": "Mechaniczna piła aktywuje się", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "Nawiedzony dzwon budzi się", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "Dźwięk odmowy", "create.subtitle.controller_click": "Sterownik klika", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "Schematoarmata strzela", "create.subtitle.copper_armor_equip": "Sprzęt do nurkowania pobrzękuje", - "create.subtitle.controller_take": "Pulpit opróżnia się", "create.subtitle.mechanical_press_activation": "Mechaniczna prasa się uruchamia", "create.subtitle.contraption_assemble": "Maszyna przesuwa się", - "create.subtitle.crafter_click": "Mechaniczny stół rzemieślniczy stuka", - "create.subtitle.depot_plop": "Przedmiot ląduje", - "create.subtitle.confirm": "Dźwięk potwierdzenia", "_": "->------------------------] Item Descriptions [------------------------<-", 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 0cfbc97d5..bdd49e822 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: 1118", + "_": "Missing Localizations: 1122", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "Engenhoca para", "create.subtitle.peculiar_bell_use": "Sino peculiar toca", - "create.subtitle.mixing": "Sons de mistura", - "create.subtitle.mechanical_press_activation_belt": "Bonks da prensa mecanica", - "create.subtitle.fwoomp": "Fwoomps do canhão de batata", "create.subtitle.worldshaper_place": "Zaps do terraformador", - "create.subtitle.sanding_long": "Sons de lixa", - "create.subtitle.crushing_1": "Sons de trituração", - "create.subtitle.depot_slide": "Item escorrega", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "Serra mecânica ativa", - "create.subtitle.blaze_munch": "Queimador de blazer mastiga", - "create.subtitle.funnel_flap": "Abas do funil batendo", "create.subtitle.schematicannon_finish": "Ding do canhão de esquema", - "create.subtitle.haunted_bell_use": "Sino assombrado toca", - "create.subtitle.scroll_value": "click do scroll", "create.subtitle.crafter_craft": "Fabricador fábrica", - "create.subtitle.controller_put": "Thumps do controle", - "create.subtitle.cranking": "Manivela gira", "create.subtitle.wrench_remove": "Componente quebra", - "create.subtitle.sanding_short": "Sons de lixa", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "tremer da rodas dentadas", "create.subtitle.slime_added": "Slime sendo espremido", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "Canhão de esquema atira", + "create.subtitle.controller_take": "Atril esvaziado", + "create.subtitle.crafter_click": "Clicks do fabricador", + "create.subtitle.depot_plop": "Item pousa", + "create.subtitle.confirm": "Ding afirmativo", + "create.subtitle.mixing": "Sons de mistura", + "create.subtitle.mechanical_press_activation_belt": "Bonks da prensa mecanica", + "create.subtitle.fwoomp": "Fwoomps do canhão de batata", + "create.subtitle.sanding_long": "Sons de lixa", + "create.subtitle.crushing_1": "Sons de trituração", + "create.subtitle.depot_slide": "Item escorrega", + "create.subtitle.blaze_munch": "Queimador de blazer mastiga", + "create.subtitle.funnel_flap": "Abas do funil batendo", + "create.subtitle.haunted_bell_use": "Sino assombrado toca", + "create.subtitle.scroll_value": "click do scroll", + "create.subtitle.controller_put": "Thumps do controle", + "create.subtitle.cranking": "Manivela gira", + "create.subtitle.sanding_short": "Sons de lixa", "create.subtitle.wrench_rotate": "Chave inglesa usada", "create.subtitle.potato_hit": "Impacto vegetal", "create.subtitle.saw_activate_wood": "Serra mecânica ativa", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "Sino assombrado acorda", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "Boop de negação", "create.subtitle.controller_click": "Clicks do controle", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "Canhão de esquema atira", "create.subtitle.copper_armor_equip": "Tilintar dos equipamentos de mergulho", - "create.subtitle.controller_take": "Atril esvaziado", "create.subtitle.mechanical_press_activation": "Clang da prensa mecânica", "create.subtitle.contraption_assemble": "Engenhoca move", - "create.subtitle.crafter_click": "Clicks do fabricador", - "create.subtitle.depot_plop": "Item pousa", - "create.subtitle.confirm": "Ding afirmativo", "_": "->------------------------] Item Descriptions [------------------------<-", 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 cf75443ac..c516c5b38 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: 1796", + "_": "Missing Localizations: 1800", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops", "create.subtitle.peculiar_bell_use": "UNLOCALIZED: Peculiar Bell tolls", - "create.subtitle.mixing": "UNLOCALIZED: Mixing noises", - "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", - "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", "create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps", - "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", - "create.subtitle.crushing_1": "UNLOCALIZED: Crushing noises", - "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "UNLOCALIZED: Mechanical Saw activates", - "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", - "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel flaps", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", - "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", - "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts", - "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", - "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks", - "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.slime_added": "UNLOCALIZED: Slime squishes", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", + "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", + "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", + "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", + "create.subtitle.mixing": "UNLOCALIZED: Mixing noises", + "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", + "create.subtitle.fwoomp": "UNLOCALIZED: Potato Launcher fwoomps", + "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", + "create.subtitle.crushing_1": "UNLOCALIZED: Crushing noises", + "create.subtitle.depot_slide": "UNLOCALIZED: Item slides", + "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze Burner munches", + "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel flaps", + "create.subtitle.haunted_bell_use": "UNLOCALIZED: Haunted Bell tolls", + "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", + "create.subtitle.controller_put": "UNLOCALIZED: Controller thumps", + "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", + "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "UNLOCALIZED: Vegetable impacts", "create.subtitle.saw_activate_wood": "UNLOCALIZED: Mechanical Saw activates", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "UNLOCALIZED: Haunted Bell awakens", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.controller_click": "UNLOCALIZED: Controller clicks", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "UNLOCALIZED: Schematicannon fires", "create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks", - "create.subtitle.controller_take": "UNLOCALIZED: Lectern empties", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves", - "create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks", - "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", - "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", 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 9d0774e38..c14a00023 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: 251", + "_": "Missing Localizations: 255", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "Invenție se oprește", "create.subtitle.peculiar_bell_use": "Clopot Ciudat bate", - "create.subtitle.mixing": "Sunete de amestecare", - "create.subtitle.mechanical_press_activation_belt": "Presă Mecanică face bonk", - "create.subtitle.fwoomp": "Lansator de Cartofi face fwoomp", "create.subtitle.worldshaper_place": "Modelator de Lume face zap", - "create.subtitle.sanding_long": "Sunete de șlefuit", - "create.subtitle.crushing_1": "Sunete de zdrobit", - "create.subtitle.depot_slide": "Obiect alunecă", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "Ferăstrău Mecanic se activează", - "create.subtitle.blaze_munch": "Arzător de Dogoreală plescăie", - "create.subtitle.funnel_flap": "Pâlnie falfâie", "create.subtitle.schematicannon_finish": "Tun de Schemă face ding", - "create.subtitle.haunted_bell_use": "Clopot Bântuit bate", - "create.subtitle.scroll_value": "Acțiune de Scroll clickuiește", "create.subtitle.crafter_craft": "Meșter lucrează", - "create.subtitle.controller_put": "Controlor bocăne", - "create.subtitle.cranking": "Manivelă se rotește", "create.subtitle.wrench_remove": "Component se sparge", - "create.subtitle.sanding_short": "Sunete de șlefuit", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "Roți Dințate vuie", "create.subtitle.slime_added": "Mâzgă zdrobește", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "Tun de Schemă trage", + "create.subtitle.controller_take": "Pupitru se golește", + "create.subtitle.crafter_click": "Meșter clickuiește", + "create.subtitle.depot_plop": "Obiect aterizează", + "create.subtitle.confirm": "Ding afirmativ", + "create.subtitle.mixing": "Sunete de amestecare", + "create.subtitle.mechanical_press_activation_belt": "Presă Mecanică face bonk", + "create.subtitle.fwoomp": "Lansator de Cartofi face fwoomp", + "create.subtitle.sanding_long": "Sunete de șlefuit", + "create.subtitle.crushing_1": "Sunete de zdrobit", + "create.subtitle.depot_slide": "Obiect alunecă", + "create.subtitle.blaze_munch": "Arzător de Dogoreală plescăie", + "create.subtitle.funnel_flap": "Pâlnie falfâie", + "create.subtitle.haunted_bell_use": "Clopot Bântuit bate", + "create.subtitle.scroll_value": "Acțiune de Scroll clickuiește", + "create.subtitle.controller_put": "Controlor bocăne", + "create.subtitle.cranking": "Manivelă se rotește", + "create.subtitle.sanding_short": "Sunete de șlefuit", "create.subtitle.wrench_rotate": "Cheie folosită", "create.subtitle.potato_hit": "Impact de legumă", "create.subtitle.saw_activate_wood": "Ferăstrău Mecanic se activează", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "Clopot Bântuit se trezețte", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "Boop de refuz", "create.subtitle.controller_click": "Controlor clickuiește", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "Tun de Schemă trage", "create.subtitle.copper_armor_equip": "Echipament de scufundare ciocăne", - "create.subtitle.controller_take": "Pupitru se golește", "create.subtitle.mechanical_press_activation": "Presă Mecanică zăngăne", "create.subtitle.contraption_assemble": "Invenție se mișcă", - "create.subtitle.crafter_click": "Meșter clickuiește", - "create.subtitle.depot_plop": "Obiect aterizează", - "create.subtitle.confirm": "Ding afirmativ", "_": "->------------------------] Item Descriptions [------------------------<-", 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 6d662a090..51fbe3d15 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: 628", + "_": "Missing Localizations: 632", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "Штуковина останавливается", "create.subtitle.peculiar_bell_use": "Особенный колокол звонит", - "create.subtitle.mixing": "Шум смешивания", - "create.subtitle.mechanical_press_activation_belt": "Механический пресс делает «бонк»", - "create.subtitle.fwoomp": "Картофельная пушка делает «Свомп»", "create.subtitle.worldshaper_place": "Ручной редактор мира делает «Зап»", - "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", - "create.subtitle.crushing_1": "Шум разрушения", - "create.subtitle.depot_slide": "Шелест предметов", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "Активируется механическая пила", - "create.subtitle.blaze_munch": "Всполох радостно жуёт", - "create.subtitle.funnel_flap": "Занавески воронок хлопают", "create.subtitle.schematicannon_finish": "Схематичная пушка закончила работу", - "create.subtitle.haunted_bell_use": "Призрачный колокол звонит", - "create.subtitle.scroll_value": "Щелчки колеса прокрутки", "create.subtitle.crafter_craft": "Крафтер создаёт", - "create.subtitle.controller_put": "Контроллер стучит", - "create.subtitle.cranking": "Вращается рукоятка", "create.subtitle.wrench_remove": "Компонент ломается", - "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "Шестерни грохочут", "create.subtitle.slime_added": "Намазывание слизи", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "Выстрелы схематичной пушки", + "create.subtitle.controller_take": "Кафедра опустошается", + "create.subtitle.crafter_click": "Крафтер кликает", + "create.subtitle.depot_plop": "Предмет падает", + "create.subtitle.confirm": "Утвердительный «Динь»", + "create.subtitle.mixing": "Шум смешивания", + "create.subtitle.mechanical_press_activation_belt": "Механический пресс делает «бонк»", + "create.subtitle.fwoomp": "Картофельная пушка делает «Свомп»", + "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", + "create.subtitle.crushing_1": "Шум разрушения", + "create.subtitle.depot_slide": "Шелест предметов", + "create.subtitle.blaze_munch": "Всполох радостно жуёт", + "create.subtitle.funnel_flap": "Занавески воронок хлопают", + "create.subtitle.haunted_bell_use": "Призрачный колокол звонит", + "create.subtitle.scroll_value": "Щелчки колеса прокрутки", + "create.subtitle.controller_put": "Контроллер стучит", + "create.subtitle.cranking": "Вращается рукоятка", + "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", "create.subtitle.wrench_rotate": "Использован гаечный ключ", "create.subtitle.potato_hit": "Овощ врезается", "create.subtitle.saw_activate_wood": "Активируется механическая пила", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "Призрачный колокол пробуждается", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "Отрицательный «Буп»", "create.subtitle.controller_click": "Клики контроллера", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "Выстрелы схематичной пушки", "create.subtitle.copper_armor_equip": "Позвякивание снаряжения для дайвинга", - "create.subtitle.controller_take": "Кафедра опустошается", "create.subtitle.mechanical_press_activation": "Механический пресс активирован", "create.subtitle.contraption_assemble": "Штуковина движется", - "create.subtitle.crafter_click": "Крафтер кликает", - "create.subtitle.depot_plop": "Предмет падает", - "create.subtitle.confirm": "Утвердительный «Динь»", "_": "->------------------------] Item Descriptions [------------------------<-", 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 66479d416..380e84553 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: 248", + "_": "Missing Localizations: 252", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "结构：停止移动", "create.subtitle.peculiar_bell_use": "奇异钟：鸣响", - "create.subtitle.mixing": "搅拌器：搅拌声", - "create.subtitle.mechanical_press_activation_belt": "辊压机：撞击传送带", - "create.subtitle.fwoomp": "土豆加农炮：发射", "create.subtitle.worldshaper_place": "环境塑型器：放置方块", - "create.subtitle.sanding_long": "打磨噪音", - "create.subtitle.crushing_1": "粉碎噪音", - "create.subtitle.depot_slide": "物品：滑入", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "动力锯：切割", - "create.subtitle.blaze_munch": "烈焰人：咀嚼", - "create.subtitle.funnel_flap": "漏斗：垂帘碰撞", "create.subtitle.schematicannon_finish": "蓝图加农炮：叮", - "create.subtitle.haunted_bell_use": "缠魂钟：鸣响", - "create.subtitle.scroll_value": "拨码输入：咔哒", "create.subtitle.crafter_craft": "动力合成器：合成中", - "create.subtitle.controller_put": "遥控器：放进讲台", - "create.subtitle.cranking": "手摇曲柄：转动", "create.subtitle.wrench_remove": "组件：被破坏", - "create.subtitle.sanding_short": "打磨噪音", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "齿轮：嘎吱作响", "create.subtitle.slime_added": "黏液：压扁", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "蓝图加农炮：发射", + "create.subtitle.controller_take": "讲台：取走物品", + "create.subtitle.crafter_click": "动力合成器：咔哒声", + "create.subtitle.depot_plop": "物品：着地", + "create.subtitle.confirm": "提示声：接受", + "create.subtitle.mixing": "搅拌器：搅拌声", + "create.subtitle.mechanical_press_activation_belt": "辊压机：撞击传送带", + "create.subtitle.fwoomp": "土豆加农炮：发射", + "create.subtitle.sanding_long": "打磨噪音", + "create.subtitle.crushing_1": "粉碎噪音", + "create.subtitle.depot_slide": "物品：滑入", + "create.subtitle.blaze_munch": "烈焰人：咀嚼", + "create.subtitle.funnel_flap": "漏斗：垂帘碰撞", + "create.subtitle.haunted_bell_use": "缠魂钟：鸣响", + "create.subtitle.scroll_value": "拨码输入：咔哒", + "create.subtitle.controller_put": "遥控器：放进讲台", + "create.subtitle.cranking": "手摇曲柄：转动", + "create.subtitle.sanding_short": "打磨噪音", "create.subtitle.wrench_rotate": "扳手：拧动", "create.subtitle.potato_hit": "土豆：击中", "create.subtitle.saw_activate_wood": "动力锯：切割", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "奇异钟：转化", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "提示声：出错", "create.subtitle.controller_click": "遥控器：按下按钮", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "蓝图加农炮：发射", "create.subtitle.copper_armor_equip": "潜水装备：铿锵", - "create.subtitle.controller_take": "讲台：取走物品", "create.subtitle.mechanical_press_activation": "辊压机：工作中", "create.subtitle.contraption_assemble": "结构：开始移动", - "create.subtitle.crafter_click": "动力合成器：咔哒声", - "create.subtitle.depot_plop": "物品：着地", - "create.subtitle.confirm": "提示声：接受", "_": "->------------------------] Item Descriptions [------------------------<-", 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 4a68fe47e..bd3a15967 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: 642", + "_": "Missing Localizations: 646", "_": "->------------------------] Game Elements [------------------------<-", @@ -1591,46 +1591,50 @@ "create.subtitle.contraption_disassemble": "結構停止", "create.subtitle.peculiar_bell_use": "黃銅鐘聲", - "create.subtitle.mixing": "攪拌機噪音", - "create.subtitle.mechanical_press_activation_belt": "液壓機工作", - "create.subtitle.fwoomp": "馬鈴薯大砲發射", "create.subtitle.worldshaper_place": "地形塑造器發射聲", - "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", - "create.subtitle.crushing_1": "粉碎機咀嚼聲", - "create.subtitle.depot_slide": "物品滑動聲", + "create.subtitle.steam": "UNLOCALIZED: Steam noises", "create.subtitle.saw_activate_stone": "機械鋸子聲", - "create.subtitle.blaze_munch": "烈焰使者開心地吃著", - "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel flaps", "create.subtitle.schematicannon_finish": "藍圖大炮完成任務", - "create.subtitle.haunted_bell_use": "靈魂鐘敲響", - "create.subtitle.scroll_value": "滾動輸入聲", "create.subtitle.crafter_craft": "機械合成器合成聲", - "create.subtitle.controller_put": "遙控器放置聲", - "create.subtitle.cranking": "手搖把手轉動聲", "create.subtitle.wrench_remove": "零件移除聲", - "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", + "create.subtitle.train2": "UNLOCALIZED: Bogey wheels rumble", + "create.subtitle.train3": "UNLOCALIZED: Bogey wheels rumble muffled", "create.subtitle.whistle": "UNLOCALIZED: Whistling", "create.subtitle.cogs": "齒輪隆隆聲", "create.subtitle.slime_added": "黏液擠壓", + "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", + "create.subtitle.schematicannon_launch_block": "藍圖大炮發射", + "create.subtitle.controller_take": "拿下遙控器", + "create.subtitle.crafter_click": "機械合成器工作聲", + "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", + "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", + "create.subtitle.mixing": "攪拌機噪音", + "create.subtitle.mechanical_press_activation_belt": "液壓機工作", + "create.subtitle.fwoomp": "馬鈴薯大砲發射", + "create.subtitle.sanding_long": "UNLOCALIZED: Sanding noises", + "create.subtitle.crushing_1": "粉碎機咀嚼聲", + "create.subtitle.depot_slide": "物品滑動聲", + "create.subtitle.blaze_munch": "烈焰使者開心地吃著", + "create.subtitle.funnel_flap": "UNLOCALIZED: Funnel flaps", + "create.subtitle.haunted_bell_use": "靈魂鐘敲響", + "create.subtitle.scroll_value": "滾動輸入聲", + "create.subtitle.controller_put": "遙控器放置聲", + "create.subtitle.cranking": "手搖把手轉動聲", + "create.subtitle.sanding_short": "UNLOCALIZED: Sanding noises", "create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used", "create.subtitle.potato_hit": "食物撞擊聲", "create.subtitle.saw_activate_wood": "機械鋸子運作聲", "create.subtitle.whistle_high": "UNLOCALIZED: High whistling", "create.subtitle.whistle_train": "UNLOCALIZED: Whistling", "create.subtitle.haunted_bell_convert": "靈魂鐘轉化聲", + "create.subtitle.train": "UNLOCALIZED: Bogey wheels rumble", "create.subtitle.whistle_train_high": "UNLOCALIZED: High whistling", - "create.subtitle.whistle_train_low": "UNLOCALIZED: Low whistling", "create.subtitle.deny": "UNLOCALIZED: Declining boop", "create.subtitle.controller_click": "遙控器按鍵聲", "create.subtitle.whistle_low": "UNLOCALIZED: Low whistling", - "create.subtitle.schematicannon_launch_block": "藍圖大炮發射", "create.subtitle.copper_armor_equip": "潛水裝裝備聲", - "create.subtitle.controller_take": "拿下遙控器", "create.subtitle.mechanical_press_activation": "液壓機工作", "create.subtitle.contraption_assemble": "結構移動", - "create.subtitle.crafter_click": "機械合成器工作聲", - "create.subtitle.depot_plop": "UNLOCALIZED: Item lands", - "create.subtitle.confirm": "UNLOCALIZED: Affirmative ding", "_": "->------------------------] Item Descriptions [------------------------<-", diff --git a/src/generated/resources/assets/create/sounds.json b/src/generated/resources/assets/create/sounds.json index e5da11631..b5cb0b9d9 100644 --- a/src/generated/resources/assets/create/sounds.json +++ b/src/generated/resources/assets/create/sounds.json @@ -389,6 +389,46 @@ ], "subtitle": "create.subtitle.slime_added" }, + "steam": { + "sounds": [ + { + "name": "create:steam", + "type": "file", + "attenuation_distance": 32 + } + ], + "subtitle": "create.subtitle.steam" + }, + "train": { + "sounds": [ + { + "name": "create:train", + "type": "file", + "attenuation_distance": 128 + } + ], + "subtitle": "create.subtitle.train" + }, + "train2": { + "sounds": [ + { + "name": "create:train2", + "type": "file", + "attenuation_distance": 128 + } + ], + "subtitle": "create.subtitle.train2" + }, + "train3": { + "sounds": [ + { + "name": "create:train3", + "type": "file", + "attenuation_distance": 16 + } + ], + "subtitle": "create.subtitle.train3" + }, "whistle": { "sounds": [ { diff --git a/src/main/java/com/simibubi/create/AllSoundEvents.java b/src/main/java/com/simibubi/create/AllSoundEvents.java index a5275e6e3..c6b37e479 100644 --- a/src/main/java/com/simibubi/create/AllSoundEvents.java +++ b/src/main/java/com/simibubi/create/AllSoundEvents.java @@ -238,6 +238,26 @@ public class AllSoundEvents { .attenuationDistance(64) .build(), + STEAM = create("steam").subtitle("Steam noises") + .category(SoundSource.NEUTRAL) + .attenuationDistance(32) + .build(), + + TRAIN = create("train").subtitle("Bogey wheels rumble") + .category(SoundSource.NEUTRAL) + .attenuationDistance(128) + .build(), + + TRAIN2 = create("train2").subtitle("Bogey wheels rumble") + .category(SoundSource.NEUTRAL) + .attenuationDistance(128) + .build(), + + TRAIN3 = create("train3").subtitle("Bogey wheels rumble muffled") + .category(SoundSource.NEUTRAL) + .attenuationDistance(16) + .build(), + WHISTLE_TRAIN_HIGH = create("whistle_train_high").subtitle("High whistling") .category(SoundSource.RECORDS) .build(), @@ -406,7 +426,7 @@ public class AllSoundEvents { public SoundEntry build() { SoundEntry entry = wrappedEvents.isEmpty() ? new CustomSoundEntry(id, variants, subtitle, category, attenuationDistance) - : new WrappedSoundEntry(id, subtitle, wrappedEvents, category); + : new WrappedSoundEntry(id, subtitle, wrappedEvents, category, attenuationDistance); entries.put(entry.getId(), entry); return entry; } @@ -418,11 +438,13 @@ public class AllSoundEvents { protected ResourceLocation id; protected String subtitle; protected SoundSource category; + protected int attenuationDistance; - public SoundEntry(ResourceLocation id, String subtitle, SoundSource category) { + public SoundEntry(ResourceLocation id, String subtitle, SoundSource category, int attenuationDistance) { this.id = id; this.subtitle = subtitle; this.category = category; + this.attenuationDistance = attenuationDistance; } public abstract void prepare(); @@ -498,8 +520,8 @@ public class AllSoundEvents { private List>> compiledEvents; public WrappedSoundEntry(ResourceLocation id, String subtitle, - List>> wrappedEvents, SoundSource category) { - super(id, subtitle, category); + List>> wrappedEvents, SoundSource category, int attenuationDistance) { + super(id, subtitle, category, attenuationDistance); this.wrappedEvents = wrappedEvents; compiledEvents = Lists.newArrayList(); } @@ -541,6 +563,8 @@ public class AllSoundEvents { .getLocation() .toString()); s.addProperty("type", "event"); + if (attenuationDistance != 0) + s.addProperty("attenuation_distance", attenuationDistance); list.add(s); entry.add("sounds", list); if (i == 0 && hasSubtitle()) @@ -572,13 +596,11 @@ public class AllSoundEvents { protected List variants; protected SoundEvent event; - protected int attenuationDistance; public CustomSoundEntry(ResourceLocation id, List variants, String subtitle, SoundSource category, int attenuationDistance) { - super(id, subtitle, category); + super(id, subtitle, category, attenuationDistance); this.variants = variants; - this.attenuationDistance = attenuationDistance; } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineTileEntity.java index 4440c0ba3..621d00d91 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/steam/SteamEngineTileEntity.java @@ -6,6 +6,7 @@ import java.util.List; import javax.annotation.Nullable; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; @@ -21,6 +22,8 @@ import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.AxisDirection; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -56,7 +59,7 @@ public class SteamEngineTileEntity extends SmartTileEntity implements IHaveGoggl boolean verticalTarget = false; BlockState shaftState = shaft.getBlockState(); Axis targetAxis = Axis.X; - if (shaftState.getBlock()instanceof IRotate ir) + if (shaftState.getBlock() instanceof IRotate ir) targetAxis = ir.getRotationAxis(shaftState); verticalTarget = targetAxis == Axis.Y; @@ -93,7 +96,7 @@ public class SteamEngineTileEntity extends SmartTileEntity implements IHaveGoggl protected AABB createRenderBoundingBox() { return super.createRenderBoundingBox().inflate(2); } - + public PoweredShaftTileEntity getShaft() { PoweredShaftTileEntity shaft = target.get(); if (shaft == null || shaft.isRemoved() || !shaft.canBePoweredBy(worldPosition)) { @@ -152,6 +155,18 @@ public class SteamEngineTileEntity extends SmartTileEntity implements IHaveGoggl return; } + FluidTankTileEntity sourceTE = source.get(); + if (sourceTE != null) { + FluidTankTileEntity controller = sourceTE.getControllerTE(); + if (controller != null && controller.boiler != null) { + float volume = 3f / Math.max(2, controller.boiler.attachedEngines / 6); + float pitch = 1.18f - level.random.nextFloat() * .25f; + level.playLocalSound(worldPosition.getX(), worldPosition.getY(), worldPosition.getZ(), + SoundEvents.CANDLE_EXTINGUISH, SoundSource.BLOCKS, volume, pitch, false); + AllSoundEvents.STEAM.playAt(level, worldPosition, volume / 16, .8f, false); + } + } + Direction facing = SteamEngineBlock.getFacing(getBlockState()); for (int i = 0; i < 2; i++) { @@ -197,7 +212,7 @@ public class SteamEngineTileEntity extends SmartTileEntity implements IHaveGoggl angle *= -1; return angle; } - + @Override public boolean addToGoggleTooltip(List tooltip, boolean isPlayerSneaking) { PoweredShaftTileEntity shaft = getShaft(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java index acab09263..a9c0ce257 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java @@ -39,6 +39,7 @@ import net.minecraft.tags.BlockTags; import net.minecraft.util.Mth; import net.minecraft.world.damagesource.EntityDamageSource; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.MobCategory; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; @@ -333,6 +334,8 @@ public class ContraptionCollider { EntityDamageSource pSource = new EntityDamageSource("create.run_over", contraptionEntity); double damage = diffMotion.length(); + if (entity.getClassification(false) == MobCategory.MONSTER) + damage *= 2; if (!(entity instanceof Player p) || !p.isCreative() && !p.isSpectator()) { if (playerType == PlayerType.CLIENT) { @@ -346,9 +349,7 @@ public class ContraptionCollider { SoundSource.NEUTRAL, 1, .75f); } - Vec3 added = entityMotion.add(entity.position() - .subtract(contraptionPosition) - .multiply(1, 0, 1) + Vec3 added = entityMotion.add(contraptionMotion.multiply(1, 0, 1) .normalize() .add(0, .25, 0) .scale(damage * 4)) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandler.java index 337d8ca34..82e1cb253 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionHandler.java @@ -67,6 +67,7 @@ public class ContraptionHandler { if (entityLiving.getVehicle() == null) entityLiving.teleportTo(position.x, position.y, position.z); data.remove("ContraptionDismountLocation"); + entityLiving.setOnGround(false); } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerMovementBehaviour.java index 2da04b8e6..c01f96181 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerMovementBehaviour.java @@ -46,7 +46,7 @@ public class BlazeBurnerMovementBehaviour implements MovementBehaviour { Vec3 c = context.position; Vec3 v = c.add(VecHelper.offsetRandomly(Vec3.ZERO, r, .125f) .multiply(1, 0, 1)); - if (r.nextInt(3) == 0) + if (r.nextInt(3) == 0 && context.motion.length() < 1 / 64f) context.world.addParticle(ParticleTypes.LARGE_SMOKE, v.x, v.y, v.z, 0, 0, 0); LerpedFloat headAngle = getHeadAngle(context); diff --git a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorMovementBehaviour.java b/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorMovementBehaviour.java index 354539f56..6ff0d1510 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/curiosities/deco/SlidingDoorMovementBehaviour.java @@ -45,7 +45,7 @@ public class SlidingDoorMovementBehaviour implements MovementBehaviour { if (!wasSettled && doorTE.animation.settled() && !open) context.world.playLocalSound(context.position.x, context.position.y, context.position.z, - SoundEvents.IRON_DOOR_CLOSE, SoundSource.BLOCKS, .5f, 1, false); + SoundEvents.IRON_DOOR_CLOSE, SoundSource.BLOCKS, .125f, 1, false); } protected void tickOpen(MovementContext context, boolean currentlyOpen) { @@ -67,7 +67,7 @@ public class SlidingDoorMovementBehaviour implements MovementBehaviour { if (shouldOpen) context.world.playSound(null, new BlockPos(context.position), SoundEvents.IRON_DOOR_OPEN, - SoundSource.BLOCKS, .5f, 1); + SoundSource.BLOCKS, .125f, 1); } private void toggleDoor(BlockPos pos, Contraption contraption, StructureBlockInfo info) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java b/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java index 261238073..36b652908 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java @@ -227,7 +227,7 @@ public class DisplayLinkScreen extends AbstractSimiScreen { .renderGuiItem(targetIcon, x + 37, y + 105); ms.pushPose(); - ms.translate(0, guiTop + 48, 0); + ms.translate(0, guiTop + 46, 0); configWidgets.getFirst() .renderWidgetBG(guiLeft, ms); ms.translate(0, 21, 0); diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/ArrivalSoundQueue.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/ArrivalSoundQueue.java index ceb24a635..9797adadb 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/ArrivalSoundQueue.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/ArrivalSoundQueue.java @@ -106,7 +106,7 @@ public class ArrivalSoundQueue { playSimple(entity, SoundEvents.BELL_BLOCK, 1, 1); } - if (state.getBlock()instanceof NoteBlock nb) { + if (state.getBlock() instanceof NoteBlock nb) { float f = (float) Math.pow(2, (state.getValue(NoteBlock.NOTE) - 12) / 12.0); playSimple(entity, state.getValue(NoteBlock.INSTRUMENT) .getSoundEvent(), 1, f); @@ -114,14 +114,14 @@ public class ArrivalSoundQueue { if (state.getBlock() instanceof WhistleBlock && info.nbt != null) { int pitch = info.nbt.getInt("Pitch"); - float f = (float) Math.pow(2, (pitch - 12) / 12.0); WhistleSize size = state.getValue(WhistleBlock.SIZE); - playSimple(entity, (size == WhistleSize.LARGE ? AllSoundEvents.WHISTLE_TRAIN_LOW - : size == WhistleSize.MEDIUM ? AllSoundEvents.WHISTLE_TRAIN_MEDIUM : AllSoundEvents.WHISTLE_TRAIN_HIGH) + float f = (float) Math.pow(2, ((size == WhistleSize.SMALL ? 12 : 0) - pitch) / 12.0); + playSimple(entity, + (size == WhistleSize.LARGE ? AllSoundEvents.WHISTLE_TRAIN_LOW : AllSoundEvents.WHISTLE_TRAIN_MEDIUM) .getMainEvent(), 1, f); - playSimple(entity, AllSoundEvents.WHISTLE_CHIFF.getMainEvent(), .75f, - size == WhistleSize.SMALL ? f + .75f : f); +// playSimple(entity, AllSoundEvents.WHISTLE_CHIFF.getMainEvent(), .75f, +// size == WhistleSize.SMALL ? f + .75f : f); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java index f6daa65a7..026d36477 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntity.java @@ -81,6 +81,11 @@ public class CarriageContraptionEntity extends OrientedContraptionEntity { private Vec3 serverPrevPos; + @OnlyIn(Dist.CLIENT) + public CarriageSounds sounds; + @OnlyIn(Dist.CLIENT) + public CarriageParticles particles; + public CarriageContraptionEntity(EntityType type, Level world) { super(type, world); validForRender = false; @@ -271,6 +276,14 @@ public class CarriageContraptionEntity extends OrientedContraptionEntity { dce.alignEntity(this); + if (sounds == null) + sounds = new CarriageSounds(this); + sounds.tick(dce); + + if (particles == null) + particles = new CarriageParticles(this); + particles.tick(dce); + double distanceTo = 0; if (!firstPositionUpdate) { Vec3 diff = position().subtract(xo, yo, zo); @@ -414,6 +427,8 @@ public class CarriageContraptionEntity extends OrientedContraptionEntity { carriage.trailingBogey().couplingAnchors = Couple.create(null, null); } firstPositionUpdate = true; + if (sounds != null) + sounds.stop(); } @Override diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageParticles.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageParticles.java new file mode 100644 index 000000000..107511351 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageParticles.java @@ -0,0 +1,120 @@ +package com.simibubi.create.content.logistics.trains.entity; + +import java.util.Random; + +import com.simibubi.create.content.logistics.trains.entity.Carriage.DimensionalCarriageEntity; +import com.simibubi.create.foundation.utility.Iterate; +import com.simibubi.create.foundation.utility.VecHelper; +import com.simibubi.create.foundation.utility.animation.LerpedFloat; +import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser; + +import net.minecraft.client.Minecraft; +import net.minecraft.core.Direction.Axis; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; + +public class CarriageParticles { + + CarriageContraptionEntity entity; + boolean arrived; + int depressurise; + + double prevMotion; + LerpedFloat brakes; + + public CarriageParticles(CarriageContraptionEntity entity) { + this.entity = entity; + arrived = true; + depressurise = 0; + prevMotion = 0; + brakes = LerpedFloat.linear(); + } + + public void tick(DimensionalCarriageEntity dce) { + Minecraft mc = Minecraft.getInstance(); + Entity camEntity = mc.cameraEntity; + if (camEntity == null) + return; + Vec3 leadingAnchor = dce.leadingAnchor(); + if (leadingAnchor == null || !leadingAnchor.closerThan(camEntity.position(), 64)) + return; + + Random r = entity.level.random; + Vec3 contraptionMotion = entity.position() + .subtract(entity.getPrevPositionVec()); + double length = contraptionMotion.length(); + if (arrived && length > 0.01f) + arrived = false; + arrived |= entity.isStalled(); + + boolean stopped = length < .002f; + if (stopped) { + if (!arrived) { + arrived = true; + depressurise = 20; + } + } else + depressurise = 0; + + if (depressurise > 0) + depressurise--; + + brakes.chase(prevMotion > length + length / 512f ? 1 : 0, .25f, Chaser.exp(.625f)); + brakes.tickChaser(); + prevMotion = length; + + Level level = entity.level; + Vec3 position = entity.getPosition(0); + float viewYRot = entity.getViewYRot(0); + float viewXRot = entity.getViewXRot(0); + int bogeySpacing = entity.getCarriage().bogeySpacing; + + for (CarriageBogey bogey : entity.getCarriage().bogeys) { + if (bogey == null) + continue; + + boolean spark = depressurise == 0 || depressurise > 10; + + float cutoff = length < 1 / 8f ? 0 : 1 / 8f; + + if (length > 1 / 6f) + cutoff = Math.max(cutoff, brakes.getValue() * 1.15f); + + for (int j : Iterate.positiveAndNegative) { + if (r.nextFloat() > cutoff && (spark || r.nextInt(4) == 0)) + continue; + for (int i : Iterate.positiveAndNegative) { + if (r.nextFloat() > cutoff && (spark || r.nextInt(4) == 0)) + continue; + + Vec3 v = Vec3.ZERO.add(j * 1.15, spark ? -.6f : .32, i); + Vec3 m = Vec3.ZERO.add(j * (spark ? .5 : .25), spark ? .49 : -.29, 0); + + m = VecHelper.rotate(m, bogey.pitch.getValue(0), Axis.X); + m = VecHelper.rotate(m, bogey.yaw.getValue(0), Axis.Y); + + v = VecHelper.rotate(v, bogey.pitch.getValue(0), Axis.X); + v = VecHelper.rotate(v, bogey.yaw.getValue(0), Axis.Y); + + v = VecHelper.rotate(v, -viewYRot - 90, Axis.Y); + v = VecHelper.rotate(v, viewXRot, Axis.X); + v = VecHelper.rotate(v, -180, Axis.Y); + + v = v.add(0, 0, bogey.isLeading ? 0 : -bogeySpacing); + v = VecHelper.rotate(v, 180, Axis.Y); + v = VecHelper.rotate(v, -viewXRot, Axis.X); + v = VecHelper.rotate(v, viewYRot + 90, Axis.Y); + v = v.add(position); + + m = m.add(contraptionMotion.scale(.75f)); + + level.addParticle(spark ? ParticleTypes.CRIT : ParticleTypes.POOF, v.x, v.y, v.z, m.x, m.y, m.z); + } + } + } + + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSounds.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSounds.java new file mode 100644 index 000000000..b3d0431ca --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageSounds.java @@ -0,0 +1,233 @@ +package com.simibubi.create.content.logistics.trains.entity; + +import com.simibubi.create.AllSoundEvents; +import com.simibubi.create.content.logistics.trains.entity.Carriage.DimensionalCarriageEntity; +import com.simibubi.create.foundation.utility.animation.LerpedFloat; +import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.phys.Vec3; + +public class CarriageSounds { + + CarriageContraptionEntity entity; + + LerpedFloat distanceFactor; + LerpedFloat speedFactor; + LerpedFloat approachFactor; + LerpedFloat seatCrossfade; + + LoopingSound minecartEsqueSound; + LoopingSound sharedWheelSound; + LoopingSound sharedWheelSoundSeated; + + boolean arrived; + + int tick; + int prevSharedTick; + + public CarriageSounds(CarriageContraptionEntity entity) { + this.entity = entity; + distanceFactor = LerpedFloat.linear(); + speedFactor = LerpedFloat.linear(); + approachFactor = LerpedFloat.linear(); + seatCrossfade = LerpedFloat.linear(); + arrived = true; + } + + public void tick(DimensionalCarriageEntity dce) { + Minecraft mc = Minecraft.getInstance(); + Entity camEntity = mc.cameraEntity; + if (camEntity == null) + return; + + Vec3 leadingAnchor = dce.leadingAnchor(); + Vec3 trailingAnchor = dce.trailingAnchor(); + if (leadingAnchor == null || trailingAnchor == null) + return; + + tick++; + + Vec3 cam = camEntity.getEyePosition(); + Vec3 contraptionMotion = entity.position() + .subtract(entity.getPrevPositionVec()); + Vec3 combinedMotion = contraptionMotion.subtract(camEntity.getDeltaMovement()); + + if (arrived && contraptionMotion.length() > 0.01f) + arrived = false; + arrived |= entity.isStalled(); + + Vec3 toBogey1 = leadingAnchor.subtract(cam); + Vec3 toBogey2 = trailingAnchor.subtract(cam); + double distance1 = toBogey1.length(); + double distance2 = toBogey2.length(); + + Vec3 toCarriage = distance1 > distance2 ? toBogey2 : toBogey1; + double distance = Math.min(distance1, distance2); + Vec3 soundLocation = cam.add(toCarriage); + + double dot = toCarriage.normalize() + .dot(combinedMotion.normalize()); + + speedFactor.chase(contraptionMotion.length(), .25f, Chaser.exp(.05f)); + distanceFactor.chase(Mth.clampedLerp(100, 0, (distance - 3) / 64d), .25f, Chaser.exp(50f)); + approachFactor.chase(Mth.clampedLerp(50, 200, .5f * (dot + 1)), .25f, Chaser.exp(10f)); + seatCrossfade.chase(camEntity.getVehicle() instanceof CarriageContraptionEntity ? 1 : 0, .1f, Chaser.EXP); + + speedFactor.tickChaser(); + distanceFactor.tickChaser(); + approachFactor.tickChaser(); + seatCrossfade.tickChaser(); + + minecartEsqueSound = playIfMissing(mc, minecartEsqueSound, AllSoundEvents.TRAIN.getMainEvent()); + sharedWheelSound = playIfMissing(mc, sharedWheelSound, AllSoundEvents.TRAIN2.getMainEvent()); + sharedWheelSoundSeated = playIfMissing(mc, sharedWheelSoundSeated, AllSoundEvents.TRAIN3.getMainEvent()); + + float volume = Math.min(Math.min(speedFactor.getValue(), distanceFactor.getValue() / 100), + approachFactor.getValue() / 300 + .0125f); + + if (entity.carriageIndex == 0) { + float v = volume * (1 - seatCrossfade.getValue() * .35f) * .75f; + if ((3 + tick) % 4 == 0) + AllSoundEvents.STEAM.playAt(entity.level, soundLocation, v * ((tick + 7) % 8 == 0 ? 0.75f : .45f), 1.17f, + false); + if (tick % 16 == 0) + AllSoundEvents.STEAM.playAt(entity.level, soundLocation, v * 1.5f, .8f, false); + } + + if (!arrived && speedFactor.getValue() < .002f) { + arrived = true; + entity.level.playLocalSound(soundLocation.x, soundLocation.y, soundLocation.z, SoundEvents.LAVA_EXTINGUISH, + SoundSource.NEUTRAL, .25f, .78f, false); + entity.level.playLocalSound(soundLocation.x, soundLocation.y, soundLocation.z, + SoundEvents.WOODEN_TRAPDOOR_CLOSE, SoundSource.NEUTRAL, .2f, 1.5f, false); + AllSoundEvents.STEAM.playAt(entity.level, soundLocation, .75f, .5f, false); + } + + float pitchModifier = ((entity.getId() * 10) % 13) / 36f; + + volume = Math.min(volume, distanceFactor.getValue() / 800); + + float pitch = Mth.clamp(speedFactor.getValue() * 2 + .25f, .75f, 1.95f) - pitchModifier; + float pitch2 = Mth.clamp(speedFactor.getValue() * 2, 0.75f, 1.25f) - pitchModifier; + + minecartEsqueSound.setPitch(pitch * 1.5f); + + volume = Math.min(volume, distanceFactor.getValue() / 1000); + + Train train = entity.getCarriage().train; + for (Carriage carriage : train.carriages) { + DimensionalCarriageEntity mainDCE = carriage.getDimensionalIfPresent(entity.level.dimension()); + if (mainDCE == null) + continue; + CarriageContraptionEntity mainEntity = mainDCE.entity.get(); + if (mainEntity == null) + continue; + if (mainEntity.sounds == null) + mainEntity.sounds = new CarriageSounds(mainEntity); + mainEntity.sounds.submitSharedSoundVolume(soundLocation, volume); + if (carriage != entity.getCarriage()) + finalizeSharedVolume(0); + return; + } + + finalizeSharedVolume(volume); + minecartEsqueSound.setLocation(soundLocation); + sharedWheelSound.setPitch(pitch2); + sharedWheelSound.setLocation(soundLocation); + sharedWheelSoundSeated.setPitch(pitch2); + sharedWheelSoundSeated.setLocation(soundLocation); + } + + private LoopingSound playIfMissing(Minecraft mc, LoopingSound loopingSound, SoundEvent sound) { + if (loopingSound == null) { + loopingSound = new LoopingSound(sound, SoundSource.NEUTRAL); + mc.getSoundManager() + .play(loopingSound); + } + return loopingSound; + } + + public void submitSharedSoundVolume(Vec3 location, float volume) { + sharedWheelSound = + playIfMissing(Minecraft.getInstance(), sharedWheelSound, AllSoundEvents.TRAIN2.getMainEvent()); + sharedWheelSoundSeated = + playIfMissing(Minecraft.getInstance(), sharedWheelSoundSeated, AllSoundEvents.TRAIN3.getMainEvent()); + + boolean approach = true; + + if (tick != prevSharedTick) { + prevSharedTick = tick; + approach = false; + } else if (sharedWheelSound.getVolume() > volume) + return; + + Vec3 currentLoc = new Vec3(minecartEsqueSound.getX(), minecartEsqueSound.getY(), minecartEsqueSound.getZ()); + Vec3 newLoc = approach ? currentLoc.add(location.subtract(currentLoc) + .scale(.125f)) : location; + + minecartEsqueSound.setLocation(newLoc); + sharedWheelSound.setLocation(newLoc); + sharedWheelSoundSeated.setLocation(newLoc); + finalizeSharedVolume(volume); + } + + public void finalizeSharedVolume(float volume) { + float crossfade = seatCrossfade.getValue(); + minecartEsqueSound.setVolume((1 - crossfade * .65f) * volume / 2); + volume = Math.min(volume, Math.max((speedFactor.getValue() - .25f) / 4 + 0.01f, 0)); + sharedWheelSoundSeated.setVolume(volume * crossfade); + sharedWheelSound.setVolume(volume * (1 - crossfade) * 1.5f); + } + + public void stop() { + if (minecartEsqueSound != null) + minecartEsqueSound.stopSound(); + if (sharedWheelSound != null) + sharedWheelSound.stopSound(); + if (sharedWheelSoundSeated != null) + sharedWheelSoundSeated.stopSound(); + } + + class LoopingSound extends AbstractTickableSoundInstance { + + protected LoopingSound(SoundEvent p_119606_, SoundSource p_119607_) { + super(p_119606_, p_119607_); + attenuation = Attenuation.LINEAR; + looping = true; + delay = 0; + volume = 0.0001f; + } + + @Override + public void tick() {} + + public void setVolume(float volume) { + this.volume = volume; + } + + public void setPitch(float pitch) { + this.pitch = pitch; + } + + public void setLocation(Vec3 location) { + x = location.x; + y = location.y; + z = location.z; + } + + public void stopSound() { + Minecraft.getInstance() + .getSoundManager() + .stop(this); + } + + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Train.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/Train.java index 776394698..40bb4e800 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Train.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/Train.java @@ -924,6 +924,8 @@ public class Train { int i = iterateFromBack ? carriageCount - 1 - index : index; Carriage carriage = carriages.get(i); IItemHandlerModifiable fuelItems = carriage.storage.getFuelItems(); + if (fuelItems == null) + continue; for (int slot = 0; slot < fuelItems.getSlots(); slot++) { ItemStack stack = fuelItems.extractItem(slot, 1, true); diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationScreen.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationScreen.java index 6e4afd7e6..fcd6e8859 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/edgePoint/station/StationScreen.java @@ -254,11 +254,10 @@ public class StationScreen extends AbstractStationScreen { for (int i = carriages.size() - 1; i > 0; i--) { RenderSystem.setShaderColor(1, 1, 1, Math.min(1f, Math.min((position + offset - 10) / 30f, (background.width - 40 - position - offset) / 30f))); - - if (i == carriages.size() - 1 && train.doubleEnded) { - offset += icon.render(TrainIconType.FLIPPED_ENGINE, ms, x + offset, y + 20) + 1; - continue; - } +// if (i == carriages.size() - 1 && train.doubleEnded) { +// offset += icon.render(TrainIconType.FLIPPED_ENGINE, ms, x + offset, y + 20) + 1; +// continue; +// } Carriage carriage = carriages.get(te.trainBackwards ? carriages.size() - i - 1 : i); offset += icon.render(carriage.bogeySpacing, ms, x + offset, y + 20) + 1; } diff --git a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java index d44b6679b..daf568007 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java +++ b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java @@ -140,7 +140,7 @@ public class BuilderTransformers { public static NonNullUnaryOperator> ladder(String name, Supplier ingredient) { return b -> b.initialProperties(() -> Blocks.LADDER) - .addLayer(() -> RenderType::cutoutMipped) + .addLayer(() -> RenderType::cutout) .blockstate((c, p) -> p.horizontalBlock(c.get(), p.models() .withExistingParent(c.getName(), p.modLoc("block/ladder")) .texture("0", p.modLoc("block/ladder_" + name + "_hoop")) diff --git a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java index f95a41faf..a8945b3d3 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java @@ -288,7 +288,7 @@ public class BlockHelper { public static double getBounceMultiplier(Block block) { if (block instanceof SlimeBlock) return 0.8D; - if (block instanceof BedBlock || block instanceof SeatBlock) + if (block instanceof BedBlock) return 0.66 * 0.8D; return 0; } diff --git a/src/main/resources/assets/create/sounds/steam.ogg b/src/main/resources/assets/create/sounds/steam.ogg new file mode 100644 index 000000000..acc75ff16 Binary files /dev/null and b/src/main/resources/assets/create/sounds/steam.ogg differ diff --git a/src/main/resources/assets/create/sounds/train.ogg b/src/main/resources/assets/create/sounds/train.ogg new file mode 100644 index 000000000..534618f3c Binary files /dev/null and b/src/main/resources/assets/create/sounds/train.ogg differ diff --git a/src/main/resources/assets/create/sounds/train2.ogg b/src/main/resources/assets/create/sounds/train2.ogg new file mode 100644 index 000000000..8ecf15f50 Binary files /dev/null and b/src/main/resources/assets/create/sounds/train2.ogg differ diff --git a/src/main/resources/assets/create/sounds/train3.ogg b/src/main/resources/assets/create/sounds/train3.ogg new file mode 100644 index 000000000..eef422cfa Binary files /dev/null and b/src/main/resources/assets/create/sounds/train3.ogg differ diff --git a/src/main/resources/assets/create/sounds/whistle_train.ogg b/src/main/resources/assets/create/sounds/whistle_train.ogg index d2e62ec6c..30b385ddf 100644 Binary files a/src/main/resources/assets/create/sounds/whistle_train.ogg and b/src/main/resources/assets/create/sounds/whistle_train.ogg differ diff --git a/src/main/resources/assets/create/sounds/whistle_train_low.ogg b/src/main/resources/assets/create/sounds/whistle_train_low.ogg index 379275e87..56e44f597 100644 Binary files a/src/main/resources/assets/create/sounds/whistle_train_low.ogg and b/src/main/resources/assets/create/sounds/whistle_train_low.ogg differ