diff --git a/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 b/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 index 30f2014b..60558fda 100644 --- a/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 +++ b/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 @@ -1,4 +1,16 @@ -// 1.19.2 2023-06-02T14:09:23.4990502 Item Models: hexcasting +// 1.19.2 2023-06-04T21:59:01.7641342 Item Models: hexcasting +2fc68dcd6d73da3deaa6a33240dd9160a2b79592 assets/hexcasting/models/block/deco/quenched_allay_bricks_0.json +d59af7a48b20b210240b26115fb172d6202f9254 assets/hexcasting/models/block/deco/quenched_allay_bricks_1.json +a62eeebbca2d145c22f25725bd848ed4d673cefa assets/hexcasting/models/block/deco/quenched_allay_bricks_2.json +90e14c7ae44f667810fa5d31af5fd02cb575c13a assets/hexcasting/models/block/deco/quenched_allay_bricks_3.json +669d9348f4581dae45c35268a760675509a89a29 assets/hexcasting/models/block/deco/quenched_allay_bricks_small_0.json +bb65f6b36336fb4746e749a2b248e521ff24f901 assets/hexcasting/models/block/deco/quenched_allay_bricks_small_1.json +39b54b608cdf5e959a5c115379e45aaf590a254a assets/hexcasting/models/block/deco/quenched_allay_bricks_small_2.json +da0aee7c9516804372262165dc5aab16bd1c6ce6 assets/hexcasting/models/block/deco/quenched_allay_bricks_small_3.json +bacd99e8c24b9ce004e8aeff509cca4b971f3ed9 assets/hexcasting/models/block/deco/quenched_allay_tiles_0.json +1b272b737dea8a856c63e253359863dff7ec7e54 assets/hexcasting/models/block/deco/quenched_allay_tiles_1.json +9840fe9648aedd03ecda485e7c6466bbe2a418ba assets/hexcasting/models/block/deco/quenched_allay_tiles_2.json +71abe574694be3f0be75433068bae0489bae5055 assets/hexcasting/models/block/deco/quenched_allay_tiles_3.json 9af2754cb1e53eeaa85618cf92651b4878cf62b1 assets/hexcasting/models/block/quenched_allay_0.json de4ff723b4332d4e26bd01f74e0485e28c9a2178 assets/hexcasting/models/block/quenched_allay_1.json 4c29163e07f3a903017e38a9cc102f4b37db20b1 assets/hexcasting/models/block/quenched_allay_2.json @@ -6,6 +18,7 @@ de4ff723b4332d4e26bd01f74e0485e28c9a2178 assets/hexcasting/models/block/quenched f2156b3a7041cf99891b528393db64c6b9ca1a4f assets/hexcasting/models/item/abacus.json 19730853397b109cfedd0c3bbda83d5de6cd15b9 assets/hexcasting/models/item/akashic_record.json 8c735feff09d46d00ed681311f46f61a50cfdc9b assets/hexcasting/models/item/amethyst_dust.json +fbb8706993fbc3246c56b9f3eb274ff8968b70f8 assets/hexcasting/models/item/amethyst_pillar.json 87e7ee44cdd0808a3dd72babfd1db716df2bcdfe assets/hexcasting/models/item/artifact.json 1cd1b4d002d1a9a044ceab7cca842e4a2b7bd2f4 assets/hexcasting/models/item/artifact_0_filled.json 4709e65d8e74cf45b3ba014bdf70373728cccc78 assets/hexcasting/models/item/artifact_1.json @@ -64,6 +77,10 @@ de7f7dec75da3170672de5c46a87ff47297db12b assets/hexcasting/models/item/dye_color f867a3b2bbc117a782d49f0819b60f4727d1f483 assets/hexcasting/models/item/edified_button.json c9faada6299f388afc2d2798843d2b45159950d1 assets/hexcasting/models/item/edified_door.json 7f22e012a844cc2c5e30b0fcbdc2e7e4afac1c40 assets/hexcasting/models/item/edified_log.json +8197108bfba4b5963e3c0b1e76a04b8a0d6aae03 assets/hexcasting/models/item/edified_log_amethyst.json +7d6bd7d94d4417f85444c387fc34d9b6947858f1 assets/hexcasting/models/item/edified_log_aventurine.json +c13f4b5b9e57224107c7f7c00928a6873b437245 assets/hexcasting/models/item/edified_log_citrine.json +2415591623223d1cb1a4ac2aeb2d1337694fa9a9 assets/hexcasting/models/item/edified_log_purple.json 6b2c9d4aca0c869d7e18707c22b00c14e1d30f0c assets/hexcasting/models/item/edified_pressure_plate.json 31b4d60ff15a6d6de7aecb6feeba25a366bba2fd assets/hexcasting/models/item/edified_slab.json 2584421c2e9e1cdf22a703018b54cf449613d7d9 assets/hexcasting/models/item/edified_stairs.json @@ -130,7 +147,10 @@ d60b723c44183b59cbadfd02a911dab5e89e0e61 assets/hexcasting/models/item/pride_col c67e74e2a323872c3b34b113df99da8b77a501c6 assets/hexcasting/models/item/pride_colorizer_plural.json 7c4191ec2479b0a67e578da49d459deea8294ec4 assets/hexcasting/models/item/pride_colorizer_transgender.json 5038e069909e2dcf8664bcde81b229c8e27191ae assets/hexcasting/models/item/quenched_allay.json +6bef352b86abdaf9ce4f4942f01e746aa7cc62a2 assets/hexcasting/models/item/quenched_allay_bricks.json +c9aab9c7c0483766c670cfda7916323473e3c097 assets/hexcasting/models/item/quenched_allay_bricks_small.json a8859c93236b88f9ed46a4957f5723965ce04e03 assets/hexcasting/models/item/quenched_allay_shard.json +812d5b11011c52dc5ce97040f9df5125c0542d10 assets/hexcasting/models/item/quenched_allay_tiles.json 8105007d186fe2c6bea6958dd85d1b2ed3cecb58 assets/hexcasting/models/item/quenched_shard_0.json aef7d4b759bcc8a1d5b886b8a0170657e447a8d8 assets/hexcasting/models/item/quenched_shard_1.json 4a08374ef00de51381df9659488cb305e7c8674f assets/hexcasting/models/item/quenched_shard_2.json @@ -145,7 +165,9 @@ e5e1c3116c97deeee0ab5e87178043f4f1b53bea assets/hexcasting/models/item/scroll_an e4dd5a16b9914044c1721df150e02b657835d97b assets/hexcasting/models/item/scroll_pristine_small.json c809785d09b2545dac68d4a10b1e576454dd51e7 assets/hexcasting/models/item/scroll_small.json 9b82beea7667a8f9de3d1e8df136bb2034ed51a8 assets/hexcasting/models/item/slate.json +973361a2dd2ba5f3cd9fe2104f7ead43b085acc8 assets/hexcasting/models/item/slate_amethyst_pillar.json 612d4c65fb907c75975659edf00c7d92bf1b43d8 assets/hexcasting/models/item/slate_blank.json +96c85c64446072761910774b36924436c637faab assets/hexcasting/models/item/slate_pillar.json e6452f95b60240e0067769d7f32a0b9fa7718a1b assets/hexcasting/models/item/slate_written.json 34abd8e443c028eeb24535b685cb3876f7235c23 assets/hexcasting/models/item/spellbook.json 2c23e0ce8a59f0f143ab514f46251e39fae39d6e assets/hexcasting/models/item/spellbook_0_filled.json diff --git a/Common/src/generated/resources/.cache/d2fe5b6fab5fdc7ee7ca336c062752306bdf6128 b/Common/src/generated/resources/.cache/d2fe5b6fab5fdc7ee7ca336c062752306bdf6128 index c3cdd973..0f4cbf37 100644 --- a/Common/src/generated/resources/.cache/d2fe5b6fab5fdc7ee7ca336c062752306bdf6128 +++ b/Common/src/generated/resources/.cache/d2fe5b6fab5fdc7ee7ca336c062752306bdf6128 @@ -1,11 +1,14 @@ -// 1.19.2 2023-06-02T13:11:35.7728131 Block States: hexcasting +// 1.19.2 2023-06-04T22:11:58.5791186 Block States: hexcasting 901e38574bdaa40ea4a0f6e773a88a95d9c03e55 assets/hexcasting/blockstates/akashic_bookshelf.json 32a77ef668198002563d68be35a24fa93c8d454a assets/hexcasting/blockstates/akashic_connector.json 85080ce0a0387583a839e4788517d675a1a35e24 assets/hexcasting/blockstates/akashic_record.json +04221253f80c85d1e19e9688cae5039f257c8d63 assets/hexcasting/blockstates/amethyst_bricks.json +3b4d0e25a44b9ac1582a969bdd435c3d436b8ba8 assets/hexcasting/blockstates/amethyst_bricks_small.json 1919f303e32e4ea395caa26c1e08c65cd2641e95 assets/hexcasting/blockstates/amethyst_dust_block.json d422119401df3daae032f86ea740b6065a92c44c assets/hexcasting/blockstates/amethyst_edified_leaves.json +25990c171a75164aa282a23acae949b17173426d assets/hexcasting/blockstates/amethyst_pillar.json 276a70fa0e2b94ec3e2218015842b6e315157283 assets/hexcasting/blockstates/amethyst_sconce.json -8b35482fc7d38211847ee2e18b8df56cc06dece2 assets/hexcasting/blockstates/amethyst_tiles.json +09b6b22fecc577c4fcf4f7ad49f5d6907ef3d10a assets/hexcasting/blockstates/amethyst_tiles.json 65f7a4db6fa7616374ff814624231aec859d0a71 assets/hexcasting/blockstates/ancient_scroll_paper.json 236496e910696b68480a7b8a977434213fa2197a assets/hexcasting/blockstates/ancient_scroll_paper_lantern.json 2f2eb1130119f6d5f17a98082b727ec7a2ea5334 assets/hexcasting/blockstates/aventurine_edified_leaves.json @@ -17,6 +20,10 @@ b76cc8a2d66700417046c0dc671badd9af3eb519 assets/hexcasting/blockstates/directrix e125b73869a438bafa7f47cfa4c8d837e2463c6f assets/hexcasting/blockstates/edified_button.json 749d29dc5e11aeba703022dd66aad939d211a3b9 assets/hexcasting/blockstates/edified_door.json 9080ec8bb4142aa3f80775fb017d821585cdfeba assets/hexcasting/blockstates/edified_log.json +b9bbfe3288a699ef51ee0d21ec8e335f811353ca assets/hexcasting/blockstates/edified_log_amethyst.json +fc0f4407ef06ac962b5985db31800e05c8f1d1be assets/hexcasting/blockstates/edified_log_aventurine.json +56a1a09d9e755d5db882fad46c2c603037148f24 assets/hexcasting/blockstates/edified_log_citrine.json +1c6a336f3e975ef6c74a62f49f98af601f979a76 assets/hexcasting/blockstates/edified_log_purple.json 2a894cc506928113c967e65281950d91ca73ec50 assets/hexcasting/blockstates/edified_panel.json 61abf0ff91d33d51f2c1e0b5aace5580ad3ec5af assets/hexcasting/blockstates/edified_planks.json b2c7e0d8dd5ef0e942a28363649a88e268f36ce2 assets/hexcasting/blockstates/edified_pressure_plate.json @@ -30,10 +37,21 @@ b4c85725c8cddadffe0b80586dcd35a8d08b7f47 assets/hexcasting/blockstates/impetus/e d2c41f2997d018f2e8e095508378e6d9aa8d7b6c assets/hexcasting/blockstates/impetus/redstone.json d7c50e1ce1a4219f22e1c1ac6b5a1e38ee16d0d7 assets/hexcasting/blockstates/impetus/rightclick.json c41c3f2f39c9fa8a319a705e2183112df18cb4f8 assets/hexcasting/blockstates/quenched_allay.json +0cdb41c9716ca939f348876aebbb46921e490f0d assets/hexcasting/blockstates/quenched_allay_bricks.json +d595dc580e8c154c771131ab2ad0c982c1c6b280 assets/hexcasting/blockstates/quenched_allay_bricks_small.json +fb69a8b5507838f3e418a4f9724da20b73cfc2d0 assets/hexcasting/blockstates/quenched_allay_tiles.json 0aca7e2e67793a21ffc794c02fb2b22d02d2058a assets/hexcasting/blockstates/scroll_paper.json e5c88e23be0552d4c06062510e8feeab510472ef assets/hexcasting/blockstates/scroll_paper_lantern.json ef6b44bd2360926cb9dcde5bb3f1380385acea90 assets/hexcasting/blockstates/slate.json +9d2f430f379569c512ca80540bb0242f33066ed3 assets/hexcasting/blockstates/slate_amethyst_bricks.json +8de3b35109abb92bcd8f8ce0e05068abf37b0c27 assets/hexcasting/blockstates/slate_amethyst_bricks_small.json +b341fc5a5f113863b37bc3e0f4cb16d677a4baeb assets/hexcasting/blockstates/slate_amethyst_pillar.json +b52cc5b8ab2d301df1d220b2596b393a19a149fe assets/hexcasting/blockstates/slate_amethyst_tiles.json 571fe1d5dfdfd9dacd88bc6d04b1a10e01920bd9 assets/hexcasting/blockstates/slate_block.json +c8c732a2c32e0fbdd2d3c1f7de9d1633479f7ce1 assets/hexcasting/blockstates/slate_bricks.json +a67dc65f3b1e4035662154f0de32e33e2300ad3c assets/hexcasting/blockstates/slate_bricks_small.json +b4f572a104921eba369abe5c84af3682087067c9 assets/hexcasting/blockstates/slate_pillar.json +113b805c092cf5e62f0972056d0d53a591b5aae9 assets/hexcasting/blockstates/slate_tiles.json 13fc293e23c575b19f81f9c4bcd7131d2c34f678 assets/hexcasting/blockstates/stripped_edified_log.json d66dd72dfbc57537c39d98cf221cc0bfd108dc47 assets/hexcasting/blockstates/stripped_edified_wood.json b2f3c31e92c7ce6d5b42d95d7ece82b898a9f4f7 assets/hexcasting/models/block/akashic_bookshelf.json @@ -46,7 +64,6 @@ d3b9ed0fd896d96d9bf571ccf3e37d1101e5c162 assets/hexcasting/models/block/akashic_ e2a738dede302484f7c8d19dde58c08f841f0432 assets/hexcasting/models/block/akashic_record.json 218a4e73a221eae6b0da7ecdd7f64c0532be46ee assets/hexcasting/models/block/amethyst_dust_block.json 031fefc08eaad4f0d5b7b4b23a0f311f5b5b84b4 assets/hexcasting/models/block/amethyst_edified_leaves.json -a01a3f7c666a611dbf675b66eea2087d435e99d9 assets/hexcasting/models/block/amethyst_tiles.json c0a2818ae1162e8b93d32a913602ba8523476695 assets/hexcasting/models/block/ancient_scroll_paper.json 77d0a5c4496678f96da5103b49777e612e3cba1e assets/hexcasting/models/block/ancient_scroll_paper_lantern.json 8b6de8cb9ccea9a8e4ce207f0b72048881c11da9 assets/hexcasting/models/block/aventurine_edified_leaves.json @@ -136,6 +153,20 @@ b45b1e1ff5360c9bd5985bf6ea375df437da2b22 assets/hexcasting/models/block/circle/i b45b1e1ff5360c9bd5985bf6ea375df437da2b22 assets/hexcasting/models/block/circle/impetus/rightclick/lit_west.json 7b47963b4fb1598595cc972f8ac6a38d542c6cf8 assets/hexcasting/models/block/citrine_edified_leaves.json 8b556039d842c21d8cb4cb902aaa5ab6f657a566 assets/hexcasting/models/block/conjured.json +663e744436e300ccead6a7865c72beb86a12532b assets/hexcasting/models/block/deco/amethyst_bricks.json +8db7e7dff6590f9031718c0513e3d75f92ff2525 assets/hexcasting/models/block/deco/amethyst_bricks_small.json +4ba75056f28a3a9ea0c69eb4bd7167a43bd31d74 assets/hexcasting/models/block/deco/amethyst_pillar.json +498da886ef9ba804d18e9a9ebad2acce0efb4ac2 assets/hexcasting/models/block/deco/amethyst_tiles.json +11ed17c8196b894e7f46f72f58fae1286dec4636 assets/hexcasting/models/block/deco/slate_amethyst_bricks_0.json +a04e6772e19e0803217bad644b0f2b2d342cc0fb assets/hexcasting/models/block/deco/slate_amethyst_bricks_1.json +ea05d80cfd1b19be57a04502948bd72f6b39810f assets/hexcasting/models/block/deco/slate_amethyst_bricks_2.json +c7ace7614fedaa48a07e573948d3265eb9baf399 assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_0.json +6060174b4ee67529c5159a95b1d9a4dc29939558 assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_1.json +e7737a9b49cf47235ce4bc5661ae511fb5502f02 assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_2.json +7232b88842fa67b4d3c49d4080623c758f85d8cd assets/hexcasting/models/block/deco/slate_amethyst_tiles.json +d8cda16f0554a97039096a7c2fba50044bd5d0fa assets/hexcasting/models/block/deco/slate_bricks.json +099367e64dea6cef0399ccb30293e56030a5dc20 assets/hexcasting/models/block/deco/slate_bricks_small.json +606a997b09ab7b1b0b6ddf754b583bd7fceb2e46 assets/hexcasting/models/block/deco/slate_tiles.json d04e6e7976a44e4286f0693a0ea173bc08525c6d assets/hexcasting/models/block/edified_button.json 79b149288702e1239dee1f94f8562f8c37410d14 assets/hexcasting/models/block/edified_button_pressed.json b13efe9e1aade0163a8d378184a19a639b98c460 assets/hexcasting/models/block/edified_door_bottom_left.json @@ -147,7 +178,15 @@ b13efe9e1aade0163a8d378184a19a639b98c460 assets/hexcasting/models/block/edified_ 729cf57ba13bf915999b4297aadb2ef6848d0337 assets/hexcasting/models/block/edified_door_top_right.json db3008a51e611ee3ffb86b5829df6b7da6bfcc61 assets/hexcasting/models/block/edified_door_top_right_open.json c5433d0b5c9f039ae3c314c8a82c7e1d3238447d assets/hexcasting/models/block/edified_log.json +4e779dbe1d8dfcb2d500bf43d71ecf0bd0104eac assets/hexcasting/models/block/edified_log_amethyst.json +5c9d3a002deae195ba8bff03ac106c302d36792d assets/hexcasting/models/block/edified_log_amethyst_horizontal.json +a470e058329c844661a8011393b57d00efa1fe09 assets/hexcasting/models/block/edified_log_aventurine.json +20695e3c99b52b7738e96c57659bb358dbe9f9ec assets/hexcasting/models/block/edified_log_aventurine_horizontal.json +c38df07b2dada3843ce9399b244d2b9ecdb8faf2 assets/hexcasting/models/block/edified_log_citrine.json +df0e644143c2e50e1f165e89223796a758feb685 assets/hexcasting/models/block/edified_log_citrine_horizontal.json 71f1505d8255e1d57b8a9100b008dbaf73beacdc assets/hexcasting/models/block/edified_log_horizontal.json +231d3d0651bc8525e45f1c9a6bdcd0292b7209b4 assets/hexcasting/models/block/edified_log_purple.json +3cbf60f5ff164e84ae1224520f991a53c1177c14 assets/hexcasting/models/block/edified_log_purple_horizontal.json e691e8592c9ba75a2c67979ebef11e1c9280075b assets/hexcasting/models/block/edified_panel.json 7dbd6ab538ab6452c981275976d698a8cd7f5636 assets/hexcasting/models/block/edified_planks.json e291a8a550c6a31e1e11cdd590129d2b61aa3f36 assets/hexcasting/models/block/edified_planks_2.json @@ -166,9 +205,16 @@ ba95ea7a856895ca2a3438293b79fe4798b212ad assets/hexcasting/models/block/edified_ d4f286180e320c0ca819067b9e9a9b1db7f72e0a assets/hexcasting/models/block/edified_wood.json b2e1617c6549ffdf0a38bfbb6e9270a54c7a2718 assets/hexcasting/models/block/edified_wood_horizontal.json 9af2754cb1e53eeaa85618cf92651b4878cf62b1 assets/hexcasting/models/block/quenched_allay.json +2fc68dcd6d73da3deaa6a33240dd9160a2b79592 assets/hexcasting/models/block/quenched_allay_bricks.json +669d9348f4581dae45c35268a760675509a89a29 assets/hexcasting/models/block/quenched_allay_bricks_small.json +bacd99e8c24b9ce004e8aeff509cca4b971f3ed9 assets/hexcasting/models/block/quenched_allay_tiles.json 12ef9da44a265e8aa92d4c37d26fa0777493629e assets/hexcasting/models/block/scroll_paper.json 4f0924c356f9d7bccc490344944d44010ea7e918 assets/hexcasting/models/block/scroll_paper_lantern.json +e450fafba8beee7b800376ed54ff7c3ff7db5faf assets/hexcasting/models/block/slate_amethyst_pillar.json +c68d869d5320b9304ed301a3ce6dfa7dbea74747 assets/hexcasting/models/block/slate_amethyst_pillar_horizontal.json 603ffa587a335cf23e2bb17604583c6ad6f436b8 assets/hexcasting/models/block/slate_block.json +e7481aed52721e3893c4fa70341d696992223c25 assets/hexcasting/models/block/slate_pillar.json +5cfe93a217031aff9db6c9067c56d2366b13ac7e assets/hexcasting/models/block/slate_pillar_horizontal.json a5081ed63f45e689df2c2d6a6c1283bfcd89f20f assets/hexcasting/models/block/stripped_edified_log.json e5484f6caf6bea67cc8a447c202a4f1dc11957db assets/hexcasting/models/block/stripped_edified_log_horizontal.json 4495b24baf73ef0aaf930a136bf0052398aad1b3 assets/hexcasting/models/block/stripped_edified_wood.json @@ -176,10 +222,12 @@ ca5cd940b68d928845dc2d104da3dda8d15e45dd assets/hexcasting/models/block/stripped 19a6005af10d0812e8c861053f5863e6e04af3ba assets/hexcasting/models/item/akashic_bookshelf.json faf66c95b0725ee747c4e510414522121d9f80eb assets/hexcasting/models/item/akashic_connector.json 19730853397b109cfedd0c3bbda83d5de6cd15b9 assets/hexcasting/models/item/akashic_record.json +b5ddad23811e2f51a036c497dbe2e9f569801e79 assets/hexcasting/models/item/amethyst_bricks.json +f41f6f46a5a37e757eb4e4df3b10f68fc86efe66 assets/hexcasting/models/item/amethyst_bricks_small.json 951a9945880de02cae20c1afaf38b16b21194dd1 assets/hexcasting/models/item/amethyst_dust_block.json 144aa423e08987551a34aff969884a11c4efbff7 assets/hexcasting/models/item/amethyst_edified_leaves.json f81fdf1ffe88fab521b34901e983cd4836ce4529 assets/hexcasting/models/item/amethyst_sconce.json -d0eb15cbb5d10fdf43d421d89b4018ed60d352e2 assets/hexcasting/models/item/amethyst_tiles.json +fa23967e352823f0fc9e2bdd11a9cbac7c47b135 assets/hexcasting/models/item/amethyst_tiles.json 1d0a961ead6b43d20c621b351532656bf3a0d6d2 assets/hexcasting/models/item/ancient_scroll_paper.json d4a109488c27fc5d60e9054cd1485f1982040ff3 assets/hexcasting/models/item/ancient_scroll_paper_lantern.json 7c2b9b5296ba5e3c261bb237555e7d4082ad9303 assets/hexcasting/models/item/aventurine_edified_leaves.json @@ -195,4 +243,10 @@ cbe5bc7148b9e1c1cf5c4517801da664aa39efb8 assets/hexcasting/models/item/impetus/l e7f590cfc681aa7d19c56df325c95c5fbed01bc5 assets/hexcasting/models/item/impetus/rightclick.json 769dcfb4a504e4dcd28a43cf603a18c66f57e594 assets/hexcasting/models/item/scroll_paper.json 222e40e5754f5cb5a04321c4ed4cee27748c9224 assets/hexcasting/models/item/scroll_paper_lantern.json +e5b07f23ead1bba9ee5a3b86a9e520da883ba331 assets/hexcasting/models/item/slate_amethyst_bricks.json +826f953fdee668104ec1772941c56332e12dbc46 assets/hexcasting/models/item/slate_amethyst_bricks_small.json +a179178b90c8650b7906ce3aa302623bf3c427b7 assets/hexcasting/models/item/slate_amethyst_tiles.json 145db42b0d90bdb4fd82f5a7eea229be4c0f9675 assets/hexcasting/models/item/slate_block.json +eef72354b37ba0940ecf1e0cc5219cc15a6886a6 assets/hexcasting/models/item/slate_bricks.json +cb5ccddcc3654021fc134867303483bd135db65c assets/hexcasting/models/item/slate_bricks_small.json +71c735cca7c0b8c4e55b31fd87e46982552db135 assets/hexcasting/models/item/slate_tiles.json diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_bricks.json b/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_bricks.json new file mode 100644 index 00000000..267e1b4d --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hexcasting:block/deco/amethyst_bricks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_bricks_small.json new file mode 100644 index 00000000..66b78f9a --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_bricks_small.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hexcasting:block/deco/amethyst_bricks_small" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_pillar.json b/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_pillar.json new file mode 100644 index 00000000..257e10ca --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_pillar.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "hexcasting:block/deco/amethyst_pillar", + "x": 180 + }, + "facing=east": { + "model": "hexcasting:block/deco/amethyst_pillar", + "x": 90, + "y": 90 + }, + "facing=north": { + "model": "hexcasting:block/deco/amethyst_pillar", + "x": 90 + }, + "facing=south": { + "model": "hexcasting:block/deco/amethyst_pillar", + "x": 90, + "y": 180 + }, + "facing=up": { + "model": "hexcasting:block/deco/amethyst_pillar" + }, + "facing=west": { + "model": "hexcasting:block/deco/amethyst_pillar", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_tiles.json b/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_tiles.json index 79459a90..b716f2a5 100644 --- a/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_tiles.json +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/amethyst_tiles.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "hexcasting:block/amethyst_tiles" + "model": "hexcasting:block/deco/amethyst_tiles" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_amethyst.json b/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_amethyst.json new file mode 100644 index 00000000..7526dda3 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_amethyst.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "hexcasting:block/edified_log_amethyst_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "hexcasting:block/edified_log_amethyst" + }, + "axis=z": { + "model": "hexcasting:block/edified_log_amethyst_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_aventurine.json b/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_aventurine.json new file mode 100644 index 00000000..ed8e454e --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_aventurine.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "hexcasting:block/edified_log_aventurine_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "hexcasting:block/edified_log_aventurine" + }, + "axis=z": { + "model": "hexcasting:block/edified_log_aventurine_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_citrine.json b/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_citrine.json new file mode 100644 index 00000000..258b377a --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_citrine.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "hexcasting:block/edified_log_citrine_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "hexcasting:block/edified_log_citrine" + }, + "axis=z": { + "model": "hexcasting:block/edified_log_citrine_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_purple.json b/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_purple.json new file mode 100644 index 00000000..078f72a9 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/edified_log_purple.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "hexcasting:block/edified_log_purple_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "hexcasting:block/edified_log_purple" + }, + "axis=z": { + "model": "hexcasting:block/edified_log_purple_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/quenched_allay_bricks.json b/Common/src/generated/resources/assets/hexcasting/blockstates/quenched_allay_bricks.json new file mode 100644 index 00000000..e3d66f7e --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/quenched_allay_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hexcasting:block/quenched_allay_bricks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/quenched_allay_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/blockstates/quenched_allay_bricks_small.json new file mode 100644 index 00000000..72aad9ca --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/quenched_allay_bricks_small.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hexcasting:block/quenched_allay_bricks_small" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/quenched_allay_tiles.json b/Common/src/generated/resources/assets/hexcasting/blockstates/quenched_allay_tiles.json new file mode 100644 index 00000000..ddb791a0 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/quenched_allay_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hexcasting:block/quenched_allay_tiles" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_bricks.json b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_bricks.json new file mode 100644 index 00000000..e99315f3 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_bricks.json @@ -0,0 +1,15 @@ +{ + "variants": { + "": [ + { + "model": "hexcasting:block/deco/slate_amethyst_bricks_0" + }, + { + "model": "hexcasting:block/deco/slate_amethyst_bricks_1" + }, + { + "model": "hexcasting:block/deco/slate_amethyst_bricks_2" + } + ] + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_bricks_small.json new file mode 100644 index 00000000..e6b5557c --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_bricks_small.json @@ -0,0 +1,15 @@ +{ + "variants": { + "": [ + { + "model": "hexcasting:block/deco/slate_amethyst_bricks_small_0" + }, + { + "model": "hexcasting:block/deco/slate_amethyst_bricks_small_1" + }, + { + "model": "hexcasting:block/deco/slate_amethyst_bricks_small_2" + } + ] + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_pillar.json b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_pillar.json new file mode 100644 index 00000000..056bc449 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "hexcasting:block/slate_amethyst_pillar_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "hexcasting:block/slate_amethyst_pillar" + }, + "axis=z": { + "model": "hexcasting:block/slate_amethyst_pillar_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_tiles.json b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_tiles.json new file mode 100644 index 00000000..4c5f5d61 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_amethyst_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hexcasting:block/deco/slate_amethyst_tiles" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/slate_bricks.json b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_bricks.json new file mode 100644 index 00000000..003a0daa --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hexcasting:block/deco/slate_bricks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/slate_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_bricks_small.json new file mode 100644 index 00000000..cdd21fd4 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_bricks_small.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hexcasting:block/deco/slate_bricks_small" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/slate_pillar.json b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_pillar.json new file mode 100644 index 00000000..6d0e098f --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "hexcasting:block/slate_pillar_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "hexcasting:block/slate_pillar" + }, + "axis=z": { + "model": "hexcasting:block/slate_pillar_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/slate_tiles.json b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_tiles.json new file mode 100644 index 00000000..1482ae08 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/blockstates/slate_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hexcasting:block/deco/slate_tiles" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_bricks.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_bricks.json new file mode 100644 index 00000000..89c8ec51 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/amethyst_bricks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_bricks_small.json new file mode 100644 index 00000000..fc1202b6 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_bricks_small.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/amethyst_bricks_small" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_pillar.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_pillar.json new file mode 100644 index 00000000..5ee8934b --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_pillar.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "hexcasting:block/deco/amethyst_pillar_bottom", + "side": "hexcasting:block/deco/amethyst_pillar_side", + "top": "hexcasting:block/deco/amethyst_pillar_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_tiles.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_tiles.json new file mode 100644 index 00000000..ab9ffcda --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/amethyst_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/amethyst_tiles" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_0.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_0.json new file mode 100644 index 00000000..e0c97c18 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_bricks_0" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_1.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_1.json new file mode 100644 index 00000000..61215cda --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_bricks_1" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_2.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_2.json new file mode 100644 index 00000000..536da900 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_bricks_2" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_3.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_3.json new file mode 100644 index 00000000..e45bf99d --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_bricks_3" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_0.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_0.json new file mode 100644 index 00000000..2b93f327 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_bricks_small_0" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_1.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_1.json new file mode 100644 index 00000000..91ade205 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_bricks_small_1" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_2.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_2.json new file mode 100644 index 00000000..e6b6bd7b --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_bricks_small_2" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_3.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_3.json new file mode 100644 index 00000000..7da0cdfc --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_bricks_small_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_bricks_small_3" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_0.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_0.json new file mode 100644 index 00000000..3d953c56 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_tiles_0" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_1.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_1.json new file mode 100644 index 00000000..6d6150b8 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_tiles_1" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_2.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_2.json new file mode 100644 index 00000000..758194fe --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_tiles_2" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_3.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_3.json new file mode 100644 index 00000000..5c83c33e --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/quenched_allay_tiles_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_tiles_3" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_0.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_0.json new file mode 100644 index 00000000..910ec099 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/slate_amethyst_bricks_0" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_1.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_1.json new file mode 100644 index 00000000..4d565a54 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/slate_amethyst_bricks_1" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_2.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_2.json new file mode 100644 index 00000000..a9072bac --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/slate_amethyst_bricks_2" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_0.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_0.json new file mode 100644 index 00000000..ad3c92af --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/slate_amethyst_bricks_small_0" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_1.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_1.json new file mode 100644 index 00000000..1f24ff9a --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/slate_amethyst_bricks_small_1" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_2.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_2.json new file mode 100644 index 00000000..e106adbe --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_bricks_small_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/slate_amethyst_bricks_small_2" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_tiles.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_tiles.json new file mode 100644 index 00000000..2c80ba14 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_amethyst_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/slate_amethyst_tiles" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_bricks.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_bricks.json new file mode 100644 index 00000000..7fb51bcd --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/slate_bricks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_bricks_small.json new file mode 100644 index 00000000..3b262eaf --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_bricks_small.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/slate_bricks_small" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/amethyst_tiles.json b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_tiles.json similarity index 57% rename from Common/src/generated/resources/assets/hexcasting/models/block/amethyst_tiles.json rename to Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_tiles.json index 9870b725..d18efee9 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/block/amethyst_tiles.json +++ b/Common/src/generated/resources/assets/hexcasting/models/block/deco/slate_tiles.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "hexcasting:block/amethyst_tiles" + "all": "hexcasting:block/deco/slate_tiles" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_amethyst.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_amethyst.json new file mode 100644 index 00000000..e9833c81 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_amethyst.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "hexcasting:block/edified_log_top", + "side": "hexcasting:block/deco/edified_log_amethyst" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_amethyst_horizontal.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_amethyst_horizontal.json new file mode 100644 index 00000000..fdfc8bd1 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_amethyst_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "hexcasting:block/edified_log_top", + "side": "hexcasting:block/deco/edified_log_amethyst" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_aventurine.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_aventurine.json new file mode 100644 index 00000000..f9f832f6 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_aventurine.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "hexcasting:block/edified_log_top", + "side": "hexcasting:block/deco/edified_log_aventurine" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_aventurine_horizontal.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_aventurine_horizontal.json new file mode 100644 index 00000000..e7ddcd8e --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_aventurine_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "hexcasting:block/edified_log_top", + "side": "hexcasting:block/deco/edified_log_aventurine" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_citrine.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_citrine.json new file mode 100644 index 00000000..ea1b1d60 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_citrine.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "hexcasting:block/edified_log_top", + "side": "hexcasting:block/deco/edified_log_citrine" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_citrine_horizontal.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_citrine_horizontal.json new file mode 100644 index 00000000..2ae70b9a --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_citrine_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "hexcasting:block/edified_log_top", + "side": "hexcasting:block/deco/edified_log_citrine" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_purple.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_purple.json new file mode 100644 index 00000000..70736370 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_purple.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "hexcasting:block/edified_log_top", + "side": "hexcasting:block/deco/edified_log_purple" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_purple_horizontal.json b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_purple_horizontal.json new file mode 100644 index 00000000..235890db --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/edified_log_purple_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "hexcasting:block/edified_log_top", + "side": "hexcasting:block/deco/edified_log_purple" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/quenched_allay_bricks.json b/Common/src/generated/resources/assets/hexcasting/models/block/quenched_allay_bricks.json new file mode 100644 index 00000000..e0c97c18 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/quenched_allay_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_bricks_0" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/quenched_allay_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/models/block/quenched_allay_bricks_small.json new file mode 100644 index 00000000..2b93f327 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/quenched_allay_bricks_small.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_bricks_small_0" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/quenched_allay_tiles.json b/Common/src/generated/resources/assets/hexcasting/models/block/quenched_allay_tiles.json new file mode 100644 index 00000000..3d953c56 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/quenched_allay_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hexcasting:block/deco/quenched_allay_tiles_0" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/slate_amethyst_pillar.json b/Common/src/generated/resources/assets/hexcasting/models/block/slate_amethyst_pillar.json new file mode 100644 index 00000000..1ec3ef6c --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/slate_amethyst_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "hexcasting:block/deco/slate_amethyst_pillar_end", + "side": "hexcasting:block/deco/slate_amethyst_pillar_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/slate_amethyst_pillar_horizontal.json b/Common/src/generated/resources/assets/hexcasting/models/block/slate_amethyst_pillar_horizontal.json new file mode 100644 index 00000000..bbd24d1c --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/slate_amethyst_pillar_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "hexcasting:block/deco/slate_amethyst_pillar_end", + "side": "hexcasting:block/deco/slate_amethyst_pillar_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/slate_pillar.json b/Common/src/generated/resources/assets/hexcasting/models/block/slate_pillar.json new file mode 100644 index 00000000..697f4daa --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/slate_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "hexcasting:block/deco/slate_pillar_end", + "side": "hexcasting:block/deco/slate_pillar_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/slate_pillar_horizontal.json b/Common/src/generated/resources/assets/hexcasting/models/block/slate_pillar_horizontal.json new file mode 100644 index 00000000..cca16a0c --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/block/slate_pillar_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "hexcasting:block/deco/slate_pillar_end", + "side": "hexcasting:block/deco/slate_pillar_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_bricks.json b/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_bricks.json new file mode 100644 index 00000000..5ec08429 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/deco/amethyst_bricks" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_bricks_small.json new file mode 100644 index 00000000..1b8fe48d --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_bricks_small.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/deco/amethyst_bricks_small" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_pillar.json b/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_pillar.json new file mode 100644 index 00000000..98d9d0c8 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/deco/amethyst_pillar" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_tiles.json b/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_tiles.json index 580c37a9..b8ecd40c 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_tiles.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/amethyst_tiles.json @@ -1,3 +1,3 @@ { - "parent": "hexcasting:block/amethyst_tiles" + "parent": "hexcasting:block/deco/amethyst_tiles" } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_amethyst.json b/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_amethyst.json new file mode 100644 index 00000000..8e80eb67 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_amethyst.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/edified_log_amethyst" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_aventurine.json b/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_aventurine.json new file mode 100644 index 00000000..45007ec4 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_aventurine.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/edified_log_aventurine" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_citrine.json b/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_citrine.json new file mode 100644 index 00000000..9cae3948 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_citrine.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/edified_log_citrine" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_purple.json b/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_purple.json new file mode 100644 index 00000000..62c67453 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/edified_log_purple.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/edified_log_purple" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/quenched_allay_bricks.json b/Common/src/generated/resources/assets/hexcasting/models/item/quenched_allay_bricks.json new file mode 100644 index 00000000..c3a1b638 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/quenched_allay_bricks.json @@ -0,0 +1,28 @@ +{ + "overrides": [ + { + "model": "hexcasting:block/deco/quenched_allay_bricks_0", + "predicate": { + "hexcasting:variant": 0.0 + } + }, + { + "model": "hexcasting:block/deco/quenched_allay_bricks_1", + "predicate": { + "hexcasting:variant": 1.0 + } + }, + { + "model": "hexcasting:block/deco/quenched_allay_bricks_2", + "predicate": { + "hexcasting:variant": 2.0 + } + }, + { + "model": "hexcasting:block/deco/quenched_allay_bricks_3", + "predicate": { + "hexcasting:variant": 3.0 + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/quenched_allay_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/models/item/quenched_allay_bricks_small.json new file mode 100644 index 00000000..c0e376a5 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/quenched_allay_bricks_small.json @@ -0,0 +1,28 @@ +{ + "overrides": [ + { + "model": "hexcasting:block/deco/quenched_allay_bricks_small_0", + "predicate": { + "hexcasting:variant": 0.0 + } + }, + { + "model": "hexcasting:block/deco/quenched_allay_bricks_small_1", + "predicate": { + "hexcasting:variant": 1.0 + } + }, + { + "model": "hexcasting:block/deco/quenched_allay_bricks_small_2", + "predicate": { + "hexcasting:variant": 2.0 + } + }, + { + "model": "hexcasting:block/deco/quenched_allay_bricks_small_3", + "predicate": { + "hexcasting:variant": 3.0 + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/quenched_allay_tiles.json b/Common/src/generated/resources/assets/hexcasting/models/item/quenched_allay_tiles.json new file mode 100644 index 00000000..5ea5cf33 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/quenched_allay_tiles.json @@ -0,0 +1,28 @@ +{ + "overrides": [ + { + "model": "hexcasting:block/deco/quenched_allay_tiles_0", + "predicate": { + "hexcasting:variant": 0.0 + } + }, + { + "model": "hexcasting:block/deco/quenched_allay_tiles_1", + "predicate": { + "hexcasting:variant": 1.0 + } + }, + { + "model": "hexcasting:block/deco/quenched_allay_tiles_2", + "predicate": { + "hexcasting:variant": 2.0 + } + }, + { + "model": "hexcasting:block/deco/quenched_allay_tiles_3", + "predicate": { + "hexcasting:variant": 3.0 + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_bricks.json b/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_bricks.json new file mode 100644 index 00000000..727a50c8 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/deco/slate_amethyst_bricks_0" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_bricks_small.json new file mode 100644 index 00000000..accf94f2 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_bricks_small.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/deco/slate_amethyst_bricks_small_0" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_pillar.json b/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_pillar.json new file mode 100644 index 00000000..74988731 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/slate_amethyst_pillar" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_tiles.json b/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_tiles.json new file mode 100644 index 00000000..e20b742c --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/slate_amethyst_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/deco/slate_amethyst_tiles" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/slate_bricks.json b/Common/src/generated/resources/assets/hexcasting/models/item/slate_bricks.json new file mode 100644 index 00000000..adc88039 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/slate_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/deco/slate_bricks" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/slate_bricks_small.json b/Common/src/generated/resources/assets/hexcasting/models/item/slate_bricks_small.json new file mode 100644 index 00000000..4d0555b2 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/slate_bricks_small.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/deco/slate_bricks_small" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/slate_pillar.json b/Common/src/generated/resources/assets/hexcasting/models/item/slate_pillar.json new file mode 100644 index 00000000..8d6a18fa --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/slate_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/slate_pillar" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/slate_tiles.json b/Common/src/generated/resources/assets/hexcasting/models/item/slate_tiles.json new file mode 100644 index 00000000..c2bf7616 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/slate_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "hexcasting:block/deco/slate_tiles" +} \ No newline at end of file diff --git a/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java b/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java index 95a96dee..74d79a42 100644 --- a/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java +++ b/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java @@ -30,6 +30,7 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.item.Item; @@ -39,16 +40,18 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; +import java.util.*; import java.util.function.*; import static at.petrak.hexcasting.api.HexAPI.modLoc; public class RegisterClientStuff { - public static List QUENCHED_ALLAY_VARIANTS = new ArrayList<>(); + public static Map> QUENCHED_ALLAY_VARIANTS = new HashMap<>(); + private static final Map QUENCHED_ALLAY_TYPES = Map.of( + HexBlocks.QUENCHED_ALLAY, false, + HexBlocks.QUENCHED_ALLAY_TILES, true, + HexBlocks.QUENCHED_ALLAY_BRICKS, true, + HexBlocks.QUENCHED_ALLAY_BRICKS_SMALL, true); public static void init() { registerSealableDataHolderOverrides(HexItems.FOCUS, @@ -107,6 +110,9 @@ public class RegisterClientStuff { registerGaslight4(HexItems.STAFF_QUENCHED); registerGaslight4(HexBlocks.QUENCHED_ALLAY.asItem()); + registerGaslight4(HexBlocks.QUENCHED_ALLAY_TILES.asItem()); + registerGaslight4(HexBlocks.QUENCHED_ALLAY_BRICKS.asItem()); + registerGaslight4(HexBlocks.QUENCHED_ALLAY_BRICKS_SMALL.asItem()); registerGaslight4(HexItems.QUENCHED_SHARD); x.setRenderLayer(HexBlocks.CONJURED_LIGHT, RenderType.cutout()); @@ -233,6 +239,12 @@ public class RegisterClientStuff { BlockEntityAkashicBookshelfRenderer::new); registerer.registerBlockEntityRenderer(HexBlockEntities.QUENCHED_ALLAY_TILE, BlockEntityQuenchedAllayRenderer::new); + registerer.registerBlockEntityRenderer(HexBlockEntities.QUENCHED_ALLAY_TILES_TILE, + BlockEntityQuenchedAllayRenderer::new); + registerer.registerBlockEntityRenderer(HexBlockEntities.QUENCHED_ALLAY_BRICKS_TILE, + BlockEntityQuenchedAllayRenderer::new); + registerer.registerBlockEntityRenderer(HexBlockEntities.QUENCHED_ALLAY_BRICKS_SMALL_TILE, + BlockEntityQuenchedAllayRenderer::new); } @FunctionalInterface @@ -242,16 +254,32 @@ public class RegisterClientStuff { } public static void onModelRegister(ResourceManager recMan, Consumer extraModels) { - for (int i = 0; i < BlockQuenchedAllay.VARIANTS; i++) { - extraModels.accept(modLoc("block/quenched_allay_" + i)); + for (var type : QUENCHED_ALLAY_TYPES.entrySet()) { + var blockLoc = Registry.BLOCK.getKey(type.getKey()); + var locStart = "block/"; + if (type.getValue()) + locStart += "deco/"; + + for (int i = 0; i < BlockQuenchedAllay.VARIANTS; i++) { + extraModels.accept(modLoc( locStart + blockLoc.getPath() + "_" + i)); + } } } public static void onModelBake(ModelBakery loader, Map map) { - for (int i = 0; i < BlockQuenchedAllay.VARIANTS; i++) { - var variantLoc = modLoc("block/quenched_allay_" + i); - var model = map.get(variantLoc); - QUENCHED_ALLAY_VARIANTS.add(model); + for (var type : QUENCHED_ALLAY_TYPES.entrySet()) { + var blockLoc = Registry.BLOCK.getKey(type.getKey()); + var locStart = "block/"; + if (type.getValue()) + locStart += "deco/"; + + var list = new ArrayList(); + for (int i = 0; i < BlockQuenchedAllay.VARIANTS; i++) { + var variantLoc = modLoc(locStart + blockLoc.getPath() + "_" + i); + var model = map.get(variantLoc); + list.add(model); + } + QUENCHED_ALLAY_VARIANTS.put(blockLoc, list); } } } diff --git a/Common/src/main/java/at/petrak/hexcasting/client/render/be/BlockEntityQuenchedAllayRenderer.java b/Common/src/main/java/at/petrak/hexcasting/client/render/be/BlockEntityQuenchedAllayRenderer.java index 46446015..82e37713 100644 --- a/Common/src/main/java/at/petrak/hexcasting/client/render/be/BlockEntityQuenchedAllayRenderer.java +++ b/Common/src/main/java/at/petrak/hexcasting/client/render/be/BlockEntityQuenchedAllayRenderer.java @@ -11,6 +11,7 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.BlockRenderDispatcher; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; +import net.minecraft.core.Registry; import net.minecraft.world.phys.AABB; // TODO: this doesn't cover the block being *behind* something. Is it possible to cleanly do that? @@ -22,13 +23,13 @@ public class BlockEntityQuenchedAllayRenderer implements BlockEntityRenderer $$0) { + $$0.add(FACING); + } + + public BlockState getStateForPlacement(BlockPlaceContext ctx) { + return this.defaultBlockState().setValue(FACING, ctx.getClickedFace()); + } +} \ No newline at end of file diff --git a/Common/src/main/java/at/petrak/hexcasting/common/blocks/entity/BlockEntityQuenchedAllay.java b/Common/src/main/java/at/petrak/hexcasting/common/blocks/entity/BlockEntityQuenchedAllay.java index e43f691f..dac5512a 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/blocks/entity/BlockEntityQuenchedAllay.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/blocks/entity/BlockEntityQuenchedAllay.java @@ -1,17 +1,24 @@ package at.petrak.hexcasting.common.blocks.entity; import at.petrak.hexcasting.api.block.HexBlockEntity; +import at.petrak.hexcasting.common.blocks.BlockQuenchedAllay; import at.petrak.hexcasting.common.lib.HexBlockEntities; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.state.BlockState; +import java.util.function.BiFunction; + /** * No-op BE just to have a BER */ public class BlockEntityQuenchedAllay extends HexBlockEntity { - public BlockEntityQuenchedAllay(BlockPos pos, BlockState blockState) { - super(HexBlockEntities.QUENCHED_ALLAY_TILE, pos, blockState); + public BlockEntityQuenchedAllay(BlockQuenchedAllay block, BlockPos pos, BlockState blockState) { + super(HexBlockEntities.typeForQuenchedAllay(block), pos, blockState); + } + + public static BiFunction fromKnownBlock(BlockQuenchedAllay block) { + return (pos, state) -> new BlockEntityQuenchedAllay(block, pos, state); } @Override diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlockEntities.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlockEntities.java index 2983a5e1..6e229206 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlockEntities.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlockEntities.java @@ -1,6 +1,7 @@ package at.petrak.hexcasting.common.lib; import at.petrak.hexcasting.api.HexAPI; +import at.petrak.hexcasting.common.blocks.BlockQuenchedAllay; import at.petrak.hexcasting.common.blocks.akashic.BlockEntityAkashicBookshelf; import at.petrak.hexcasting.common.blocks.circles.BlockEntitySlate; import at.petrak.hexcasting.common.blocks.circles.impetuses.BlockEntityLookingImpetus; @@ -53,7 +54,28 @@ public class HexBlockEntities { BlockEntitySlate::new, HexBlocks.SLATE); public static final BlockEntityType QUENCHED_ALLAY_TILE = register( - "quenched_allay", BlockEntityQuenchedAllay::new, HexBlocks.QUENCHED_ALLAY); + "quenched_allay", BlockEntityQuenchedAllay.fromKnownBlock(HexBlocks.QUENCHED_ALLAY), HexBlocks.QUENCHED_ALLAY); + + public static final BlockEntityType QUENCHED_ALLAY_TILES_TILE = register( + "quenched_allay_tiles", BlockEntityQuenchedAllay.fromKnownBlock(HexBlocks.QUENCHED_ALLAY_TILES), HexBlocks.QUENCHED_ALLAY_TILES); + + public static final BlockEntityType QUENCHED_ALLAY_BRICKS_TILE = register( + "quenched_allay_bricks", BlockEntityQuenchedAllay.fromKnownBlock(HexBlocks.QUENCHED_ALLAY_BRICKS), HexBlocks.QUENCHED_ALLAY_BRICKS); + + public static final BlockEntityType QUENCHED_ALLAY_BRICKS_SMALL_TILE = register( + "quenched_allay_bricks_small", BlockEntityQuenchedAllay.fromKnownBlock(HexBlocks.QUENCHED_ALLAY_BRICKS_SMALL), HexBlocks.QUENCHED_ALLAY_BRICKS_SMALL); + + public static BlockEntityType typeForQuenchedAllay(BlockQuenchedAllay block) { + if (block == HexBlocks.QUENCHED_ALLAY) + return QUENCHED_ALLAY_TILE; + if (block == HexBlocks.QUENCHED_ALLAY_TILES) + return QUENCHED_ALLAY_TILES_TILE; + if (block == HexBlocks.QUENCHED_ALLAY_BRICKS) + return QUENCHED_ALLAY_BRICKS_TILE; + if (block == HexBlocks.QUENCHED_ALLAY_BRICKS_SMALL) + return QUENCHED_ALLAY_BRICKS_SMALL_TILE; + return null; + } private static BlockEntityType register(String id, BiFunction func, Block... blocks) { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java index eb63bb46..99d53750 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java @@ -95,6 +95,14 @@ public class HexBlocks { .isViewBlocking(HexBlocks::never); } + // we have to make it emit light because otherwise it occludes itself and is always dark + private static BlockBehaviour.Properties quenched() { + return BlockBehaviour.Properties + .copy(Blocks.AMETHYST_BLOCK) + .lightLevel($ -> 4) + .noOcclusion(); + } + // we give these faux items so Patchi can have an item to view with public static final Block CONJURED_LIGHT = blockItem("conjured_light", new BlockConjuredLight( @@ -151,20 +159,33 @@ public class HexBlocks { public static final BlockAkashicLigature AKASHIC_LIGATURE = blockItem("akashic_connector", new BlockAkashicLigature(akashicWoodyHard().lightLevel(bs -> 4))); - // we have to make it emit light because otherwise it occludes itself and is always dark - public static final BlockQuenchedAllay QUENCHED_ALLAY = blockItem("quenched_allay", new BlockQuenchedAllay( - BlockBehaviour.Properties - .copy(Blocks.AMETHYST_BLOCK) - .lightLevel($ -> 4) - .noOcclusion())); + public static final BlockQuenchedAllay QUENCHED_ALLAY = blockItem("quenched_allay", new BlockQuenchedAllay(quenched())); // Decoration?! public static final Block SLATE_BLOCK = blockItem("slate_block", new Block(slateish().strength(2f, 4f))); + public static final Block SLATE_TILES = blockItem("slate_tiles", new Block(slateish().strength(2f, 4f))); + public static final Block SLATE_BRICKS = blockItem("slate_bricks", new Block(slateish().strength(2f, 4f))); + public static final Block SLATE_BRICKS_SMALL = blockItem("slate_bricks_small", new Block(slateish().strength(2f, 4f))); + public static final RotatedPillarBlock SLATE_PILLAR = blockItem("slate_pillar", new RotatedPillarBlock(slateish().strength(2f, 4f))); public static final SandBlock AMETHYST_DUST_BLOCK = blockItem("amethyst_dust_block", new SandBlock(0xff_b38ef3, BlockBehaviour.Properties.of(Material.SAND, MaterialColor.COLOR_PURPLE) .strength(0.5f).sound(SoundType.SAND))); public static final AmethystBlock AMETHYST_TILES = blockItem("amethyst_tiles", new AmethystBlock(BlockBehaviour.Properties.copy(Blocks.AMETHYST_BLOCK))); + public static final AmethystBlock AMETHYST_BRICKS = blockItem("amethyst_bricks", + new AmethystBlock(BlockBehaviour.Properties.copy(Blocks.AMETHYST_BLOCK))); + public static final AmethystBlock AMETHYST_BRICKS_SMALL = blockItem("amethyst_bricks_small", + new AmethystBlock(BlockBehaviour.Properties.copy(Blocks.AMETHYST_BLOCK))); + public static final BlockAmethystDirectional AMETHYST_PILLAR = blockItem("amethyst_pillar", + new BlockAmethystDirectional(BlockBehaviour.Properties.copy(Blocks.AMETHYST_BLOCK))); + public static final Block SLATE_AMETHYST_TILES = blockItem("slate_amethyst_tiles", new Block(slateish().strength(2f, 4f))); + public static final Block SLATE_AMETHYST_BRICKS = blockItem("slate_amethyst_bricks", new Block(slateish().strength(2f, 4f))); + public static final Block SLATE_AMETHYST_BRICKS_SMALL = blockItem("slate_amethyst_bricks_small", new Block(slateish().strength(2f, 4f))); + public static final RotatedPillarBlock SLATE_AMETHYST_PILLAR = blockItem("slate_amethyst_pillar", + new RotatedPillarBlock(slateish().strength(2f, 4f))); + public static final BlockQuenchedAllay QUENCHED_ALLAY_TILES = blockItem("quenched_allay_tiles", new BlockQuenchedAllay(quenched())); + public static final BlockQuenchedAllay QUENCHED_ALLAY_BRICKS = blockItem("quenched_allay_bricks", new BlockQuenchedAllay(quenched())); + public static final BlockQuenchedAllay QUENCHED_ALLAY_BRICKS_SMALL = blockItem("quenched_allay_bricks_small", new BlockQuenchedAllay(quenched())); public static final Block SCROLL_PAPER = blockItem("scroll_paper", new BlockFlammable(papery(MaterialColor.TERRACOTTA_WHITE), 100, 60)); public static final Block ANCIENT_SCROLL_PAPER = blockItem("ancient_scroll_paper", @@ -183,6 +204,14 @@ public class HexBlocks { public static final BlockAkashicLog EDIFIED_LOG = blockItem("edified_log", new BlockAkashicLog(edifiedWoody())); + public static final BlockAkashicLog EDIFIED_LOG_AMETHYST = blockItem("edified_log_amethyst", + new BlockAkashicLog(edifiedWoody())); + public static final BlockAkashicLog EDIFIED_LOG_AVENTURINE = blockItem("edified_log_aventurine", + new BlockAkashicLog(edifiedWoody())); + public static final BlockAkashicLog EDIFIED_LOG_CITRINE = blockItem("edified_log_citrine", + new BlockAkashicLog(edifiedWoody())); + public static final BlockAkashicLog EDIFIED_LOG_PURPLE = blockItem("edified_log_purple", + new BlockAkashicLog(edifiedWoody())); public static final BlockAkashicLog STRIPPED_EDIFIED_LOG = blockItem("stripped_edified_log", new BlockAkashicLog(edifiedWoody())); public static final BlockAkashicLog EDIFIED_WOOD = blockItem("edified_wood", diff --git a/Common/src/main/java/at/petrak/hexcasting/common/misc/AkashicTreeGrower.java b/Common/src/main/java/at/petrak/hexcasting/common/misc/AkashicTreeGrower.java index d781730f..99ceb0a1 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/misc/AkashicTreeGrower.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/misc/AkashicTreeGrower.java @@ -6,21 +6,23 @@ import com.google.common.collect.Lists; import net.minecraft.core.Holder; import net.minecraft.data.worldgen.features.FeatureUtils; import net.minecraft.util.RandomSource; +import net.minecraft.util.random.SimpleWeightedRandomList; import net.minecraft.util.valueproviders.ConstantInt; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.grower.AbstractTreeGrower; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration; import net.minecraft.world.level.levelgen.feature.featuresize.TwoLayersFeatureSize; import net.minecraft.world.level.levelgen.feature.foliageplacers.FancyFoliagePlacer; import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; +import net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider; import net.minecraft.world.level.levelgen.feature.trunkplacers.FancyTrunkPlacer; import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.OptionalInt; -import java.util.Random; public class AkashicTreeGrower extends AbstractTreeGrower { public static final AkashicTreeGrower INSTANCE = new AkashicTreeGrower(); @@ -28,15 +30,19 @@ public class AkashicTreeGrower extends AbstractTreeGrower { public static final List>> GROWERS = Lists.newArrayList(); public static void init() { - GROWERS.add(buildTreeFeature(HexBlocks.AMETHYST_EDIFIED_LEAVES, "1")); - GROWERS.add(buildTreeFeature(HexBlocks.AVENTURINE_EDIFIED_LEAVES, "2")); - GROWERS.add(buildTreeFeature(HexBlocks.CITRINE_EDIFIED_LEAVES, "3")); + GROWERS.add(buildTreeFeature(HexBlocks.AMETHYST_EDIFIED_LEAVES, HexBlocks.EDIFIED_LOG_AMETHYST, "1")); + GROWERS.add(buildTreeFeature(HexBlocks.AVENTURINE_EDIFIED_LEAVES, HexBlocks.EDIFIED_LOG_AVENTURINE, "2")); + GROWERS.add(buildTreeFeature(HexBlocks.CITRINE_EDIFIED_LEAVES, HexBlocks.EDIFIED_LOG_CITRINE, "3")); } - private static Holder> buildTreeFeature(Block leaves, String name) { + private static Holder> buildTreeFeature(Block leaves, Block altLog, String name) { return FeatureUtils.register(HexAPI.MOD_ID + ":akashic_tree" + name, Feature.TREE, new TreeConfiguration.TreeConfigurationBuilder( - BlockStateProvider.simple(HexBlocks.EDIFIED_LOG), + new WeightedStateProvider( + SimpleWeightedRandomList.builder() + .add(HexBlocks.EDIFIED_LOG.defaultBlockState(), 8) + .add(altLog.defaultBlockState(), 1) + .build()), // baseHeight, heightRandA, heightRandB new FancyTrunkPlacer(5, 5, 3), BlockStateProvider.simple(leaves), diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java b/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java index 524ec0b8..55784c10 100644 --- a/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java +++ b/Common/src/main/java/at/petrak/hexcasting/datagen/HexLootTables.java @@ -46,11 +46,16 @@ public class HexLootTables extends PaucalLootTableProvider { HexBlocks.IMPETUS_RIGHTCLICK, HexBlocks.IMPETUS_LOOK, HexBlocks.IMPETUS_REDSTONE, HexBlocks.DIRECTRIX_REDSTONE, HexBlocks.EMPTY_DIRECTRIX, HexBlocks.AKASHIC_RECORD, HexBlocks.AKASHIC_BOOKSHELF, HexBlocks.AKASHIC_LIGATURE, - HexBlocks.SLATE_BLOCK, HexBlocks.AMETHYST_DUST_BLOCK, HexBlocks.AMETHYST_TILES, HexBlocks.SCROLL_PAPER, - HexBlocks.ANCIENT_SCROLL_PAPER, HexBlocks.SCROLL_PAPER_LANTERN, HexBlocks.ANCIENT_SCROLL_PAPER_LANTERN, - HexBlocks.SCONCE, - HexBlocks.EDIFIED_LOG, HexBlocks.STRIPPED_EDIFIED_LOG, HexBlocks.EDIFIED_WOOD, - HexBlocks.STRIPPED_EDIFIED_WOOD, + HexBlocks.SLATE_BLOCK, HexBlocks.SLATE_TILES, HexBlocks.SLATE_BRICKS, HexBlocks.SLATE_BRICKS_SMALL, + HexBlocks.SLATE_PILLAR, HexBlocks.AMETHYST_DUST_BLOCK, HexBlocks.AMETHYST_TILES, HexBlocks.AMETHYST_BRICKS, + HexBlocks.AMETHYST_BRICKS_SMALL, HexBlocks.AMETHYST_PILLAR, HexBlocks.SLATE_AMETHYST_TILES, + HexBlocks.SLATE_AMETHYST_BRICKS, HexBlocks.SLATE_AMETHYST_BRICKS_SMALL, HexBlocks.SLATE_AMETHYST_PILLAR, + HexBlocks.QUENCHED_ALLAY_TILES, HexBlocks.QUENCHED_ALLAY_BRICKS, HexBlocks.QUENCHED_ALLAY_BRICKS_SMALL, + HexBlocks.SCROLL_PAPER, HexBlocks.ANCIENT_SCROLL_PAPER, HexBlocks.SCROLL_PAPER_LANTERN, + HexBlocks.ANCIENT_SCROLL_PAPER_LANTERN, HexBlocks.SCONCE, + HexBlocks.EDIFIED_LOG, HexBlocks.EDIFIED_LOG_AMETHYST, HexBlocks.EDIFIED_LOG_AVENTURINE, + HexBlocks.EDIFIED_LOG_CITRINE, HexBlocks.EDIFIED_LOG_PURPLE, HexBlocks.STRIPPED_EDIFIED_LOG, + HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD, HexBlocks.EDIFIED_PLANKS, HexBlocks.EDIFIED_TILE, HexBlocks.EDIFIED_PANEL, HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_STAIRS, HexBlocks.EDIFIED_PRESSURE_PLATE, HexBlocks.EDIFIED_BUTTON); diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java index fe3d283f..b7caa459 100644 --- a/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java +++ b/Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.java @@ -3,6 +3,7 @@ package at.petrak.hexcasting.datagen.recipe; import at.petrak.hexcasting.api.HexAPI; import at.petrak.hexcasting.api.misc.MediaConstants; import at.petrak.hexcasting.api.mod.HexTags; +import at.petrak.hexcasting.common.blocks.decoration.BlockAkashicLog; import at.petrak.hexcasting.common.items.ItemStaff; import at.petrak.hexcasting.common.items.colorizer.ItemPrideColorizer; import at.petrak.hexcasting.common.lib.HexBlocks; @@ -35,6 +36,7 @@ import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.SimpleRecipeSerializer; import net.minecraft.world.level.block.Blocks; +import java.util.List; import java.util.function.Consumer; import java.util.function.Function; @@ -44,6 +46,11 @@ public class HexplatRecipes extends PaucalRecipeProvider { private final IXplatIngredients ingredients; private final Function conditions; + private final List EDIFIED_LOGS = List.of( + HexBlocks.EDIFIED_LOG, HexBlocks.EDIFIED_LOG_AMETHYST, + HexBlocks.EDIFIED_LOG_AVENTURINE, HexBlocks.EDIFIED_LOG_CITRINE, + HexBlocks.EDIFIED_LOG_PURPLE); + public HexplatRecipes(DataGenerator generator, IXplatIngredients ingredients, Function conditions) { super(generator, HexAPI.MOD_ID); @@ -298,11 +305,13 @@ public class HexplatRecipes extends PaucalRecipeProvider { .requires(HexTags.Items.EDIFIED_LOGS) .unlockedBy("has_item", hasItem(HexTags.Items.EDIFIED_LOGS)).save(recipes); - ShapedRecipeBuilder.shaped(HexBlocks.EDIFIED_WOOD, 3) - .define('W', HexBlocks.EDIFIED_LOG) - .pattern("WW") - .pattern("WW") - .unlockedBy("has_item", hasItem(HexBlocks.EDIFIED_LOG)).save(recipes); + for (var log : EDIFIED_LOGS) { + ShapedRecipeBuilder.shaped(HexBlocks.EDIFIED_WOOD, 3) + .define('W', log) + .pattern("WW") + .pattern("WW") + .unlockedBy("has_item", hasItem(log)).save(recipes); + } ShapedRecipeBuilder.shaped(HexBlocks.STRIPPED_EDIFIED_WOOD, 3) .define('W', HexBlocks.STRIPPED_EDIFIED_LOG) @@ -466,14 +475,16 @@ public class HexplatRecipes extends PaucalRecipeProvider { .save(recipes, modLoc("compat/create/crushing/amethyst_shard")); // FD compat - this.conditions.apply(new FarmersDelightCuttingRecipeBuilder() - .withInput(HexBlocks.EDIFIED_LOG) - .withTool(ingredients.axeStrip()) - .withOutput(HexBlocks.STRIPPED_EDIFIED_LOG) - .withOutput("farmersdelight:tree_bark") - .withSound(SoundEvents.AXE_STRIP)) - .whenModLoaded("farmersdelight") - .save(recipes, modLoc("compat/farmersdelight/cutting/akashic_log")); + for (var log : EDIFIED_LOGS) { + this.conditions.apply(new FarmersDelightCuttingRecipeBuilder() + .withInput(log) + .withTool(ingredients.axeStrip()) + .withOutput(HexBlocks.STRIPPED_EDIFIED_LOG) + .withOutput("farmersdelight:tree_bark") + .withSound(SoundEvents.AXE_STRIP)) + .whenModLoaded("farmersdelight") + .save(recipes, modLoc("compat/farmersdelight/cutting/" + Registry.BLOCK.getKey(log).getNamespace())); + } this.conditions.apply(new FarmersDelightCuttingRecipeBuilder() .withInput(HexBlocks.EDIFIED_WOOD) diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java index c15110e5..093ee010 100644 --- a/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java +++ b/Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexBlockTagProvider.java @@ -26,19 +26,25 @@ public class HexBlockTagProvider extends PaucalBlockTagProvider { .addTag(HexTags.Blocks.DIRECTRICES); tag(BlockTags.MINEABLE_WITH_PICKAXE) - .add(HexBlocks.SLATE_BLOCK, HexBlocks.SLATE, + .add(HexBlocks.SLATE_BLOCK, HexBlocks.SLATE_TILES, HexBlocks.SLATE_BRICKS, + HexBlocks.SLATE_BRICKS_SMALL, HexBlocks.SLATE_PILLAR, HexBlocks.SLATE, HexBlocks.EMPTY_DIRECTRIX, HexBlocks.DIRECTRIX_REDSTONE, HexBlocks.IMPETUS_EMPTY, HexBlocks.IMPETUS_RIGHTCLICK, HexBlocks.IMPETUS_LOOK, HexBlocks.IMPETUS_REDSTONE, - HexBlocks.AMETHYST_TILES, HexBlocks.SCONCE, - HexBlocks.QUENCHED_ALLAY); + HexBlocks.AMETHYST_TILES, HexBlocks.AMETHYST_BRICKS, HexBlocks.AMETHYST_BRICKS_SMALL, + HexBlocks.AMETHYST_PILLAR, HexBlocks.SLATE_AMETHYST_TILES, HexBlocks.SLATE_AMETHYST_BRICKS, + HexBlocks.SLATE_AMETHYST_BRICKS_SMALL, HexBlocks.SLATE_AMETHYST_PILLAR, HexBlocks.SCONCE, + HexBlocks.QUENCHED_ALLAY, HexBlocks.QUENCHED_ALLAY_TILES, HexBlocks.QUENCHED_ALLAY_BRICKS, + HexBlocks.QUENCHED_ALLAY_BRICKS_SMALL); tag(BlockTags.MINEABLE_WITH_SHOVEL) .add(HexBlocks.AMETHYST_DUST_BLOCK); tag(BlockTags.MINEABLE_WITH_AXE) .add(HexBlocks.AKASHIC_RECORD, HexBlocks.AKASHIC_BOOKSHELF, HexBlocks.AKASHIC_LIGATURE, - HexBlocks.EDIFIED_LOG, HexBlocks.STRIPPED_EDIFIED_LOG, + HexBlocks.EDIFIED_LOG, HexBlocks.EDIFIED_LOG_AMETHYST, + HexBlocks.EDIFIED_LOG_AVENTURINE, HexBlocks.EDIFIED_LOG_CITRINE, + HexBlocks.EDIFIED_LOG_PURPLE, HexBlocks.STRIPPED_EDIFIED_LOG, HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD, HexBlocks.EDIFIED_PLANKS, HexBlocks.EDIFIED_PANEL, HexBlocks.EDIFIED_TILE, HexBlocks.EDIFIED_DOOR, HexBlocks.EDIFIED_TRAPDOOR, HexBlocks.EDIFIED_SLAB, @@ -53,13 +59,19 @@ public class HexBlockTagProvider extends PaucalBlockTagProvider { HexBlocks.SCONCE); tag(HexTags.Blocks.EDIFIED_LOGS) - .add(HexBlocks.EDIFIED_LOG, HexBlocks.STRIPPED_EDIFIED_LOG, + .add(HexBlocks.EDIFIED_LOG, HexBlocks.EDIFIED_LOG_AMETHYST, + HexBlocks.EDIFIED_LOG_AVENTURINE, HexBlocks.EDIFIED_LOG_CITRINE, + HexBlocks.EDIFIED_LOG_PURPLE, HexBlocks.STRIPPED_EDIFIED_LOG, HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD); tag(BlockTags.LOGS) - .add(HexBlocks.EDIFIED_LOG, HexBlocks.STRIPPED_EDIFIED_LOG, + .add(HexBlocks.EDIFIED_LOG, HexBlocks.EDIFIED_LOG_AMETHYST, + HexBlocks.EDIFIED_LOG_AVENTURINE, HexBlocks.EDIFIED_LOG_CITRINE, + HexBlocks.EDIFIED_LOG_PURPLE, HexBlocks.STRIPPED_EDIFIED_LOG, HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD); tag(BlockTags.LOGS_THAT_BURN) - .add(HexBlocks.EDIFIED_LOG, HexBlocks.STRIPPED_EDIFIED_LOG, + .add(HexBlocks.EDIFIED_LOG, HexBlocks.EDIFIED_LOG_AMETHYST, + HexBlocks.EDIFIED_LOG_AVENTURINE, HexBlocks.EDIFIED_LOG_CITRINE, + HexBlocks.EDIFIED_LOG_PURPLE, HexBlocks.STRIPPED_EDIFIED_LOG, HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_WOOD); tag(BlockTags.LEAVES) .add(HexBlocks.AMETHYST_EDIFIED_LEAVES, HexBlocks.AVENTURINE_EDIFIED_LEAVES, diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_bricks.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_bricks.png new file mode 100644 index 00000000..7a5f8e38 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_bricks.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_bricks_small.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_bricks_small.png new file mode 100644 index 00000000..28d4e899 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_bricks_small.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_pillar_bottom.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_pillar_bottom.png new file mode 100644 index 00000000..29f2ae83 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_pillar_bottom.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_pillar_side.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_pillar_side.png new file mode 100644 index 00000000..1460f514 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_pillar_side.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_pillar_top.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_pillar_top.png new file mode 100644 index 00000000..e51801aa Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_pillar_top.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_tiles.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_tiles.png new file mode 100644 index 00000000..1c3ac5b8 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/amethyst_tiles.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_amethyst.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_amethyst.png new file mode 100644 index 00000000..51372152 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_amethyst.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_aventurine.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_aventurine.png new file mode 100644 index 00000000..cff619de Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_aventurine.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_citrine.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_citrine.png new file mode 100644 index 00000000..8df470c8 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_citrine.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_purple.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_purple.png new file mode 100644 index 00000000..dec75a4b Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/edified_log_purple.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_0.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_0.png new file mode 100644 index 00000000..a6b25120 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_0.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_1.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_1.png new file mode 100644 index 00000000..e31a3b9f Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_1.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_2.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_2.png new file mode 100644 index 00000000..a02af528 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_2.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_3.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_3.png new file mode 100644 index 00000000..86be4550 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_3.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_0.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_0.png new file mode 100644 index 00000000..d3d7685f Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_0.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_1.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_1.png new file mode 100644 index 00000000..e1d56483 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_1.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_2.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_2.png new file mode 100644 index 00000000..01d2d85d Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_2.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_3.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_3.png new file mode 100644 index 00000000..78171a10 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_bricks_small_3.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_0.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_0.png new file mode 100644 index 00000000..332fb162 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_0.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_1.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_1.png new file mode 100644 index 00000000..1086cb55 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_1.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_2.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_2.png new file mode 100644 index 00000000..7ee57d8f Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_2.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_3.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_3.png new file mode 100644 index 00000000..e0273128 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/quenched_allay_tiles_3.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_0.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_0.png new file mode 100644 index 00000000..8752f904 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_0.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_1.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_1.png new file mode 100644 index 00000000..12055dc1 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_1.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_2.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_2.png new file mode 100644 index 00000000..11f8c9b3 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_2.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_small_0.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_small_0.png new file mode 100644 index 00000000..69de9969 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_small_0.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_small_1.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_small_1.png new file mode 100644 index 00000000..92fb3e30 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_small_1.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_small_2.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_small_2.png new file mode 100644 index 00000000..90080836 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_bricks_small_2.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_pillar_end.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_pillar_end.png new file mode 100644 index 00000000..9eb0766e Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_pillar_end.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_pillar_side.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_pillar_side.png new file mode 100644 index 00000000..22d94182 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_pillar_side.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_tiles.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_tiles.png new file mode 100644 index 00000000..4cce94e4 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_amethyst_tiles.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_bricks.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_bricks.png new file mode 100644 index 00000000..310e2d53 Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_bricks.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_bricks_small.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_bricks_small.png new file mode 100644 index 00000000..6644df1b Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_bricks_small.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_pillar_end.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_pillar_end.png new file mode 100644 index 00000000..63c3e16b Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_pillar_end.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_pillar_side.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_pillar_side.png new file mode 100644 index 00000000..989fcd6f Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_pillar_side.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_tiles.png b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_tiles.png new file mode 100644 index 00000000..34c7f21a Binary files /dev/null and b/Common/src/main/resources/assets/hexcasting/textures/block/deco/slate_tiles.png differ diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt index 842fdfc3..b6c3aa04 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt @@ -171,6 +171,10 @@ object FabricHexInitializer : ModInitializer { val flameOn = FlammableBlockRegistry.getDefaultInstance() for (log in listOf( HexBlocks.EDIFIED_LOG, + HexBlocks.EDIFIED_LOG_AMETHYST, + HexBlocks.EDIFIED_LOG_AVENTURINE, + HexBlocks.EDIFIED_LOG_CITRINE, + HexBlocks.EDIFIED_LOG_PURPLE, HexBlocks.STRIPPED_EDIFIED_LOG, HexBlocks.EDIFIED_WOOD, HexBlocks.STRIPPED_EDIFIED_LOG, diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiEdifyRecipe.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiEdifyRecipe.java index 33fe1f84..b5ec3aab 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiEdifyRecipe.java +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiEdifyRecipe.java @@ -30,7 +30,13 @@ public class EmiEdifyRecipe implements EmiRecipe { EmiStack.of(HexBlocks.AVENTURINE_EDIFIED_LEAVES), EmiStack.of(HexBlocks.CITRINE_EDIFIED_LEAVES) )); - this.log = EmiStack.of(HexBlocks.EDIFIED_LOG); + this.log = EmiIngredient.of(List.of( + EmiStack.of(HexBlocks.EDIFIED_LOG), + EmiStack.of(HexBlocks.EDIFIED_LOG_AMETHYST), + EmiStack.of(HexBlocks.EDIFIED_LOG_AVENTURINE), + EmiStack.of(HexBlocks.EDIFIED_LOG_CITRINE) +// EmiStack.of(HexBlocks.EDIFIED_LOG_PURPLE) + )); } @Override diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java index 83109f6e..8a5b7494 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java @@ -124,10 +124,38 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider { blockAndItem(HexBlocks.SLATE_BLOCK, models().cubeAll("slate_block", modLoc("block/slate"))); + blockAndItem(HexBlocks.SLATE_TILES, models().cubeAll("block/deco/slate_tiles", modLoc("block/deco/slate_tiles"))); + blockAndItem(HexBlocks.SLATE_BRICKS, models().cubeAll("block/deco/slate_bricks", modLoc("block/deco/slate_bricks"))); + blockAndItem(HexBlocks.SLATE_BRICKS_SMALL, models().cubeAll("block/deco/slate_bricks_small", modLoc("block/deco/slate_bricks_small"))); + axisBlock(HexBlocks.SLATE_PILLAR, modLoc("block/deco/slate_pillar")); blockAndItem(HexBlocks.AMETHYST_DUST_BLOCK, models().singleTexture("amethyst_dust_block", modLoc(BLOCK_FOLDER + "/cube_half_mirrored"), "all", modLoc("block/amethyst_dust_block"))); - cubeBlockAndItem(HexBlocks.AMETHYST_TILES, "amethyst_tiles"); + blockAndItem(HexBlocks.AMETHYST_TILES, models().cubeAll("block/deco/amethyst_tiles", modLoc("block/deco/amethyst_tiles"))); + blockAndItem(HexBlocks.AMETHYST_BRICKS, models().cubeAll("block/deco/amethyst_bricks", modLoc("block/deco/amethyst_bricks"))); + blockAndItem(HexBlocks.AMETHYST_BRICKS_SMALL, models().cubeAll("block/deco/amethyst_bricks_small", modLoc("block/deco/amethyst_bricks_small"))); + directionalBlock(HexBlocks.AMETHYST_PILLAR, + models().cubeBottomTop("block/deco/amethyst_pillar", + modLoc("block/deco/amethyst_pillar_side"), + modLoc("block/deco/amethyst_pillar_bottom"), + modLoc("block/deco/amethyst_pillar_top"))); + blockAndItem(HexBlocks.SLATE_AMETHYST_TILES, models().cubeAll("block/deco/slate_amethyst_tiles", modLoc("block/deco/slate_amethyst_tiles"))); + + simpleBlock(HexBlocks.SLATE_AMETHYST_BRICKS, + new ConfiguredModel(models().cubeAll("block/deco/slate_amethyst_bricks_0", modLoc("block/deco/slate_amethyst_bricks_0"))), + new ConfiguredModel(models().cubeAll("block/deco/slate_amethyst_bricks_1", modLoc("block/deco/slate_amethyst_bricks_1"))), + new ConfiguredModel(models().cubeAll("block/deco/slate_amethyst_bricks_2", modLoc("block/deco/slate_amethyst_bricks_2"))) + ); + simpleBlockItem(HexBlocks.SLATE_AMETHYST_BRICKS, models().cubeAll("block/deco/slate_amethyst_bricks_0", modLoc("block/deco/slate_amethyst_bricks_0"))); + + simpleBlock(HexBlocks.SLATE_AMETHYST_BRICKS_SMALL, + new ConfiguredModel(models().cubeAll("block/deco/slate_amethyst_bricks_small_0", modLoc("block/deco/slate_amethyst_bricks_small_0"))), + new ConfiguredModel(models().cubeAll("block/deco/slate_amethyst_bricks_small_1", modLoc("block/deco/slate_amethyst_bricks_small_1"))), + new ConfiguredModel(models().cubeAll("block/deco/slate_amethyst_bricks_small_2", modLoc("block/deco/slate_amethyst_bricks_small_2"))) + ); + simpleBlockItem(HexBlocks.SLATE_AMETHYST_BRICKS_SMALL, models().cubeAll("block/deco/slate_amethyst_bricks_small_0", modLoc("block/deco/slate_amethyst_bricks_small_0"))); + + axisBlock(HexBlocks.SLATE_AMETHYST_PILLAR, modLoc("block/deco/slate_amethyst_pillar")); cubeBlockAndItem(HexBlocks.SCROLL_PAPER, "scroll_paper"); cubeBlockAndItem(HexBlocks.ANCIENT_SCROLL_PAPER, "ancient_scroll_paper"); @@ -143,6 +171,10 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider { modLoc("block/ancient_scroll_paper_lantern_top"))); axisBlock(HexBlocks.EDIFIED_LOG, modLoc("block/edified_log"), modLoc("block/edified_log_top")); + axisBlock(HexBlocks.EDIFIED_LOG_AMETHYST, modLoc("block/deco/edified_log_amethyst"), modLoc("block/edified_log_top")); + axisBlock(HexBlocks.EDIFIED_LOG_AVENTURINE, modLoc("block/deco/edified_log_aventurine"), modLoc("block/edified_log_top")); + axisBlock(HexBlocks.EDIFIED_LOG_CITRINE, modLoc("block/deco/edified_log_citrine"), modLoc("block/edified_log_top")); + axisBlock(HexBlocks.EDIFIED_LOG_PURPLE, modLoc("block/deco/edified_log_purple"), modLoc("block/edified_log_top")); axisBlock(HexBlocks.STRIPPED_EDIFIED_LOG, modLoc("block/stripped_edified_log"), modLoc("block/stripped_edified_log_top")); axisBlock(HexBlocks.EDIFIED_WOOD, modLoc("block/edified_log"), modLoc("block/edified_log")); @@ -200,6 +232,9 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider { // for the break particles simpleBlock(HexBlocks.QUENCHED_ALLAY, models().cubeAll("quenched_allay", modLoc("block/quenched_allay_0"))); + simpleBlock(HexBlocks.QUENCHED_ALLAY_TILES, models().cubeAll("quenched_allay_tiles", modLoc("block/deco/quenched_allay_tiles_0"))); + simpleBlock(HexBlocks.QUENCHED_ALLAY_BRICKS, models().cubeAll("quenched_allay_bricks", modLoc("block/deco/quenched_allay_bricks_0"))); + simpleBlock(HexBlocks.QUENCHED_ALLAY_BRICKS_SMALL, models().cubeAll("quenched_allay_bricks_small", modLoc("block/deco/quenched_allay_bricks_small_0"))); } // Assumes that the bottom are always the same diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java index accd53e6..6a93bf74 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java @@ -102,6 +102,12 @@ public class HexItemModels extends PaucalItemModelProvider { "layer0", modLoc(path.getPath()))); buildFourVariantGaslight(getPath(HexBlocks.QUENCHED_ALLAY), "block/quenched_allay", (name, path) -> cubeAll(path.getPath(), path)); + buildFourVariantGaslight(getPath(HexBlocks.QUENCHED_ALLAY_TILES), "block/deco/quenched_allay_tiles", (name, path) -> + cubeAll(path.getPath(), path)); + buildFourVariantGaslight(getPath(HexBlocks.QUENCHED_ALLAY_BRICKS), "block/deco/quenched_allay_bricks", (name, path) -> + cubeAll(path.getPath(), path)); + buildFourVariantGaslight(getPath(HexBlocks.QUENCHED_ALLAY_BRICKS_SMALL), "block/deco/quenched_allay_bricks_small", (name, path) -> + cubeAll(path.getPath(), path)); simpleItem(modLoc("patchouli_book")); @@ -157,6 +163,13 @@ public class HexItemModels extends PaucalItemModelProvider { .model(new ModelFile.UncheckedModelFile(modLoc("item/slate_written"))) .end(); + getBuilder(getPath(HexBlocks.SLATE_PILLAR)).parent( + new ModelFile.UncheckedModelFile(modLoc("block/slate_pillar"))); + getBuilder(getPath(HexBlocks.AMETHYST_PILLAR)).parent( + new ModelFile.UncheckedModelFile(modLoc("block/deco/amethyst_pillar"))); + getBuilder(getPath(HexBlocks.SLATE_AMETHYST_PILLAR)).parent( + new ModelFile.UncheckedModelFile(modLoc("block/slate_amethyst_pillar"))); + getBuilder(getPath(HexBlocks.AKASHIC_RECORD)).parent( new ModelFile.UncheckedModelFile(modLoc("block/akashic_record"))); simpleItem(modLoc("edified_door")); @@ -164,6 +177,14 @@ public class HexItemModels extends PaucalItemModelProvider { new ModelFile.UncheckedModelFile(modLoc("block/edified_trapdoor_bottom"))); getBuilder(getPath(HexBlocks.EDIFIED_LOG)).parent( new ModelFile.UncheckedModelFile(modLoc("block/edified_log"))); + getBuilder(getPath(HexBlocks.EDIFIED_LOG_AMETHYST)).parent( + new ModelFile.UncheckedModelFile(modLoc("block/edified_log_amethyst"))); + getBuilder(getPath(HexBlocks.EDIFIED_LOG_AVENTURINE)).parent( + new ModelFile.UncheckedModelFile(modLoc("block/edified_log_aventurine"))); + getBuilder(getPath(HexBlocks.EDIFIED_LOG_CITRINE)).parent( + new ModelFile.UncheckedModelFile(modLoc("block/edified_log_citrine"))); + getBuilder(getPath(HexBlocks.EDIFIED_LOG_PURPLE)).parent( + new ModelFile.UncheckedModelFile(modLoc("block/edified_log_purple"))); getBuilder(getPath(HexBlocks.STRIPPED_EDIFIED_LOG)).parent( new ModelFile.UncheckedModelFile(modLoc("block/stripped_edified_log"))); getBuilder(getPath(HexBlocks.EDIFIED_WOOD)).parent( diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/EdifyRecipeCategory.java b/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/EdifyRecipeCategory.java index 593ae2bd..84ab9bab 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/EdifyRecipeCategory.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/EdifyRecipeCategory.java @@ -63,7 +63,11 @@ public class EdifyRecipeCategory implements IRecipeCategory { .addItemStack(new ItemStack(HexBlocks.AVENTURINE_EDIFIED_LEAVES)) .addItemStack(new ItemStack(HexBlocks.CITRINE_EDIFIED_LEAVES)); builder.addSlot(RecipeIngredientRole.OUTPUT, 51, 35) - .addItemStack(new ItemStack(HexBlocks.EDIFIED_LOG)); + .addItemStack(new ItemStack(HexBlocks.EDIFIED_LOG)) + .addItemStack(new ItemStack(HexBlocks.EDIFIED_LOG_AMETHYST)) + .addItemStack(new ItemStack(HexBlocks.EDIFIED_LOG_AVENTURINE)) + .addItemStack(new ItemStack(HexBlocks.EDIFIED_LOG_CITRINE)); +// .addItemStack(new ItemStack(HexBlocks.EDIFIED_LOG_PURPLE)); }