diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 34cd76a7..96745a1f 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,4 +1,5 @@ 43a8097658049963b5a203fe1cd9c346f0176646 assets/ultramarine/blockstates/abacus.json +1ea73cfe5e98784cfd880a67563a60919cb6eb79 assets/ultramarine/blockstates/acacia_bracket.json ee1f1fa11379dc2f8d54020c282dfdfefe2c0880 assets/ultramarine/blockstates/apple_basket.json 565181ba6b7e8c96a6184275d0ae1e8e64be8ccb assets/ultramarine/blockstates/back_cushion.json 5e3a3e130b7fbc1c2153101b70794ce238387162 assets/ultramarine/blockstates/bamboo_bonsai.json @@ -8,6 +9,7 @@ d314f271f5f2110ab70017ff907125a3886e5bec assets/ultramarine/blockstates/bamboo_m e9a14c3e9fc7004f3be3875bb29156ef7369d1a1 assets/ultramarine/blockstates/bamboo_mat_stairs.json 10b084d671f526d860eca5ca696d7d25133e53ed assets/ultramarine/blockstates/bamboo_slips.json 61d2e95ea64df15b95ef09dc5433a314c7c328d9 assets/ultramarine/blockstates/bamboo_tea_basket.json +ec299742ffb5d2f754c5763543eb10b888a6d4da assets/ultramarine/blockstates/birch_bracket.json 682bccacfb4ebb184a930c9ef191c399fbb8321d assets/ultramarine/blockstates/black_brick_slab.json fe33690b9997868a86b85f8422c702ad031ae3af assets/ultramarine/blockstates/black_brick_stairs.json 46ae4c6deedf1cc73db4afdc5c69bfc668ec07cf assets/ultramarine/blockstates/black_brick_wall.json @@ -118,6 +120,7 @@ c85ec2ad408bbc5fd9e1fae67408715d119c5aee assets/ultramarine/blockstates/clay_dol 3bd1c452b1d845cfb76f30fddef8618c74ba6ed0 assets/ultramarine/blockstates/clay_doll_male.json 6be77a893fe9e8fbe6cda41fe65876db9b7a3097 assets/ultramarine/blockstates/couplet.json 46745e31c8db85b7403a94da8fd1c21f5fb28e43 assets/ultramarine/blockstates/couplet_top.json +595b2f22d0a26bccae00c4b901f0a3b676197edc assets/ultramarine/blockstates/crimson_bracket.json 19b574ea8062a1bc6c034d7cedd96fce750203f6 assets/ultramarine/blockstates/cut_cyan_floor_tiles.json 9c1db1e11dac27ef2b49e991e5f37abb433e10bf assets/ultramarine/blockstates/cyan_and_blue_fangxin.json 474e93759e2ff2080d26fa8f9bc7061a9c46c9b0 assets/ultramarine/blockstates/cyan_and_blue_fangxin_edge.json @@ -153,6 +156,7 @@ ea7f93cc44de852cd06a8a90d6db89e9eca7857d assets/ultramarine/blockstates/dark_blu 6e7f584423dcddd8ebda67b7b76185b8ad87aafa assets/ultramarine/blockstates/dark_blue_fangxin_edge.json 042f197a2be67a91512adf3c21bc988825bf2c4c assets/ultramarine/blockstates/dark_cyan_floor_tile.json 90739f69ff4a2838754d98760d6ec5c657d7320f assets/ultramarine/blockstates/dark_green_and_dark_blue_carved_wood.json +ac05c9ed4521ee6ca8c47fbf29ac5dbbb15fa7ef assets/ultramarine/blockstates/dark_oak_bracket.json 5e9aa053425dd0b115ce3108c8f39ccd1f80cd0c assets/ultramarine/blockstates/dark_oak_rafter.json ef9d573b796b9bfb87fecf7d56875baecaf7a210 assets/ultramarine/blockstates/dark_oak_rafter_end.json 4d06107c2172830ed49b5ccf4a26a68edeb33900 assets/ultramarine/blockstates/deepslate_hematite_ore.json @@ -234,6 +238,7 @@ a54aa98f7ade032a2c6003c10c0f374f850da659 assets/ultramarine/blockstates/horizont a00161538dcc0866b0c270ed457a563ac7a0a1a7 assets/ultramarine/blockstates/jade_candlestick.json 7e326522b0c3f658207164f978fd9afcc98c9ab7 assets/ultramarine/blockstates/jade_ore.json ea12565d6c83b21ff82b56b17ec655052c39c713 assets/ultramarine/blockstates/jade_pendant.json +047d26e2225b1a62e831337d5836bff0043da356 assets/ultramarine/blockstates/jungle_bracket.json 110874afac1edb98936f27e6bc4901fbe5183065 assets/ultramarine/blockstates/knife.json eb6ac4e0a7f6bfdbfb820d49e901601463a2b297 assets/ultramarine/blockstates/knife_rest.json 2385474fa1ab8fe4a8eb1939b423e3a7d6a366f4 assets/ultramarine/blockstates/knocker.json @@ -292,6 +297,7 @@ ff7a736cfee5c121753c66c6d86d9146ed21afc0 assets/ultramarine/blockstates/medium_y 4f44717d4c083d13d86bb3123059f74c1f2a8d4e assets/ultramarine/blockstates/mixed_cyan_floor_tiles.json 4abcdce898d9415299a90ef9fb1e538d2f0f0845 assets/ultramarine/blockstates/nether_cobalt_ore.json 8b32f03af61d204c02a929c5af37460a40ee9e49 assets/ultramarine/blockstates/oak_bed.json +3de888aa08edd7ffdab7d6b4b483cbd27982a669 assets/ultramarine/blockstates/oak_bracket.json c14aef2b2cb4f378fd0dc0455233eb5e9b64fffb assets/ultramarine/blockstates/oak_cabinet.json 3ed3674679e1208b2cc02f5cfb754c917fc2d125 assets/ultramarine/blockstates/octagonal_palace_lantern.json 06d32a51e4b499eff66a1fd3bed4d5c2a7f95ed7 assets/ultramarine/blockstates/orange_and_blue_carved_wood.json @@ -384,6 +390,7 @@ aa1a1f976bfa72fcc0c3254541c1c2018fd561cf assets/ultramarine/blockstates/small_wo 261e9ca908796aa80b462b405966b739b3d216a8 assets/ultramarine/blockstates/small_yellow_ivy.json 7fb07a095682110ed59bdc6451def23c91a733fe assets/ultramarine/blockstates/song_wooden_door.json 7916b43e13f132b61b96b1ae8b5370a009124202 assets/ultramarine/blockstates/song_wooden_window.json +74b40a988e08d0a92f3f191f645a7601ead2ede3 assets/ultramarine/blockstates/spruce_bracket.json 437d29bba143e82fa97817722b014e3fc0aa329f assets/ultramarine/blockstates/spruce_pillar_base.json 815a8d07be6257a92af7446cc221bd02e5bde357 assets/ultramarine/blockstates/square_palace_lantern.json 962ad42caa180fbc85c5d1af05d3bc6b6ebe5146 assets/ultramarine/blockstates/standing_lamp.json @@ -411,6 +418,7 @@ e1f1d19ed4acffe84559727de9051bdfb4b34410 assets/ultramarine/blockstates/variegat 55b724dc5f083066ab7314878782369192df6345 assets/ultramarine/blockstates/variegated_rocks.json 71b3a19add717711f774b44beaf94634f26e938a assets/ultramarine/blockstates/vertical_cyan_floor_tiles.json 780f041d2a86cae2fdb0b59ad65564bb1d96d639 assets/ultramarine/blockstates/vertical_gilded_dark_oak_queti.json +d79091626a470abf9e7962379fca6ebefb2ee9f0 assets/ultramarine/blockstates/warped_bracket.json 1a15abc8c4415bf64a393cc78cb47c2750c40fd3 assets/ultramarine/blockstates/warped_cabinet.json cbcd38383818732c82fe8d8db9d3957d544ae69a assets/ultramarine/blockstates/weathered_red_stone_tile.json d5cd2650843e2e2bd3d0cf71fdcb22a905144c5e assets/ultramarine/blockstates/weathered_stone.json @@ -461,6 +469,7 @@ c4428beadf536c432cd70bcc9dac9643e919aa6b assets/ultramarine/blockstates/yellow_r 498ecf77a3b8aa798b3d383b692c3c8bfb5bdf93 assets/ultramarine/blockstates/yellow_roof_tiles.json 2d543cf3b50d5eea1f3d9e820e7b905d2f0e5d68 assets/ultramarine/blockstates/yellow_sky_lantern.json 1f48eeee798d71e08a60db27810a450deb0c2451 assets/ultramarine/blockstates/yellow_su_style_caihua.json +be862da85a35bcfecd3c49adb33d9fea825daae8 assets/ultramarine/models/block/acacia_bracket.json 15ad62b6dd17d95e0452a231d7ea3ed5b5f7e2a5 assets/ultramarine/models/block/apple_basket.json 8d710c088d8db2d72de3ec130ed2fce237a83ebf assets/ultramarine/models/block/apple_basket_double.json 6385f78f20b04d874431c17da199ad2b1686fb46 assets/ultramarine/models/block/bamboo_mat.json @@ -469,6 +478,7 @@ f371c8a18b68dbbacb9b9362cfba6a1680d0bbab assets/ultramarine/models/block/bamboo_ ed07ca8a9d55f6d1b748498c12e8b4fa49de7bcd assets/ultramarine/models/block/bamboo_mat_stairs.json c07485142a870dde6311a26f63a16201315e80b8 assets/ultramarine/models/block/bamboo_mat_stairs_inner.json 26bfaef844c479a8e0f7e76304504764be0d2586 assets/ultramarine/models/block/bamboo_mat_stairs_outer.json +4a377891ffedd8dc93357e5dedc44b4f1409ed58 assets/ultramarine/models/block/birch_bracket.json 20531f9b31254b7058d7c1f4a136a0f66e140375 assets/ultramarine/models/block/black_brick_slab.json e394178fa01000f740fcc9df6a38d0458c50fca0 assets/ultramarine/models/block/black_brick_slab_top.json 77bbf807a3b91f94a50dfc914d4cae28a7edb37f assets/ultramarine/models/block/black_brick_stairs.json @@ -1117,6 +1127,7 @@ cc5efd6e757371068ea93bb9e207dd49f33d5b3a assets/ultramarine/models/block/carved_ 5223a7cb8e80843bc903f86f127a9d5f2791fe4d assets/ultramarine/models/block/celery_basket_double.json 07091c85d08196aa9abdb97db2dedce2a8de10a6 assets/ultramarine/models/block/chiseled_cyan_floor_tile.json 381b52469ca26ecc759bc887febbbac6fe2366a4 assets/ultramarine/models/block/chiseled_gilded_dark_oak.json +dc4218103b02b7f2f1e8cfce082565922b37296c assets/ultramarine/models/block/crimson_bracket.json 13c925302d0e6d7eddbd2699206bb2224d8fca28 assets/ultramarine/models/block/cut_cyan_floor_tiles.json 82f0b177249c73f8c4528a899e898cdbdd46ee0d assets/ultramarine/models/block/cyan_and_blue_fangxin.json 8446d639d2b960918457de48945f5e47c5db0e60 assets/ultramarine/models/block/cyan_and_blue_fangxin_edge.json @@ -1418,6 +1429,7 @@ e6126574de06f644c1ad742ad51dc4de7806b997 assets/ultramarine/models/block/cyan_ro 09fafcfdee0e875387a678a26fe325fba0217088 assets/ultramarine/models/block/dark_blue_fangxin_horizontal.json 39d4fb56e1c2c001f8a82c9c0cf2f56329a15eca assets/ultramarine/models/block/dark_cyan_floor_tile.json f27a639c5b7ab030126f8c3e7e65c876c40b00e2 assets/ultramarine/models/block/dark_green_and_dark_blue_carved_wood.json +f2fb06c8d3c23c1c42f2724a3639b0054fe94251 assets/ultramarine/models/block/dark_oak_bracket.json 6d7f1a111994302831dcb9922d9e90ca97dd2549 assets/ultramarine/models/block/deepslate_hematite_ore.json 9b423bfed406ad3e7b8f2777326edf9ace313fc9 assets/ultramarine/models/block/deepslate_jade_ore.json bbd263183471f9022a03cbaa9e905d3e1d8da6b9 assets/ultramarine/models/block/deepslate_magnesite_ore.json @@ -1976,6 +1988,7 @@ e7628526c952ba33ffcbd7ebe1b6395937e7e6ce assets/ultramarine/models/block/green_w f4a1f911c9e6b9a3a2565a30a3d1574ee1a4d9c1 assets/ultramarine/models/block/green_white_red_carved_wood.json 7e3203c1159163dc4f11b8e95aa687c460c6a0e5 assets/ultramarine/models/block/hematite_ore.json 8c0af41bc29f6f8162143a7e06c6da9b8bcd2586 assets/ultramarine/models/block/jade_ore.json +24eacf6d9a5fa03cf23404a8e692c106140b5b2e assets/ultramarine/models/block/jungle_bracket.json 744c1581f5783256ad1e6bed5aa3c412cd1b9d59 assets/ultramarine/models/block/layered_cyan_floor_tiles.json ee9ae841cf710b5ef3927fabc5f9ad04ae4829be assets/ultramarine/models/block/light_cyan_floor_tile.json a15fa192e997264a3144e905d5a39e58b595fc08 assets/ultramarine/models/block/light_cyan_floor_tile_slab.json @@ -1989,6 +2002,7 @@ c6a8a78e57e4d61bac60fb5b50fd8410683f2e50 assets/ultramarine/models/block/light_c 4c14dba2badf1163420faf70e0227074e5d8d09b assets/ultramarine/models/block/magnesite_ore.json a758c7253ed9baa244865ad526a5ac58595b8630 assets/ultramarine/models/block/mixed_cyan_floor_tiles.json 29e88a7ba5a0fef9f1979edfb70e7e425868faef assets/ultramarine/models/block/nether_cobalt_ore.json +07d135a5ea3c9e93ede36fce264651ed5762fc11 assets/ultramarine/models/block/oak_bracket.json 71ca323c6f3023da746d9e0170356b44655ccb1e assets/ultramarine/models/block/orange_and_blue_carved_wood.json 8fedb4fc903b43278e89a7f8b2c0c0d40aa11b37 assets/ultramarine/models/block/orange_and_green_carved_wood.json 7d59e754570293d5e35cd611cefacc000f102705 assets/ultramarine/models/block/orange_basket.json @@ -2043,6 +2057,7 @@ d091e3d18c44c49f26c94171840ad5cdcf875699 assets/ultramarine/models/block/rosewoo 5dc7fe87d561a47f752b9eb69681b6d30e8246ec assets/ultramarine/models/block/rosewood_stairs.json 2bc5863812dbb3dbee0e5c0865572e254f0ba2e8 assets/ultramarine/models/block/rosewood_stairs_inner.json a34f51f167f46069c8cad3c11bea75a68786b0cf assets/ultramarine/models/block/rosewood_stairs_outer.json +482b05af192e1c88ac35ea9b353741145476e4a2 assets/ultramarine/models/block/spruce_bracket.json 9712bdab944464441f44ef5f7fcb8c678cb44850 assets/ultramarine/models/block/spruce_pillar_base.json 7d147f9e3e73ff43c61a1fcc9033961af686cbed assets/ultramarine/models/block/stone_flower_window.json 2c0344b7a7efd15b859690a1e483e9eaaf61c23b assets/ultramarine/models/block/stone_pillar_base.json @@ -2054,6 +2069,7 @@ a34f51f167f46069c8cad3c11bea75a68786b0cf assets/ultramarine/models/block/rosewoo a7493b90e9b0446cdb8446a740cf91293aeb38a7 assets/ultramarine/models/block/variegated_rock_stairs_outer.json fc4e165ec20281b270473792573ba814bdbb1ba5 assets/ultramarine/models/block/variegated_rocks.json 5454f4545259b9283823ba3cf07ee7a850f7073c assets/ultramarine/models/block/vertical_cyan_floor_tiles.json +dbaa7b0f61f2a137de81069941ef62f763230691 assets/ultramarine/models/block/warped_bracket.json 18e167bfd7a3f325f164945fef40bc514c0b2d90 assets/ultramarine/models/block/weathered_red_stone_tile.json 3203255945729dba14ca3953d614ea335e0bfeaa assets/ultramarine/models/block/weathered_stone.json b8a065ad8e29bb7edd6500d9c2400f129d2cb674 assets/ultramarine/models/block/weathered_stone_slab.json @@ -2406,6 +2422,7 @@ b1a2eaf01185a360a5167d19525699dbd82dfde8 assets/ultramarine/models/block/yellow_ 1f01be556ab72afad1f28e23cee238a3d34fc6d2 assets/ultramarine/models/block/yellow_roof_tiles_snow_layer_9_none.json ba4cc4be895e9b2c20c95d82d11063633916fbc4 assets/ultramarine/models/block/yellow_roof_tiles_snow_layer_9_right.json 3c5cc7fc6dfe115e9de2e8fa1b42d61ef7285f2e assets/ultramarine/models/item/abacus.json +687e26e09490552bff943ff21ffa63ff7f0a43ae assets/ultramarine/models/item/acacia_bracket.json 207516384dccc7165f9a62da579d92c82cc7d4ee assets/ultramarine/models/item/apple_basket.json cfbae1e9a29268592efc32728ed096b2c116372c assets/ultramarine/models/item/architrave_template.json 86a7ced5431176c275dc3e8bf228f18546e5404a assets/ultramarine/models/item/back_cushion.json @@ -2417,6 +2434,7 @@ cfbae1e9a29268592efc32728ed096b2c116372c assets/ultramarine/models/item/architra 76963c533d6653d11d79e233b7b598e07784fd7c assets/ultramarine/models/item/bamboo_slips.json ff5ecb4efc3b630fb89a8d5c6e22552792daf972 assets/ultramarine/models/item/bamboo_tea_basket.json 1766a0228391d7d219aacdd8def2d10a919b1bf5 assets/ultramarine/models/item/baozi.json +409455e900121c22389b7ff01dc139e31a1f6850 assets/ultramarine/models/item/birch_bracket.json 99ebf4f8978914eba256a4bebc72eed51f04cc73 assets/ultramarine/models/item/black_brick.json 1edcf7d64ef76d8e9a3bfab1d39a2d8a5c53dcec assets/ultramarine/models/item/black_brick_slab.json aef72f1bdef4ab3de9e81be2362fde22e00cc56c assets/ultramarine/models/item/black_brick_stairs.json @@ -2544,6 +2562,7 @@ eb729bff1891eee064a37221edb221b5fd9498fd assets/ultramarine/models/item/cooked_m dad4e440c73201b39892a3a7bb46eb4e57492d56 assets/ultramarine/models/item/copper_cash_coin.json f49925a2f19a5d8941dae2ea13cb71eedbc4bf44 assets/ultramarine/models/item/couplet.json fc63743d818d27d5c1b29c7e7a132980d8a1f00b assets/ultramarine/models/item/couplet_top.json +ffde18ccd197811ea808fc5d6fa1c983d648d003 assets/ultramarine/models/item/crimson_bracket.json 5351a2356f2db377ea12457b4c6af8916732bf8c assets/ultramarine/models/item/cut_cyan_floor_tiles.json 9c0d7e9d4a9c26f25f1407df6e09e0958bb23d12 assets/ultramarine/models/item/cyan_and_blue_fangxin.json 503ef44c861a777688036923065da63c404e0986 assets/ultramarine/models/item/cyan_and_blue_fangxin_edge.json @@ -2582,6 +2601,7 @@ bad2416310ea66ff94a8e3eec835a98524a66c36 assets/ultramarine/models/item/dark_blu 127369e36e869ba893e29d7987084474903ad7d3 assets/ultramarine/models/item/dark_blue_fangxin_edge.json c67394e62e83f3cb4a332a5e17e779e066c8d90e assets/ultramarine/models/item/dark_cyan_floor_tile.json b436a74361fd06e11f391d85d4f5ddaf4dfdaa73 assets/ultramarine/models/item/dark_green_and_dark_blue_carved_wood.json +bea94c66cecd478341481491392cf462fbc2b485 assets/ultramarine/models/item/dark_oak_bracket.json fac368bba104c843cf0ecc8fe16bbdd48cd07931 assets/ultramarine/models/item/dark_oak_rafter.json 1a4db4d5d194902d426107a12ed9c1cb81f2c9a9 assets/ultramarine/models/item/dark_oak_rafter_end.json 212271778244e27b0356f880d2ac9aa136df7e10 assets/ultramarine/models/item/deepslate_hematite_ore.json @@ -2679,6 +2699,7 @@ b0788a544233b026352fc99233b098e046b6b94c assets/ultramarine/models/item/jade_can 485c95acefe8f1ae98f30defccb19c8e9b012cd5 assets/ultramarine/models/item/jade_ore.json 2b188678e3bc347396737f2e474d8eae9d827c75 assets/ultramarine/models/item/jade_parts.json 0712147ba377a31750224b251259909b0e3553b2 assets/ultramarine/models/item/jade_pendant.json +f4742e5dd6653c6941d5e6ad76fb5df850d7bc7c assets/ultramarine/models/item/jungle_bracket.json 6dc5368d4f4f0d4dcdbf7e631f6dae06a3518ef7 assets/ultramarine/models/item/knife.json 0ecb5cd11a352b891f605a66202a6ef231195548 assets/ultramarine/models/item/knife_rest.json c7b93957b15a18d1f64f668f609cef472b09ae66 assets/ultramarine/models/item/knocker.json @@ -2745,6 +2766,7 @@ fb201b875d2a31447af5b01c131cd48b7e3a74f3 assets/ultramarine/models/item/medium_y c47195d043a1b6da3bfa2158122ea774d9bb818d assets/ultramarine/models/item/mung_bean_cake.json 2d9fd1ee2427766b35f58633114a198b6596df86 assets/ultramarine/models/item/nether_cobalt_ore.json d51cc091722bd4ec7c9a43e34f431387689fe54a assets/ultramarine/models/item/oak_bed.json +213f3b712f343bf7fdc39c0bee4edd6954fda528 assets/ultramarine/models/item/oak_bracket.json e6de6e1851202c9f3b8943518b797a83835e6a73 assets/ultramarine/models/item/oak_cabinet.json 099a0bff1338d6bc10e666a0b7af9cc01451ef1a assets/ultramarine/models/item/octagonal_palace_lantern.json 57935a669cea28494d7ceac6d1da9b0bf4e06b0a assets/ultramarine/models/item/orange_and_blue_carved_wood.json @@ -2859,6 +2881,7 @@ d1fa040f0d534ca3ce2a889fc1d2ff845a4118b4 assets/ultramarine/models/item/small_ye 6a87828da0146bcfd869761e3b78491fa7057c52 assets/ultramarine/models/item/small_yellow_ivy.json 7e41d55e2c526fff7eaaa40658a91c64e13f4f55 assets/ultramarine/models/item/song_wooden_door.json b26b64368b06f4d619570b1c83a70c4429a0a288 assets/ultramarine/models/item/song_wooden_window.json +5e2fcedcc138b46af6df284462e682ad389a5baf assets/ultramarine/models/item/spruce_bracket.json b89119e69443ae4d02e1853eddc1a6747a26b719 assets/ultramarine/models/item/spruce_pillar_base.json ba1fbd7fea608d55edbe393de167b1ed5b0d3412 assets/ultramarine/models/item/square_palace_lantern.json 5c5bd70e9a4db58d44fcd1e4127f4caffd41a5bc assets/ultramarine/models/item/standing_lamp.json @@ -2891,6 +2914,7 @@ eab2d04e399d9af1e4ee645d3edf64eb088a1622 assets/ultramarine/models/item/variegat 101a7af91a9cf39a74a3c9e5a634207608ed0727 assets/ultramarine/models/item/variegated_rocks.json 81e942840d88336dee3926cba1717ee64d767be5 assets/ultramarine/models/item/vertical_cyan_floor_tiles.json 44e6bc11a05ab9ae064649713e3298fe4d7d05dd assets/ultramarine/models/item/vertical_gilded_dark_oak_queti.json +0ba65f12fee77e169f5a930562e7db6f68941641 assets/ultramarine/models/item/warped_bracket.json 4751e559ca3cc93fd1a5469083f2f96c5f4c6fcb assets/ultramarine/models/item/warped_cabinet.json a16dd13aa88a9c6c34ac697bdc3b443bec5a3156 assets/ultramarine/models/item/weathered_red_stone_tile.json 13d47cd1d9a3460a76a89f7ab97d1b2747f6ef84 assets/ultramarine/models/item/weathered_stone.json @@ -3334,7 +3358,7 @@ b73cc45e816c59d3eb8735f91a00095e314e7732 assets/ultramarine/textures/block/yello 56f8f8c5910dcd2dcfffa47ef0433a7e49195dfc data/minecraft/recipes/brick.json 645284c5035f3bb0e95477cf7f70b5a9a5d5ac32 data/minecraft/recipes/white_candle.json bb3cff8ef2b03825fc5bbeffb336436d70edcaa4 data/minecraft/tags/blocks/fences.json -70c15401c3014fa1a3acf5d6377537f0c6f44a10 data/minecraft/tags/blocks/mineable/axe.json +6da211c4a0daa09467402493cd75c67675e1f477 data/minecraft/tags/blocks/mineable/axe.json f322d81978eac3de4a54e222a418652bf27462bb data/minecraft/tags/blocks/mineable/hoe.json cd50c530ebbcb9aebd0fc973c34da1d0fafd3690 data/minecraft/tags/blocks/mineable/pickaxe.json abbdc8dce331da2dc7cc4c8928d8c981c65f43d5 data/minecraft/tags/blocks/needs_iron_tool.json @@ -3518,6 +3542,8 @@ d76b47383cc75685cc530b3ebee93ca45b52ca20 data/ultramarine/advancements/recipes/u d2775028d559a42916566d62d8eff42b64f8e334 data/ultramarine/advancements/recipes/ultramarine.decorations/terracotta_pot.json 4f3e20dff28fcc91edb5acdc8faa09ac31bfe3fb data/ultramarine/advancements/recipes/ultramarine.decorations/wooden_crate.json f848f1a235cfec29092c3bd2ae318922026741a9 data/ultramarine/advancements/recipes/ultramarine.decorations/wooden_poles.json +b543f3b3df85c194e390e858a3ef318e8b2e3ecc data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/acacia_bracket.json +18d98286431a3cbc40bcf598197fc8ba044222db data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/birch_bracket.json 568646442e5a2da906f702f292b4c652f2c946de data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/black_white_blue_carved_wood.json ac5f2b0897b49990e030d23fc4ed1d30916b1722 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/black_white_green_carved_wood.json 9e5980a74b0b184a12e9e231829187ea3306b515 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/blue_and_green_chuihua.json @@ -3574,6 +3600,7 @@ cc49a3d493b42a7461453234969307835b3e1f9e data/ultramarine/advancements/recipes/u 1f21e4c98b2647cc0bf249d43195238201d40309 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/central_gilded_dark_oak_queti.json a3594fab7c0fa0363d7f25fe1e148b6302228a25 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/chiseled_gilded_dark_oak.json ef1a76488ca4786624add6899421365b275b9dde data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/circular_yellow_carved_pattern.json +66880b5389f3ac934f1a4a3d1203bb1e5651aa63 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/crimson_bracket.json 538fc1b7d42fe4fbb1c4799a64c0cb69b0191b7e data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/cyan_and_blue_fangxin.json 0f2f044527f2802fb824466dae29c99356722b54 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/cyan_and_blue_fangxin_edge.json 9d04d55e15bb9f84d97f10ccadd32d795c32a515 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/cyan_and_blue_fangxin_edge_variant.json @@ -3597,6 +3624,7 @@ dc227596c3d121356d6cf2f322e5105dc18d8403 data/ultramarine/advancements/recipes/u f83f68b5d76f50f67aa483bde9a37ef31b54c04a data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/dark_blue_fangxin.json 9da36a4cb6beb258bdbd31cc4b08a3d8407e1b36 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/dark_blue_fangxin_edge.json ada7bb6ff17936473af84076b26ee8c4cc859823 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/dark_green_and_dark_blue_carved_wood.json +2c36c1b1300b0828b501d1852993cd85290c02b0 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/dark_oak_bracket.json f4e54cbe5d1a7cb4e489c7f8833984a07e1c75da data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/dark_oak_rafter.json ba8f558a2f811bd085f3b815882c0a8556464480 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/dark_oak_rafter_end.json 9a4d88f4fc5c5c01cbcbb960ae4e594b72227f61 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/empty_tuanhua_slab.json @@ -3645,6 +3673,7 @@ af87448e4e746e6345ec95114214a91c6e79e314 data/ultramarine/advancements/recipes/u 721b136c827ae2b3e0b68be3b1caff170d4386f2 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/green_wanzi_rafter_end.json cfb44b5f10dfa82cf8c89c729596cf1a33bd5d64 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/green_white_red_carved_wood.json 4db2732ad3340ef491ee1aae0403e2f955a3d3fb data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/horizontal_gilded_dark_oak_queti.json +fe29dabc8d036e3b80c2c5dfe46029e01ea488e7 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/jungle_bracket.json 89775a0c8d91728e9549d8f6c76458be8f41349a data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/large_gray_su_style_caihua.json 2d4e354dcfedfbced10b08725453f3ea2a8d40de data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/large_green_su_style_caihua.json 244319d119ca0ba63473b93e93fbba1d71fb85f0 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/large_white_su_style_caihua.json @@ -3659,6 +3688,7 @@ b18f6cb826ebb74f97e4a20c39f65b0409bde289 data/ultramarine/advancements/recipes/u f22cd8f9367a6ba56fcce46efc95c47aa745dc46 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/long_yellow_carved_zhaotou_pattern.json 30f0298f8367451cee921b2a5f4f10ca70323ad0 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/medium_su_style_caihua.json 11d364559ee78cb2d0006443a9f7d53598cd0944 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/medium_yellow_carved_pattern.json +a7d8832beebd71ae4d1011dc08cc257e3e30ed6a data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/oak_bracket.json eea4f9b6a52ba86463cb9ac991053df0e7cf68cf data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/orange_and_blue_carved_wood.json e0264f2a1595fdba6e7fac301a01328cbab5d1c6 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/orange_and_green_carved_wood.json a57f8a41e49b23495f3ae17d59458de3b5c1fd4b data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/qing_golden_dragon_ceiling.json @@ -3690,12 +3720,14 @@ ca5cb1eab2bd09210a2780855e44dbe6b14999f1 data/ultramarine/advancements/recipes/u c79b996492a84b2a371b2084cc76a7e368077ba1 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/small_stone_guardian_lion.json d493270c328d7c85a2578ddbdfe4bc94448dd332 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/small_wooden_guardian_lion.json 878ccb17bfdaa08eb1d3457e3dc912bf74fd906f data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/small_yellow_glazed_guardian_lion.json +d6c7c659d8a975253c925cd5b2a52bedb6a96cec data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/spruce_bracket.json 45b1f75f7830e5f2c6366be0d4ceaefbc5b0ccc6 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/spruce_pillar_base.json 5c2f4fa5d363d18c03e3a5beb919a45281a42eb4 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/stone_pillar_base.json ce39563860fffd68e6af96c2d11bd5b189826979 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/stripped_dark_oak_pillar_base.json 2e56b36b68bc1926ec7cc72f62bb14cd9f665675 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/tall_wooden_queti_edge.json 147a9e2f793bf782170854161510b0c69e489f67 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/thick_carved_queti.json d661be2b587224e384ea42ffec487fa922cb4c99 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/vertical_gilded_dark_oak_queti.json +0c0fa7ba41a48a249d2685c802e294d51a58d17b data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/warped_bracket.json d75a79e93c02ee48374d27b4d7c28c275407682f data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/white_and_blue_fangxin.json 1f21987337824bbc94076dd4b006694be226c9c5 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/white_and_blue_fangxin_edge.json 3be82c8074281ce923e78bf8078768470564b7c8 data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/white_and_cyan_fangxin.json @@ -3868,6 +3900,7 @@ b7401bbd6250498b77678776ad6e0529df02529b data/ultramarine/advancements/recipes/u 14251351df446f59395a0fde83b26353cf8a2245 data/ultramarine/advancements/recipes/ultramarine.windows_and_doors/stone_flower_window.json 82b8f301d04961735ac30e6f0f15ff9f5d9e0c1c data/ultramarine/advancements/recipes/ultramarine.windows_and_doors/tall_royal_rosewood_window.json 73911b3e562f3076e2f26b1912c0afb6e088b7a7 data/ultramarine/loot_tables/blocks/abacus.json +b0b93e83934a28c977096b2eefe78de5119c13b4 data/ultramarine/loot_tables/blocks/acacia_bracket.json 953efe57699fa453b60d0e17ea2fbaa6b876170a data/ultramarine/loot_tables/blocks/back_cushion.json 98896fd40b7b2bde12db7407c638b7e675519598 data/ultramarine/loot_tables/blocks/bamboo_curtain.json 78249f6e38dfa012f50b2103718e6c7d0ffac6ae data/ultramarine/loot_tables/blocks/bamboo_mat.json @@ -3875,6 +3908,7 @@ b7401bbd6250498b77678776ad6e0529df02529b data/ultramarine/advancements/recipes/u fdabf68a2afc6e785fff0cf61b1bb6f37bfe8514 data/ultramarine/loot_tables/blocks/bamboo_mat_stairs.json 68a9320e82e388cdf5bc6c1fa5e2b17bb3f5f4ba data/ultramarine/loot_tables/blocks/bamboo_slips.json fdfa24822d81afe0684623c4c00301b5d2a4d152 data/ultramarine/loot_tables/blocks/bamboo_tea_basket.json +17680fde1e2fc1855259347ce2dc909be5420a23 data/ultramarine/loot_tables/blocks/birch_bracket.json 976457aebc049dd09357698fe946a130392f485e data/ultramarine/loot_tables/blocks/black_brick_slab.json 386948fdd00c9298200353c41071de734c969809 data/ultramarine/loot_tables/blocks/black_brick_stairs.json 4a302de6d473a194580474dd41de0d2077744990 data/ultramarine/loot_tables/blocks/black_brick_wall.json @@ -3980,6 +4014,7 @@ da5681e31a941ec4a52584aff701119abe3ccbf4 data/ultramarine/loot_tables/blocks/cir 9b8f7d0ab15e290304a3346de61d7217f0bd5f9b data/ultramarine/loot_tables/blocks/clay_doll_male.json 1267725afb137fb2f3ebad8b50287ada75133f1a data/ultramarine/loot_tables/blocks/couplet.json ed1cc6b8e80792e6720f3a69518064b704f77a62 data/ultramarine/loot_tables/blocks/couplet_top.json +a8fdea7f8b7200dec97d084b0823359e8e001f50 data/ultramarine/loot_tables/blocks/crimson_bracket.json 1b2a5af1b7d79a67bb6837a026c266dd4f52329b data/ultramarine/loot_tables/blocks/cut_cyan_floor_tiles.json d8c7dbc509f1261de4bfe450e55da3b05b80c8cf data/ultramarine/loot_tables/blocks/cyan_and_blue_fangxin.json ade93011308ae2e5c5025323c9d8e6356f0d52f5 data/ultramarine/loot_tables/blocks/cyan_and_blue_fangxin_edge.json @@ -4014,6 +4049,7 @@ af7c4468f32f0cba142b02690322f637714356ec data/ultramarine/loot_tables/blocks/dar 9b5335a7791f0edf32e2d17775568d197ab3f95b data/ultramarine/loot_tables/blocks/dark_blue_fangxin_edge.json cb5587e8bff163819cd692fea08cd563267069b7 data/ultramarine/loot_tables/blocks/dark_cyan_floor_tile.json 7253a56188add28bd4b0a77bdff788a0d36624eb data/ultramarine/loot_tables/blocks/dark_green_and_dark_blue_carved_wood.json +9fa9229a820ba6f7533e046a2859803147048128 data/ultramarine/loot_tables/blocks/dark_oak_bracket.json 63287a4a68a02b71d39c855ae442cdd3714a8759 data/ultramarine/loot_tables/blocks/dark_oak_rafter.json 05cf0f2c8e2675e2cab96dc17f7b1e94b5062182 data/ultramarine/loot_tables/blocks/dark_oak_rafter_end.json 0021a9a8d82bec55d149149785f47da0a198b379 data/ultramarine/loot_tables/blocks/deepslate_hematite_ore.json @@ -4088,6 +4124,7 @@ b057f719f4173c928a7a2aa20e3c99a9fe75df44 data/ultramarine/loot_tables/blocks/imp b125ca67bffd0a1ea5fe9ee0a355b6939e84f4da data/ultramarine/loot_tables/blocks/jade_candlestick.json ea07703bd0102fc176121fac7082579cb162e73b data/ultramarine/loot_tables/blocks/jade_ore.json f156f9000638d646d1b5efd5eb9faae72277695f data/ultramarine/loot_tables/blocks/jade_pendant.json +9e4f19f3706c072ef1ea6e9c15cc927188f810e1 data/ultramarine/loot_tables/blocks/jungle_bracket.json 68d783e0dde0d60b67e5ce767390a2c5ab1acb40 data/ultramarine/loot_tables/blocks/knife.json 21fc395529d145d1c0695b19fb1641d6365ca674 data/ultramarine/loot_tables/blocks/knife_rest.json 9471370283b78c437e1cd58106ea1d67def26e7f data/ultramarine/loot_tables/blocks/knocker.json @@ -4142,6 +4179,7 @@ b3545373c621311f298df9dc5490665587467822 data/ultramarine/loot_tables/blocks/mem a5cc18f62ca479fd3f215531dac6955a362918b1 data/ultramarine/loot_tables/blocks/mixed_cyan_floor_tiles.json 758b825513f875eee036a7d9ca863b919f415127 data/ultramarine/loot_tables/blocks/nether_cobalt_ore.json 88b4393fe57c4da0f4ee111587badb189b7cfb32 data/ultramarine/loot_tables/blocks/oak_bed.json +6ff81b86700c972c2902ac082b7658d9f69c8c58 data/ultramarine/loot_tables/blocks/oak_bracket.json 1d8922f4783a9bb430920819ca1616bcdd4d9da3 data/ultramarine/loot_tables/blocks/oak_cabinet.json 9c9ff344910410e41caf3fc931f618c967460904 data/ultramarine/loot_tables/blocks/octagonal_palace_lantern.json 2fe8ce514eec74fe9c55b03c3674ec0ceb8497c3 data/ultramarine/loot_tables/blocks/orange_and_blue_carved_wood.json @@ -4219,6 +4257,7 @@ d09aafb8633851dfc93f68cd4c801c0caeefbd5a data/ultramarine/loot_tables/blocks/sma b2e7282235f28551d4ea7f6b6f951f3f15946e7e data/ultramarine/loot_tables/blocks/small_yellow_ivy.json 8cb82645d77db09f24d4afb79d71b5ec5d8b1cde data/ultramarine/loot_tables/blocks/song_wooden_door.json ff505b0393c77094776634dd103ebbcc81e0a278 data/ultramarine/loot_tables/blocks/song_wooden_window.json +619283c8eaae211c3e709be1e46d9757b4ee0dd1 data/ultramarine/loot_tables/blocks/spruce_bracket.json 1f340ead38b931f52b0b36be0428aeac5891545b data/ultramarine/loot_tables/blocks/spruce_pillar_base.json c9d09dc40d4c1388b594d26dc0c25f895828c265 data/ultramarine/loot_tables/blocks/square_palace_lantern.json 3adeb38563726c9a96e24e08c7de4a3a6829b706 data/ultramarine/loot_tables/blocks/standing_lamp.json @@ -4244,6 +4283,7 @@ fae7d5c7167c52b2fd85c11fcab2def784816ac2 data/ultramarine/loot_tables/blocks/tri 082433f68ec990d803742119faf7b1aa953ee577 data/ultramarine/loot_tables/blocks/variegated_rocks.json 836d94c5e4dbbb383a5ee1067c166148df08f862 data/ultramarine/loot_tables/blocks/vertical_cyan_floor_tiles.json 3410c3e5343d4b5b9584c5a3015d7467eb1fb628 data/ultramarine/loot_tables/blocks/vertical_gilded_dark_oak_queti.json +a21bf222477175be23e925c48699d6c3ffce91aa data/ultramarine/loot_tables/blocks/warped_bracket.json cfed4e27c45787e430d3f2cf980a62af8eeaa55e data/ultramarine/loot_tables/blocks/warped_cabinet.json 0ff0da2951e0965c55e4ba1394c3a7f1a71929bb data/ultramarine/loot_tables/blocks/weathered_red_stone_tile.json 6eb381f52df961301aeb1597a9cfeee005b56c4a data/ultramarine/loot_tables/blocks/weathered_stone.json @@ -4291,6 +4331,7 @@ d8e41dfa2a62106f65cf08330bdf57f4dccaca81 data/ultramarine/loot_tables/blocks/yel 35037870b4eb18347e4abc1be6ed92240e5ccc0f data/ultramarine/loot_tables/blocks/yellow_sky_lantern.json c4405cf0cc6215954753141e3b3f1c1b17b5f13c data/ultramarine/loot_tables/blocks/yellow_su_style_caihua.json 2738a6049697d67dba6ca04f1d51fd0980252653 data/ultramarine/recipes/abacus.json +22828a1a8dbebe056e4b0ca5d215b15160d566cd data/ultramarine/recipes/acacia_bracket.json 85e436b14d679e069d90c8b7e17c14f00f0fe386 data/ultramarine/recipes/architrave_template.json f7fb671ada2bea499b5098b7b1d97540bf6a7aa1 data/ultramarine/recipes/back_cushion.json 04c8b1ee20ca8a8bb9f065df2bf5e1d7baf98d76 data/ultramarine/recipes/bamboo_curtain.json @@ -4300,6 +4341,7 @@ c8a802b3c3aec2d6ac4b951a3467fbfb8af4e817 data/ultramarine/recipes/bamboo_mat_sla bf738c1ab0a025c1dfbf91702a5af0c3f46fc657 data/ultramarine/recipes/bamboo_mat_stairs_from_crafting.json 4c9677280d15ce19f1274b193b38f50a6cf2c182 data/ultramarine/recipes/bamboo_mat_stairs_from_woodworking.json 2d9171a231ba6fabd9d76cf439062864677cf43c data/ultramarine/recipes/bamboo_slips.json +da82bf6e716d9b3dcfa33c6b8050471d08670f35 data/ultramarine/recipes/birch_bracket.json 2258b24e64ce3c6b03fe4373da1cbc28d677e754 data/ultramarine/recipes/black_brick_from_blasting.json 659515621d7e9de143dce29ceeba56e674065ca6 data/ultramarine/recipes/black_brick_from_smelting.json 631ee575e5cc795fc43c1903c7cf3fbc9dc9d6bc data/ultramarine/recipes/black_brick_slab_from_crafting.json @@ -4428,6 +4470,7 @@ caa4f09e5853bba0d1629704fade995c58152126 data/ultramarine/recipes/chessboard.jso 538310622dc23ef04af91f09bea877eaa809ad70 data/ultramarine/recipes/cobalt_dust.json 1ee83afb1a53494ad0714b1f488782bd88bffc8d data/ultramarine/recipes/couplet.json a4f5b59274739f8837d9e96f7724b3b5f590b231 data/ultramarine/recipes/couplet_top.json +cd88798aa0d29a4a5010c1794067fc566fcab20f data/ultramarine/recipes/crimson_bracket.json 7f23644c1b6359a4517910f392c98ae3bd3d536e data/ultramarine/recipes/cut_cyan_floor_tiles.json 262c8135059d290e73415929505eaa3a1875f4bc data/ultramarine/recipes/cyan_and_blue_fangxin.json 90ffb08ccfc45d31c3c28b0d3f13ab187d5aea1b data/ultramarine/recipes/cyan_and_blue_fangxin_edge.json @@ -4477,6 +4520,7 @@ aa9f67e7db38550645ee6e2eae2e45b63d844e30 data/ultramarine/recipes/dark_blue_fang a505d6cf5ccb0bc78f89c18b9483868857342e29 data/ultramarine/recipes/dark_cyan_floor_tile.json 7647b1344fcffb0a559c8eaa059d9b25f3c10be5 data/ultramarine/recipes/dark_cyan_floor_tile_batch.json 2389bafb7d8e4294fe4669cfdad9571d72a8d2df data/ultramarine/recipes/dark_green_and_dark_blue_carved_wood.json +30a2542fdbb1d94aebd4b2f514f16ac143d14209 data/ultramarine/recipes/dark_oak_bracket.json 873fe2a1e42398cc016134e171d40c8bd75b93d9 data/ultramarine/recipes/dark_oak_rafter.json a4005ac36a259a006391389fa58ab18c1b134f24 data/ultramarine/recipes/dark_oak_rafter_end.json 8b2eb0554f3cf572c6142ee2ce9d1c213190966e data/ultramarine/recipes/ebony_cabinet.json @@ -4565,6 +4609,7 @@ ecb185310436b5831e2d95183126536e10c53568 data/ultramarine/recipes/imperial_jade_ 57f1e81128c26872bf30bffcc1df14b660c417be data/ultramarine/recipes/jade_candlestick.json a85a18a70ef13caaa5fb7d74a351501fbf5ef841 data/ultramarine/recipes/jade_parts.json 0e8e8e94ce28d944e858301d1a627b323032deb2 data/ultramarine/recipes/jade_pendant.json +4f50a00e31d5a89cf293ab054d036ddfc9eb5e1e data/ultramarine/recipes/jungle_bracket.json 386eb4cc3c65f32caaa7fa687b10b6e89e3320c5 data/ultramarine/recipes/knife.json ad2fea5cba25504754220357353ee03d315dfdd9 data/ultramarine/recipes/knife_rest.json 3aa5df9fe7610130079eed39345f834ac5dd1d1c data/ultramarine/recipes/knocker.json @@ -4621,6 +4666,7 @@ eea9e50264350ab893c698b582eefd5b4edccb6c data/ultramarine/recipes/medium_su_styl 1c139ce7f56e1713150caba1818697742ce03dd2 data/ultramarine/recipes/memorial_tablet.json 920017fdaa76279463269e0cc44eb1f6224d5dad data/ultramarine/recipes/mixed_cyan_floor_tiles.json ebf4a54d8ed527462aee4b9073b93658d98f6caf data/ultramarine/recipes/oak_bed.json +75df54c765e396a1ca3d0ff462c14ccede32b6c5 data/ultramarine/recipes/oak_bracket.json 734ae80816c84fa68ed0d91dfb8a6a79c81fe5cb data/ultramarine/recipes/oak_cabinet.json 4aefeeb90350900768c4cd5257f6bae04707259c data/ultramarine/recipes/octagonal_palace_lantern.json b40a8dbc58d6d4b3b3b1a131182a2bd28faffb67 data/ultramarine/recipes/orange_and_blue_carved_wood.json @@ -4727,6 +4773,7 @@ af5aa23283a6cc992bbb9a8d594c1c564426a4ec data/ultramarine/recipes/small_yellow_g c26404071bfb4ee8f42701d9ce6152860c9743da data/ultramarine/recipes/small_yellow_ivy_batch.json bada37a8b2c7588a6954ddf6e63a21e694bbb2a4 data/ultramarine/recipes/song_wooden_door.json 763f76085c0a99fb2a3ff527510e13a012787f20 data/ultramarine/recipes/song_wooden_window.json +89d0b588f8dc7edde900c5969480ae7bd90bb84a data/ultramarine/recipes/spruce_bracket.json 402ff8c13b83496031fbcdb855c7dc1ca9c649d8 data/ultramarine/recipes/spruce_pillar_base.json d8a56bc26b341e3819089e469d4d850bd1a3ceb2 data/ultramarine/recipes/square_palace_lantern.json 92c4768a62a11f3a94e6cf7de79be28cd1146532 data/ultramarine/recipes/standing_lamp.json @@ -4756,6 +4803,7 @@ bd4be6c7f38c72da70b9f2636420c990caf6124d data/ultramarine/recipes/variegated_roc 6c88dd417964dbb2edc9aa697da05207e20fc632 data/ultramarine/recipes/variegated_rocks.json c4f77c305baf6256c1fc8cf5d6e131241ed4c279 data/ultramarine/recipes/vertical_cyan_floor_tiles.json b9df5e92eb0106ca4702906c94fcc0b4cb6bf663 data/ultramarine/recipes/vertical_gilded_dark_oak_queti.json +ec8726ac16099b9a1b176a415e2b3d5fb6aab28b data/ultramarine/recipes/warped_bracket.json 3e4653493dc5c2e981311c970f86b0a15292f15d data/ultramarine/recipes/warped_cabinet.json 5538cce242a068790bede1cc27a53e1336d47e9b data/ultramarine/recipes/weathered_red_stone_tile.json 3f609906cd9d141dc7dbd7c4cb40b410a6902282 data/ultramarine/recipes/weathered_red_stone_tile_batch.json diff --git a/src/generated/resources/assets/ultramarine/blockstates/acacia_bracket.json b/src/generated/resources/assets/ultramarine/blockstates/acacia_bracket.json new file mode 100644 index 00000000..487d8647 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/acacia_bracket.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,waterlogged=false": { + "model": "ultramarine:block/acacia_bracket", + "y": 180 + }, + "facing=south,waterlogged=false": { + "model": "ultramarine:block/acacia_bracket" + }, + "facing=west,waterlogged=false": { + "model": "ultramarine:block/acacia_bracket", + "y": 90 + }, + "facing=east,waterlogged=false": { + "model": "ultramarine:block/acacia_bracket", + "y": 270 + }, + "facing=north,waterlogged=true": { + "model": "ultramarine:block/acacia_bracket", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "ultramarine:block/acacia_bracket" + }, + "facing=west,waterlogged=true": { + "model": "ultramarine:block/acacia_bracket", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "ultramarine:block/acacia_bracket", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/birch_bracket.json b/src/generated/resources/assets/ultramarine/blockstates/birch_bracket.json new file mode 100644 index 00000000..d45578da --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/birch_bracket.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,waterlogged=false": { + "model": "ultramarine:block/birch_bracket", + "y": 180 + }, + "facing=south,waterlogged=false": { + "model": "ultramarine:block/birch_bracket" + }, + "facing=west,waterlogged=false": { + "model": "ultramarine:block/birch_bracket", + "y": 90 + }, + "facing=east,waterlogged=false": { + "model": "ultramarine:block/birch_bracket", + "y": 270 + }, + "facing=north,waterlogged=true": { + "model": "ultramarine:block/birch_bracket", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "ultramarine:block/birch_bracket" + }, + "facing=west,waterlogged=true": { + "model": "ultramarine:block/birch_bracket", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "ultramarine:block/birch_bracket", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/crimson_bracket.json b/src/generated/resources/assets/ultramarine/blockstates/crimson_bracket.json new file mode 100644 index 00000000..c8c9cad3 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/crimson_bracket.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,waterlogged=false": { + "model": "ultramarine:block/crimson_bracket", + "y": 180 + }, + "facing=south,waterlogged=false": { + "model": "ultramarine:block/crimson_bracket" + }, + "facing=west,waterlogged=false": { + "model": "ultramarine:block/crimson_bracket", + "y": 90 + }, + "facing=east,waterlogged=false": { + "model": "ultramarine:block/crimson_bracket", + "y": 270 + }, + "facing=north,waterlogged=true": { + "model": "ultramarine:block/crimson_bracket", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "ultramarine:block/crimson_bracket" + }, + "facing=west,waterlogged=true": { + "model": "ultramarine:block/crimson_bracket", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "ultramarine:block/crimson_bracket", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/dark_oak_bracket.json b/src/generated/resources/assets/ultramarine/blockstates/dark_oak_bracket.json new file mode 100644 index 00000000..cd9520a1 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/dark_oak_bracket.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,waterlogged=false": { + "model": "ultramarine:block/dark_oak_bracket", + "y": 180 + }, + "facing=south,waterlogged=false": { + "model": "ultramarine:block/dark_oak_bracket" + }, + "facing=west,waterlogged=false": { + "model": "ultramarine:block/dark_oak_bracket", + "y": 90 + }, + "facing=east,waterlogged=false": { + "model": "ultramarine:block/dark_oak_bracket", + "y": 270 + }, + "facing=north,waterlogged=true": { + "model": "ultramarine:block/dark_oak_bracket", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "ultramarine:block/dark_oak_bracket" + }, + "facing=west,waterlogged=true": { + "model": "ultramarine:block/dark_oak_bracket", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "ultramarine:block/dark_oak_bracket", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/jungle_bracket.json b/src/generated/resources/assets/ultramarine/blockstates/jungle_bracket.json new file mode 100644 index 00000000..90e7175c --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/jungle_bracket.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,waterlogged=false": { + "model": "ultramarine:block/jungle_bracket", + "y": 180 + }, + "facing=south,waterlogged=false": { + "model": "ultramarine:block/jungle_bracket" + }, + "facing=west,waterlogged=false": { + "model": "ultramarine:block/jungle_bracket", + "y": 90 + }, + "facing=east,waterlogged=false": { + "model": "ultramarine:block/jungle_bracket", + "y": 270 + }, + "facing=north,waterlogged=true": { + "model": "ultramarine:block/jungle_bracket", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "ultramarine:block/jungle_bracket" + }, + "facing=west,waterlogged=true": { + "model": "ultramarine:block/jungle_bracket", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "ultramarine:block/jungle_bracket", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/oak_bracket.json b/src/generated/resources/assets/ultramarine/blockstates/oak_bracket.json new file mode 100644 index 00000000..6946b40c --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/oak_bracket.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,waterlogged=false": { + "model": "ultramarine:block/oak_bracket", + "y": 180 + }, + "facing=south,waterlogged=false": { + "model": "ultramarine:block/oak_bracket" + }, + "facing=west,waterlogged=false": { + "model": "ultramarine:block/oak_bracket", + "y": 90 + }, + "facing=east,waterlogged=false": { + "model": "ultramarine:block/oak_bracket", + "y": 270 + }, + "facing=north,waterlogged=true": { + "model": "ultramarine:block/oak_bracket", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "ultramarine:block/oak_bracket" + }, + "facing=west,waterlogged=true": { + "model": "ultramarine:block/oak_bracket", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "ultramarine:block/oak_bracket", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/spruce_bracket.json b/src/generated/resources/assets/ultramarine/blockstates/spruce_bracket.json new file mode 100644 index 00000000..727751f6 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/spruce_bracket.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,waterlogged=false": { + "model": "ultramarine:block/spruce_bracket", + "y": 180 + }, + "facing=south,waterlogged=false": { + "model": "ultramarine:block/spruce_bracket" + }, + "facing=west,waterlogged=false": { + "model": "ultramarine:block/spruce_bracket", + "y": 90 + }, + "facing=east,waterlogged=false": { + "model": "ultramarine:block/spruce_bracket", + "y": 270 + }, + "facing=north,waterlogged=true": { + "model": "ultramarine:block/spruce_bracket", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "ultramarine:block/spruce_bracket" + }, + "facing=west,waterlogged=true": { + "model": "ultramarine:block/spruce_bracket", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "ultramarine:block/spruce_bracket", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/warped_bracket.json b/src/generated/resources/assets/ultramarine/blockstates/warped_bracket.json new file mode 100644 index 00000000..78575d6b --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/warped_bracket.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,waterlogged=false": { + "model": "ultramarine:block/warped_bracket", + "y": 180 + }, + "facing=south,waterlogged=false": { + "model": "ultramarine:block/warped_bracket" + }, + "facing=west,waterlogged=false": { + "model": "ultramarine:block/warped_bracket", + "y": 90 + }, + "facing=east,waterlogged=false": { + "model": "ultramarine:block/warped_bracket", + "y": 270 + }, + "facing=north,waterlogged=true": { + "model": "ultramarine:block/warped_bracket", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "ultramarine:block/warped_bracket" + }, + "facing=west,waterlogged=true": { + "model": "ultramarine:block/warped_bracket", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "ultramarine:block/warped_bracket", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/acacia_bracket.json b/src/generated/resources/assets/ultramarine/models/block/acacia_bracket.json new file mode 100644 index 00000000..3c28aa9b --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/block/acacia_bracket.json @@ -0,0 +1,7 @@ +{ + "parent": "ultramarine:block/wooden_bracket", + "textures": { + "1": "minecraft:block/stripped_acacia_log", + "particle": "minecraft:block/stripped_acacia_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/birch_bracket.json b/src/generated/resources/assets/ultramarine/models/block/birch_bracket.json new file mode 100644 index 00000000..ffb9b66b --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/block/birch_bracket.json @@ -0,0 +1,7 @@ +{ + "parent": "ultramarine:block/wooden_bracket", + "textures": { + "1": "minecraft:block/stripped_birch_log", + "particle": "minecraft:block/stripped_birch_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/crimson_bracket.json b/src/generated/resources/assets/ultramarine/models/block/crimson_bracket.json new file mode 100644 index 00000000..dcd38247 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/block/crimson_bracket.json @@ -0,0 +1,7 @@ +{ + "parent": "ultramarine:block/wooden_bracket", + "textures": { + "1": "minecraft:block/stripped_crimson_stem", + "particle": "minecraft:block/stripped_crimson_stem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/dark_oak_bracket.json b/src/generated/resources/assets/ultramarine/models/block/dark_oak_bracket.json new file mode 100644 index 00000000..c48001d4 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/block/dark_oak_bracket.json @@ -0,0 +1,7 @@ +{ + "parent": "ultramarine:block/wooden_bracket", + "textures": { + "1": "minecraft:block/stripped_dark_oak_log", + "particle": "minecraft:block/stripped_dark_oak_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/jungle_bracket.json b/src/generated/resources/assets/ultramarine/models/block/jungle_bracket.json new file mode 100644 index 00000000..4aa49b04 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/block/jungle_bracket.json @@ -0,0 +1,7 @@ +{ + "parent": "ultramarine:block/wooden_bracket", + "textures": { + "1": "minecraft:block/stripped_jungle_log", + "particle": "minecraft:block/stripped_jungle_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/oak_bracket.json b/src/generated/resources/assets/ultramarine/models/block/oak_bracket.json new file mode 100644 index 00000000..622235e5 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/block/oak_bracket.json @@ -0,0 +1,7 @@ +{ + "parent": "ultramarine:block/wooden_bracket", + "textures": { + "1": "minecraft:block/stripped_oak_log", + "particle": "minecraft:block/stripped_oak_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/spruce_bracket.json b/src/generated/resources/assets/ultramarine/models/block/spruce_bracket.json new file mode 100644 index 00000000..f9872af8 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/block/spruce_bracket.json @@ -0,0 +1,7 @@ +{ + "parent": "ultramarine:block/wooden_bracket", + "textures": { + "1": "minecraft:block/stripped_spruce_log", + "particle": "minecraft:block/stripped_spruce_log" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/warped_bracket.json b/src/generated/resources/assets/ultramarine/models/block/warped_bracket.json new file mode 100644 index 00000000..845c8bad --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/block/warped_bracket.json @@ -0,0 +1,7 @@ +{ + "parent": "ultramarine:block/wooden_bracket", + "textures": { + "1": "minecraft:block/stripped_warped_stem", + "particle": "minecraft:block/stripped_warped_stem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/acacia_bracket.json b/src/generated/resources/assets/ultramarine/models/item/acacia_bracket.json new file mode 100644 index 00000000..652bb196 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/acacia_bracket.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/acacia_bracket" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/birch_bracket.json b/src/generated/resources/assets/ultramarine/models/item/birch_bracket.json new file mode 100644 index 00000000..e2b17e05 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/birch_bracket.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/birch_bracket" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/crimson_bracket.json b/src/generated/resources/assets/ultramarine/models/item/crimson_bracket.json new file mode 100644 index 00000000..b1db43a4 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/crimson_bracket.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/crimson_bracket" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/dark_oak_bracket.json b/src/generated/resources/assets/ultramarine/models/item/dark_oak_bracket.json new file mode 100644 index 00000000..f2855cb7 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/dark_oak_bracket.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/dark_oak_bracket" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/jungle_bracket.json b/src/generated/resources/assets/ultramarine/models/item/jungle_bracket.json new file mode 100644 index 00000000..350e29d6 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/jungle_bracket.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/jungle_bracket" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/oak_bracket.json b/src/generated/resources/assets/ultramarine/models/item/oak_bracket.json new file mode 100644 index 00000000..9029a44e --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/oak_bracket.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/oak_bracket" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/spruce_bracket.json b/src/generated/resources/assets/ultramarine/models/item/spruce_bracket.json new file mode 100644 index 00000000..e0f83cb8 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/spruce_bracket.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/spruce_bracket" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/warped_bracket.json b/src/generated/resources/assets/ultramarine/models/item/warped_bracket.json new file mode 100644 index 00000000..3f8f7670 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/warped_bracket.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/warped_bracket" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index 0768475d..28686973 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -8,6 +8,14 @@ "ultramarine:bamboo_mat", "ultramarine:bamboo_mat_slab", "ultramarine:bamboo_mat_stairs", + "ultramarine:oak_bracket", + "ultramarine:spruce_bracket", + "ultramarine:birch_bracket", + "ultramarine:jungle_bracket", + "ultramarine:acacia_bracket", + "ultramarine:dark_oak_bracket", + "ultramarine:crimson_bracket", + "ultramarine:warped_bracket", "ultramarine:red_carved_wood", "ultramarine:red_carved_wooden_slab", "ultramarine:red_carved_wooden_stairs", diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/acacia_bracket.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/acacia_bracket.json new file mode 100644 index 00000000..84dff55d --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/acacia_bracket.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:acacia_bracket" + ] + }, + "criteria": { + "has_wood": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [], + "tag": "minecraft:acacia_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:acacia_bracket" + } + } + }, + "requirements": [ + [ + "has_wood", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/birch_bracket.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/birch_bracket.json new file mode 100644 index 00000000..66663651 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/birch_bracket.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:birch_bracket" + ] + }, + "criteria": { + "has_wood": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [], + "tag": "minecraft:birch_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:birch_bracket" + } + } + }, + "requirements": [ + [ + "has_wood", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/crimson_bracket.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/crimson_bracket.json new file mode 100644 index 00000000..c17a8d71 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/crimson_bracket.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:crimson_bracket" + ] + }, + "criteria": { + "has_wood": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [], + "tag": "minecraft:crimson_stems" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:crimson_bracket" + } + } + }, + "requirements": [ + [ + "has_wood", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/dark_oak_bracket.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/dark_oak_bracket.json new file mode 100644 index 00000000..30227c46 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/dark_oak_bracket.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:dark_oak_bracket" + ] + }, + "criteria": { + "has_wood": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [], + "tag": "minecraft:dark_oak_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:dark_oak_bracket" + } + } + }, + "requirements": [ + [ + "has_wood", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/jungle_bracket.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/jungle_bracket.json new file mode 100644 index 00000000..1a69f901 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/jungle_bracket.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:jungle_bracket" + ] + }, + "criteria": { + "has_wood": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [], + "tag": "minecraft:jungle_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:jungle_bracket" + } + } + }, + "requirements": [ + [ + "has_wood", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/oak_bracket.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/oak_bracket.json new file mode 100644 index 00000000..82467e7c --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/oak_bracket.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:oak_bracket" + ] + }, + "criteria": { + "has_wood": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [], + "tag": "minecraft:oak_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:oak_bracket" + } + } + }, + "requirements": [ + [ + "has_wood", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/spruce_bracket.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/spruce_bracket.json new file mode 100644 index 00000000..d5bd44f3 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/spruce_bracket.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:spruce_bracket" + ] + }, + "criteria": { + "has_wood": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [], + "tag": "minecraft:spruce_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:spruce_bracket" + } + } + }, + "requirements": [ + [ + "has_wood", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/warped_bracket.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/warped_bracket.json new file mode 100644 index 00000000..e45ff6ea --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.decorative_blocks/warped_bracket.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:warped_bracket" + ] + }, + "criteria": { + "has_wood": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [], + "tag": "minecraft:warped_stems" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:warped_bracket" + } + } + }, + "requirements": [ + [ + "has_wood", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/acacia_bracket.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/acacia_bracket.json new file mode 100644 index 00000000..e6b9cd2b --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/acacia_bracket.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "acacia_bracket", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:acacia_bracket" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/birch_bracket.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/birch_bracket.json new file mode 100644 index 00000000..83148c99 --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/birch_bracket.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "birch_bracket", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:birch_bracket" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/crimson_bracket.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/crimson_bracket.json new file mode 100644 index 00000000..974f29e0 --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/crimson_bracket.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "crimson_bracket", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:crimson_bracket" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/dark_oak_bracket.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/dark_oak_bracket.json new file mode 100644 index 00000000..e42a8f74 --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/dark_oak_bracket.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "dark_oak_bracket", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:dark_oak_bracket" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/jungle_bracket.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/jungle_bracket.json new file mode 100644 index 00000000..bd123c17 --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/jungle_bracket.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "jungle_bracket", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:jungle_bracket" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/oak_bracket.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/oak_bracket.json new file mode 100644 index 00000000..a2ba54f5 --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/oak_bracket.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "oak_bracket", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:oak_bracket" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/spruce_bracket.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/spruce_bracket.json new file mode 100644 index 00000000..102aa403 --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/spruce_bracket.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "spruce_bracket", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:spruce_bracket" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/warped_bracket.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/warped_bracket.json new file mode 100644 index 00000000..5a88d8bf --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/warped_bracket.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "warped_bracket", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:warped_bracket" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/acacia_bracket.json b/src/generated/resources/data/ultramarine/recipes/acacia_bracket.json new file mode 100644 index 00000000..c88c7047 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/acacia_bracket.json @@ -0,0 +1,8 @@ +{ + "type": "ultramarine:woodworking", + "ingredient": { + "tag": "minecraft:acacia_logs" + }, + "result": "ultramarine:acacia_bracket", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/birch_bracket.json b/src/generated/resources/data/ultramarine/recipes/birch_bracket.json new file mode 100644 index 00000000..0a9353e2 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/birch_bracket.json @@ -0,0 +1,8 @@ +{ + "type": "ultramarine:woodworking", + "ingredient": { + "tag": "minecraft:birch_logs" + }, + "result": "ultramarine:birch_bracket", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/crimson_bracket.json b/src/generated/resources/data/ultramarine/recipes/crimson_bracket.json new file mode 100644 index 00000000..bf2e1a6c --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/crimson_bracket.json @@ -0,0 +1,8 @@ +{ + "type": "ultramarine:woodworking", + "ingredient": { + "tag": "minecraft:crimson_stems" + }, + "result": "ultramarine:crimson_bracket", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/dark_oak_bracket.json b/src/generated/resources/data/ultramarine/recipes/dark_oak_bracket.json new file mode 100644 index 00000000..00727f40 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/dark_oak_bracket.json @@ -0,0 +1,8 @@ +{ + "type": "ultramarine:woodworking", + "ingredient": { + "tag": "minecraft:dark_oak_logs" + }, + "result": "ultramarine:dark_oak_bracket", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/jungle_bracket.json b/src/generated/resources/data/ultramarine/recipes/jungle_bracket.json new file mode 100644 index 00000000..40adcc6f --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/jungle_bracket.json @@ -0,0 +1,8 @@ +{ + "type": "ultramarine:woodworking", + "ingredient": { + "tag": "minecraft:jungle_logs" + }, + "result": "ultramarine:jungle_bracket", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/oak_bracket.json b/src/generated/resources/data/ultramarine/recipes/oak_bracket.json new file mode 100644 index 00000000..dc29db08 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/oak_bracket.json @@ -0,0 +1,8 @@ +{ + "type": "ultramarine:woodworking", + "ingredient": { + "tag": "minecraft:oak_logs" + }, + "result": "ultramarine:oak_bracket", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/spruce_bracket.json b/src/generated/resources/data/ultramarine/recipes/spruce_bracket.json new file mode 100644 index 00000000..dfca033b --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/spruce_bracket.json @@ -0,0 +1,8 @@ +{ + "type": "ultramarine:woodworking", + "ingredient": { + "tag": "minecraft:spruce_logs" + }, + "result": "ultramarine:spruce_bracket", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/warped_bracket.json b/src/generated/resources/data/ultramarine/recipes/warped_bracket.json new file mode 100644 index 00000000..8ee733e6 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/warped_bracket.json @@ -0,0 +1,8 @@ +{ + "type": "ultramarine:woodworking", + "ingredient": { + "tag": "minecraft:warped_stems" + }, + "result": "ultramarine:warped_bracket", + "count": 1 +} \ No newline at end of file diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java index 1eef2773..b17a6bb8 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java @@ -148,6 +148,17 @@ public class BlockRegistry { * DECORATIVE BLOCKS */ + // SIMPLE WOODEN + + public static final RegistryObject OAK_BRACKET = BLOCKS.register("oak_bracket", () -> new Bracket(BaseBlockProperty.WOOD)); + public static final RegistryObject SPRUCE_BRACKET = BLOCKS.register("spruce_bracket", () -> new Bracket(BaseBlockProperty.WOOD)); + public static final RegistryObject BIRCH_BRACKET = BLOCKS.register("birch_bracket", () -> new Bracket(BaseBlockProperty.WOOD)); + public static final RegistryObject JUNGLE_BRACKET = BLOCKS.register("jungle_bracket", () -> new Bracket(BaseBlockProperty.WOOD)); + public static final RegistryObject ACACIA_BRACKET = BLOCKS.register("acacia_bracket", () -> new Bracket(BaseBlockProperty.WOOD)); + public static final RegistryObject DARK_OAK_BRACKET = BLOCKS.register("dark_oak_bracket", () -> new Bracket(BaseBlockProperty.WOOD)); + public static final RegistryObject CRIMSON_BRACKET = BLOCKS.register("crimson_bracket", () -> new Bracket(BaseBlockProperty.WOOD)); + public static final RegistryObject WARPED_BRACKET = BLOCKS.register("warped_bracket", () -> new Bracket(BaseBlockProperty.WOOD)); + // SIMPLE CARVED WOOD public static final RegistryObject RED_CARVED_WOOD = BLOCKS.register("red_carved_wood", () -> new BaseBlock(BaseBlockProperty.WOOD)); diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java index 46a7fb6d..77b59341 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java @@ -150,6 +150,17 @@ public class ItemRegistry { * DECORATIVE BLOCKS */ + // SIMPLE WOODEN + + public static final RegistryObject OAK_BRACKET = fromBlock(BlockRegistry.OAK_BRACKET, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject SPRUCE_BRACKET = fromBlock(BlockRegistry.SPRUCE_BRACKET, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject BIRCH_BRACKET = fromBlock(BlockRegistry.BIRCH_BRACKET, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject JUNGLE_BRACKET = fromBlock(BlockRegistry.JUNGLE_BRACKET, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject ACACIA_BRACKET = fromBlock(BlockRegistry.ACACIA_BRACKET, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject DARK_OAK_BRACKET = fromBlock(BlockRegistry.DARK_OAK_BRACKET, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject CRIMSON_BRACKET = fromBlock(BlockRegistry.CRIMSON_BRACKET, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject WARPED_BRACKET = fromBlock(BlockRegistry.WARPED_BRACKET, ModCreativeTab.DECORATIVE_BLOCKS); + // SIMPLE CARVED WOOD public static final RegistryObject RED_CARVED_WOOD = fromBlock(BlockRegistry.RED_CARVED_WOOD, ModCreativeTab.DECORATIVE_BLOCKS); diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java index adc9b4d7..da725d66 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java +++ b/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java @@ -118,6 +118,14 @@ protected void registerStatesAndModels() { railingBlock(BlockRegistry.CARVED_WOODEN_RAILING.get()); + woodenBracket(BlockRegistry.OAK_BRACKET.get(), mcLoc(BLOCK + "stripped_oak_log")); + woodenBracket(BlockRegistry.SPRUCE_BRACKET.get(), mcLoc(BLOCK + "stripped_spruce_log")); + woodenBracket(BlockRegistry.BIRCH_BRACKET.get(), mcLoc(BLOCK + "stripped_birch_log")); + woodenBracket(BlockRegistry.JUNGLE_BRACKET.get(), mcLoc(BLOCK + "stripped_jungle_log")); + woodenBracket(BlockRegistry.ACACIA_BRACKET.get(), mcLoc(BLOCK + "stripped_acacia_log")); + woodenBracket(BlockRegistry.DARK_OAK_BRACKET.get(), mcLoc(BLOCK + "stripped_dark_oak_log")); + woodenBracket(BlockRegistry.CRIMSON_BRACKET.get(), mcLoc(BLOCK + "stripped_crimson_stem")); + woodenBracket(BlockRegistry.WARPED_BRACKET.get(), mcLoc(BLOCK + "stripped_warped_stem")); simpleBlock(BlockRegistry.RED_CARVED_WOOD.get()); carvedWoodenSlab(BlockRegistry.RED_CARVED_WOODEN_SLAB.get(), BlockRegistry.RED_CARVED_WOOD.get()); straightStairs(BlockRegistry.RED_CARVED_WOODEN_STAIRS.get()); @@ -805,6 +813,10 @@ private void horizontalBlockNoOffset(Block block){ horizontalBlock(block, models().getExistingFile(modLoc(BLOCK + name(block))), 0); } + private void woodenBracket(Block block, ResourceLocation texture){ + horizontalBlock(block, models().withExistingParent(blockLoc(block).getPath(), modLoc(BLOCK + "wooden_bracket")).texture("1", texture).texture("particle", texture), 0); + } + private void shiftedHorizontalBlockNoOffset(Block block){ horizontalBlock(block, state -> { Boolean shifted = state.getValue(SHIFTED); diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java index da1c43cc..318249e7 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java +++ b/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java @@ -158,6 +158,17 @@ private static void categoryBuildingBlocks(@NotNull Consumer rec private static void categoryDecorativeBlocks(@NotNull Consumer recipeConsumer) { + // SIMPLE WOODEN + + woodworking(Ingredient.of(ItemTags.OAK_LOGS), ItemRegistry.OAK_BRACKET.get()).unlockedBy("has_wood", tagUnlock(ItemTags.OAK_LOGS)).save(recipeConsumer); + woodworking(Ingredient.of(ItemTags.SPRUCE_LOGS), ItemRegistry.SPRUCE_BRACKET.get()).unlockedBy("has_wood", tagUnlock(ItemTags.SPRUCE_LOGS)).save(recipeConsumer); + woodworking(Ingredient.of(ItemTags.BIRCH_LOGS), ItemRegistry.BIRCH_BRACKET.get()).unlockedBy("has_wood", tagUnlock(ItemTags.BIRCH_LOGS)).save(recipeConsumer); + woodworking(Ingredient.of(ItemTags.JUNGLE_LOGS), ItemRegistry.JUNGLE_BRACKET.get()).unlockedBy("has_wood", tagUnlock(ItemTags.JUNGLE_LOGS)).save(recipeConsumer); + woodworking(Ingredient.of(ItemTags.ACACIA_LOGS), ItemRegistry.ACACIA_BRACKET.get()).unlockedBy("has_wood", tagUnlock(ItemTags.ACACIA_LOGS)).save(recipeConsumer); + woodworking(Ingredient.of(ItemTags.DARK_OAK_LOGS), ItemRegistry.DARK_OAK_BRACKET.get()).unlockedBy("has_wood", tagUnlock(ItemTags.DARK_OAK_LOGS)).save(recipeConsumer); + woodworking(Ingredient.of(ItemTags.CRIMSON_STEMS), ItemRegistry.CRIMSON_BRACKET.get()).unlockedBy("has_wood", tagUnlock(ItemTags.CRIMSON_STEMS)).save(recipeConsumer); + woodworking(Ingredient.of(ItemTags.WARPED_STEMS), ItemRegistry.WARPED_BRACKET.get()).unlockedBy("has_wood", tagUnlock(ItemTags.WARPED_STEMS)).save(recipeConsumer); + // SIMPLE CARVED WOOD carvedWood(ItemRegistry.RED_CARVED_WOOD.get(), new Ingredient[]{Ingredient.of(ModItemTags.FORGE_RED_DYE), Ingredient.of(ModItemTags.FORGE_RED_DYE)}, recipeConsumer); diff --git a/src/main/resources/assets/ultramarine/lang/en_us.json b/src/main/resources/assets/ultramarine/lang/en_us.json index ec512257..b9298406 100644 --- a/src/main/resources/assets/ultramarine/lang/en_us.json +++ b/src/main/resources/assets/ultramarine/lang/en_us.json @@ -442,6 +442,14 @@ "block.ultramarine.red_wooden_railing": "Red Wooden Railing", "block.ultramarine.wooden_railing": "Wooden Railing", "block.ultramarine.wooden_railing_variant": "Wooden Railing Variant", + "block.ultramarine.oak_bracket": "Oak Bracket", + "block.ultramarine.spruce_bracket": "Spruce Bracket", + "block.ultramarine.birch_bracket": "Birch Bracket", + "block.ultramarine.jungle_bracket": "Jungle Bracket", + "block.ultramarine.acacia_bracket": "Acacia Bracket", + "block.ultramarine.dark_oak_bracket": "Dark Oak Bracket", + "block.ultramarine.crimson_bracket": "Crimson Bracket", + "block.ultramarine.warped_bracket": "Warped Bracket", "__comment9__": "Functional Blocks", "block.ultramarine.woodworking_workbench": "Woodworking Workbench", diff --git a/src/main/resources/assets/ultramarine/lang/zh_cn.json b/src/main/resources/assets/ultramarine/lang/zh_cn.json index 00845392..2358a966 100644 --- a/src/main/resources/assets/ultramarine/lang/zh_cn.json +++ b/src/main/resources/assets/ultramarine/lang/zh_cn.json @@ -441,6 +441,14 @@ "block.ultramarine.red_wooden_railing": "大红栏杆中心", "block.ultramarine.wooden_railing": "木栏杆", "block.ultramarine.wooden_railing_variant": "木栏杆变种", + "block.ultramarine.oak_bracket": "橡木拱", + "block.ultramarine.spruce_bracket": "云杉木拱", + "block.ultramarine.birch_bracket": "白桦木拱", + "block.ultramarine.jungle_bracket": "丛林木拱", + "block.ultramarine.acacia_bracket": "金合欢木拱", + "block.ultramarine.dark_oak_bracket": "深色橡木拱", + "block.ultramarine.crimson_bracket": "绯红木拱", + "block.ultramarine.warped_bracket": "诡异木拱", "__comment9__": "Functional Blocks", "block.ultramarine.woodworking_workbench": "木工桌", diff --git a/src/main/resources/assets/ultramarine/models/block/wooden_bracket.json b/src/main/resources/assets/ultramarine/models/block/wooden_bracket.json new file mode 100644 index 00000000..dacfecf4 --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/wooden_bracket.json @@ -0,0 +1,83 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "log" + }, + "elements": [ + { + "from": [0, 10, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 11, 16, 5], "texture": "#1"}, + "east": {"uv": [0, 5, 16, 11], "texture": "#1"}, + "south": {"uv": [0, 5, 16, 11], "texture": "#1"}, + "west": {"uv": [0, 5, 16, 11], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [3, 2, 3], + "to": [13, 10, 13], + "faces": { + "north": {"uv": [3, 6, 13, 14], "texture": "#1"}, + "east": {"uv": [3, 6, 13, 14], "texture": "#1"}, + "south": {"uv": [3, 6, 13, 14], "texture": "#1"}, + "west": {"uv": [3, 6, 13, 14], "texture": "#1"}, + "up": {"uv": [3, 6, 13, 14], "texture": "#1"}, + "down": {"uv": [3, 6, 13, 14], "texture": "#1"} + } + }, + { + "from": [3, 2, 13], + "to": [13, 8, 16], + "faces": { + "north": {"uv": [3, 1, 13, 7], "texture": "#1"}, + "east": {"uv": [5, 7, 11, 10], "rotation": 90, "texture": "#1"}, + "south": {"uv": [3, 1, 13, 7], "texture": "#1"}, + "west": {"uv": [5, 7, 11, 10], "rotation": 90, "texture": "#1"}, + "up": {"uv": [3, 7, 13, 10], "texture": "#1"}, + "down": {"uv": [3, 2, 13, 5], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2] + } + ] +} \ No newline at end of file