Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create.git into mc1.16/dev

This commit is contained in:
PepperBell 2021-04-28 13:38:26 -07:00
commit 9140c2ad4c
26 changed files with 278 additions and 37 deletions

View file

@ -407,19 +407,19 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
97e9ee471ea650f6b7f3d3f39f00201cd5ad752d assets/create/lang/en_ud.json 97e9ee471ea650f6b7f3d3f39f00201cd5ad752d assets/create/lang/en_ud.json
514ab1f6fa3d24dc575a5dcaaaa96a8009da7414 assets/create/lang/en_us.json de5b848a5bb52bb1c85a9123b3f3fbc084e315b8 assets/create/lang/en_us.json
7e45e9a69fb4d21d199174673f2ea6fe35ee6859 assets/create/lang/unfinished/de_de.json 77fc60d2271fe111ccd165ab936da031555a5987 assets/create/lang/unfinished/de_de.json
2af0dd8cd0776b8ed5110990405f3cd515abe8e8 assets/create/lang/unfinished/es_es.json 413556ffe8e3459b75930681f5b6923d9d90c0b6 assets/create/lang/unfinished/es_es.json
90fc3a9475b957eebf10380a960416b072987541 assets/create/lang/unfinished/es_mx.json b2e5909fc6169fa68968e74d4592834f5e72ae24 assets/create/lang/unfinished/es_mx.json
997cc00c6a9afbb142e25c5a1840908363afad41 assets/create/lang/unfinished/fr_fr.json aa79feefc0d9fd7006079aba9eaab882127478c3 assets/create/lang/unfinished/fr_fr.json
6a9c89ff7a7c2df5f78a6a739a204744a4a5607a assets/create/lang/unfinished/it_it.json 3eded7242f2a47068bf2298ae68dbe645ef405aa assets/create/lang/unfinished/it_it.json
e21697e70444e3c8fb367b7a4fe867726157390d assets/create/lang/unfinished/ja_jp.json 88f3ced413786eea34a1344a4df8b530854f6c39 assets/create/lang/unfinished/ja_jp.json
9f2d7b6fc84f6257837b4c517489f6ef31a4e1a5 assets/create/lang/unfinished/ko_kr.json e3f82fb1de5c4e08a3b7ea2fbecaa43183762e54 assets/create/lang/unfinished/ko_kr.json
5bcfe026f3bb3f0aa0ea415e54dedad4195bb70a assets/create/lang/unfinished/nl_nl.json c39e821107cced812df201720542f96bcafc3338 assets/create/lang/unfinished/nl_nl.json
bc60cb08266e8d13523d086cdb85aa12da78a47b assets/create/lang/unfinished/pt_br.json 0598ab0e3f20a17d8ffec9874b5165b6c40c654c assets/create/lang/unfinished/pt_br.json
288e3e76a1aa090a676415aeb9f5383b3386e40d assets/create/lang/unfinished/ru_ru.json bb1e3d00fc19e93813e7437a2c2cea2b0b8c2af1 assets/create/lang/unfinished/ru_ru.json
0b6852ca1cea71d24cfdee7004ab37fa7810a0fe assets/create/lang/unfinished/zh_cn.json a8e0dfc2ba5b41cee05636b16b4661e96d5e8b5a assets/create/lang/unfinished/zh_cn.json
619d82eba592f4ae88ddbc2c9dfae02627876300 assets/create/lang/unfinished/zh_tw.json 74c50139e2274be160a1bd0068f411cc6ec845d5 assets/create/lang/unfinished/zh_tw.json
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json
@ -1648,7 +1648,7 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear
866fbb0ce2878a73e0440d1caf6534c8bd7c384f assets/create/models/item/zinc_ingot.json 866fbb0ce2878a73e0440d1caf6534c8bd7c384f assets/create/models/item/zinc_ingot.json
a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json
b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json
71739e613693c476e481dfcf38628a4f52f0f570 assets/create/sounds.json a3214d60696bcbca721ad4b3ebbdd84ff6f6b32d assets/create/sounds.json
5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json 5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json
187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json 187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json
0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json 0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json

View file

