From f04da385839fbb2e6170ac37a492cc899fcae12f Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 22 Oct 2022 00:27:33 +0200 Subject: [PATCH] Firing up the funnel generator --- src/generated/resources/.cache/cache | 126 +++++++++--------- .../blockstates/andesite_alloy_block.json | 7 + .../blockstates/andesite_belt_funnel.json | 32 ++--- .../create/blockstates/andesite_funnel.json | 24 ++-- .../create/blockstates/brass_belt_funnel.json | 32 ++--- .../create/blockstates/brass_funnel.json | 24 ++-- .../resources/assets/create/lang/en_ud.json | 1 + .../resources/assets/create/lang/en_us.json | 1 + .../assets/create/lang/unfinished/de_de.json | 3 +- .../assets/create/lang/unfinished/es_cl.json | 3 +- .../assets/create/lang/unfinished/es_es.json | 3 +- .../assets/create/lang/unfinished/fr_fr.json | 3 +- .../assets/create/lang/unfinished/it_it.json | 3 +- .../assets/create/lang/unfinished/ja_jp.json | 3 +- .../assets/create/lang/unfinished/ko_kr.json | 3 +- .../assets/create/lang/unfinished/nl_nl.json | 3 +- .../assets/create/lang/unfinished/pl_pl.json | 3 +- .../assets/create/lang/unfinished/pt_br.json | 3 +- .../assets/create/lang/unfinished/pt_pt.json | 3 +- .../assets/create/lang/unfinished/ro_ro.json | 3 +- .../assets/create/lang/unfinished/ru_ru.json | 3 +- .../assets/create/lang/unfinished/uk_ua.json | 3 +- .../assets/create/lang/unfinished/zh_cn.json | 3 +- .../assets/create/lang/unfinished/zh_tw.json | 3 +- .../models/block/andesite_alloy_block.json | 6 + .../block/andesite_belt_funnel_extended.json | 13 -- ...andesite_belt_funnel_extended_powered.json | 13 +- ...desite_belt_funnel_extended_unpowered.json | 10 ++ .../block/andesite_belt_funnel_pulling.json | 13 -- .../andesite_belt_funnel_pulling_powered.json | 13 +- ...ndesite_belt_funnel_pulling_unpowered.json | 10 ++ .../block/andesite_belt_funnel_pushing.json | 13 -- .../andesite_belt_funnel_pushing_powered.json | 13 +- ...ndesite_belt_funnel_pushing_unpowered.json | 10 ++ .../block/andesite_belt_funnel_retracted.json | 13 -- ...ndesite_belt_funnel_retracted_powered.json | 13 +- ...esite_belt_funnel_retracted_unpowered.json | 10 ++ .../andesite_funnel_horizontal_pull.json | 11 -- ...desite_funnel_horizontal_pull_powered.json | 11 +- ...site_funnel_horizontal_pull_unpowered.json | 10 ++ .../andesite_funnel_horizontal_push.json | 11 -- ...desite_funnel_horizontal_push_powered.json | 11 +- ...site_funnel_horizontal_push_unpowered.json | 10 ++ ...esite_funnel_vertical_filterless_pull.json | 13 -- ...nnel_vertical_filterless_pull_powered.json | 14 +- ...el_vertical_filterless_pull_unpowered.json | 11 ++ ...esite_funnel_vertical_filterless_push.json | 13 -- ...nnel_vertical_filterless_push_powered.json | 14 +- ...el_vertical_filterless_push_unpowered.json | 11 ++ .../block/brass_belt_funnel_extended.json | 13 -- .../brass_belt_funnel_extended_powered.json | 11 +- .../brass_belt_funnel_extended_unpowered.json | 10 ++ .../block/brass_belt_funnel_pulling.json | 13 -- .../brass_belt_funnel_pulling_powered.json | 11 +- .../brass_belt_funnel_pulling_unpowered.json | 10 ++ .../block/brass_belt_funnel_pushing.json | 13 -- .../brass_belt_funnel_pushing_powered.json | 11 +- .../brass_belt_funnel_pushing_unpowered.json | 10 ++ .../block/brass_belt_funnel_retracted.json | 13 -- .../brass_belt_funnel_retracted_powered.json | 11 +- ...brass_belt_funnel_retracted_unpowered.json | 10 ++ .../block/brass_funnel_horizontal_pull.json | 11 -- .../brass_funnel_horizontal_pull_powered.json | 11 +- ...rass_funnel_horizontal_pull_unpowered.json | 10 ++ .../block/brass_funnel_horizontal_push.json | 11 -- .../brass_funnel_horizontal_push_powered.json | 11 +- ...rass_funnel_horizontal_push_unpowered.json | 10 ++ .../block/brass_funnel_vertical_pull.json | 13 -- .../brass_funnel_vertical_pull_powered.json | 14 +- .../brass_funnel_vertical_pull_unpowered.json | 11 ++ .../block/brass_funnel_vertical_push.json | 13 -- .../brass_funnel_vertical_push_powered.json | 14 +- .../brass_funnel_vertical_push_unpowered.json | 11 ++ .../models/item/andesite_alloy_block.json | 3 + .../create/models/item/andesite_funnel.json | 11 +- .../create/models/item/brass_funnel.json | 11 +- .../blocks/andesite_alloy_block.json | 20 +++ .../forge/tags/blocks/storage_blocks.json | 1 + .../blocks/storage_blocks/andesite_alloy.json | 6 + .../data/forge/tags/items/storage_blocks.json | 1 + .../items/storage_blocks/andesite_alloy.json | 6 + .../tags/blocks/mineable/pickaxe.json | 1 + .../java/com/simibubi/create/AllBlocks.java | 17 ++- .../block/funnel/BeltFunnelGenerator.java | 28 ++-- .../block/funnel/FunnelGenerator.java | 39 +++--- .../block/belt_funnel/block_extended.json | 2 +- .../block/belt_funnel/block_pulling.json | 2 +- .../block/belt_funnel/block_pushing.json | 2 +- .../block/belt_funnel/block_retracted.json | 3 +- .../models/block/funnel/block_horizontal.json | 2 +- .../models/block/funnel/block_vertical.json | 4 +- .../funnel/block_vertical_filterless.json | 4 +- .../textures/block/funnel/andesite_funnel.png | Bin 8648 -> 3878 bytes 93 files changed, 519 insertions(+), 505 deletions(-) create mode 100644 src/generated/resources/assets/create/blockstates/andesite_alloy_block.json create mode 100644 src/generated/resources/assets/create/models/block/andesite_alloy_block.json delete mode 100644 src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended.json create mode 100644 src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling.json create mode 100644 src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing.json create mode 100644 src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted.json create mode 100644 src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull.json create mode 100644 src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push.json create mode 100644 src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull.json create mode 100644 src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push.json create mode 100644 src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/brass_belt_funnel_extended.json create mode 100644 src/generated/resources/assets/create/models/block/brass_belt_funnel_extended_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling.json create mode 100644 src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing.json create mode 100644 src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted.json create mode 100644 src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull.json create mode 100644 src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push.json create mode 100644 src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull.json create mode 100644 src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull_unpowered.json delete mode 100644 src/generated/resources/assets/create/models/block/brass_funnel_vertical_push.json create mode 100644 src/generated/resources/assets/create/models/block/brass_funnel_vertical_push_unpowered.json create mode 100644 src/generated/resources/assets/create/models/item/andesite_alloy_block.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/andesite_alloy_block.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/andesite_alloy.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/andesite_alloy.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index e0f94546b..6c5b720b8 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -2,12 +2,13 @@ f0d6baaabda94151134f569246d61a6e710c35a9 assets/create/blockstates/acacia_window_pane.json 6b70306397316d6ebfa1cb07f2308d5c7fce83e0 assets/create/blockstates/adjustable_chain_gearshift.json 9dd79bf5430f674e7d3e3fc7d59edee3d66e241e assets/create/blockstates/analog_lever.json -96097d97028f38d61d64fec7c7095aaf64650db3 assets/create/blockstates/andesite_belt_funnel.json +a891d5abbc133288a9ad377b3ea9adad8ee92972 assets/create/blockstates/andesite_alloy_block.json +47cb4f4629277b467263bd54a44dec45837eb719 assets/create/blockstates/andesite_belt_funnel.json 9999a75c7766781eadb12510a09264600bc846e4 assets/create/blockstates/andesite_casing.json 96bd534d3d84336927fb6512f9848d837d557084 assets/create/blockstates/andesite_encased_cogwheel.json 1673172100317477ca559c32fd91d16b165e0085 assets/create/blockstates/andesite_encased_large_cogwheel.json 9639b901ffdd2ecccab5575c5c9e6c7b5c901e02 assets/create/blockstates/andesite_encased_shaft.json -ca9a629472625abf741f02b94ce4578292fb14a7 assets/create/blockstates/andesite_funnel.json +7c5ac6149a991dfe125be3ae3c27c0c841e11f6c assets/create/blockstates/andesite_funnel.json 73154ab9fe5463116d06d0732f9a1c2fa817dc3f assets/create/blockstates/andesite_ladder.json 3adca59d03198c273f13c21c6058348c9fa71735 assets/create/blockstates/andesite_pillar.json 1d2d8081581e07d9be4b382aede4f2de4401cc6b assets/create/blockstates/andesite_tunnel.json @@ -28,13 +29,13 @@ ec2ab87734acc209e6be3bc4898b1199f819bfd3 assets/create/blockstates/blue_sail.jso 4854d1ef52130a7887aecc60bcaffbd66f0871a8 assets/create/blockstates/blue_seat.json dea175335c5db0abe758cd208dc984c22506a176 assets/create/blockstates/blue_toolbox.json f3697a7d105e5d271f5999b86df071fe5893457c assets/create/blockstates/blue_valve_handle.json -5f57741e500903b70c80d2a72788a25e97387e2e assets/create/blockstates/brass_belt_funnel.json +4b436e4afa3b1734567010788064fee73f69c92e assets/create/blockstates/brass_belt_funnel.json 8b1dd00adcc7e74c5a9feed069e2610b15a338cb assets/create/blockstates/brass_block.json b8dd6e505943e06706d0718ece620ab3cf943650 assets/create/blockstates/brass_casing.json 577adb030af119fb980ededaa7fc2a3d3ed14220 assets/create/blockstates/brass_encased_cogwheel.json e69a71fdeb5855b2a59a31598f25eaea589c1748 assets/create/blockstates/brass_encased_large_cogwheel.json 288bad07593a8a2c8efaf44bba0ffb0011d36cd3 assets/create/blockstates/brass_encased_shaft.json -adfbd6cc5e44a0f431180aedbe65a19428299d8e assets/create/blockstates/brass_funnel.json +bd8f3073f3208d0116719a25044a91dd46fc11ac assets/create/blockstates/brass_funnel.json f9234ab4324892587c4b0bf38523ee7770072f6b assets/create/blockstates/brass_ladder.json 672eedcd3520c6d39603449165a23be9c612c620 assets/create/blockstates/brass_tunnel.json ffe31d5ad0486949b049cf2060d1f34ef7ceaa82 assets/create/blockstates/brown_nixie_tube.json @@ -565,24 +566,24 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 5616dda664dd106d576848124fc0fc1de18d0fd3 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -3054a5519fbf91481b0c9c8160a20679fa9530da assets/create/lang/en_ud.json -c57c7f223e483ec45f7b94a33582f2bf66c4cf60 assets/create/lang/en_us.json -4080736502d1f2367ae70d9aae33ca0314db5bd9 assets/create/lang/unfinished/de_de.json -76227addfbcb0cb33c6851fdcc915b774493b801 assets/create/lang/unfinished/es_cl.json -2cce9e6ef650c78c594d62b96cd3f976dc2affec assets/create/lang/unfinished/es_es.json -ffd78f1c2269cfc95c9cddb81f98500451f1e249 assets/create/lang/unfinished/fr_fr.json -7da0e0a81888382ef09808dc26a0acc00981bfc5 assets/create/lang/unfinished/it_it.json -777e9fcbd341e8b7c1a76400f384a7892cebd84f assets/create/lang/unfinished/ja_jp.json -3efd5341a65b265b015caff7756c93a9e62e24b2 assets/create/lang/unfinished/ko_kr.json -d69eb7e9ada984144b84adcaa66bd58d34392f93 assets/create/lang/unfinished/nl_nl.json -ef1d3c48c5b29618c7c03b862cb414450f61b2b4 assets/create/lang/unfinished/pl_pl.json -fd304a1b08cb1a26a71bf14e03427f3ea347b851 assets/create/lang/unfinished/pt_br.json -02c1b9461cf73901e7c524970fb70bc27cbeb805 assets/create/lang/unfinished/pt_pt.json -5e55fe730dadb7c4cb5f8cac65dd2288c3fc8349 assets/create/lang/unfinished/ro_ro.json -ab0235e297d83f14990c9c11c9ea494cb725c082 assets/create/lang/unfinished/ru_ru.json -2dcd9d1659d59f399b44b2d0e0e7428e248cafca assets/create/lang/unfinished/uk_ua.json -1ec8b3397df54e2af39e3e52c1ffb7c0a11a3b8b assets/create/lang/unfinished/zh_cn.json -6b2ccb147e70ae407da8686b5b989991a11bd802 assets/create/lang/unfinished/zh_tw.json +e7d21b55946bb30c58e6b1cfd3518255833b5463 assets/create/lang/en_ud.json +09c3fa149383dbcb2c1070dd17c8ca4ccf1966e3 assets/create/lang/en_us.json +b7b7ebbf555289d17e847c0221c2227c7b042ffc assets/create/lang/unfinished/de_de.json +13d36e69e4a347dffe84479d363deb9915c71b26 assets/create/lang/unfinished/es_cl.json +0c62f87191d2c2faa2f8ce2a0c23fe522100e885 assets/create/lang/unfinished/es_es.json +983e8025fba6994405f371e3d126d9a319ac62db assets/create/lang/unfinished/fr_fr.json +52d4f689e99161f86690985b2fb70128a209458d assets/create/lang/unfinished/it_it.json +553a4e82130dbc5b87ad6caf1142c19f78876659 assets/create/lang/unfinished/ja_jp.json +032418e5388048fb7b3c1375bb4168f43b704d31 assets/create/lang/unfinished/ko_kr.json +eb8fa78d35ade6ee205dbfcce2553f74a77868a1 assets/create/lang/unfinished/nl_nl.json +df9eb70809f14a0a80bf076be73dd07bf8b34b60 assets/create/lang/unfinished/pl_pl.json +412b329284d6094525f3f68651fc8e3212d33ece assets/create/lang/unfinished/pt_br.json +548d153017ceeae9dd8af3627a24a942628fddcf assets/create/lang/unfinished/pt_pt.json +a9ca34eb5d8dffe035e869210acb791fd3c7f816 assets/create/lang/unfinished/ro_ro.json +c11347776986ac1b6554e0bae19baf5667e87b86 assets/create/lang/unfinished/ru_ru.json +323e79f90c5f7d5dc5e791f7c95798fa32df089b assets/create/lang/unfinished/uk_ua.json +fb7aa2f12a983e098de2422f3ed6a7584d888305 assets/create/lang/unfinished/zh_cn.json +dd1fa10817dab6ad0fc13775a2d21e2cf4214d27 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 @@ -599,14 +600,15 @@ c3fdfa0ef84a598a17b2194fd0ea56fb323441d6 assets/create/models/block/adjustable_c 11c034a7689e3bc96cf54f67fd93bc3839ae19e9 assets/create/models/block/adjustable_chain_gearshift_middle_vertical_powered.json 221b65e4fed640dc77f8ec5fee300f2a199d05b1 assets/create/models/block/adjustable_chain_gearshift_single.json ef644b33e136692c19cf8e79fcd28431b40dbb62 assets/create/models/block/adjustable_chain_gearshift_single_powered.json -10832d276445d8a5f94413de1979349db1364ec4 assets/create/models/block/andesite_belt_funnel_extended.json -d01611179d3ed6c013f4f649127239772cbdeba3 assets/create/models/block/andesite_belt_funnel_extended_powered.json -c862af2b37ccfd0123e9e96a5400be82033bbdd3 assets/create/models/block/andesite_belt_funnel_pulling.json -ed52e27fd7d645c25dc9dc58a44f29be12cb6d5e assets/create/models/block/andesite_belt_funnel_pulling_powered.json -884aaf754de0bfd51690aab6e01f775419728cf7 assets/create/models/block/andesite_belt_funnel_pushing.json -3c8ed64100de95994580a8e6e24c7b72f2332081 assets/create/models/block/andesite_belt_funnel_pushing_powered.json -7b1888eec72c04677a3dfb709b04ad10d08d74d0 assets/create/models/block/andesite_belt_funnel_retracted.json -240230f29d092505d47c83ae59f5c908e4bf4932 assets/create/models/block/andesite_belt_funnel_retracted_powered.json +647aa88fe7f74048b06e61dd092a7ce167f6e7bc assets/create/models/block/andesite_alloy_block.json +953daa66d3befd33edfb62421c01330ff9ecf441 assets/create/models/block/andesite_belt_funnel_extended_powered.json +0e0b6fffad506f7bb9f212becb69b04fdb773372 assets/create/models/block/andesite_belt_funnel_extended_unpowered.json +5be49f276346a4908366426329319366d98c0877 assets/create/models/block/andesite_belt_funnel_pulling_powered.json +3078958b74af612dbb1a5bf18b92c190d63524d6 assets/create/models/block/andesite_belt_funnel_pulling_unpowered.json +eddf206f5fffbf9446461538da9fea70f5d22f0e assets/create/models/block/andesite_belt_funnel_pushing_powered.json +31784901768ebb9322a101710c5b6c16e7185271 assets/create/models/block/andesite_belt_funnel_pushing_unpowered.json +574ece0c5d1877a07e46f0d86add876bf002541f assets/create/models/block/andesite_belt_funnel_retracted_powered.json +2ea98218be00eea0f8b58072f970b4a2d096306d assets/create/models/block/andesite_belt_funnel_retracted_unpowered.json 4e44ccdc5e396c4380a7e59408db50553fa25226 assets/create/models/block/andesite_casing.json 762509cfb8602c6d0d3f959c08ad4934c2b5d8fa assets/create/models/block/andesite_encased_cogwheel.json 314489582d1cde98bc5e4fd4d2f0c9ab3cb731d3 assets/create/models/block/andesite_encased_cogwheel_bottom.json @@ -616,14 +618,14 @@ c8f215c191f46ff1ea6f098ab32c7d27d04cb017 assets/create/models/block/andesite_enc f8f131a53664faa5bd84b61e83d62ed5b367bf1d assets/create/models/block/andesite_encased_large_cogwheel_bottom.json 77b3bbcb47e83f985d68b0ed0344e9f79999e797 assets/create/models/block/andesite_encased_large_cogwheel_top.json 01189fb179863ce1ef524bd5ddd5b4bebd5bbc6b assets/create/models/block/andesite_encased_large_cogwheel_top_bottom.json -8d4e4a7c6ad6d45c7aa7ca3105a025511571ff26 assets/create/models/block/andesite_funnel_horizontal_pull.json -9841d6a09a09bf4d5d6a39bdc4904d86b3a825f8 assets/create/models/block/andesite_funnel_horizontal_pull_powered.json -86d5df6e365d9b2e9682f0839f61058360828ba2 assets/create/models/block/andesite_funnel_horizontal_push.json -50af1ff6ce9af162d4e438f21952c7215608dc8e assets/create/models/block/andesite_funnel_horizontal_push_powered.json -75c914bf9448e25fd01d597de48375a9782bef36 assets/create/models/block/andesite_funnel_vertical_filterless_pull.json -4d70a221809f5bc598a0a0e98bd152e9ab7a2f7f assets/create/models/block/andesite_funnel_vertical_filterless_pull_powered.json -a41c7351513a9514dfdc0fc552b646b1d715c977 assets/create/models/block/andesite_funnel_vertical_filterless_push.json -e7931f28887baadd52ac988fc8eeeb84ee6f0d27 assets/create/models/block/andesite_funnel_vertical_filterless_push_powered.json +a51ef8eb258251ecd4313d6997ce607b79a23850 assets/create/models/block/andesite_funnel_horizontal_pull_powered.json +fd19670a4504617fcd0ee0a1fb6ebeca9b30cc82 assets/create/models/block/andesite_funnel_horizontal_pull_unpowered.json +aa22be9799a91810fa0068e525dd6961d7af4900 assets/create/models/block/andesite_funnel_horizontal_push_powered.json +5ca7cfe29534b2839b2cefd6ab1047c74f9af079 assets/create/models/block/andesite_funnel_horizontal_push_unpowered.json +f2d6d85ad3e0899855d2c6658484e33ea9d5e2e0 assets/create/models/block/andesite_funnel_vertical_filterless_pull_powered.json +afa3669c0d80b4eccd839fa08a3c3e884f5dd1f6 assets/create/models/block/andesite_funnel_vertical_filterless_pull_unpowered.json +eeb2637590e8af1342c5494dea7faab0490f2f3e assets/create/models/block/andesite_funnel_vertical_filterless_push_powered.json +2c0e1bb2edca1c0315e4b989d1ae58b8fe681d05 assets/create/models/block/andesite_funnel_vertical_filterless_push_unpowered.json ee665cf464ead6135de3f60c7e2ac475af6496d7 assets/create/models/block/andesite_ladder.json 882871d4cd7b4925f300c09d00ba58785b27119e assets/create/models/block/andesite_pillar.json 587491f19767bd682bbef00eaa890d4b8a320b7a assets/create/models/block/andesite_pillar_horizontal.json @@ -663,15 +665,15 @@ c86a455b8e85ef190261718726b344cf15ba1e4f assets/create/models/block/bracket/shaf 8fa9ce896412af894d7c431a50104445d91b1d4d assets/create/models/block/bracket/shaft/ground_wooden.json 3956168840aca9425d3bf240650406c1dbc8ea66 assets/create/models/block/bracket/shaft/wall_metal.json 7aaa2fbdb618e8aab7e0da19a5393e1eaa608623 assets/create/models/block/bracket/shaft/wall_wooden.json -3fac6b1da6a81fc44a1ffe1e13dc6cfe37c3b738 assets/create/models/block/brass_belt_funnel_extended.json -2d10825bfd94419d5dbb4e60187127c4a1ce1526 assets/create/models/block/brass_belt_funnel_extended_powered.json -dfc6250e28e12ff193a45891978ec50c406fc0c2 assets/create/models/block/brass_belt_funnel_pulling.json -5ff7e01c5b65eb210a054556068d75426b547d9b assets/create/models/block/brass_belt_funnel_pulling_powered.json -5409325494780afe32e6e30377314e2992ca4aa5 assets/create/models/block/brass_belt_funnel_pushing.json -e981727fd71e32ea2ecb8e057dfe123f1b940101 assets/create/models/block/brass_belt_funnel_pushing_powered.json -97410a12b7c1461f88fb633f26ff566a0636b627 assets/create/models/block/brass_belt_funnel_retracted.json -bc23a91f300e46761bb14c597fad39c3d414e84d assets/create/models/block/brass_belt_funnel_retracted_powered.json -5adb8b446817eee3a31971d708320c7104d6bbd8 assets/create/models/block/brass_block.json +18048eac6c45e30c47cc7fc964b0986cd033bc00 assets/create/models/block/brass_belt_funnel_extended_powered.json +7870163874d8d2e29e9bed3fcaf5be715d0de541 assets/create/models/block/brass_belt_funnel_extended_unpowered.json +e4894b8cb9dda7aa4b9d035ae16f705459ddf14c assets/create/models/block/brass_belt_funnel_pulling_powered.json +8d86c2f3ddd51dc6b15d1e4ce115f0d7b1e28dda assets/create/models/block/brass_belt_funnel_pulling_unpowered.json +f0a9b05c69e67aa61b88f6db5d818ae191b3aad5 assets/create/models/block/brass_belt_funnel_pushing_powered.json +710f4903e7022761c43f7def240d5aad98389871 assets/create/models/block/brass_belt_funnel_pushing_unpowered.json +e0958b94c40e4aabbcbabd70be8a368eb877dcf9 assets/create/models/block/brass_belt_funnel_retracted_powered.json +5715303e539e6005a347480e52db2c7e6676c716 assets/create/models/block/brass_belt_funnel_retracted_unpowered.json +2b1ca994d2feec8321fdb0388028c20d40326eb7 assets/create/models/block/brass_block.json 2e67c147d7c69aabd9ab9f7aa80f60671d5a03aa assets/create/models/block/brass_casing.json 8cb0039684377c27a7fe20bdcacf24f871221478 assets/create/models/block/brass_encased_cogwheel.json c735917634c87b3d289bd912c7ceb465a3cc65b6 assets/create/models/block/brass_encased_cogwheel_bottom.json @@ -681,14 +683,14 @@ c2199a633597a73a1c2d508e5dfe0a7589b02329 assets/create/models/block/brass_encase ed150a9e18889217b7f010412e4317af04af7dc1 assets/create/models/block/brass_encased_large_cogwheel_bottom.json bb4155627c1f189e2e3bc07822d227bb0fc64bc4 assets/create/models/block/brass_encased_large_cogwheel_top.json 421cbc9bcb6511c66ff7122d1800bcd8ab866b2b assets/create/models/block/brass_encased_large_cogwheel_top_bottom.json -f7fd1f49857eca94e4135e65c85127510d666e4f assets/create/models/block/brass_funnel_horizontal_pull.json -45a23298ad03fd3b5dc2757dcd7edc18b8cce222 assets/create/models/block/brass_funnel_horizontal_pull_powered.json -a9fc7210d44b47202438668f11b31099e82c9ebd assets/create/models/block/brass_funnel_horizontal_push.json -4049bf503ec2ee22412c59e05299de20319b0dc6 assets/create/models/block/brass_funnel_horizontal_push_powered.json -320e377a4380ac637bff2e0535f229c52d886437 assets/create/models/block/brass_funnel_vertical_pull.json -28c2f8ca6403f98b82e3a0eadb608a41490cc96f assets/create/models/block/brass_funnel_vertical_pull_powered.json -c4c46d47854c9a6cf8f410006a35bbc8e599f0d5 assets/create/models/block/brass_funnel_vertical_push.json -fd6f6607a4742fa87dfe1768927a29dc4975ce7a assets/create/models/block/brass_funnel_vertical_push_powered.json +68f57bccd8a7ec0a997ab65aab74103338b0ade0 assets/create/models/block/brass_funnel_horizontal_pull_powered.json +327643126b6b4a93523354ac70b0148d36176c75 assets/create/models/block/brass_funnel_horizontal_pull_unpowered.json +49c2cf87fb273d7e557cfde908e319f7810e333d assets/create/models/block/brass_funnel_horizontal_push_powered.json +f5bc8543b6b6cddeb455a1c20500240de9d837ac assets/create/models/block/brass_funnel_horizontal_push_unpowered.json +c76668b6b61a3f81a08a1eadaa34fa8bfe68f912 assets/create/models/block/brass_funnel_vertical_pull_powered.json +33c07af5f61f89d781037a5841335e4783392fde assets/create/models/block/brass_funnel_vertical_pull_unpowered.json +2d78db12acd90364658b36e8fe7dee7f24ea361b assets/create/models/block/brass_funnel_vertical_push_powered.json +aa81eeb9771e59173ecf635f7c5334ac64c83b6d assets/create/models/block/brass_funnel_vertical_push_unpowered.json 5620cf6b033dbfb3c43d03ddad18c432eb821997 assets/create/models/block/brass_ladder.json 520087db8d479c66f85f3483af813fb668f27503 assets/create/models/block/brass_tunnel/cross.json 347ed67bf3426e323354e2d959fc9563dc7eeecd assets/create/models/block/brass_tunnel/straight.json @@ -1631,11 +1633,12 @@ c695dab3964186a857767b2b4975aebffa86dcf9 assets/create/models/item/acacia_window 564f6245f92ec48a733e34d91b96b1beebbaf44a assets/create/models/item/adjustable_chain_gearshift.json e7759d9b3cd64d2719a58dc35fc75ca65b9e14fa assets/create/models/item/analog_lever.json 2e90c7abfcad12ca656ae253d834fbb799e15277 assets/create/models/item/andesite_alloy.json +2e7cf267efb66404721ac8bf08802de0eb134159 assets/create/models/item/andesite_alloy_block.json 174c9705d25f149052835fdcf7c85626afead90b assets/create/models/item/andesite_casing.json 420020284d01c72a7fb3387750fe1dd2dcfb9550 assets/create/models/item/andesite_encased_cogwheel.json 6e246e91b4ebffd5c45311057feb5d26d1cb8aec assets/create/models/item/andesite_encased_large_cogwheel.json bc6e7469744604e578200ea87690e4dd3b25e447 assets/create/models/item/andesite_encased_shaft.json -a3866ea9f44e80b64989f2b5f8a9f344da959c87 assets/create/models/item/andesite_funnel.json +105a9946b9e4d5e949f6d557cfde750227463bff assets/create/models/item/andesite_funnel.json 4c9232a6249ad1ef51a7978a8e642a8c88dda0ab assets/create/models/item/andesite_ladder.json 75b8b00c2418b9660d35a7fabd0774925cf1c02f assets/create/models/item/andesite_pillar.json 795541cf7205d90531a23cd5b388f93a03bbf925 assets/create/models/item/andesite_tunnel.json @@ -1660,7 +1663,7 @@ f5a18f4279c2e845a5967b1c2f9e807c2bb77afb assets/create/models/item/brass_casing. 099179a466a2f370dd2c4fea0d841517fa3a558b assets/create/models/item/brass_encased_cogwheel.json 6e60b5939747835b2247cbc4907d633b017abc79 assets/create/models/item/brass_encased_large_cogwheel.json c723011e09203821b6b59cff9de22454c5e4395a assets/create/models/item/brass_encased_shaft.json -12781f22d9b91df903d38bc55c4fe9f75dba8867 assets/create/models/item/brass_funnel.json +8de90ceb9997f61efc544304fcd919a54db47d41 assets/create/models/item/brass_funnel.json 965f3f992fde899719506fd584f3fbbbf69af93c assets/create/models/item/brass_hand.json d5e8b577aee56671e117a4a2ac93e58680b51949 assets/create/models/item/brass_ingot.json 1f93ec11bd28a3f063f27e8c53fc45d027218560 assets/create/models/item/brass_ladder.json @@ -3395,6 +3398,7 @@ f92b20e0ae4c8808479df3553203c1b5e334cfe3 data/create/advancements/windmill.json 98f71c17409a37a584eed6cb6ee3878efebf3ef6 data/create/loot_tables/blocks/acacia_window_pane.json c5c0b82ab3bcd7ffd1bcb65d00876aaba69363f9 data/create/loot_tables/blocks/adjustable_chain_gearshift.json a4716789704bb30cf1c518b04c61661ba6289efa data/create/loot_tables/blocks/analog_lever.json +03eadc2a4695b505e92c1a688dc7af619fd364c0 data/create/loot_tables/blocks/andesite_alloy_block.json 468759c042e8410da9230357f4b602766190df79 data/create/loot_tables/blocks/andesite_belt_funnel.json f9b768b3b9bbddede80912f1319e7b290cd90f20 data/create/loot_tables/blocks/andesite_casing.json 982a41e1bccd9a130a2874aff995d4f7da0f0316 data/create/loot_tables/blocks/andesite_encased_cogwheel.json @@ -5702,7 +5706,8 @@ f3e20d8b3ca5652d3975da680740cc36326fdfc9 data/create/tags/items/vanilla_stripped 9fc688d8fac1033c7b8f4b8de1138e56d2faf527 data/forge/tags/blocks/ores_in_ground/deepslate.json d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/blocks/ores_in_ground/stone.json ad8fa04f7bbbafd70d0ce158af78a35e899301e2 data/forge/tags/blocks/relocation_not_supported.json -66065a698fca917446a0fb766593dbcc77fabeac data/forge/tags/blocks/storage_blocks.json +cffe82d6f1d2eefdaf200eedfe50b590aa5ffbbb data/forge/tags/blocks/storage_blocks.json +ecd6eda3669e4d4df367df99a7692cc0dd04e7ee data/forge/tags/blocks/storage_blocks/andesite_alloy.json ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/brass.json 823d05187626797205381d4620a84abda3bc8f89 data/forge/tags/blocks/storage_blocks/raw_zinc.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/blocks/storage_blocks/zinc.json @@ -5736,7 +5741,8 @@ fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json d82758dd3c2972fa94736733dc6b3944129f5a11 data/forge/tags/items/plates/obsidian.json dc96331cded39b2d2f24853f4dd6c1f6f3863115 data/forge/tags/items/raw_materials.json dc96331cded39b2d2f24853f4dd6c1f6f3863115 data/forge/tags/items/raw_materials/zinc.json -66065a698fca917446a0fb766593dbcc77fabeac data/forge/tags/items/storage_blocks.json +cffe82d6f1d2eefdaf200eedfe50b590aa5ffbbb data/forge/tags/items/storage_blocks.json +ecd6eda3669e4d4df367df99a7692cc0dd04e7ee data/forge/tags/items/storage_blocks/andesite_alloy.json ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json 823d05187626797205381d4620a84abda3bc8f89 data/forge/tags/items/storage_blocks/raw_zinc.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json @@ -5751,7 +5757,7 @@ e16d74571ae10007f06f3b86ddf05d3ca9b73559 data/minecraft/tags/blocks/doors.json 69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/lush_ground_replaceable.json a8662d145a8b1b5faa263c2aac9d12e7727c8c3f data/minecraft/tags/blocks/mineable/axe.json -6f18f0d6fe0e4204079cbf9c7b6dc79c8cebcaa9 data/minecraft/tags/blocks/mineable/pickaxe.json +120c1793c3ef27f19c2e366754060b15ff602f8d data/minecraft/tags/blocks/mineable/pickaxe.json 2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/moss_replaceable.json e157c1d3af30e409e34bbefbe15a037e6e1c8daa data/minecraft/tags/blocks/needs_iron_tool.json a08f67865337f62601c5e333b4011382d10020e4 data/minecraft/tags/blocks/needs_stone_tool.json diff --git a/src/generated/resources/assets/create/blockstates/andesite_alloy_block.json b/src/generated/resources/assets/create/blockstates/andesite_alloy_block.json new file mode 100644 index 000000000..1a141d07c --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/andesite_alloy_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/andesite_alloy_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/andesite_belt_funnel.json b/src/generated/resources/assets/create/blockstates/andesite_belt_funnel.json index 0199a6d72..a63a8d30e 100644 --- a/src/generated/resources/assets/create/blockstates/andesite_belt_funnel.json +++ b/src/generated/resources/assets/create/blockstates/andesite_belt_funnel.json @@ -1,18 +1,18 @@ { "variants": { "facing=north,powered=false,shape=retracted": { - "model": "create:block/andesite_belt_funnel_retracted" + "model": "create:block/andesite_belt_funnel_retracted_unpowered" }, "facing=south,powered=false,shape=retracted": { - "model": "create:block/andesite_belt_funnel_retracted", + "model": "create:block/andesite_belt_funnel_retracted_unpowered", "y": 180 }, "facing=west,powered=false,shape=retracted": { - "model": "create:block/andesite_belt_funnel_retracted", + "model": "create:block/andesite_belt_funnel_retracted_unpowered", "y": 270 }, "facing=east,powered=false,shape=retracted": { - "model": "create:block/andesite_belt_funnel_retracted", + "model": "create:block/andesite_belt_funnel_retracted_unpowered", "y": 90 }, "facing=north,powered=true,shape=retracted": { @@ -31,18 +31,18 @@ "y": 90 }, "facing=north,powered=false,shape=extended": { - "model": "create:block/andesite_belt_funnel_extended" + "model": "create:block/andesite_belt_funnel_extended_unpowered" }, "facing=south,powered=false,shape=extended": { - "model": "create:block/andesite_belt_funnel_extended", + "model": "create:block/andesite_belt_funnel_extended_unpowered", "y": 180 }, "facing=west,powered=false,shape=extended": { - "model": "create:block/andesite_belt_funnel_extended", + "model": "create:block/andesite_belt_funnel_extended_unpowered", "y": 270 }, "facing=east,powered=false,shape=extended": { - "model": "create:block/andesite_belt_funnel_extended", + "model": "create:block/andesite_belt_funnel_extended_unpowered", "y": 90 }, "facing=north,powered=true,shape=extended": { @@ -61,18 +61,18 @@ "y": 90 }, "facing=north,powered=false,shape=pushing": { - "model": "create:block/andesite_belt_funnel_pushing" + "model": "create:block/andesite_belt_funnel_pushing_unpowered" }, "facing=south,powered=false,shape=pushing": { - "model": "create:block/andesite_belt_funnel_pushing", + "model": "create:block/andesite_belt_funnel_pushing_unpowered", "y": 180 }, "facing=west,powered=false,shape=pushing": { - "model": "create:block/andesite_belt_funnel_pushing", + "model": "create:block/andesite_belt_funnel_pushing_unpowered", "y": 270 }, "facing=east,powered=false,shape=pushing": { - "model": "create:block/andesite_belt_funnel_pushing", + "model": "create:block/andesite_belt_funnel_pushing_unpowered", "y": 90 }, "facing=north,powered=true,shape=pushing": { @@ -91,18 +91,18 @@ "y": 90 }, "facing=north,powered=false,shape=pulling": { - "model": "create:block/andesite_belt_funnel_pulling" + "model": "create:block/andesite_belt_funnel_pulling_unpowered" }, "facing=south,powered=false,shape=pulling": { - "model": "create:block/andesite_belt_funnel_pulling", + "model": "create:block/andesite_belt_funnel_pulling_unpowered", "y": 180 }, "facing=west,powered=false,shape=pulling": { - "model": "create:block/andesite_belt_funnel_pulling", + "model": "create:block/andesite_belt_funnel_pulling_unpowered", "y": 270 }, "facing=east,powered=false,shape=pulling": { - "model": "create:block/andesite_belt_funnel_pulling", + "model": "create:block/andesite_belt_funnel_pulling_unpowered", "y": 90 }, "facing=north,powered=true,shape=pulling": { diff --git a/src/generated/resources/assets/create/blockstates/andesite_funnel.json b/src/generated/resources/assets/create/blockstates/andesite_funnel.json index 9ea4b09ee..c9aed855d 100644 --- a/src/generated/resources/assets/create/blockstates/andesite_funnel.json +++ b/src/generated/resources/assets/create/blockstates/andesite_funnel.json @@ -1,51 +1,51 @@ { "variants": { "extracting=false,facing=down,powered=false": { - "model": "create:block/andesite_funnel_vertical_filterless_pull", + "model": "create:block/andesite_funnel_vertical_filterless_pull_unpowered", "x": 180, "y": 180 }, "extracting=true,facing=down,powered=false": { - "model": "create:block/andesite_funnel_vertical_filterless_push", + "model": "create:block/andesite_funnel_vertical_filterless_push_unpowered", "x": 180, "y": 180 }, "extracting=false,facing=up,powered=false": { - "model": "create:block/andesite_funnel_vertical_filterless_pull", + "model": "create:block/andesite_funnel_vertical_filterless_pull_unpowered", "y": 180 }, "extracting=true,facing=up,powered=false": { - "model": "create:block/andesite_funnel_vertical_filterless_push", + "model": "create:block/andesite_funnel_vertical_filterless_push_unpowered", "y": 180 }, "extracting=false,facing=north,powered=false": { - "model": "create:block/andesite_funnel_horizontal_pull" + "model": "create:block/andesite_funnel_horizontal_pull_unpowered" }, "extracting=true,facing=north,powered=false": { - "model": "create:block/andesite_funnel_horizontal_push" + "model": "create:block/andesite_funnel_horizontal_push_unpowered" }, "extracting=false,facing=south,powered=false": { - "model": "create:block/andesite_funnel_horizontal_pull", + "model": "create:block/andesite_funnel_horizontal_pull_unpowered", "y": 180 }, "extracting=true,facing=south,powered=false": { - "model": "create:block/andesite_funnel_horizontal_push", + "model": "create:block/andesite_funnel_horizontal_push_unpowered", "y": 180 }, "extracting=false,facing=west,powered=false": { - "model": "create:block/andesite_funnel_horizontal_pull", + "model": "create:block/andesite_funnel_horizontal_pull_unpowered", "y": 270 }, "extracting=true,facing=west,powered=false": { - "model": "create:block/andesite_funnel_horizontal_push", + "model": "create:block/andesite_funnel_horizontal_push_unpowered", "y": 270 }, "extracting=false,facing=east,powered=false": { - "model": "create:block/andesite_funnel_horizontal_pull", + "model": "create:block/andesite_funnel_horizontal_pull_unpowered", "y": 90 }, "extracting=true,facing=east,powered=false": { - "model": "create:block/andesite_funnel_horizontal_push", + "model": "create:block/andesite_funnel_horizontal_push_unpowered", "y": 90 }, "extracting=false,facing=down,powered=true": { diff --git a/src/generated/resources/assets/create/blockstates/brass_belt_funnel.json b/src/generated/resources/assets/create/blockstates/brass_belt_funnel.json index f4466bfb2..4a7e7e2e2 100644 --- a/src/generated/resources/assets/create/blockstates/brass_belt_funnel.json +++ b/src/generated/resources/assets/create/blockstates/brass_belt_funnel.json @@ -1,18 +1,18 @@ { "variants": { "facing=north,powered=false,shape=retracted": { - "model": "create:block/brass_belt_funnel_retracted" + "model": "create:block/brass_belt_funnel_retracted_unpowered" }, "facing=south,powered=false,shape=retracted": { - "model": "create:block/brass_belt_funnel_retracted", + "model": "create:block/brass_belt_funnel_retracted_unpowered", "y": 180 }, "facing=west,powered=false,shape=retracted": { - "model": "create:block/brass_belt_funnel_retracted", + "model": "create:block/brass_belt_funnel_retracted_unpowered", "y": 270 }, "facing=east,powered=false,shape=retracted": { - "model": "create:block/brass_belt_funnel_retracted", + "model": "create:block/brass_belt_funnel_retracted_unpowered", "y": 90 }, "facing=north,powered=true,shape=retracted": { @@ -31,18 +31,18 @@ "y": 90 }, "facing=north,powered=false,shape=extended": { - "model": "create:block/brass_belt_funnel_extended" + "model": "create:block/brass_belt_funnel_extended_unpowered" }, "facing=south,powered=false,shape=extended": { - "model": "create:block/brass_belt_funnel_extended", + "model": "create:block/brass_belt_funnel_extended_unpowered", "y": 180 }, "facing=west,powered=false,shape=extended": { - "model": "create:block/brass_belt_funnel_extended", + "model": "create:block/brass_belt_funnel_extended_unpowered", "y": 270 }, "facing=east,powered=false,shape=extended": { - "model": "create:block/brass_belt_funnel_extended", + "model": "create:block/brass_belt_funnel_extended_unpowered", "y": 90 }, "facing=north,powered=true,shape=extended": { @@ -61,18 +61,18 @@ "y": 90 }, "facing=north,powered=false,shape=pushing": { - "model": "create:block/brass_belt_funnel_pushing" + "model": "create:block/brass_belt_funnel_pushing_unpowered" }, "facing=south,powered=false,shape=pushing": { - "model": "create:block/brass_belt_funnel_pushing", + "model": "create:block/brass_belt_funnel_pushing_unpowered", "y": 180 }, "facing=west,powered=false,shape=pushing": { - "model": "create:block/brass_belt_funnel_pushing", + "model": "create:block/brass_belt_funnel_pushing_unpowered", "y": 270 }, "facing=east,powered=false,shape=pushing": { - "model": "create:block/brass_belt_funnel_pushing", + "model": "create:block/brass_belt_funnel_pushing_unpowered", "y": 90 }, "facing=north,powered=true,shape=pushing": { @@ -91,18 +91,18 @@ "y": 90 }, "facing=north,powered=false,shape=pulling": { - "model": "create:block/brass_belt_funnel_pulling" + "model": "create:block/brass_belt_funnel_pulling_unpowered" }, "facing=south,powered=false,shape=pulling": { - "model": "create:block/brass_belt_funnel_pulling", + "model": "create:block/brass_belt_funnel_pulling_unpowered", "y": 180 }, "facing=west,powered=false,shape=pulling": { - "model": "create:block/brass_belt_funnel_pulling", + "model": "create:block/brass_belt_funnel_pulling_unpowered", "y": 270 }, "facing=east,powered=false,shape=pulling": { - "model": "create:block/brass_belt_funnel_pulling", + "model": "create:block/brass_belt_funnel_pulling_unpowered", "y": 90 }, "facing=north,powered=true,shape=pulling": { diff --git a/src/generated/resources/assets/create/blockstates/brass_funnel.json b/src/generated/resources/assets/create/blockstates/brass_funnel.json index 19a543d73..eb948db56 100644 --- a/src/generated/resources/assets/create/blockstates/brass_funnel.json +++ b/src/generated/resources/assets/create/blockstates/brass_funnel.json @@ -1,51 +1,51 @@ { "variants": { "extracting=false,facing=down,powered=false": { - "model": "create:block/brass_funnel_vertical_pull", + "model": "create:block/brass_funnel_vertical_pull_unpowered", "x": 180, "y": 180 }, "extracting=true,facing=down,powered=false": { - "model": "create:block/brass_funnel_vertical_push", + "model": "create:block/brass_funnel_vertical_push_unpowered", "x": 180, "y": 180 }, "extracting=false,facing=up,powered=false": { - "model": "create:block/brass_funnel_vertical_pull", + "model": "create:block/brass_funnel_vertical_pull_unpowered", "y": 180 }, "extracting=true,facing=up,powered=false": { - "model": "create:block/brass_funnel_vertical_push", + "model": "create:block/brass_funnel_vertical_push_unpowered", "y": 180 }, "extracting=false,facing=north,powered=false": { - "model": "create:block/brass_funnel_horizontal_pull" + "model": "create:block/brass_funnel_horizontal_pull_unpowered" }, "extracting=true,facing=north,powered=false": { - "model": "create:block/brass_funnel_horizontal_push" + "model": "create:block/brass_funnel_horizontal_push_unpowered" }, "extracting=false,facing=south,powered=false": { - "model": "create:block/brass_funnel_horizontal_pull", + "model": "create:block/brass_funnel_horizontal_pull_unpowered", "y": 180 }, "extracting=true,facing=south,powered=false": { - "model": "create:block/brass_funnel_horizontal_push", + "model": "create:block/brass_funnel_horizontal_push_unpowered", "y": 180 }, "extracting=false,facing=west,powered=false": { - "model": "create:block/brass_funnel_horizontal_pull", + "model": "create:block/brass_funnel_horizontal_pull_unpowered", "y": 270 }, "extracting=true,facing=west,powered=false": { - "model": "create:block/brass_funnel_horizontal_push", + "model": "create:block/brass_funnel_horizontal_push_unpowered", "y": 270 }, "extracting=false,facing=east,powered=false": { - "model": "create:block/brass_funnel_horizontal_pull", + "model": "create:block/brass_funnel_horizontal_pull_unpowered", "y": 90 }, "extracting=true,facing=east,powered=false": { - "model": "create:block/brass_funnel_horizontal_push", + "model": "create:block/brass_funnel_horizontal_push_unpowered", "y": 90 }, "extracting=false,facing=down,powered=true": { diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index a602dbf3f..a048f129c 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -3,6 +3,7 @@ "block.create.acacia_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0250\u0131\u0254\u0250\u0254\u2C6F", "block.create.adjustable_chain_gearshift": "\u0287\u025F\u0131\u0265s\u0279\u0250\u01DD\u2141 u\u0131\u0250\u0265\u0186 \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", "block.create.analog_lever": "\u0279\u01DD\u028C\u01DD\uA780 bo\u05DF\u0250u\u2C6F", + "block.create.andesite_alloy_block": "\u028Eo\u05DF\u05DF\u2C6F \u01DD\u0287\u0131s\u01DDpu\u2C6F \u025Fo \u029E\u0254o\u05DF\u15FA", "block.create.andesite_belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_casing": "bu\u0131s\u0250\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_encased_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 p\u01DDs\u0250\u0254u\u018E \u01DD\u0287\u0131s\u01DDpu\u2C6F", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 4f2358c2d..c38001908 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -6,6 +6,7 @@ "block.create.acacia_window_pane": "Acacia Window Pane", "block.create.adjustable_chain_gearshift": "Adjustable Chain Gearshift", "block.create.analog_lever": "Analog Lever", + "block.create.andesite_alloy_block": "Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Andesite Belt Funnel", "block.create.andesite_casing": "Andesite Casing", "block.create.andesite_encased_cogwheel": "Andesite Encased Cogwheel", 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 faf8ae4d2..cedce75b7 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: 873", + "_": "Missing Localizations: 874", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "Akazienholzfensterscheibe", "block.create.adjustable_chain_gearshift": "Verstellbares Kettengetriebe", "block.create.analog_lever": "Analoger Schalter", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Riementrichter aus Andesit", "block.create.andesite_casing": "Andesitrahmen", "block.create.andesite_encased_cogwheel": "Andesit-Zahnrad", 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 1b734ff53..97fdb4fe5 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: 1019", + "_": "Missing Localizations: 1020", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "Panel de Ventana de Acacia", "block.create.adjustable_chain_gearshift": "Caja de Cambios en Cadena Ajustable", "block.create.analog_lever": "Palanca Análoga", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Ingreso para Cintas de Andesita", "block.create.andesite_casing": "Cubierta de Andesita", "block.create.andesite_encased_cogwheel": "UNLOCALIZED: Andesite Encased Cogwheel", 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 0af808e9d..6b399bd34 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: 39", + "_": "Missing Localizations: 40", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "Panel de ventana de acacia", "block.create.adjustable_chain_gearshift": "Cadena de transmisión ajustable", "block.create.analog_lever": "Palanca analógica", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Embudo lateral de andesita", "block.create.andesite_casing": "Revestidor de andesita", "block.create.andesite_encased_cogwheel": "Engranaje revestido de andesita", 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 97087b84b..50c639f33 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: 2168", + "_": "Missing Localizations: 2169", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "Vitre en acacia", "block.create.adjustable_chain_gearshift": "UNLOCALIZED: Adjustable Chain Gearshift", "block.create.analog_lever": "Levier analogique", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Entonnoir en andésite pour tapis roulant", "block.create.andesite_casing": "Revêtement en andésite", "block.create.andesite_encased_cogwheel": "UNLOCALIZED: Andesite Encased Cogwheel", 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 908ada24a..e4fae59cc 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: 33", + "_": "Missing Localizations: 34", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "Pannello di finestra di acacia", "block.create.adjustable_chain_gearshift": "Cambio a catena regolabile", "block.create.analog_lever": "Leva analogica", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Imbuto di andesite su nastro", "block.create.andesite_casing": "Rivestimento di andesite", "block.create.andesite_encased_cogwheel": "Ingranaggio rivestito in andesite", 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 b009c9971..541be6aaa 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: 35", + "_": "Missing Localizations: 36", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "アカシアの板窓", "block.create.adjustable_chain_gearshift": "可変チェーンギアシフト", "block.create.analog_lever": "アナログレバー", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "安山岩ベルトファンネル", "block.create.andesite_casing": "安山岩ケーシング", "block.create.andesite_encased_cogwheel": "安山岩ケース入り歯車", 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 463d14307..ded4447f2 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: 39", + "_": "Missing Localizations: 40", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "아카시아나무 유리판 ", "block.create.adjustable_chain_gearshift": "벨트 변속기", "block.create.analog_lever": "아날로그 레버", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "안산암 퍼널", "block.create.andesite_casing": "안산암 케이스", "block.create.andesite_encased_cogwheel": "안산암 케이스를 씌운 톱니바퀴", 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 a740cff1b..745f04679 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: 2516", + "_": "Missing Localizations: 2517", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "UNLOCALIZED: Acacia Window Pane", "block.create.adjustable_chain_gearshift": "UNLOCALIZED: Adjustable Chain Gearshift", "block.create.analog_lever": "UNLOCALIZED: Analog Lever", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_casing": "UNLOCALIZED: Andesite Casing", "block.create.andesite_encased_cogwheel": "UNLOCALIZED: Andesite Encased Cogwheel", 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 2263e0266..8e6febe4e 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: 43", + "_": "Missing Localizations: 44", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "Akacjowa szyba okienna", "block.create.adjustable_chain_gearshift": "Regulowany przekładnik łańcuchowy", "block.create.analog_lever": "Dźwignia analogowa", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Andezytowy lejek taśmowy", "block.create.andesite_casing": "Andezytowa obudowa", "block.create.andesite_encased_cogwheel": "Andezytowe izolowane koło zębate", 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 438b61e06..a9f64ff4f 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: 1362", + "_": "Missing Localizations: 1363", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "Vidraça de Acácia", "block.create.adjustable_chain_gearshift": "Correia Ajustável", "block.create.analog_lever": "Alavanca Analógica", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Funil de Esteira de Andesito", "block.create.andesite_casing": "Revestimento de Andesito", "block.create.andesite_encased_cogwheel": "Roda dentada revestida com andesito", 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 48f1fd11b..5ad323b5d 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: 2227", + "_": "Missing Localizations: 2228", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "UNLOCALIZED: Acacia Window Pane", "block.create.adjustable_chain_gearshift": "Mudança de engrenagem de corrente ajustável", "block.create.analog_lever": "Alavanca Analógica", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Funil de correia de andesito", "block.create.andesite_casing": "Revestimento de Andesito", "block.create.andesite_encased_cogwheel": "Roda dentada revestida com andesito", 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 4bce461d2..12e72d4f6 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: 686", + "_": "Missing Localizations: 687", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "Geam De Salcâm", "block.create.adjustable_chain_gearshift": "Schimbător De Viteze Reglabil Înlănțuit", "block.create.analog_lever": "Manetă Analogică", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Pâlnie De Andezit Pentru Benzi", "block.create.andesite_casing": "Carcasă De Andezit", "block.create.andesite_encased_cogwheel": "Roată Dințată Încapsulată În Andezit", 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 93d72d2e7..ce993862a 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: 31", + "_": "Missing Localizations: 32", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "Панель из акациевого окна", "block.create.adjustable_chain_gearshift": "Регулируемая цепная коробка передач", "block.create.analog_lever": "Аналоговый рычаг", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Андезитовая конвейерная воронка", "block.create.andesite_casing": "Андезитовый корпус", "block.create.andesite_encased_cogwheel": "Шестерня в андезитовом корпусе", 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 489614fa6..d076effcd 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: 1017", + "_": "Missing Localizations: 1018", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "Склянна панель з акацією", "block.create.adjustable_chain_gearshift": "Регульований коробка передач", "block.create.analog_lever": "Аналоговий важіль", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "Андезитова воронка на конвеєрі", "block.create.andesite_casing": "Андезитовий корпус", "block.create.andesite_encased_cogwheel": "UNLOCALIZED: Andesite Encased Cogwheel", 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 f483c7982..459223587 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: 31", + "_": "Missing Localizations: 32", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "金合欢木窗户板", "block.create.adjustable_chain_gearshift": "可调节链式传动箱", "block.create.analog_lever": "模拟拉杆", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "安山岩传送带漏斗", "block.create.andesite_casing": "安山机壳", "block.create.andesite_encased_cogwheel": "安山齿轮箱", 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 c8ce1ebe3..1e5339718 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: 39", + "_": "Missing Localizations: 40", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,6 +7,7 @@ "block.create.acacia_window_pane": "相思木窗戶片", "block.create.adjustable_chain_gearshift": "可調式鏈式變速箱", "block.create.analog_lever": "可調式拉桿", + "block.create.andesite_alloy_block": "UNLOCALIZED: Block of Andesite Alloy", "block.create.andesite_belt_funnel": "安山岩輸送帶漏斗", "block.create.andesite_casing": "安山岩機殼", "block.create.andesite_encased_cogwheel": "安山齒輪箱", diff --git a/src/generated/resources/assets/create/models/block/andesite_alloy_block.json b/src/generated/resources/assets/create/models/block/andesite_alloy_block.json new file mode 100644 index 000000000..10e0cb6b8 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_alloy_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "create:block/andesite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended.json deleted file mode 100644 index 5036d51eb..000000000 --- a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_extended", - "textures": { - "particle": "minecraft:block/polished_andesite", - "2": "create:block/andesite_funnel_neutral", - "2_1": "create:block/andesite_funnel_push", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "5": "create:block/andesite_funnel_tall", - "6": "create:block/andesite_funnel", - "7": "create:block/andesite_funnel_plating" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended_powered.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended_powered.json index d4d5598d2..9d10ca351 100644 --- a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended_powered.json +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended_powered.json @@ -1,13 +1,10 @@ { "parent": "create:block/belt_funnel/block_extended", "textures": { - "particle": "minecraft:block/polished_andesite", - "2": "create:block/andesite_funnel_neutral", - "2_1": "create:block/andesite_funnel_push", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "5": "create:block/andesite_funnel_tall_powered", - "6": "create:block/andesite_funnel_powered", - "7": "create:block/andesite_funnel_plating" + "particle": "create:block/andesite_block", + "block": "create:block/andesite_block", + "direction": "create:block/funnel/andesite_funnel_neutral", + "redstone": "create:block/funnel/andesite_funnel_powered", + "base": "create:block/funnel/andesite_funnel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended_unpowered.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended_unpowered.json new file mode 100644 index 000000000..37387e3e7 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_extended_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/belt_funnel/block_extended", + "textures": { + "particle": "create:block/andesite_block", + "block": "create:block/andesite_block", + "direction": "create:block/funnel/andesite_funnel_neutral", + "redstone": "create:block/funnel/andesite_funnel_unpowered", + "base": "create:block/funnel/andesite_funnel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling.json deleted file mode 100644 index 5a4fd73da..000000000 --- a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_pulling", - "textures": { - "particle": "minecraft:block/polished_andesite", - "2": "create:block/andesite_funnel_neutral", - "2_1": "create:block/andesite_funnel_push", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "5": "create:block/andesite_funnel_tall", - "6": "create:block/andesite_funnel", - "7": "create:block/andesite_funnel_plating" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling_powered.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling_powered.json index a43488f11..624713368 100644 --- a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling_powered.json +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling_powered.json @@ -1,13 +1,10 @@ { "parent": "create:block/belt_funnel/block_pulling", "textures": { - "particle": "minecraft:block/polished_andesite", - "2": "create:block/andesite_funnel_neutral", - "2_1": "create:block/andesite_funnel_push", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "5": "create:block/andesite_funnel_tall_powered", - "6": "create:block/andesite_funnel_powered", - "7": "create:block/andesite_funnel_plating" + "particle": "create:block/andesite_block", + "block": "create:block/andesite_block", + "direction": "create:block/funnel/andesite_funnel_pull", + "redstone": "create:block/funnel/andesite_funnel_powered", + "base": "create:block/funnel/andesite_funnel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling_unpowered.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling_unpowered.json new file mode 100644 index 000000000..e2098131c --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pulling_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/belt_funnel/block_pulling", + "textures": { + "particle": "create:block/andesite_block", + "block": "create:block/andesite_block", + "direction": "create:block/funnel/andesite_funnel_pull", + "redstone": "create:block/funnel/andesite_funnel_unpowered", + "base": "create:block/funnel/andesite_funnel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing.json deleted file mode 100644 index 47130f005..000000000 --- a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_pushing", - "textures": { - "particle": "minecraft:block/polished_andesite", - "2": "create:block/andesite_funnel_neutral", - "2_1": "create:block/andesite_funnel_push", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "5": "create:block/andesite_funnel_tall", - "6": "create:block/andesite_funnel", - "7": "create:block/andesite_funnel_plating" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing_powered.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing_powered.json index 651382173..4d852fabd 100644 --- a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing_powered.json +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing_powered.json @@ -1,13 +1,10 @@ { "parent": "create:block/belt_funnel/block_pushing", "textures": { - "particle": "minecraft:block/polished_andesite", - "2": "create:block/andesite_funnel_neutral", - "2_1": "create:block/andesite_funnel_push", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "5": "create:block/andesite_funnel_tall_powered", - "6": "create:block/andesite_funnel_powered", - "7": "create:block/andesite_funnel_plating" + "particle": "create:block/andesite_block", + "block": "create:block/andesite_block", + "direction": "create:block/funnel/andesite_funnel_push", + "redstone": "create:block/funnel/andesite_funnel_powered", + "base": "create:block/funnel/andesite_funnel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing_unpowered.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing_unpowered.json new file mode 100644 index 000000000..3fdaa36d2 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_pushing_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/belt_funnel/block_pushing", + "textures": { + "particle": "create:block/andesite_block", + "block": "create:block/andesite_block", + "direction": "create:block/funnel/andesite_funnel_push", + "redstone": "create:block/funnel/andesite_funnel_unpowered", + "base": "create:block/funnel/andesite_funnel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted.json deleted file mode 100644 index 4b272eeee..000000000 --- a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_retracted", - "textures": { - "particle": "minecraft:block/polished_andesite", - "2": "create:block/andesite_funnel_neutral", - "2_1": "create:block/andesite_funnel_push", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "5": "create:block/andesite_funnel_tall", - "6": "create:block/andesite_funnel", - "7": "create:block/andesite_funnel_plating" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted_powered.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted_powered.json index 5552e989d..45a34cceb 100644 --- a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted_powered.json +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted_powered.json @@ -1,13 +1,10 @@ { "parent": "create:block/belt_funnel/block_retracted", "textures": { - "particle": "minecraft:block/polished_andesite", - "2": "create:block/andesite_funnel_neutral", - "2_1": "create:block/andesite_funnel_push", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "5": "create:block/andesite_funnel_tall_powered", - "6": "create:block/andesite_funnel_powered", - "7": "create:block/andesite_funnel_plating" + "particle": "create:block/andesite_block", + "block": "create:block/andesite_block", + "direction": "create:block/funnel/andesite_funnel_neutral", + "redstone": "create:block/funnel/andesite_funnel_powered", + "base": "create:block/funnel/andesite_funnel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted_unpowered.json b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted_unpowered.json new file mode 100644 index 000000000..9d61dfef3 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_belt_funnel_retracted_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/belt_funnel/block_retracted", + "textures": { + "particle": "create:block/andesite_block", + "block": "create:block/andesite_block", + "direction": "create:block/funnel/andesite_funnel_neutral", + "redstone": "create:block/funnel/andesite_funnel_unpowered", + "base": "create:block/funnel/andesite_funnel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull.json b/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull.json deleted file mode 100644 index 4ca78f3ab..000000000 --- a/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "create:block/funnel/block_horizontal", - "textures": { - "particle": "create:block/andesite_casing", - "7": "create:block/andesite_funnel_plating", - "5": "create:block/andesite_funnel_tall", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "6": "create:block/andesite_funnel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull_powered.json b/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull_powered.json index f30214bd6..b985ddc8c 100644 --- a/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull_powered.json +++ b/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull_powered.json @@ -1,11 +1,10 @@ { "parent": "create:block/funnel/block_horizontal", "textures": { - "particle": "create:block/andesite_casing", - "7": "create:block/andesite_funnel_plating", - "5": "create:block/andesite_funnel_tall_powered", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "6": "create:block/andesite_funnel_powered" + "particle": "create:block/andesite_block", + "base": "create:block/funnel/andesite_funnel", + "redstone": "create:block/funnel/andesite_funnel_powered", + "direction": "create:block/funnel/andesite_funnel_pull", + "block": "create:block/andesite_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull_unpowered.json b/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull_unpowered.json new file mode 100644 index 000000000..f815e4bb1 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_pull_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/funnel/block_horizontal", + "textures": { + "particle": "create:block/andesite_block", + "base": "create:block/funnel/andesite_funnel", + "redstone": "create:block/funnel/andesite_funnel_unpowered", + "direction": "create:block/funnel/andesite_funnel_pull", + "block": "create:block/andesite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push.json b/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push.json deleted file mode 100644 index 090a3e964..000000000 --- a/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "create:block/funnel/block_horizontal", - "textures": { - "particle": "create:block/andesite_casing", - "7": "create:block/andesite_funnel_plating", - "5": "create:block/andesite_funnel_tall", - "2_2": "create:block/andesite_funnel_push", - "3": "create:block/andesite_funnel_back", - "6": "create:block/andesite_funnel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push_powered.json b/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push_powered.json index 3907df971..fdafa100a 100644 --- a/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push_powered.json +++ b/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push_powered.json @@ -1,11 +1,10 @@ { "parent": "create:block/funnel/block_horizontal", "textures": { - "particle": "create:block/andesite_casing", - "7": "create:block/andesite_funnel_plating", - "5": "create:block/andesite_funnel_tall_powered", - "2_2": "create:block/andesite_funnel_push", - "3": "create:block/andesite_funnel_back", - "6": "create:block/andesite_funnel_powered" + "particle": "create:block/andesite_block", + "base": "create:block/funnel/andesite_funnel", + "redstone": "create:block/funnel/andesite_funnel_powered", + "direction": "create:block/funnel/andesite_funnel_push", + "block": "create:block/andesite_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push_unpowered.json b/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push_unpowered.json new file mode 100644 index 000000000..27a70e7bb --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_funnel_horizontal_push_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/funnel/block_horizontal", + "textures": { + "particle": "create:block/andesite_block", + "base": "create:block/funnel/andesite_funnel", + "redstone": "create:block/funnel/andesite_funnel_unpowered", + "direction": "create:block/funnel/andesite_funnel_push", + "block": "create:block/andesite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull.json b/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull.json deleted file mode 100644 index a05b1954a..000000000 --- a/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/funnel/block_vertical_filterless", - "textures": { - "particle": "create:block/andesite_casing", - "7": "create:block/andesite_funnel_plating", - "5": "create:block/andesite_funnel_tall", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "8": "create:block/andesite_casing", - "9": "create:block/andesite_funnel_slope", - "10": "create:block/funnel_open" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull_powered.json b/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull_powered.json index 979f71145..24b1f8300 100644 --- a/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull_powered.json +++ b/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull_powered.json @@ -1,13 +1,11 @@ { "parent": "create:block/funnel/block_vertical_filterless", "textures": { - "particle": "create:block/andesite_casing", - "7": "create:block/andesite_funnel_plating", - "5": "create:block/andesite_funnel_tall_powered", - "2_2": "create:block/andesite_funnel_pull", - "3": "create:block/andesite_funnel_back", - "8": "create:block/andesite_casing", - "9": "create:block/andesite_funnel_slope", - "10": "create:block/funnel_closed" + "particle": "create:block/andesite_block", + "base": "create:block/funnel/andesite_funnel", + "redstone": "create:block/funnel/andesite_funnel_powered", + "direction": "create:block/funnel/andesite_funnel_pull", + "frame": "create:block/funnel/andesite_funnel_frame", + "open": "create:block/funnel/funnel_closed" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull_unpowered.json b/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull_unpowered.json new file mode 100644 index 000000000..6a8ad6c1e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_pull_unpowered.json @@ -0,0 +1,11 @@ +{ + "parent": "create:block/funnel/block_vertical_filterless", + "textures": { + "particle": "create:block/andesite_block", + "base": "create:block/funnel/andesite_funnel", + "redstone": "create:block/funnel/andesite_funnel_unpowered", + "direction": "create:block/funnel/andesite_funnel_pull", + "frame": "create:block/funnel/andesite_funnel_frame", + "open": "create:block/funnel/funnel_open" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push.json b/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push.json deleted file mode 100644 index ef3fe4431..000000000 --- a/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/funnel/block_vertical_filterless", - "textures": { - "particle": "create:block/andesite_casing", - "7": "create:block/andesite_funnel_plating", - "5": "create:block/andesite_funnel_tall", - "2_2": "create:block/andesite_funnel_push", - "3": "create:block/andesite_funnel_back", - "8": "create:block/andesite_casing", - "9": "create:block/andesite_funnel_slope", - "10": "create:block/funnel_open" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push_powered.json b/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push_powered.json index 4afdf8a20..d81ac8ed2 100644 --- a/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push_powered.json +++ b/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push_powered.json @@ -1,13 +1,11 @@ { "parent": "create:block/funnel/block_vertical_filterless", "textures": { - "particle": "create:block/andesite_casing", - "7": "create:block/andesite_funnel_plating", - "5": "create:block/andesite_funnel_tall_powered", - "2_2": "create:block/andesite_funnel_push", - "3": "create:block/andesite_funnel_back", - "8": "create:block/andesite_casing", - "9": "create:block/andesite_funnel_slope", - "10": "create:block/funnel_closed" + "particle": "create:block/andesite_block", + "base": "create:block/funnel/andesite_funnel", + "redstone": "create:block/funnel/andesite_funnel_powered", + "direction": "create:block/funnel/andesite_funnel_push", + "frame": "create:block/funnel/andesite_funnel_frame", + "open": "create:block/funnel/funnel_closed" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push_unpowered.json b/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push_unpowered.json new file mode 100644 index 000000000..2b56302db --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_funnel_vertical_filterless_push_unpowered.json @@ -0,0 +1,11 @@ +{ + "parent": "create:block/funnel/block_vertical_filterless", + "textures": { + "particle": "create:block/andesite_block", + "base": "create:block/funnel/andesite_funnel", + "redstone": "create:block/funnel/andesite_funnel_unpowered", + "direction": "create:block/funnel/andesite_funnel_push", + "frame": "create:block/funnel/andesite_funnel_frame", + "open": "create:block/funnel/funnel_open" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_extended.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_extended.json deleted file mode 100644 index 0fce1a25a..000000000 --- a/src/generated/resources/assets/create/models/block/brass_belt_funnel_extended.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_extended", - "textures": { - "particle": "create:block/brass_block", - "2": "create:block/brass_funnel_neutral", - "2_1": "create:block/brass_funnel_push", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_extended_powered.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_extended_powered.json index ff664c508..9693650e4 100644 --- a/src/generated/resources/assets/create/models/block/brass_belt_funnel_extended_powered.json +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_extended_powered.json @@ -2,12 +2,9 @@ "parent": "create:block/belt_funnel/block_extended", "textures": { "particle": "create:block/brass_block", - "2": "create:block/brass_funnel_neutral", - "2_1": "create:block/brass_funnel_push", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall_powered", - "6": "create:block/brass_funnel_powered", - "7": "create:block/brass_funnel_plating" + "block": "create:block/brass_block", + "direction": "create:block/funnel/brass_funnel_neutral", + "redstone": "create:block/funnel/brass_funnel_powered", + "base": "create:block/funnel/brass_funnel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_extended_unpowered.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_extended_unpowered.json new file mode 100644 index 000000000..6dcc3453f --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_extended_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/belt_funnel/block_extended", + "textures": { + "particle": "create:block/brass_block", + "block": "create:block/brass_block", + "direction": "create:block/funnel/brass_funnel_neutral", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "base": "create:block/funnel/brass_funnel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling.json deleted file mode 100644 index 2975e7830..000000000 --- a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_pulling", - "textures": { - "particle": "create:block/brass_block", - "2": "create:block/brass_funnel_neutral", - "2_1": "create:block/brass_funnel_push", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling_powered.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling_powered.json index b2afb7d4e..9cdb6c693 100644 --- a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling_powered.json +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling_powered.json @@ -2,12 +2,9 @@ "parent": "create:block/belt_funnel/block_pulling", "textures": { "particle": "create:block/brass_block", - "2": "create:block/brass_funnel_neutral", - "2_1": "create:block/brass_funnel_push", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall_powered", - "6": "create:block/brass_funnel_powered", - "7": "create:block/brass_funnel_plating" + "block": "create:block/brass_block", + "direction": "create:block/funnel/brass_funnel_pull", + "redstone": "create:block/funnel/brass_funnel_powered", + "base": "create:block/funnel/brass_funnel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling_unpowered.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling_unpowered.json new file mode 100644 index 000000000..b99062b8b --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pulling_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/belt_funnel/block_pulling", + "textures": { + "particle": "create:block/brass_block", + "block": "create:block/brass_block", + "direction": "create:block/funnel/brass_funnel_pull", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "base": "create:block/funnel/brass_funnel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing.json deleted file mode 100644 index a1130fb8e..000000000 --- a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_pushing", - "textures": { - "particle": "create:block/brass_block", - "2": "create:block/brass_funnel_neutral", - "2_1": "create:block/brass_funnel_push", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing_powered.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing_powered.json index 99b733775..b6b5df184 100644 --- a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing_powered.json +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing_powered.json @@ -2,12 +2,9 @@ "parent": "create:block/belt_funnel/block_pushing", "textures": { "particle": "create:block/brass_block", - "2": "create:block/brass_funnel_neutral", - "2_1": "create:block/brass_funnel_push", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall_powered", - "6": "create:block/brass_funnel_powered", - "7": "create:block/brass_funnel_plating" + "block": "create:block/brass_block", + "direction": "create:block/funnel/brass_funnel_push", + "redstone": "create:block/funnel/brass_funnel_powered", + "base": "create:block/funnel/brass_funnel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing_unpowered.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing_unpowered.json new file mode 100644 index 000000000..1057b96af --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_pushing_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/belt_funnel/block_pushing", + "textures": { + "particle": "create:block/brass_block", + "block": "create:block/brass_block", + "direction": "create:block/funnel/brass_funnel_push", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "base": "create:block/funnel/brass_funnel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted.json deleted file mode 100644 index 693ec38e6..000000000 --- a/src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/belt_funnel/block_retracted", - "textures": { - "particle": "create:block/brass_block", - "2": "create:block/brass_funnel_neutral", - "2_1": "create:block/brass_funnel_push", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall", - "6": "create:block/brass_funnel", - "7": "create:block/brass_funnel_plating" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted_powered.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted_powered.json index 60060dfb5..c4355d82b 100644 --- a/src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted_powered.json +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted_powered.json @@ -2,12 +2,9 @@ "parent": "create:block/belt_funnel/block_retracted", "textures": { "particle": "create:block/brass_block", - "2": "create:block/brass_funnel_neutral", - "2_1": "create:block/brass_funnel_push", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "5": "create:block/brass_funnel_tall_powered", - "6": "create:block/brass_funnel_powered", - "7": "create:block/brass_funnel_plating" + "block": "create:block/brass_block", + "direction": "create:block/funnel/brass_funnel_neutral", + "redstone": "create:block/funnel/brass_funnel_powered", + "base": "create:block/funnel/brass_funnel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted_unpowered.json b/src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted_unpowered.json new file mode 100644 index 000000000..e910fd46b --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_belt_funnel_retracted_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/belt_funnel/block_retracted", + "textures": { + "particle": "create:block/brass_block", + "block": "create:block/brass_block", + "direction": "create:block/funnel/brass_funnel_neutral", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "base": "create:block/funnel/brass_funnel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull.json b/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull.json deleted file mode 100644 index a971472b4..000000000 --- a/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "create:block/funnel/block_horizontal", - "textures": { - "particle": "create:block/brass_casing", - "7": "create:block/brass_funnel_plating", - "5": "create:block/brass_funnel_tall", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "6": "create:block/brass_funnel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull_powered.json b/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull_powered.json index 38c8a7e7a..5aa87848c 100644 --- a/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull_powered.json +++ b/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull_powered.json @@ -1,11 +1,10 @@ { "parent": "create:block/funnel/block_horizontal", "textures": { - "particle": "create:block/brass_casing", - "7": "create:block/brass_funnel_plating", - "5": "create:block/brass_funnel_tall_powered", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "6": "create:block/brass_funnel_powered" + "particle": "create:block/brass_block", + "base": "create:block/funnel/brass_funnel", + "redstone": "create:block/funnel/brass_funnel_powered", + "direction": "create:block/funnel/brass_funnel_pull", + "block": "create:block/brass_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull_unpowered.json b/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull_unpowered.json new file mode 100644 index 000000000..b90f575ce --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_pull_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/funnel/block_horizontal", + "textures": { + "particle": "create:block/brass_block", + "base": "create:block/funnel/brass_funnel", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "direction": "create:block/funnel/brass_funnel_pull", + "block": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push.json b/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push.json deleted file mode 100644 index 85321b031..000000000 --- a/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "create:block/funnel/block_horizontal", - "textures": { - "particle": "create:block/brass_casing", - "7": "create:block/brass_funnel_plating", - "5": "create:block/brass_funnel_tall", - "2_2": "create:block/brass_funnel_push", - "3": "create:block/brass_funnel_back", - "6": "create:block/brass_funnel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push_powered.json b/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push_powered.json index 83a796536..4a9a5b9a0 100644 --- a/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push_powered.json +++ b/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push_powered.json @@ -1,11 +1,10 @@ { "parent": "create:block/funnel/block_horizontal", "textures": { - "particle": "create:block/brass_casing", - "7": "create:block/brass_funnel_plating", - "5": "create:block/brass_funnel_tall_powered", - "2_2": "create:block/brass_funnel_push", - "3": "create:block/brass_funnel_back", - "6": "create:block/brass_funnel_powered" + "particle": "create:block/brass_block", + "base": "create:block/funnel/brass_funnel", + "redstone": "create:block/funnel/brass_funnel_powered", + "direction": "create:block/funnel/brass_funnel_push", + "block": "create:block/brass_block" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push_unpowered.json b/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push_unpowered.json new file mode 100644 index 000000000..480a9e30d --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_funnel_horizontal_push_unpowered.json @@ -0,0 +1,10 @@ +{ + "parent": "create:block/funnel/block_horizontal", + "textures": { + "particle": "create:block/brass_block", + "base": "create:block/funnel/brass_funnel", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "direction": "create:block/funnel/brass_funnel_push", + "block": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull.json b/src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull.json deleted file mode 100644 index d2a1c6159..000000000 --- a/src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/funnel/block_vertical", - "textures": { - "particle": "create:block/brass_casing", - "7": "create:block/brass_funnel_plating", - "5": "create:block/brass_funnel_tall", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "8": "create:block/brass_casing", - "9": "create:block/brass_funnel_slope", - "10": "create:block/funnel_open" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull_powered.json b/src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull_powered.json index e319cf39d..5695ef663 100644 --- a/src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull_powered.json +++ b/src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull_powered.json @@ -1,13 +1,11 @@ { "parent": "create:block/funnel/block_vertical", "textures": { - "particle": "create:block/brass_casing", - "7": "create:block/brass_funnel_plating", - "5": "create:block/brass_funnel_tall_powered", - "2_2": "create:block/brass_funnel_pull", - "3": "create:block/brass_funnel_back", - "8": "create:block/brass_casing", - "9": "create:block/brass_funnel_slope", - "10": "create:block/funnel_closed" + "particle": "create:block/brass_block", + "base": "create:block/funnel/brass_funnel", + "redstone": "create:block/funnel/brass_funnel_powered", + "direction": "create:block/funnel/brass_funnel_pull", + "frame": "create:block/funnel/brass_funnel_frame", + "open": "create:block/funnel/funnel_closed" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull_unpowered.json b/src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull_unpowered.json new file mode 100644 index 000000000..6c320b02f --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_funnel_vertical_pull_unpowered.json @@ -0,0 +1,11 @@ +{ + "parent": "create:block/funnel/block_vertical", + "textures": { + "particle": "create:block/brass_block", + "base": "create:block/funnel/brass_funnel", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "direction": "create:block/funnel/brass_funnel_pull", + "frame": "create:block/funnel/brass_funnel_frame", + "open": "create:block/funnel/funnel_open" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_vertical_push.json b/src/generated/resources/assets/create/models/block/brass_funnel_vertical_push.json deleted file mode 100644 index f95cdf391..000000000 --- a/src/generated/resources/assets/create/models/block/brass_funnel_vertical_push.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/funnel/block_vertical", - "textures": { - "particle": "create:block/brass_casing", - "7": "create:block/brass_funnel_plating", - "5": "create:block/brass_funnel_tall", - "2_2": "create:block/brass_funnel_push", - "3": "create:block/brass_funnel_back", - "8": "create:block/brass_casing", - "9": "create:block/brass_funnel_slope", - "10": "create:block/funnel_open" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_vertical_push_powered.json b/src/generated/resources/assets/create/models/block/brass_funnel_vertical_push_powered.json index 45ac7f48f..3fa002b8b 100644 --- a/src/generated/resources/assets/create/models/block/brass_funnel_vertical_push_powered.json +++ b/src/generated/resources/assets/create/models/block/brass_funnel_vertical_push_powered.json @@ -1,13 +1,11 @@ { "parent": "create:block/funnel/block_vertical", "textures": { - "particle": "create:block/brass_casing", - "7": "create:block/brass_funnel_plating", - "5": "create:block/brass_funnel_tall_powered", - "2_2": "create:block/brass_funnel_push", - "3": "create:block/brass_funnel_back", - "8": "create:block/brass_casing", - "9": "create:block/brass_funnel_slope", - "10": "create:block/funnel_closed" + "particle": "create:block/brass_block", + "base": "create:block/funnel/brass_funnel", + "redstone": "create:block/funnel/brass_funnel_powered", + "direction": "create:block/funnel/brass_funnel_push", + "frame": "create:block/funnel/brass_funnel_frame", + "open": "create:block/funnel/funnel_closed" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_funnel_vertical_push_unpowered.json b/src/generated/resources/assets/create/models/block/brass_funnel_vertical_push_unpowered.json new file mode 100644 index 000000000..1180fdd00 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_funnel_vertical_push_unpowered.json @@ -0,0 +1,11 @@ +{ + "parent": "create:block/funnel/block_vertical", + "textures": { + "particle": "create:block/brass_block", + "base": "create:block/funnel/brass_funnel", + "redstone": "create:block/funnel/brass_funnel_unpowered", + "direction": "create:block/funnel/brass_funnel_push", + "frame": "create:block/funnel/brass_funnel_frame", + "open": "create:block/funnel/funnel_open" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/andesite_alloy_block.json b/src/generated/resources/assets/create/models/item/andesite_alloy_block.json new file mode 100644 index 000000000..177e920a3 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/andesite_alloy_block.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/andesite_alloy_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/andesite_funnel.json b/src/generated/resources/assets/create/models/item/andesite_funnel.json index 6cb095db3..5aa85e5b5 100644 --- a/src/generated/resources/assets/create/models/item/andesite_funnel.json +++ b/src/generated/resources/assets/create/models/item/andesite_funnel.json @@ -1,11 +1,10 @@ { "parent": "create:block/funnel/item", "textures": { - "particle": "create:block/andesite_casing", - "7": "create:block/andesite_funnel_plating", - "2": "create:block/andesite_funnel_neutral", - "6": "create:block/andesite_funnel", - "5": "create:block/andesite_funnel_tall", - "3": "create:block/andesite_funnel_back" + "particle": "create:block/andesite_block", + "block": "create:block/andesite_block", + "base": "create:block/funnel/andesite_funnel", + "direction": "create:block/funnel/andesite_funnel_neutral", + "redstone": "create:block/funnel/andesite_funnel_unpowered" } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/brass_funnel.json b/src/generated/resources/assets/create/models/item/brass_funnel.json index 5a1542acb..2450d2d13 100644 --- a/src/generated/resources/assets/create/models/item/brass_funnel.json +++ b/src/generated/resources/assets/create/models/item/brass_funnel.json @@ -1,11 +1,10 @@ { "parent": "create:block/funnel/item", "textures": { - "particle": "create:block/brass_casing", - "7": "create:block/brass_funnel_plating", - "2": "create:block/brass_funnel_neutral", - "6": "create:block/brass_funnel", - "5": "create:block/brass_funnel_tall", - "3": "create:block/brass_funnel_back" + "particle": "create:block/brass_block", + "block": "create:block/brass_block", + "base": "create:block/funnel/brass_funnel", + "direction": "create:block/funnel/brass_funnel_neutral", + "redstone": "create:block/funnel/brass_funnel_unpowered" } } \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/andesite_alloy_block.json b/src/generated/resources/data/create/loot_tables/blocks/andesite_alloy_block.json new file mode 100644 index 000000000..5fb5603d2 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/andesite_alloy_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "create:andesite_alloy_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json index 914bc595f..925cc51e0 100644 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json @@ -3,6 +3,7 @@ "values": [ "create:raw_zinc_block", "create:zinc_block", + "create:andesite_alloy_block", "create:brass_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/andesite_alloy.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/andesite_alloy.json new file mode 100644 index 000000000..49bf45975 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/andesite_alloy.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:andesite_alloy_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json index 914bc595f..925cc51e0 100644 --- a/src/generated/resources/data/forge/tags/items/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks.json @@ -3,6 +3,7 @@ "values": [ "create:raw_zinc_block", "create:zinc_block", + "create:andesite_alloy_block", "create:brass_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/andesite_alloy.json b/src/generated/resources/data/forge/tags/items/storage_blocks/andesite_alloy.json new file mode 100644 index 000000000..49bf45975 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/andesite_alloy.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:andesite_alloy_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 7e19837c9..22156935c 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -170,6 +170,7 @@ "create:deepslate_zinc_ore", "create:raw_zinc_block", "create:zinc_block", + "create:andesite_alloy_block", "create:brass_block", "create:rose_quartz_block", "create:rose_quartz_tiles", diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 08fae398e..5ce68e72c 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -1746,7 +1746,7 @@ public class AllBlocks { .properties(p -> p.color(MaterialColor.STONE)) .transform(pickaxeOnly()) .tag(AllBlockTags.SAFE_NBT.tag) - .blockstate(new BeltFunnelGenerator("andesite", new ResourceLocation("block/polished_andesite"))::generate) + .blockstate(new BeltFunnelGenerator("andesite")::generate) .loot((p, b) -> p.dropOther(b, ANDESITE_FUNNEL.get())) .register(); @@ -1771,7 +1771,7 @@ public class AllBlocks { .properties(p -> p.color(MaterialColor.TERRACOTTA_YELLOW)) .transform(pickaxeOnly()) .tag(AllBlockTags.SAFE_NBT.tag) - .blockstate(new BeltFunnelGenerator("brass", Create.asResource("block/brass_block"))::generate) + .blockstate(new BeltFunnelGenerator("brass")::generate) .loot((p, b) -> p.dropOther(b, BRASS_FUNNEL.get())) .register(); @@ -2103,6 +2103,19 @@ public class AllBlocks { .build() .lang("Block of Zinc") .register(); + + public static final BlockEntry ANDESITE_ALLOY_BLOCK = REGISTRATE.block("andesite_alloy_block", Block::new) + .initialProperties(() -> Blocks.ANDESITE) + .properties(p -> p.color(MaterialColor.STONE)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate(simpleCubeAll("andesite_block")) + .tag(Tags.Blocks.STORAGE_BLOCKS) + .transform(tagBlockAndItem("storage_blocks/andesite_alloy")) + .tag(Tags.Items.STORAGE_BLOCKS) + .build() + .lang("Block of Andesite Alloy") + .register(); public static final BlockEntry BRASS_BLOCK = REGISTRATE.block("brass_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelGenerator.java index 8e0ccaaea..d3928b952 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelGenerator.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.logistics.block.funnel; +import com.simibubi.create.Create; +import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock.Shape; import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; @@ -15,9 +17,9 @@ public class BeltFunnelGenerator extends SpecialBlockStateGen { private String type; private ResourceLocation materialBlockTexture; - public BeltFunnelGenerator(String type, ResourceLocation materialBlockTexture) { + public BeltFunnelGenerator(String type) { this.type = type; - this.materialBlockTexture = materialBlockTexture; + this.materialBlockTexture = Create.asResource("block/" + type + "_block"); } @Override @@ -33,22 +35,22 @@ public class BeltFunnelGenerator extends SpecialBlockStateGen { @Override public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, BlockState state) { - String shapeName = state.getValue(BeltFunnelBlock.SHAPE) - .getSerializedName(); - boolean powered = state.getOptionalValue(BlockStateProperties.POWERED).orElse(false); - String poweredSuffix = powered ? "_powered" : ""; + String prefix = "block/funnel/"; + Shape shape = state.getValue(BeltFunnelBlock.SHAPE); + String shapeName = shape.getSerializedName(); + boolean powered = state.getOptionalValue(BlockStateProperties.POWERED) + .orElse(false); + String poweredSuffix = powered ? "_powered" : "_unpowered"; + String shapeSuffix = shape == Shape.PULLING ? "_pull" : shape == Shape.PUSHING ? "_push" : "_neutral"; String name = ctx.getName() + "_" + shapeName + poweredSuffix; return prov.models() .withExistingParent(name, prov.modLoc("block/belt_funnel/block_" + shapeName)) .texture("particle", materialBlockTexture) - .texture("2", prov.modLoc("block/" + type + "_funnel_neutral")) - .texture("2_1", prov.modLoc("block/" + type + "_funnel_push")) - .texture("2_2", prov.modLoc("block/" + type + "_funnel_pull")) - .texture("3", prov.modLoc("block/" + type + "_funnel_back")) - .texture("5", prov.modLoc("block/" + type + "_funnel_tall" + poweredSuffix)) - .texture("6", prov.modLoc("block/" + type + "_funnel" + poweredSuffix)) - .texture("7", prov.modLoc("block/" + type + "_funnel_plating")); + .texture("block", materialBlockTexture) + .texture("direction", prov.modLoc(prefix + type + "_funnel" + shapeSuffix)) + .texture("redstone", prov.modLoc(prefix + type + "_funnel" + poweredSuffix)) + .texture("base", prov.modLoc(prefix + type + "_funnel")); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelGenerator.java index 1d5f390ce..59dcbff03 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelGenerator.java @@ -18,13 +18,13 @@ import net.minecraftforge.client.model.generators.ModelFile; public class FunnelGenerator extends SpecialBlockStateGen { private String type; - private ResourceLocation particleTexture; + private ResourceLocation blockTexture; private boolean hasFilter; public FunnelGenerator(String type, boolean hasFilter) { this.type = type; this.hasFilter = hasFilter; - this.particleTexture = Create.asResource("block/" + type + "_casing"); + this.blockTexture = Create.asResource("block/" + type + "_block"); } @Override @@ -40,7 +40,8 @@ public class FunnelGenerator extends SpecialBlockStateGen { @Override public ModelFile getModel(DataGenContext c, RegistrateBlockstateProvider p, BlockState s) { - String powered = s.getValue(FunnelBlock.POWERED) ? "_powered" : ""; + String prefix = "block/funnel/"; + String powered = s.getValue(FunnelBlock.POWERED) ? "_powered" : "_unpowered"; String closed = s.getValue(FunnelBlock.POWERED) ? "_closed" : "_open"; String extracting = s.getValue(FunnelBlock.EXTRACTING) ? "_push" : "_pull"; Direction facing = s.getValue(FunnelBlock.FACING); @@ -50,32 +51,30 @@ public class FunnelGenerator extends SpecialBlockStateGen { BlockModelBuilder model = p.models() .withExistingParent("block/" + type + "_funnel_" + parent + extracting + powered, - p.modLoc("block/funnel/block_" + parent)) - .texture("particle", particleTexture) - .texture("7", p.modLoc("block/" + type + "_funnel_plating")) - .texture("5", p.modLoc("block/" + type + "_funnel_tall" + powered)) - .texture("2_2", p.modLoc("block/" + type + "_funnel" + extracting)) - .texture("3", p.modLoc("block/" + type + "_funnel_back")); + p.modLoc(prefix + "block_" + parent)) + .texture("particle", blockTexture) + .texture("base", p.modLoc(prefix + type + "_funnel")) + .texture("redstone", p.modLoc(prefix + type + "_funnel" + powered)) + .texture("direction", p.modLoc(prefix + type + "_funnel" + extracting)); if (horizontal) - return model.texture("6", p.modLoc("block/" + type + "_funnel" + powered)); + return model.texture("block", blockTexture); - return model.texture("8", particleTexture) - .texture("9", p.modLoc("block/" + type + "_funnel_slope")) - .texture("10", p.modLoc("block/funnel" + closed)); + return model.texture("frame", p.modLoc(prefix + type + "_funnel_frame")) + .texture("open", p.modLoc(prefix + "funnel" + closed)); } public static NonNullBiConsumer, RegistrateItemModelProvider> itemModel( String type) { - ResourceLocation particleTexture = Create.asResource("block/" + type + "_casing"); + String prefix = "block/funnel/"; + ResourceLocation blockTexture = Create.asResource("block/" + type + "_block"); return (c, p) -> { p.withExistingParent("item/" + type + "_funnel", p.modLoc("block/funnel/item")) - .texture("particle", particleTexture) - .texture("7", p.modLoc("block/" + type + "_funnel_plating")) - .texture("2", p.modLoc("block/" + type + "_funnel_neutral")) - .texture("6", p.modLoc("block/" + type + "_funnel")) - .texture("5", p.modLoc("block/" + type + "_funnel_tall")) - .texture("3", p.modLoc("block/" + type + "_funnel_back")); + .texture("particle", blockTexture) + .texture("block", blockTexture) + .texture("base", p.modLoc(prefix + type + "_funnel")) + .texture("direction", p.modLoc(prefix + type + "_funnel_neutral")) + .texture("redstone", p.modLoc(prefix + type + "_funnel_unpowered")); }; } diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json b/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json index ca4b4eb0a..d555c4931 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json @@ -3,10 +3,10 @@ "parent": "block/block", "textures": { "back": "create:block/funnel/funnel_back", + "particle": "create:block/brass_block", "base": "create:block/funnel/brass_funnel", "direction": "create:block/funnel/brass_funnel_neutral", "redstone": "create:block/funnel/brass_funnel_unpowered", - "particle": "create:block/brass_block", "block": "create:block/brass_block" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json b/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json index e3dd34e56..dfc5d49bd 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json @@ -3,7 +3,7 @@ "parent": "block/block", "textures": { "back": "create:block/funnel/funnel_back", - "particle": "create:block/funnel/brass_funnel", + "particle": "create:block/brass_block", "base": "create:block/funnel/brass_funnel", "direction": "create:block/funnel/brass_funnel_pull", "redstone": "create:block/funnel/brass_funnel_unpowered" diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json b/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json index e098c5b1c..466ea15c5 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json @@ -3,7 +3,7 @@ "parent": "block/block", "textures": { "back": "create:block/funnel/funnel_back", - "particle": "create:block/funnel/brass_funnel", + "particle": "create:block/brass_block", "base": "create:block/funnel/brass_funnel", "direction": "create:block/funnel/brass_funnel_push", "redstone": "create:block/funnel/brass_funnel_unpowered" diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json b/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json index da2a1b625..8d439c4e0 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json @@ -1,13 +1,12 @@ { "credit": "Made with Blockbench", "parent": "block/block", - "texture_size": [32, 32], "textures": { "back": "create:block/funnel/funnel_back", + "particle": "create:block/brass_block", "base": "create:block/funnel/brass_funnel", "direction": "create:block/funnel/brass_funnel_neutral", "redstone": "create:block/funnel/brass_funnel_unpowered", - "particle": "create:block/brass_block", "block": "create:block/brass_block" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/funnel/block_horizontal.json b/src/main/resources/assets/create/models/block/funnel/block_horizontal.json index 184f3899c..20ace9c21 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_horizontal.json +++ b/src/main/resources/assets/create/models/block/funnel/block_horizontal.json @@ -4,9 +4,9 @@ "textures": { "back": "create:block/funnel/funnel_back", "base": "create:block/funnel/brass_funnel", - "particle": "create:block/funnel/brass_funnel_pull", "direction": "create:block/funnel/brass_funnel_pull", "redstone": "create:block/funnel/brass_funnel_unpowered", + "particle": "create:block/brass_block", "block": "create:block/brass_block" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/funnel/block_vertical.json b/src/main/resources/assets/create/models/block/funnel/block_vertical.json index e727afeeb..320aa0132 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_vertical.json +++ b/src/main/resources/assets/create/models/block/funnel/block_vertical.json @@ -5,8 +5,8 @@ "base": "create:block/funnel/brass_funnel", "direction": "create:block/funnel/brass_funnel_pull", "redstone": "create:block/funnel/brass_funnel_unpowered", - "open": "create:block/funnel_closed", - "particle": "create:block/funnel/brass_funnel_frame", + "open": "create:block/funnel/funnel_closed", + "particle": "create:block/brass_block", "frame": "create:block/funnel/brass_funnel_frame" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json b/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json index f5e0e2692..c2289d3ae 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json +++ b/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json @@ -5,8 +5,8 @@ "base": "create:block/funnel/brass_funnel", "direction": "create:block/funnel/brass_funnel_pull", "redstone": "create:block/funnel/brass_funnel_unpowered", - "open": "create:block/funnel_closed", - "particle": "create:block/funnel/brass_funnel_frame", + "open": "create:block/funnel/funnel_closed", + "particle": "create:block/brass_block", "frame": "create:block/funnel/brass_funnel_frame" }, "elements": [ diff --git a/src/main/resources/assets/create/textures/block/funnel/andesite_funnel.png b/src/main/resources/assets/create/textures/block/funnel/andesite_funnel.png index d4887d1f2b0befa6095ecf4f8a02178270a13ad5..26a6e7a336347a4e064bbc3c7df95851c5205b6d 100644 GIT binary patch delta 2399 zcmbtVc~nz(8hv3A1hPSZU=U*v*@UoFF$M{;C6OhvO+^L?SxAJ0kVFiEM5tI7kma#2 z!l0m(7L-j8l|?qIK&d*;!GaWIu_CpIECRIwg?8GRp3a#+-g)nS@B8lk&i&nYUYBF3 zUW&dJB!TPbNTWD9Vrjx~HaCm~07ktT;B^%=1Oa43gvU65}G(>R~7)2}~U(>+O&Yg>GT zFsiDP>?`d#lwT{%_+;@pUTth91NEfrH1e+cFqw2J-h^s&*Cjo&0HsPHWD({+50J(O zs5DT6o_|VG+{AnW|5>RiBy{x3_S=_>6vR!oJ)K71RIAz?x$x%1q-~N$^Lw>`7iQ8D z*n`-#z))_gevuSYU(e@$ttV)ZSKF&oW!#unNbT|%kDIf8SGognQ&BE-@Vne`+Y`XI zHszz3p&}Pw08rIfxgbDpK3Y~| zgXU_U5GZ&;%}E}rf(2XE_9@8jSWpqV1vG*ZK@QX$%!S&615gVP3EK|tf$ac8VWwa% z%oyx|kwGM!1p2_qaI7oEoknn=QS5M5<`y{cIvfo?faAcQ;M%5GCWGJ-F67b0b~rAN z9>T&4_#rr~n9F7pJcV2qUrZNs!})eNOB_f zMPgwTh508!E9>Lew)+ngL~|O>5}mNy}Q-_5x#2Xy3Kh zL_ye55rMLjLq{QtF0*{i-nE$hW^(oD{`&wiO%wHJx{D~CUo*2xuwP6Si}IOHj(Wc3cM4V0v+x=vVIhP=ZS>nj1A)hK7C?TbvNzb>tRizwvNJ zdTJ_?7a5sZcjHC_&5p<85jV&|0!bBf$_DU)F-9a)%f7FF0aiTfTfEOXF<13W5qupj8;Q`~=AFz>?R{wwqbIE&;D6y`@@R0-Bg(hrdklQu_KG3(QA7J= zQ1U+zL#;|%FWw(*`zFxO&rdRA<)A+>P=LCiunW?!hhqIDbMrx3kw z%HKRlL(n%hRYA_HuC8`mhzVp)M(2>r0=8Fn-hCq0^6RI2Ce1fezt(xNqYEmiJ z(^ct^XWRh=b0+(a*EV&e{)Qod-J2EHP6&8gS0}fl9Ht9&>ykvf+y8Y6kvdyho|jIH zNc8z<4A6a5Ug>pn+y?X4+tUwqtK>snE-SwS!mbr4q%aI8n&S>X3x(MT91fGiYS~Vg z4tSwXycA-q=0!Qvp%`Le-eOB`O|x{sVrw+1=N2Dh!eB6#wzYW;5w9vuk#ysimzT}# z&!nF{yAiq=pm&2q7266&EE9i{5IwB-E{<9SN23fu3KVZUXZK~9!07wbr*2~aL*jYm z;n>@GrS!Ns2vjTU;2SIz*)V3L#^@SdoSCWNL9{E?9)D5SqN$Rg42S7BNh7m4lIIdz z-LV6A7zgvy(6?M3-?4Vr=j3F(ZHAmFqW2{x1lwJF3LQ6aGuy~K~#W`=9@-=l=g?GC!&O@zPy)QcE8llrmfZy<$=DtU6GSG48 zAypSSp-6J-udEoKn7`+p^y4wi?5mR~hbnM_s7s+Yk-}Lk|Fin>nX@OCj+$M{u*Gqr;OK!WS*zJA2!%PbJ6Wbh!UMSd`&DZ) zE0?uT>CqnhPM!9~PTsLGwhDnw9BXOldpgXMeurtgHomh)-L-A<{mY{}0?n}Rpf+S) WE5!ZpCuKiQQb=R=F*CO8Mr0?l&GHOmnHe)<&r+gL3Mp#{?L<$;wMo_Oo+rV?Un#UK!f z1j)?E7W{?sKO#clH#aQo0|X-aCCq*Y&z2kvWph|`h93asg|Y!C5W=8CAR&*7(|v<{ z)g)u*&r1NdI@m*Pt>#43<2U(RSAxX3Fr3~rv*{Od2*#@h(`RS@v zg_$YCDqTAwh78NPt+XcYHocFG{6^hB;qj%7Ti+?`-SDxZu=!g}zs{=4%qEr4ou>~p zZ=EAr4^d|({qvhm^kKH@Bh>saJ5;BA>vdLoAKQt0n9}d|V$5gs4XJAOKwa#vsz~_c zO!%EV&DgsGGh!M$o<_VqCZIoeRn$^AWa|3o&OlwSryG0IAuTG|ud^IRwAAlejqjUf z74GGIlq1&d$vFO|IZ`F}x~A~pm7Io<@oz6yj{!F>+$uZoO=&L@Aqp|zs!8X%n7R89p4VmWz;IL3nDhs zJZ40?>YX1Pd!oB={BZW zk#VHs>5LI)dX9gUv1)N8ttidOIk3X=^qbP5qd7rOf$qNJ=Ly{QFRf!!&Rk93SwxZa z`&8`uw$JW27(}UI@upoo#PKwNMUU0JE?2IuwRv>}y;J9ufwp5p3OWZR6ca#zKhdcQ zM^43RN)PD`w)NjxQ#9W1c~>=14>6_AQrMB@;vXk5f+%dZ*00z-AXfJDj zN6QA#Rsxon1AMlfbC5WXzQU_W>1FP)zP*`feB}&vm`;p*W?djfkvbb_f9~}aM;8_7 z2dYnqBvFabDge1~r}0b7qK|Z8kFiO+0yQ(?^gU|Tm!3Zq^WEzpaR1qL-h+=POA1RS zvMYM~xLALV$YT4A%guH+R=C;8<7K*2dLPSJ9Db-e*LPQ_CUrS7qh#})!wxB9(+cLv z%;9JZRg!tee|1_7u5v;##zVRF9Cl(|iMB^ilP&f~o9b@3&n6Yel_36e}X4_O!Cv$SYlL;o%v?hF-9`y`_<9ZWIv?&&;2CZ$|hw^jMH@%p22rB3r@EPxLxuODbFR~w!fNm$u z=J@!PbB*7M3G@uAm?ivm~6-`6{=dnb`*DM^nFREm;9^!fSwQkK~&2w&5v zx+p%lt;E{COyC&zo<)MPV(E(5!qlpwb{EU|FUywb1c}&{bT+uVXQ!6ES+=gIKQZZ` zd6vKO3)5c3+UGjEZ+bTu1cjsCoawXi)%+?NdX0%1aCFWWW7$>voij;Y6XayM-}k{( zZ%#?C|FFZxo(7NUv6to0V#7Nvbl+_sm9<+g?vBY+n^p!chItx@OIE%=yT$^Sf}Fa# zJehe0c1o2IaGRbVp5a_=64!a-6!%Sg)<@N2zUnJY>TOXX=QqI*vktWB34U&Rv<%Ln|CT$)AQ=)Yx^*6hyuZmVIGRBimZ?2bANz7B1 zHDH#at{$b(XQenJXx_C$y;5x*n@pc?2#ONV`TYL=SMi+P9hn~a!OD-;g|1GWXekGH zoUCoXj0bfQ7~by_?r@Olvg1pX3hY5}ZT{#! z$tCxx?Y9HhM2Z=+*`wmOuF_UpswHWet={}i`^A|L!LybU~TKC&P^(R@)^9C~TBb9Q6g%6yB+;@cxuwbLV%^L(WKrv~+|_y~dt$N9DOrLaN8WhCYf4gU_e+Z@YaSXsV?47g z_rtZ__l8Pza<$An4(*M}eA~o5x$Z>HhPn=PRN1g~np>9nxL45rv-{!CcEN7vEGxI) zm38RV*K^alLz^p-dq|k0fi=cuuZaOz!5jGP38r--&8f4VHq#oVB7-docny1s-doMs zC=Z`x)XK+0j+C|^FH+8k$ zAa8qOrTAj_A&n>Dj_;#ZTPF#)WL{PP4}C8NF3x@x;{|Dq9mv zbel`pUk!abSH?WxA02llr`ruDF-&olt^%fxLhC z*`I(nmreA{za;AthzNbDfMJ-~y2=Z7?}^b%bP!(U<+jdMQ2(uPWBV;qyRrFIxZ0)t z@2(F=WKZ3FR`(T>Z$m!YgB3WP2^0<@ky$%s!`-FoArD0iR-iu`g&`N;`xv-Pp?~6p zcI(%tx#z5IWr@FyZ{%8NZW)vq%&^=xdeusvzLBJ;tFm76wEm!JNvp=S01e`nw|7dD zNo~^m;%`!fTi4w&k2BY{l((@zI2n7sRcsV?*Qcn-C1P@w(EG>cnPc`1`>CR$%8CXi z5`ev@qIr!;LcB~)v-UT`Bt4QwhAV*JY{?UoO&JoNi|H@NF11T#+9HH_*B*UpR=r=o z6f<^tCc^JYn{@r0xGTdyszTsSWQse>H+e%|lw4&c(|2+`yK1qx?#mQKLQ1Z=s!a40 z`pZfA<<)|Ve8+oTM)4646z1Hp+`z!{)#|pNs+()VwMIWpFJ7ThY&#me}G4ZhWPt2xx^41rFmW=c+H=ND?#TW zJYOB99hTNmLly^sVl*%s2$*pQBM7CWD+bl((C9>4BaMTkV6HGg8(LP!$PHOzd-Inoq=3{KQ(W+ zAB_$NjhffIP{x#GY5h}%A4V^RKYLz+k6wtRQGeptfgHbi42=p0`~ZK@5H84!`~}Zr z(0|{cU;N>({EH!=x}W^Npnr?kye;!_B^t4)fqbPTBON8ay+j&|%AgVFFY!nm1x+WT zU>F3B3d3MDQ7}9OL5AURC>)MXMxzlF^a3gplglGBsQ{k}B-dboJQPh$6ai16!0=ca zNPz_a7(tVYg`p8-fKEfx(KIr70fiNZ0agOpZ=qFuDjGC$ltBu?*mcanxvzI(m>3U&(B!qFhJv1 z+>e?wAbY{*huZKz1OE$?oi{6(`M=}&9r}|+pTi4gaeS>fRumtA%KLMkKLY<`vIV;x zm&XYu{TrwL8&3Os!kU4yEKcYG{dPdW_tE#3%%j3&1#j zU!r=GnO*?cZ+{fqZ}W^lNMs}pg+P+=G#H(Vqros}G#*CAV-YYqod6){WCU6hkN=gO z%cApw$s9o63(NsZ433P05ikG(h5^V_B!ET{2sG@k=Ki1EL!pRBO(FvG|KT1$ zLlBTiJRL@-X<|Y55Lg(6PQb&knkYO5>}5C_;(HtVnH&EJ_fVQdEb=$^wBh{w<8QgD z&A)?KS`rs#vo`+@LnQIrh+QC??Z*H(zh?PwRsTQW7RdkTF#k?`A?&-fA&VUf_F!+G zRWS2U)&BwTJA(y-3NX2>KQnzHf;M87FDiZ$gd6@HZc-V3) zv026SIxhfyZ8Z^h87bwEoh)Vw*~kX>I@-K<ftg5!PRz@xuZ;oOJ1;!+`6kn3L9v?qvhm5j&r!NF zJ09kjd1Je&x zNT)M0GW?#uoVw&z^saT{(Pf>qB=dj4WPmV6Abi*>P)^MdzJ1>BEtDcF2pb zFMHRH7~+JJCOi(@6KDqn`Nu}#`D?_FpM%!lARq(#B;-kiw(L*CceI|Ot@NLG36jROlc+p5)6PpDYWCMoPi}NjjXrbcjLena52o@uNu$mYdTlEzESln1o7L|<@~D%0$wjlwUrur3?AtP%4O9$&OZoO#nhN-fmQ4;JN3&0BtqM ATL1t6