From 5bc1fbabee84e11d259f899e768a40f78f833ed9 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 23 Sep 2022 20:59:38 +0200 Subject: [PATCH] Port new changes --- .../12afe0d97856fb2040b8407470e6d13529994eaa | 2 +- .../455c485c9c8ef171bbc1ce4d435b3110ba1557ba | 2 +- .../4c6aefd01d2f404cb6dd8a4f408ce8f3778751da | 36 ++++++++-------- .../6ec3b5a261c9ae3df674f7595dc66530ce54feb9 | 2 +- .../82992cbf8f2794d83ac94034835eac0acd7915b9 | 2 +- .../8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 | 42 +++++++++---------- .../b256105d8411632b0d585496ea8944a751a08034 | 2 +- .../c24b4d2b8d15abff51c78bd94f4403d9eae6c139 | 2 +- .../assets/create/lang/unfinished/de_de.json | 2 +- .../assets/create/lang/unfinished/es_cl.json | 2 +- .../assets/create/lang/unfinished/es_es.json | 2 +- .../assets/create/lang/unfinished/fr_fr.json | 2 +- .../assets/create/lang/unfinished/ja_jp.json | 2 +- .../assets/create/lang/unfinished/ko_kr.json | 2 +- .../assets/create/lang/unfinished/nl_nl.json | 2 +- .../assets/create/lang/unfinished/pl_pl.json | 2 +- .../assets/create/lang/unfinished/pt_br.json | 2 +- .../assets/create/lang/unfinished/pt_pt.json | 2 +- .../assets/create/lang/unfinished/ro_ro.json | 2 +- .../assets/create/lang/unfinished/uk_ua.json | 2 +- .../assets/create/lang/unfinished/zh_cn.json | 2 +- .../assets/create/lang/unfinished/zh_tw.json | 2 +- .../mounted/MinecartContraptionItem.java | 2 +- .../trains/track/FakeTrackBlock.java | 7 +++- .../logistics/trains/track/TrackBlock.java | 7 +++- 25 files changed, 70 insertions(+), 64 deletions(-) diff --git a/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa b/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa index e5fe05abe..ef556daed 100644 --- a/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa +++ b/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa @@ -1,4 +1,4 @@ -// 1.19.2 2022-09-06T15:47:33.6198974 Create's Sequenced Assembly Recipes +// 1.19.2 2022-09-23T20:53:24.9127077 Create's Sequenced Assembly Recipes e6efd0d76dc451a44b663a453cef6e6656ad523f data/create/recipes/sequenced_assembly/precision_mechanism.json 0cdbd4f583aa0a2aa8f3ca2827199bede1732722 data/create/recipes/sequenced_assembly/sturdy_sheet.json 1274315b5c570722d6f5b2ed7f5e53fe01b6288a data/create/recipes/sequenced_assembly/track.json diff --git a/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba b/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba index 8a7acaf4f..365de5eff 100644 --- a/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba +++ b/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba @@ -1,4 +1,4 @@ -// 1.19.2 2022-09-06T15:47:33.6178697 Create's Advancements +// 1.19.2 2022-09-23T20:53:24.9106842 Create's Advancements 2079ae09cf699108a8035ced7ca712fed4ab1577 data/create/advancements/andesite_alloy.json 082d3987c5e074ed50be4a94a6fdc17120af241b data/create/advancements/andesite_casing.json 4618109cfb4550fd8e19dc9d794ef24398b10a61 data/create/advancements/anvil_plough.json diff --git a/src/generated/resources/.cache/4c6aefd01d2f404cb6dd8a4f408ce8f3778751da b/src/generated/resources/.cache/4c6aefd01d2f404cb6dd8a4f408ce8f3778751da index a201c2b2a..506f1ccf6 100644 --- a/src/generated/resources/.cache/4c6aefd01d2f404cb6dd8a4f408ce8f3778751da +++ b/src/generated/resources/.cache/4c6aefd01d2f404cb6dd8a4f408ce8f3778751da @@ -1,18 +1,18 @@ -// 1.19.2 2022-09-17T21:51:07.3712389 Lang merger -ca7295cdf5aedac28119596bf480757bf3ff4b17 assets/create/lang/en_us.json -a983fbc8286052188d28afd01de061bb3c97eea3 assets/create/lang/unfinished/de_de.json -f892b130f0b1ccac28c6e7d4e69d81cb1190b466 assets/create/lang/unfinished/es_cl.json -affc91bb228051babc38cbbc40986b6554b3ddaa assets/create/lang/unfinished/es_es.json -1296d8eb7489184c2e6099a6d784ddf1d676e337 assets/create/lang/unfinished/fr_fr.json -433bd052bf87efb9fb57bb2848442d83dde436ec assets/create/lang/unfinished/it_it.json -948747c66214f34510568eea3b93ee49bd690448 assets/create/lang/unfinished/ja_jp.json -5b3c88caf51dff87ea23be21c0ccda4973f57032 assets/create/lang/unfinished/ko_kr.json -27ae9264c43dc0712e49867e2e72accc170fa889 assets/create/lang/unfinished/nl_nl.json -7dc0293b0407ce4cd624732961b1c47c5c71b811 assets/create/lang/unfinished/pl_pl.json -e4dcb5f3260118ae6ff70d0f4000e045426046d9 assets/create/lang/unfinished/pt_br.json -d35b90d4653624ade66cd7d5969743403d9a4f0e assets/create/lang/unfinished/pt_pt.json -9d07accc39dedda6bc67411dbc223dc436f77709 assets/create/lang/unfinished/ro_ro.json -6288290f72d6ff33cbcf0fdcbff927e90d4eab78 assets/create/lang/unfinished/ru_ru.json -c8632e1dbeeb5f7b91d4a50bc616ed2666479ee1 assets/create/lang/unfinished/uk_ua.json -c6071b1b85a10ed8d16c0bfed6966857a6a77c1a assets/create/lang/unfinished/zh_cn.json -c42df91108c442aa0e4e5d6a7ee9938154c9c9c3 assets/create/lang/unfinished/zh_tw.json +// 1.19.2 2022-09-23T20:53:24.8228086 Lang merger +4b9ffd38401c3366dc8fba48bd867b580bd7a016 assets/create/lang/en_us.json +c2d8149ca2c7db92f0c8c3c7d68e7e63302878df assets/create/lang/unfinished/de_de.json +a0e1127515d1cf6868741eaa864d9342f552a99c assets/create/lang/unfinished/es_cl.json +917cb1979c9ad8785864351d42eaafa3fa29ea1d assets/create/lang/unfinished/es_es.json +b5ed9782c171eac41695f2b12b71870cded97fa6 assets/create/lang/unfinished/fr_fr.json +a253fa32573b2fb9941dddeff32325a81dea8850 assets/create/lang/unfinished/it_it.json +d21e3535c795ac4db5224bb57baceab62fc2a51b assets/create/lang/unfinished/ja_jp.json +da47fd6bc5192384df742f2e5dd556a697c15659 assets/create/lang/unfinished/ko_kr.json +32babc881a7f928a6fa93d20b46d52f0165d6ba7 assets/create/lang/unfinished/nl_nl.json +b88ce42806a06cd65203e2e296057e0911733d06 assets/create/lang/unfinished/pl_pl.json +c3bc8db145cdc14dc3403fdf7f9bdf4fc3ed5f45 assets/create/lang/unfinished/pt_br.json +338d90442da4075a5c8facbc0e9fca8d2accfcd2 assets/create/lang/unfinished/pt_pt.json +c3afd5e860c6e2956cda4d55ee1167e8b987ade6 assets/create/lang/unfinished/ro_ro.json +ba8e498f1cdc26d5af6b22b57aafc70358d42c4a assets/create/lang/unfinished/ru_ru.json +5f2d947d98adbcc2e79eeb792352a4b5596e76dc assets/create/lang/unfinished/uk_ua.json +135f81829c79a0f4209ec02bfc0acc817de87e94 assets/create/lang/unfinished/zh_cn.json +400a4ebd430a0ca749898a3d8a068a7f15d2e62a assets/create/lang/unfinished/zh_tw.json diff --git a/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 b/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 index e58747ece..61a50f7c5 100644 --- a/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 +++ b/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 @@ -1,4 +1,4 @@ -// 1.19.2 2022-09-06T15:47:33.6208868 Create's Mechanical Crafting Recipes +// 1.19.2 2022-09-23T20:53:24.9127077 Create's Mechanical Crafting Recipes f076d64d9f30709bed34775136c9241097b28aa9 data/create/recipes/mechanical_crafting/crushing_wheel.json 694dca9dcff246bb7f560b3304fcc244c53217d5 data/create/recipes/mechanical_crafting/extendo_grip.json 3b2837b08607c1ca466fa3eb418209b2e55da6ba data/create/recipes/mechanical_crafting/potato_cannon.json diff --git a/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 b/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 index d30b5dd3f..c92958ad8 100644 --- a/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 +++ b/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 @@ -1,4 +1,4 @@ -// 1.19.2 2022-09-06T15:47:33.6078714 Create's Standard Recipes +// 1.19.2 2022-09-23T20:53:24.8237936 Create's Standard Recipes b397254b7cdb19d1c64ed1c30e1f6aa5c8af7270 data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json c14aec90afe9450b7dd472ff612e2f8013d09abf data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json fd9a8eb94364c8424f23c510900ef9cd0904b53e data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json diff --git a/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 b/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 index 66db76316..ae0a486f1 100644 --- a/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 +++ b/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 @@ -1,4 +1,4 @@ -// 1.19.2 2022-09-21T09:09:19.8483732 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.19.2 2022-09-23T20:53:24.8357617 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json @@ -22,13 +22,13 @@ c8b65faf51122eb411f5895e718869da9b260c2e assets/create/blockstates/black_nixie_t 980ae9ba3f6d4e0faea8f3878985f9a9dadc0796 assets/create/blockstates/black_sail.json da3ad0225984a0dcbfb4ed800e307e45aff5aaa1 assets/create/blockstates/black_seat.json 0083f6aa3fda2c7ebb2e5f2a032e740cf3ae3846 assets/create/blockstates/black_toolbox.json -ebd2d9541744c987eb493e86ead8ca25cfdf06a6 assets/create/blockstates/black_valve_handle.json +28f2fb355e80171403e540afd2aed44e9c19659a assets/create/blockstates/black_valve_handle.json 06ecd28cd97f4e8200dc396858695cad57b871c8 assets/create/blockstates/blaze_burner.json 37caf031254b5171a1fbfe9906f4bc65e8dbc909 assets/create/blockstates/blue_nixie_tube.json d540f0f23e0d7c03f8e147cf3eebbaf7caec9f93 assets/create/blockstates/blue_sail.json d2fdb432bb037de781260c789e905b223fab408c assets/create/blockstates/blue_seat.json f91092da79b69fece9583ccc15350612f439ee1b assets/create/blockstates/blue_toolbox.json -e58b9a65b27334833c3cf57c99f645e2ea2b68ba assets/create/blockstates/blue_valve_handle.json +e330efa253172b315f73401ed8f2c39270ba90d3 assets/create/blockstates/blue_valve_handle.json f88ccf59cced46a7c2965077d4c36f7db0a8e7aa assets/create/blockstates/brass_belt_funnel.json 5a2551315557447abc579cf9225e3a12d9a46641 assets/create/blockstates/brass_block.json ac2f8f5e1d556e5c697da95729e82f107b115f09 assets/create/blockstates/brass_casing.json @@ -42,7 +42,7 @@ debf33346bf410216f21082e1e8d07aa6250b84c assets/create/blockstates/brown_nixie_t 1334fc9e71d9f2a6117f448817263467a9c695de assets/create/blockstates/brown_sail.json 19524b2c0672632e63372f405a87dbea35f1d160 assets/create/blockstates/brown_seat.json 1ffc38bf682e84aad4cb300c573375eb0cdcc434 assets/create/blockstates/brown_toolbox.json -78ee794048441269f2c8ceee43b38655a9974348 assets/create/blockstates/brown_valve_handle.json +440b29e1dffa4374ddc1aed444bff18a485bc1cb assets/create/blockstates/brown_valve_handle.json 2064534de4791b339fdcd4ef3a8129a2e233ec50 assets/create/blockstates/calcite_pillar.json 060c957b28afed9f4e0954cbef7e80cbf4b99f58 assets/create/blockstates/cart_assembler.json c7eca70054241944171b1d4ffcba0376b071ec62 assets/create/blockstates/chocolate.json @@ -62,7 +62,7 @@ c7eca70054241944171b1d4ffcba0376b071ec62 assets/create/blockstates/chocolate.jso 9a9f03140a57a7a8903d3e1b159bdc052566a6ec assets/create/blockstates/copper_tiles.json 7db7a0d81887091ca889f40bb8a508d3098c5164 assets/create/blockstates/copper_tile_slab.json c0b7eca017242913d156e4623147add0d03574f6 assets/create/blockstates/copper_tile_stairs.json -61538ee993b0e887d4763f2a4c75a77beb63dad8 assets/create/blockstates/copper_valve_handle.json +ef3ccb2d8b03f5a972b053a15bb037f8db6af17c assets/create/blockstates/copper_valve_handle.json 61aff016059d737c970202cfe22e1cf9e111fb01 assets/create/blockstates/creative_crate.json a04c7aa7dc994b76252b0d35d0a90f8ee79c7282 assets/create/blockstates/creative_fluid_tank.json 185cf1232b3db390c24653c17c0522d8320f94a4 assets/create/blockstates/creative_motor.json @@ -189,7 +189,7 @@ bb627b2e78dba6833cf2d357033f253fc89aa1b8 assets/create/blockstates/cyan_nixie_tu f1061b8f9757374d6608fda07e301a2623e79f72 assets/create/blockstates/cyan_sail.json 538c6d95da5cc460e99c91647dac61726a91479f assets/create/blockstates/cyan_seat.json c4d84b719762aca46cdb8decddfeb97dcc50676c assets/create/blockstates/cyan_toolbox.json -ecb885f156cab8b7fad41eadf6323a5bb2f4a203 assets/create/blockstates/cyan_valve_handle.json +477d32008d5aa6ed5a6825a70b9bb7d976e7d0fc assets/create/blockstates/cyan_valve_handle.json f4d7f5a38db9b92399a81f49ff1787d025c6f41f assets/create/blockstates/dark_oak_window.json a1b25bf2a5ec3cc2d6db727a3779703d2dc60bbc assets/create/blockstates/dark_oak_window_pane.json c705f9cd47042867c87fab3a898a57152dec6dd5 assets/create/blockstates/deepslate_pillar.json @@ -212,7 +212,7 @@ f93e4059876bfc6d70b9fa2bc24d8e3d6943d56f assets/create/blockstates/exposed_coppe f1a03ede031d8c4e33a4d07c529e71936da9dc6d assets/create/blockstates/fake_track.json 21fa4a1bf4ee851e090a21c97c9a38d18cfddf0d assets/create/blockstates/fluid_pipe.json 185e6367c5c5b3632e54148c74987057cbfccaca assets/create/blockstates/fluid_tank.json -3523dd12d6940591d94171d0c27a13dda029a53b assets/create/blockstates/fluid_valve.json +76a2cd731390e827f464442af1557c37fb595443 assets/create/blockstates/fluid_valve.json dd631893f279aa1446a1c54c50014220555216a2 assets/create/blockstates/flywheel.json a8c3ef55b001fc92ca92c73ace5f56a8c759c8aa assets/create/blockstates/framed_glass.json 6efecd71555a36cc959448e5c200dba45b0d7a07 assets/create/blockstates/framed_glass_door.json @@ -228,13 +228,13 @@ e3f2a093c436cb65c5a7ac049a14cc4dadb22526 assets/create/blockstates/granite_pilla 30ba031a6b5a327d2a4caa12169676da573c2133 assets/create/blockstates/gray_sail.json f35a502c4a5e2703e7c6811b3d2ba16a9c47d4c8 assets/create/blockstates/gray_seat.json 87457e0eddae80225dbb3145f2d120296ea1bfcd assets/create/blockstates/gray_toolbox.json -15191b6f516a8e95d968375734e9304ae595a4d8 assets/create/blockstates/gray_valve_handle.json +f18b87db39836eef20154b239d488eebb64b3455 assets/create/blockstates/gray_valve_handle.json 0f0fe2bf83f763e04cd2d7a979beb547feac3191 assets/create/blockstates/green_nixie_tube.json 0a2a5fbf2cf084e1be0426a224c291dc22a826fd assets/create/blockstates/green_sail.json b4aede1847d204ecdb7847559066d9d2ffb66903 assets/create/blockstates/green_seat.json 6f080890b3b30c46ba9ceb382c1171940bf4966f assets/create/blockstates/green_toolbox.json -abead4f89d857eb90a33ea8a475dbfe9512b81ad assets/create/blockstates/green_valve_handle.json -bc6a79e4b6830b499d1a1313fbe9095cf522d613 assets/create/blockstates/hand_crank.json +a343aefdb4207d1bffa6f4b40e20283a6d42c2f9 assets/create/blockstates/green_valve_handle.json +23430b770b5257af36844dfe9b976e343a6d1180 assets/create/blockstates/hand_crank.json d0b26c085df3ee5189082bc18945e5f74ee529fa assets/create/blockstates/haunted_bell.json 035dd3adaaf86510237f516d2657535da3d56d37 assets/create/blockstates/honey.json 44343f14fb6e43a93882b4f9ce0640e54876fdf8 assets/create/blockstates/horizontal_framed_glass.json @@ -265,26 +265,26 @@ fcf02725651ab5973fab1cfc09fdd68cb4b93579 assets/create/blockstates/lectern_contr f2354e8cb6086473ac97a5228b99706858dcad8a assets/create/blockstates/light_blue_sail.json 6b7045eaf9efe3a90f2d9a6785be6a5fd534b8e7 assets/create/blockstates/light_blue_seat.json b7065e7871c3c7f1a0656c2f92f82544e606f2fb assets/create/blockstates/light_blue_toolbox.json -ba040111377ebb37488b8e889d183ee3308da1e9 assets/create/blockstates/light_blue_valve_handle.json +549882a0f4de60906ca870a6197330f81d4e1afe assets/create/blockstates/light_blue_valve_handle.json fa5fb2be73c7c54b70e927b66adf3f4d64c5cb6b assets/create/blockstates/light_gray_nixie_tube.json 3d95c9c4442d1bdd660bae382c72c68134db86dd assets/create/blockstates/light_gray_sail.json 8ec5144da4a49dd5b497af07b0d4b88c9c0b6cc0 assets/create/blockstates/light_gray_seat.json 35b151db396069b146d223fbe46be5b0c3dda8a9 assets/create/blockstates/light_gray_toolbox.json -a3c29d1679e783ed4d3d679c6613ad817c49e6fe assets/create/blockstates/light_gray_valve_handle.json +894827ffd176bc733abecf18d96888e9ed5a3eb4 assets/create/blockstates/light_gray_valve_handle.json a6f319c803c03e34bbf841ea52d82f0f7ec7a413 assets/create/blockstates/limestone.json 7ff65e1c4c8e48a0b694cd17506a192e6a7e6e44 assets/create/blockstates/limestone_pillar.json 7f20b548dd535942b2d6f41c39de7ad4fafe637e assets/create/blockstates/lime_nixie_tube.json ad1ec304729fd6d336c0d4d0c27c9345af636695 assets/create/blockstates/lime_sail.json b9934a558e1b495403dc2c71ffb43cce7d396013 assets/create/blockstates/lime_seat.json 49a02f7fc16697ba1cf16cee7e45ab6bfd8b06ce assets/create/blockstates/lime_toolbox.json -29e215de4762dc3c9ae712ec135bba44657290c2 assets/create/blockstates/lime_valve_handle.json +ba181485f219d3ae23509a7edf28e25d9edb10f4 assets/create/blockstates/lime_valve_handle.json 654e845cebed82b7afbcf81380921e0a475b01e9 assets/create/blockstates/linear_chassis.json e195e82e4d0c1fc20474535bc9068cbb77a5e175 assets/create/blockstates/lit_blaze_burner.json 296186b196af94e1ab3f7e8a3254f6d31ae47a5c assets/create/blockstates/magenta_nixie_tube.json f150922cbed1c05fb3892d4ac91eb471234252e2 assets/create/blockstates/magenta_sail.json bb1ab5c70647933400b3a99ef9d166ba5e3d4709 assets/create/blockstates/magenta_seat.json fcd226c7863262d98765c701538bf9e44d2b177e assets/create/blockstates/magenta_toolbox.json -da853e67740f457e8b4489dfaf5ed645e0973e9c assets/create/blockstates/magenta_valve_handle.json +ecf670d95969a33a738f59e08393299891f78847 assets/create/blockstates/magenta_valve_handle.json 9386361f50a60bb14f397821285e64d33ed21fd2 assets/create/blockstates/mechanical_arm.json aafb4c62ae10fd65003f05160f3e1fbddbb01c5e assets/create/blockstates/mechanical_bearing.json be119eeeb8e0d9a9a5515dd2c49eaf91268d49b3 assets/create/blockstates/mechanical_crafter.json @@ -312,7 +312,7 @@ ba9c3ecfacbd398048440d247decffeaefc714b5 assets/create/blockstates/mysterious_cu af4c2c4861d1410e1b7371a5bf3fe09ed3ab0077 assets/create/blockstates/orange_sail.json aab812cecf7d10d4e7587f4dead8a98238a15f41 assets/create/blockstates/orange_seat.json 2bc30ed9907230271b4e2d0786f106f3e1e25029 assets/create/blockstates/orange_toolbox.json -9ae860d993c9392975912fd1f56c26ed92e45a99 assets/create/blockstates/orange_valve_handle.json +2af63a4768f84fc93c7e7d67fa9a64438433e59f assets/create/blockstates/orange_valve_handle.json 515ed7dae09b052f289419ba09998a23e0d7083d assets/create/blockstates/ornate_iron_window.json 8118444f37536b9104ef4818d374b0c8a7c987bf assets/create/blockstates/ornate_iron_window_pane.json 97cd78453af94f44cef1187988966626574b29d5 assets/create/blockstates/oxidized_copper_shingles.json @@ -326,7 +326,7 @@ ac536ae742c12e97bfd0b2483c87ff29f3935eaf assets/create/blockstates/oxidized_copp 213da5c04a33ae8ae7c0a4dec9844bbb6d670e33 assets/create/blockstates/pink_sail.json 8d5c80d5dc561240dfe8d7f212ffc33ac4e0fcd8 assets/create/blockstates/pink_seat.json 90bd26c7c6933f5ebbe17b0fe58f840e2924a0f5 assets/create/blockstates/pink_toolbox.json -ffe2fe5eb76d844956d9ce4a093194421d0867dd assets/create/blockstates/pink_valve_handle.json +9f698d0fe8cfd3c9b727ec00623e6d473d516d4a assets/create/blockstates/pink_valve_handle.json 73c2a6e6e2e0dad1bdcf2d8b089b28dd4c72c825 assets/create/blockstates/piston_extension_pole.json 7f51f7590e5a54ced28cefedff541bda5bdff6a7 assets/create/blockstates/placard.json c5b4aa064acbbb5f1d245427f90a0b737289edd1 assets/create/blockstates/polished_cut_andesite.json @@ -397,7 +397,7 @@ b658654aa97e8dd2c897f432a601835a3f8aca10 assets/create/blockstates/purple_nixie_ f8f9802df9c0b4e39edeefc3b1abb38255d79801 assets/create/blockstates/purple_sail.json 91b5ab66d7ec5235d278ee2bed6ddd88f39ce81d assets/create/blockstates/purple_seat.json 6aa467b3588359fdf5d7201f844193d5b70f20f7 assets/create/blockstates/purple_toolbox.json -82475c16b1578fc548d876152c866ab8dd2fd1db assets/create/blockstates/purple_valve_handle.json +6d02761efbb93349654514f67f5c0b7331e2823a assets/create/blockstates/purple_valve_handle.json 3aca01f2eddb22adb1b25735b98a990bfc7220d2 assets/create/blockstates/radial_chassis.json 72faac9777be540f95f8b662a833856e0e1b8f35 assets/create/blockstates/railway_casing.json 7ce346fa18702f6fe6e2a939efcfa26eda63fe38 assets/create/blockstates/raw_zinc_block.json @@ -407,7 +407,7 @@ e3fd62e466e3e6e7bd6fc8661f764ba972a466fc assets/create/blockstates/red_nixie_tub 4c36b562da58ef2af57009da7cf2426059249228 assets/create/blockstates/red_sail.json 145f4e9ffaeff9be180e6c4e4989f2cf44cf0686 assets/create/blockstates/red_seat.json 380f46b7cb72b13c0f16fd4a4287a1a33adeff41 assets/create/blockstates/red_toolbox.json -09a14ebba493303b59e5b90d67c8672bf2acf595 assets/create/blockstates/red_valve_handle.json +b689d87a27ed0cb2cab190a2ad2b599818bff56c assets/create/blockstates/red_valve_handle.json 87ab7ca62ecf24d60d7e5c61bd5af97714dad0ad assets/create/blockstates/refined_radiance_casing.json 3807bcc6ccc3dad0dbfcc8fcf260a361aa488659 assets/create/blockstates/rope.json baa7da231c6c45d5eabaf04985d46e206a3346f8 assets/create/blockstates/rope_pulley.json @@ -485,7 +485,7 @@ ad79aa8ff306695f65386fdeb44c5285547934b6 assets/create/blockstates/small_veridiu b54200ebe65c4ad2e5661c81ba5bf939039277ca assets/create/blockstates/small_veridium_brick_stairs.json 0237d58443ca9dc2a9186c2387dd6633702a7598 assets/create/blockstates/small_veridium_brick_wall.json 4d987859e5f5a930c20e955919304088fb6fc6d1 assets/create/blockstates/smart_chute.json -4485611f21dedacfb637b7940d0ad3425c304b12 assets/create/blockstates/smart_fluid_pipe.json +57fc35b2e0ae9ab16c011abd95f507910c70a234 assets/create/blockstates/smart_fluid_pipe.json a70c025de5d85180f371ff05bbdc531d8bdfaab1 assets/create/blockstates/speedometer.json e118ee8a8be4ef171215733b7e9fcfedd64a548a assets/create/blockstates/spout.json 50c775e32c0d7ea3f5199323875f6437afe85b61 assets/create/blockstates/spruce_window.json @@ -549,14 +549,14 @@ da110f382368257e15431c77164aef82e014e3f8 assets/create/blockstates/weathered_cop f079469d186087d23f0d91b384040f777b0088b1 assets/create/blockstates/white_sail.json 317a6463db64b66d215d25b65ab52fe7f26ba9f8 assets/create/blockstates/white_seat.json 6cb8c82a429b54d6a87d02eec5cfd1fcd5365f1e assets/create/blockstates/white_toolbox.json -edfa0c21824f76e6d7725a379ce6392d13ebaa2a assets/create/blockstates/white_valve_handle.json +c0bfe8416173868f9916c4a54dd9f983887c5bac assets/create/blockstates/white_valve_handle.json ec2720e3f1bc84304d0c81cd23ff1e155b0c2f2c assets/create/blockstates/windmill_bearing.json d688e80dfbd5b17970814887c3698fc721981caa assets/create/blockstates/wooden_bracket.json 157942a838aa02909fb2238ad9ce77edc82f6142 assets/create/blockstates/yellow_nixie_tube.json 68b6e267e93b96dbc0596ea4a1cd26636aa0e04a assets/create/blockstates/yellow_sail.json 4face2dd50a30bda0b21742319e701e666d51f8c assets/create/blockstates/yellow_seat.json b0d8f08968763a5f74e5cd5644377a76a9f39753 assets/create/blockstates/yellow_toolbox.json -2843dd63dd5f770dd59909b6a522d6f85cec8f3c assets/create/blockstates/yellow_valve_handle.json +fe8c497aacc641c2f01cec90bba9f19e59cc2ed2 assets/create/blockstates/yellow_valve_handle.json e819e93fdcbe9fd9c050a052d2718ff3b3539365 assets/create/blockstates/zinc_block.json 64121dcb216381c83b4fe28aa361ea07c24c9ad0 assets/create/blockstates/zinc_ore.json af25fce0cd0f61c6f0feaf6cfe00e92fb6d0e6e0 assets/create/lang/en_ud.json diff --git a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 index 976838a5f..ea9eef57c 100644 --- a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 +++ b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 @@ -1,4 +1,4 @@ -// 1.19.2 2022-09-06T15:47:33.6128825 Create's Processing Recipes +// 1.19.2 2022-09-23T20:53:24.8287802 Create's Processing Recipes 3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json 8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json 8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json diff --git a/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 b/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 index e4dab034f..27dae0e78 100644 --- a/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 +++ b/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 @@ -1,2 +1,2 @@ -// 1.19.2 2022-09-06T15:47:33.6128825 Create's Custom Sounds +// 1.19.2 2022-09-23T20:53:24.9116814 Create's Custom Sounds 043955db25ffe58e7debb9a4f11e41a9571376e6 assets/create/sounds.json 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 6c6635ee8..d0f67b9b2 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: 842", + "_": "Missing Localizations: 844", "_": "->------------------------] Game Elements [------------------------<-", 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 f64bfb2d3..2ca308f3e 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: 988", + "_": "Missing Localizations: 990", "_": "->------------------------] Game Elements [------------------------<-", 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 235ae50f0..96d9e5f1e 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: 8", + "_": "Missing Localizations: 10", "_": "->------------------------] Game Elements [------------------------<-", 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 b5b2fb837..754171f0b 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: 2139", + "_": "Missing Localizations: 2141", "_": "->------------------------] Game Elements [------------------------<-", 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 befca1ecc..44f97c417 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: 4", + "_": "Missing Localizations: 6", "_": "->------------------------] Game Elements [------------------------<-", 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 6bf819bd0..87280df3d 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: 8", + "_": "Missing Localizations: 10", "_": "->------------------------] Game Elements [------------------------<-", 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 211c02165..c680c269d 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: 2487", + "_": "Missing Localizations: 2489", "_": "->------------------------] Game Elements [------------------------<-", 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 c36b870d3..ce780876e 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: 12", + "_": "Missing Localizations: 14", "_": "->------------------------] Game Elements [------------------------<-", 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 77eb668ab..58d49fc54 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: 1331", + "_": "Missing Localizations: 1333", "_": "->------------------------] Game Elements [------------------------<-", 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 7b25ffe37..8bde4ad28 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: 2196", + "_": "Missing Localizations: 2198", "_": "->------------------------] Game Elements [------------------------<-", 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 cda565a37..9a4980ffc 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: 655", + "_": "Missing Localizations: 657", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/uk_ua.json b/src/generated/resources/assets/create/lang/unfinished/uk_ua.json index 3fbb2e9b8..e60d31930 100644 --- a/src/generated/resources/assets/create/lang/unfinished/uk_ua.json +++ b/src/generated/resources/assets/create/lang/unfinished/uk_ua.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 986", + "_": "Missing Localizations: 988", "_": "->------------------------] Game Elements [------------------------<-", 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 806dbe7c5..acd4159f2 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: 4", + "_": "Missing Localizations: 6", "_": "->------------------------] Game Elements [------------------------<-", 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 a78453115..1ab135bf2 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: 8", + "_": "Missing Localizations: 10", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java index 3d5520671..3412531e1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java @@ -240,7 +240,7 @@ public class MinecartContraptionItem extends Item { return; } - contraption.stop(event.getWorld()); + contraption.stop(event.getLevel()); for (MutablePair pair : contraption.getActors()) if (AllMovementBehaviours.getBehaviour(pair.left.state)instanceof PortableStorageInterfaceMovement psim) diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/FakeTrackBlock.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/FakeTrackBlock.java index 5e1772688..d0ad1d877 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/FakeTrackBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/FakeTrackBlock.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.logistics.trains.track; +import org.jetbrains.annotations.Nullable; + import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; @@ -44,9 +46,10 @@ public class FakeTrackBlock extends Block implements EntityBlock, ProperWaterlog public RenderShape getRenderShape(BlockState pState) { return RenderShape.ENTITYBLOCK_ANIMATED; } - + @Override - public BlockPathTypes getAiPathNodeType(BlockState state, BlockGetter world, BlockPos pos, Mob entity) { + public @Nullable BlockPathTypes getBlockPathType(BlockState state, BlockGetter level, BlockPos pos, + @Nullable Mob mob) { return BlockPathTypes.DAMAGE_OTHER; } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java index 34036e1b6..6c697ba2f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java @@ -17,6 +17,8 @@ import java.util.Map.Entry; import java.util.Random; import java.util.function.Consumer; +import org.jetbrains.annotations.Nullable; + import com.google.common.base.Predicates; import com.jozufozu.flywheel.core.PartialModel; import com.jozufozu.flywheel.util.transform.TransformStack; @@ -122,9 +124,10 @@ public class TrackBlock extends Block protected void createBlockStateDefinition(Builder p_49915_) { super.createBlockStateDefinition(p_49915_.add(SHAPE, HAS_TE, WATERLOGGED)); } - + @Override - public BlockPathTypes getAiPathNodeType(BlockState state, BlockGetter world, BlockPos pos, Mob entity) { + public @Nullable BlockPathTypes getBlockPathType(BlockState state, BlockGetter level, BlockPos pos, + @Nullable Mob mob) { return BlockPathTypes.RAIL; }