@ -1154,6 +1154,8 @@
"create.subtitle.cogs": "Cogwheels rumble", "create.subtitle.cogs": "Cogwheels rumble",
"create.subtitle.slime_added": "Slime squishes", "create.subtitle.slime_added": "Slime squishes",
"create.subtitle.contraption_disassemble": "Contraption stops",
"create.subtitle.wrench_rotate": "Wrench used",
"create.subtitle.mixing": "Mixing Noises", "create.subtitle.mixing": "Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "Affirmative ding", "create.subtitle.blockzapper_confirm": "Affirmative ding",
@ -1165,8 +1167,12 @@
"create.subtitle.schematicannon_finish": "Schematicannon dings", "create.subtitle.schematicannon_finish": "Schematicannon dings",
"create.subtitle.scroll_value": "Scroll-input clicks", "create.subtitle.scroll_value": "Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "Mechanical Press clangs", "create.subtitle.mechanical_press_activation": "Mechanical Press clangs",
"create.subtitle.contraption_assemble": "Contraption moves",
"create.subtitle.crafter_craft": "Crafter crafts",
"create.subtitle.blockzapper_deny": "Declining boop", "create.subtitle.blockzapper_deny": "Declining boop",
"create.subtitle.cranking": "Hand Crank turns", "create.subtitle.cranking": "Hand Crank turns",
"create.subtitle.crafter_click": "Crafter clicks",
"create.subtitle.wrench_remove": "Component breaks",
"create.subtitle.depot_plop": "Item lands", "create.subtitle.depot_plop": "Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 921", "_": "Missing Localizations: 927",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "Schleim matscht", "create.subtitle.slime_added": "Schleim matscht",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "Bestätigendes Ding", "create.subtitle.blockzapper_confirm": "Bestätigendes Ding",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "Bauplankanone endet", "create.subtitle.schematicannon_finish": "Bauplankanone endet",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "Mechanische Presse wird aktiviert", "create.subtitle.mechanical_press_activation": "Mechanische Presse wird aktiviert",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "Ablehnendes Boop", "create.subtitle.blockzapper_deny": "Ablehnendes Boop",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 614", "_": "Missing Localizations: 620",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "Slime aplastado", "create.subtitle.slime_added": "Slime aplastado",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "Ding afirmativo", "create.subtitle.blockzapper_confirm": "Ding afirmativo",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "Acabados de Schematicannon", "create.subtitle.schematicannon_finish": "Acabados de Schematicannon",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "La Prensa Mecánica se activa", "create.subtitle.mechanical_press_activation": "La Prensa Mecánica se activa",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "Boop declinante", "create.subtitle.blockzapper_deny": "Boop declinante",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 1272", "_": "Missing Localizations: 1278",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "UNLOCALIZED: Slime squishes", "create.subtitle.slime_added": "UNLOCALIZED: Slime squishes",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative ding", "create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative ding",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining boop", "create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining boop",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 1171", "_": "Missing Localizations: 1177",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "Bruit de slime", "create.subtitle.slime_added": "Bruit de slime",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "Ding d'affirmation", "create.subtitle.blockzapper_confirm": "Ding d'affirmation",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "Fin de schémacanon", "create.subtitle.schematicannon_finish": "Fin de schémacanon",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "Activation de la presse mechanique", "create.subtitle.mechanical_press_activation": "Activation de la presse mechanique",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "Boop de déclin", "create.subtitle.blockzapper_deny": "Boop de déclin",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 631", "_": "Missing Localizations: 637",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "Slime schiacciato", "create.subtitle.slime_added": "Slime schiacciato",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "Ding affermativo", "create.subtitle.blockzapper_confirm": "Ding affermativo",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "Finiture cannoneschematico", "create.subtitle.schematicannon_finish": "Finiture cannoneschematico",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "Pressa meccanica attiva", "create.subtitle.mechanical_press_activation": "Pressa meccanica attiva",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "Boop in calo", "create.subtitle.blockzapper_deny": "Boop in calo",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 613", "_": "Missing Localizations: 619",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "スライムがぐしゃっとつぶれる", "create.subtitle.slime_added": "スライムがぐしゃっとつぶれる",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "成功音", "create.subtitle.blockzapper_confirm": "成功音",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "概略図砲が作業を終える", "create.subtitle.schematicannon_finish": "概略図砲が作業を終える",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "メカニカルプレスが作動する", "create.subtitle.mechanical_press_activation": "メカニカルプレスが作動する",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "失敗音", "create.subtitle.blockzapper_deny": "失敗音",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 684", "_": "Missing Localizations: 690",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "슬라임이 철퍽거림", "create.subtitle.slime_added": "슬라임이 철퍽거림",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "확인 효과음", "create.subtitle.blockzapper_confirm": "확인 효과음",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "청사진 대포가 끝남", "create.subtitle.schematicannon_finish": "청사진 대포가 끝남",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "압착기가 가동됨", "create.subtitle.mechanical_press_activation": "압착기가 가동됨",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "취소 효과음", "create.subtitle.blockzapper_deny": "취소 효과음",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 1561", "_": "Missing Localizations: 1567",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "UNLOCALIZED: Slime squishes", "create.subtitle.slime_added": "UNLOCALIZED: Slime squishes",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative ding", "create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative ding",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining boop", "create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining boop",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 1615", "_": "Missing Localizations: 1621",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "UNLOCALIZED: Slime squishes", "create.subtitle.slime_added": "UNLOCALIZED: Slime squishes",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative ding", "create.subtitle.blockzapper_confirm": "UNLOCALIZED: Affirmative ding",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings", "create.subtitle.schematicannon_finish": "UNLOCALIZED: Schematicannon dings",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs", "create.subtitle.mechanical_press_activation": "UNLOCALIZED: Mechanical Press clangs",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining boop", "create.subtitle.blockzapper_deny": "UNLOCALIZED: Declining boop",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 528", "_": "Missing Localizations: 534",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "Намазывание слизи", "create.subtitle.slime_added": "Намазывание слизи",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "Утвердительный динь", "create.subtitle.blockzapper_confirm": "Утвердительный динь",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "Схематичная пушка закончила работу", "create.subtitle.schematicannon_finish": "Схематичная пушка закончила работу",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "Механический пресс активирован", "create.subtitle.mechanical_press_activation": "Механический пресс активирован",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "Тихий буп", "create.subtitle.blockzapper_deny": "Тихий буп",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 628", "_": "Missing Localizations: 634",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "粘液:挤碎声", "create.subtitle.slime_added": "粘液:挤碎声",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "选择方块", "create.subtitle.blockzapper_confirm": "选择方块",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "蓝图加农炮:完成任务", "create.subtitle.schematicannon_finish": "蓝图加农炮:完成任务",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "辊压机:工作中", "create.subtitle.mechanical_press_activation": "辊压机:工作中",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "放置失败", "create.subtitle.blockzapper_deny": "放置失败",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 633", "_": "Missing Localizations: 639",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -1155,6 +1155,8 @@
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble", "create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
"create.subtitle.slime_added": "黏液擠壓", "create.subtitle.slime_added": "黏液擠壓",
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises", "create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks", "create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
"create.subtitle.blockzapper_confirm": "選擇方塊", "create.subtitle.blockzapper_confirm": "選擇方塊",
@ -1166,8 +1168,12 @@
"create.subtitle.schematicannon_finish": "藍圖大炮完成任務", "create.subtitle.schematicannon_finish": "藍圖大炮完成任務",
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks", "create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
"create.subtitle.mechanical_press_activation": "液壓機工作", "create.subtitle.mechanical_press_activation": "液壓機工作",
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
"create.subtitle.blockzapper_deny": "放置失敗", "create.subtitle.blockzapper_deny": "放置失敗",
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns", "create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands", "create.subtitle.depot_plop": "UNLOCALIZED: Item lands",

View file

@ -41,6 +41,58 @@
], ],
"subtitle": "create.subtitle.cogs" "subtitle": "create.subtitle.cogs"
}, },
"contraption_assemble": {
"sounds": [
{
"name": "minecraft:block.wooden_trapdoor.open",
"type": "event"
}
],
"subtitle": "create.subtitle.contraption_assemble"
},
"contraption_assemble_compounded_1": {
"sounds": [
{
"name": "minecraft:block.chest.open",
"type": "event"
}
]
},
"contraption_disassemble": {
"sounds": [
{
"name": "minecraft:block.iron_trapdoor.close",
"type": "event"
}
],
"subtitle": "create.subtitle.contraption_disassemble"
},
"crafter_click": {
"sounds": [
{
"name": "minecraft:block.netherite_block.hit",
"type": "event"
}
],
"subtitle": "create.subtitle.crafter_click"
},
"crafter_click_compounded_1": {
"sounds": [
{
"name": "minecraft:block.wooden_trapdoor.open",
"type": "event"
}
]
},
"crafter_craft": {
"sounds": [
{
"name": "minecraft:entity.item.break",
"type": "event"
}
],
"subtitle": "create.subtitle.crafter_craft"
},
"cranking": { "cranking": {
"sounds": [ "sounds": [
{ {
@ -179,5 +231,31 @@
} }
], ],
"subtitle": "create.subtitle.slime_added" "subtitle": "create.subtitle.slime_added"
},
"wrench_remove": {
"sounds": [
{
"name": "minecraft:entity.item.pickup",
"type": "event"
}
],
"subtitle": "create.subtitle.wrench_remove"
},
"wrench_remove_compounded_1": {
"sounds": [
{
"name": "minecraft:block.netherite_block.hit",
"type": "event"
}
]
},
"wrench_rotate": {
"sounds": [
{
"name": "minecraft:block.wooden_trapdoor.close",
"type": "event"
}
],
"subtitle": "create.subtitle.wrench_rotate"
} }
} }

View file

@ -115,6 +115,39 @@ public class AllSoundEvents {
.category(SoundCategory.BLOCKS) .category(SoundCategory.BLOCKS)
.build(), .build(),
CONTRAPTION_ASSEMBLE = create("contraption_assemble").subtitle("Contraption moves")
.playExisting(SoundEvents.BLOCK_WOODEN_TRAPDOOR_OPEN, .5f, .5f)
.playExisting(SoundEvents.BLOCK_CHEST_OPEN, .045f, .74f)
.category(SoundCategory.BLOCKS)
.build(),
CONTRAPTION_DISASSEMBLE = create("contraption_disassemble").subtitle("Contraption stops")
.playExisting(SoundEvents.BLOCK_IRON_TRAPDOOR_CLOSE, .35f, .75f)
.category(SoundCategory.BLOCKS)
.build(),
WRENCH_ROTATE = create("wrench_rotate").subtitle("Wrench used")
.playExisting(SoundEvents.BLOCK_WOODEN_TRAPDOOR_CLOSE, .25f, 1.25f)
.category(SoundCategory.BLOCKS)
.build(),
WRENCH_REMOVE = create("wrench_remove").subtitle("Component breaks")
.playExisting(SoundEvents.ENTITY_ITEM_PICKUP, .25f, .75f)
.playExisting(SoundEvents.BLOCK_NETHERITE_BLOCK_HIT, .25f, .75f)
.category(SoundCategory.BLOCKS)
.build(),
CRAFTER_CLICK = create("crafter_click").subtitle("Crafter clicks")
.playExisting(SoundEvents.BLOCK_NETHERITE_BLOCK_HIT, .25f, 1)
.playExisting(SoundEvents.BLOCK_WOODEN_TRAPDOOR_OPEN, .125f, 1)
.category(SoundCategory.BLOCKS)
.build(),
CRAFTER_CRAFT = create("crafter_craft").subtitle("Crafter crafts")
.playExisting(SoundEvents.ENTITY_ITEM_BREAK, .125f, .75f)
.category(SoundCategory.BLOCKS)
.build(),
BLAZE_MUNCH = create("blaze_munch").subtitle("Blaze Burner munches") BLAZE_MUNCH = create("blaze_munch").subtitle("Blaze Burner munches")
.playExisting(SoundEvents.ENTITY_GENERIC_EAT, .5f, 1f) .playExisting(SoundEvents.ENTITY_GENERIC_EAT, .5f, 1f)
.category(SoundCategory.BLOCKS) .category(SoundCategory.BLOCKS)

View file

@ -581,7 +581,7 @@ public abstract class KineticTileEntity extends SmartTileEntity
SoundScapes.playGeneralKineticAmbience(pos, pitch); SoundScapes.playGeneralKineticAmbience(pos, pitch);
Block block = getBlockState().getBlock(); Block block = getBlockState().getBlock();
if (ICogWheel.isSmallCog(block) || ICogWheel.isSmallCog(block) || block instanceof GearboxBlock) if (ICogWheel.isSmallCog(block) || ICogWheel.isLargeCog(block) || block instanceof GearboxBlock)
SoundScapes.playCogwheelAmbience(pos, pitch); SoundScapes.playCogwheelAmbience(pos, pitch);
} }

View file

@ -15,6 +15,7 @@ import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.NBTUtil; import net.minecraft.nbt.NBTUtil;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType; import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3d;
@ -113,6 +114,7 @@ public abstract class BlockBreakingKineticTileEntity extends KineticTileEntity {
float breakSpeed = getBreakSpeed(); float breakSpeed = getBreakSpeed();
destroyProgress += MathHelper.clamp((int) (breakSpeed / blockHardness), 1, 10 - destroyProgress); destroyProgress += MathHelper.clamp((int) (breakSpeed / blockHardness), 1, 10 - destroyProgress);
world.playSound(null, pos, stateToBreak.getSoundType().getHitSound(), SoundCategory.NEUTRAL, .25f, 1);
if (destroyProgress >= 10) { if (destroyProgress >= 10) {
onBlockBroken(stateToBreak); onBlockBroken(stateToBreak);

View file

@ -14,6 +14,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.NBTUtil; import net.minecraft.nbt.NBTUtil;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
@ -164,6 +165,7 @@ public class BlockBreakingMovementBehaviour extends MovementBehaviour {
float breakSpeed = MathHelper.clamp(Math.abs(context.getAnimationSpeed()) / 500f, 1 / 128f, 16f); float breakSpeed = MathHelper.clamp(Math.abs(context.getAnimationSpeed()) / 500f, 1 / 128f, 16f);
destroyProgress += MathHelper.clamp((int) (breakSpeed / blockHardness), 1, 10 - destroyProgress); destroyProgress += MathHelper.clamp((int) (breakSpeed / blockHardness), 1, 10 - destroyProgress);
world.playSound(null, breakingPos, stateToBreak.getSoundType().getHitSound(), SoundCategory.NEUTRAL, .25f, 1);
if (destroyProgress >= 10) { if (destroyProgress >= 10) {
world.sendBlockBreakProgress(id, breakingPos, -1); world.sendBlockBreakProgress(id, breakingPos, -1);

View file

@ -11,6 +11,7 @@ import org.apache.commons.lang3.tuple.Pair;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntity;
import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput;
import com.simibubi.create.content.contraptions.components.crafter.RecipeGridHandler.GroupedItems; import com.simibubi.create.content.contraptions.components.crafter.RecipeGridHandler.GroupedItems;
@ -31,6 +32,8 @@ import net.minecraft.particles.ItemParticleData;
import net.minecraft.particles.ParticleTypes; import net.minecraft.particles.ParticleTypes;
import net.minecraft.tileentity.TileEntityType; import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3d;
@ -67,7 +70,12 @@ public class MechanicalCrafterTileEntity extends KineticTileEntity {
return stack; return stack;
if (te.covered) if (te.covered)
return stack; return stack;
return super.insertItem(slot, stack, simulate); ItemStack insertItem = super.insertItem(slot, stack, simulate);
if (insertItem.getCount() != stack.getCount() && !simulate)
te.getWorld()
.playSound(null, te.getPos(), SoundEvents.ENTITY_ITEM_FRAME_ADD_ITEM, SoundCategory.BLOCKS, .25f,
.5f);
return insertItem;
} }
} }
@ -173,10 +181,12 @@ public class MechanicalCrafterTileEntity extends KineticTileEntity {
groupedItemsBeforeCraft = before; groupedItemsBeforeCraft = before;
if (phaseBefore == Phase.EXPORTING && phase == Phase.WAITING) { if (phaseBefore == Phase.EXPORTING && phase == Phase.WAITING) {
Direction facing = getBlockState().get(MechanicalCrafterBlock.HORIZONTAL_FACING); Direction facing = getBlockState().get(MechanicalCrafterBlock.HORIZONTAL_FACING);
Vector3d vec = Vector3d.of(facing.getDirectionVec()).scale(.75) Vector3d vec = Vector3d.of(facing.getDirectionVec())
.scale(.75)
.add(VecHelper.getCenterOf(pos)); .add(VecHelper.getCenterOf(pos));
Direction targetDirection = MechanicalCrafterBlock.getTargetDirection(getBlockState()); Direction targetDirection = MechanicalCrafterBlock.getTargetDirection(getBlockState());
vec = vec.add(Vector3d.of(targetDirection.getDirectionVec()).scale(1)); vec = vec.add(Vector3d.of(targetDirection.getDirectionVec())
.scale(1));
world.addParticle(ParticleTypes.CRIT, vec.x, vec.y, vec.z, 0, 0, 0); world.addParticle(ParticleTypes.CRIT, vec.x, vec.y, vec.z, 0, 0, 0);
} }
} }
@ -275,6 +285,10 @@ public class MechanicalCrafterTileEntity extends KineticTileEntity {
Pointing pointing = getBlockState().get(MechanicalCrafterBlock.POINTING); Pointing pointing = getBlockState().get(MechanicalCrafterBlock.POINTING);
groupedItems.mergeOnto(targetingCrafter.groupedItems, pointing); groupedItems.mergeOnto(targetingCrafter.groupedItems, pointing);
groupedItems = new GroupedItems(); groupedItems = new GroupedItems();
float pitch = targetingCrafter.groupedItems.grid.size() * 1/16f + .5f;
AllSoundEvents.CRAFTER_CLICK.playOnServer(world, pos, 1, pitch);
phase = Phase.WAITING; phase = Phase.WAITING;
countDown = 0; countDown = 0;
sendData(); sendData();
@ -319,7 +333,14 @@ public class MechanicalCrafterTileEntity extends KineticTileEntity {
} }
} }
int prev = countDown;
countDown -= getCountDownSpeed(); countDown -= getCountDownSpeed();
if (countDown < 1000 && prev >= 1000) {
AllSoundEvents.CRAFTER_CLICK.playOnServer(world, pos, 1, 2);
AllSoundEvents.CRAFTER_CRAFT.playOnServer(world, pos);
}
if (countDown < 0) { if (countDown < 0) {
countDown = 0; countDown = 0;
if (!runLogic) if (!runLogic)
@ -391,7 +412,8 @@ public class MechanicalCrafterTileEntity extends KineticTileEntity {
BlockState blockState = getBlockState(); BlockState blockState = getBlockState();
boolean present = AllBlocks.MECHANICAL_CRAFTER.has(blockState); boolean present = AllBlocks.MECHANICAL_CRAFTER.has(blockState);
Vector3d vec = present ? Vector3d.of(blockState.get(HORIZONTAL_FACING) Vector3d vec = present ? Vector3d.of(blockState.get(HORIZONTAL_FACING)
.getDirectionVec()).scale(.75f) : Vector3d.ZERO; .getDirectionVec())
.scale(.75f) : Vector3d.ZERO;
Vector3d ejectPos = VecHelper.getCenterOf(pos) Vector3d ejectPos = VecHelper.getCenterOf(pos)
.add(vec); .add(vec);
groupedItems.grid.forEach((pair, stack) -> dropItem(ejectPos, stack)); groupedItems.grid.forEach((pair, stack) -> dropItem(ejectPos, stack));

View file

@ -84,10 +84,10 @@ public class HandCrankTileEntity extends GeneratingKineticTileEntity {
@Override @Override
public void tickAudio() { public void tickAudio() {
super.tickAudio(); super.tickAudio();
if (inUse > 0 && AnimationTickHolder.getTicks() % 2 == 0) { if (inUse > 0 && AnimationTickHolder.getTicks() % 10 == 0) {
if (!AllBlocks.HAND_CRANK.has(getBlockState())) if (!AllBlocks.HAND_CRANK.has(getBlockState()))
return; return;
AllSoundEvents.CRANKING.playAt(world, pos, (inUse) / 5f, .65f + (10 - inUse) / 10f, true); AllSoundEvents.CRANKING.playAt(world, pos, (inUse) / 2.5f, .65f + (10 - inUse) / 10f, true);
} }
} }

View file

@ -215,6 +215,7 @@ public class DeployerHandler {
if (blockBreakingProgress != null) if (blockBreakingProgress != null)
before = blockBreakingProgress.getValue(); before = blockBreakingProgress.getValue();
progress += before; progress += before;
world.playSound(null, clickedPos, clickedState.getSoundType().getHitSound(), SoundCategory.NEUTRAL, .25f, 1);
if (progress >= 1) { if (progress >= 1) {
tryHarvestBlock(player.interactionManager, clickedPos); tryHarvestBlock(player.interactionManager, clickedPos);

View file

@ -4,6 +4,7 @@ import static net.minecraft.state.properties.BlockStateProperties.FACING;
import java.util.List; import java.util.List;
import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity;
import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity; import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException; import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
@ -169,6 +170,8 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity
movedContraption.setRotationAxis(direction.getAxis()); movedContraption.setRotationAxis(direction.getAxis());
world.addEntity(movedContraption); world.addEntity(movedContraption);
AllSoundEvents.CONTRAPTION_ASSEMBLE.playOnServer(world, pos);
running = true; running = true;
angle = 0; angle = 0;
sendData(); sendData();
@ -181,8 +184,10 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity
angle = 0; angle = 0;
if (isWindmill()) if (isWindmill())
applyRotation(); applyRotation();
if (movedContraption != null) if (movedContraption != null) {
movedContraption.disassemble(); movedContraption.disassemble();
AllSoundEvents.CONTRAPTION_DISASSEMBLE.playOnServer(world, pos);
}
movedContraption = null; movedContraption = null;
running = false; running = false;

View file

@ -1,6 +1,7 @@
package com.simibubi.create.content.contraptions.components.structureMovement.piston; package com.simibubi.create.content.contraptions.components.structureMovement.piston;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.IRotate;
import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException; import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException;
import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionCollider;
@ -83,6 +84,8 @@ public class MechanicalPistonTileEntity extends LinearActuatorTileEntity {
applyContraptionPosition(); applyContraptionPosition();
forceMove = true; forceMove = true;
world.addEntity(movedContraption); world.addEntity(movedContraption);
AllSoundEvents.CONTRAPTION_ASSEMBLE.playOnServer(world, pos);
} }
@Override @Override
@ -95,6 +98,7 @@ public class MechanicalPistonTileEntity extends LinearActuatorTileEntity {
if (movedContraption != null) { if (movedContraption != null) {
applyContraptionPosition(); applyContraptionPosition();
movedContraption.disassemble(); movedContraption.disassemble();
AllSoundEvents.CONTRAPTION_DISASSEMBLE.playOnServer(world, pos);
} }
running = false; running = false;
movedContraption = null; movedContraption = null;

View file

@ -1,5 +1,7 @@
package com.simibubi.create.content.contraptions.wrench; package com.simibubi.create.content.contraptions.wrench;
import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.Create;
import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock; import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock; import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity;
@ -18,6 +20,8 @@ import net.minecraft.item.ItemUseContext;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResultType; import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;
@ -40,6 +44,9 @@ public interface IWrenchable {
((GeneratingKineticTileEntity) te).reActivateSource = true; ((GeneratingKineticTileEntity) te).reActivateSource = true;
} }
if (world.getBlockState(context.getPos()) != state)
playRotateSound(world, context.getPos());
return ActionResultType.SUCCESS; return ActionResultType.SUCCESS;
} }
@ -60,10 +67,19 @@ public interface IWrenchable {
}); });
state.spawnAdditionalDrops((ServerWorld) world, pos, ItemStack.EMPTY); state.spawnAdditionalDrops((ServerWorld) world, pos, ItemStack.EMPTY);
world.destroyBlock(pos, false); world.destroyBlock(pos, false);
playRemoveSound(world, pos);
} }
return ActionResultType.SUCCESS; return ActionResultType.SUCCESS;
} }
default void playRemoveSound(World world, BlockPos pos) {
AllSoundEvents.WRENCH_REMOVE.playOnServer(world, pos, 1, Create.random.nextFloat() * .5f + .5f);
}
default void playRotateSound(World world, BlockPos pos) {
AllSoundEvents.WRENCH_ROTATE.playOnServer(world, pos, 1, Create.random.nextFloat() + .5f);
}
default BlockState getRotatedBlockState(BlockState originalState, Direction targetedFace) { default BlockState getRotatedBlockState(BlockState originalState, Direction targetedFace) {
BlockState newState = originalState; BlockState newState = originalState;

View file

@ -82,7 +82,7 @@ class SoundScape {
public float getVolume() { public float getVolume() {
int soundCount = SoundScapes.getSoundCount(group, pitchGroup); int soundCount = SoundScapes.getSoundCount(group, pitchGroup);
float argMax = (float) SoundScapes.SOUND_VOLUME_ARG_MAX; float argMax = (float) SoundScapes.SOUND_VOLUME_ARG_MAX;
return MathHelper.clamp(soundCount / (argMax * 10f), 0, .05f); return MathHelper.clamp(soundCount / (argMax * 10f), 0.075f, .15f);
} }
} }