diff --git a/gradle.properties b/gradle.properties index 55253bf7..24ef10ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -version=3.1.0 +version=3.2.0 group=galena mod_name=Oreganized mod_author=Xaidee as part of Team Galena diff --git a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 index 272fe803..7dec2a19 100644 --- a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 +++ b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 @@ -1,18 +1,19 @@ -// 1.20.1 2024-10-14T22:19:49.9706005 oreganized Block States +// 1.20.1 2024-10-24T15:02:18.4232762 oreganized Block States d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json 05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json -dfd0c1bf50927d51a16ab9bf7c8ab2e2cb083998 assets/oreganized/blockstates/black_vigil_candle.json +5de0c522692198c3b8b01df17d8952035b80c8d9 assets/oreganized/blockstates/black_vigil_candle.json 5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json 7e852e66ced2113bbad988b38469db326e88495c assets/oreganized/blockstates/blue_crystal_glass_pane.json -56fb90326ebe2d84b9ca372a806ce150c05792a0 assets/oreganized/blockstates/blue_vigil_candle.json +28bcb96bd4f55f8e42e0362e6f2f880d7abc24ce assets/oreganized/blockstates/blue_vigil_candle.json +954bb81539b55a5fd035c92f6a9ae1a20eebc010 assets/oreganized/blockstates/bone_pile.json 8f4bdde9fa05052630cd12fb4da9889024377adf assets/oreganized/blockstates/brown_crystal_glass.json d59afe9c89ba1e614ce5943fdc8aa3d450585560 assets/oreganized/blockstates/brown_crystal_glass_pane.json -962520caaced7a64c57776c7e246158d2ad43174 assets/oreganized/blockstates/brown_vigil_candle.json +17e53257c89e754a0e69726cf9311f2c682f3470 assets/oreganized/blockstates/brown_vigil_candle.json 3c5c1979dfdd7174c48384591f2628f19f75fad1 assets/oreganized/blockstates/chiseled_glance.json 40088e383637c88f443a53fbafce9ade2ca40ddd assets/oreganized/blockstates/cut_lead.json 493ed64157b69a2cd174f244e50d75ccec5b7531 assets/oreganized/blockstates/cyan_crystal_glass.json c1a188e052dc339804e5a201559b11fb8b43fec4 assets/oreganized/blockstates/cyan_crystal_glass_pane.json -55339cbe4204b859647ba328efa46585cfc435f2 assets/oreganized/blockstates/cyan_vigil_candle.json +d8fbe11591dde2833c3456a0d584d3a708a4c838 assets/oreganized/blockstates/cyan_vigil_candle.json 8b7ca6fbce4b9d9e566adde74d2c27386cd1bdf8 assets/oreganized/blockstates/deepslate_lead_ore.json 91256f551a38187fc36c676586147444a26b6ef5 assets/oreganized/blockstates/deepslate_silver_ore.json f0b8760d1a59408e5a3e68a4ad55e45c0601c07b assets/oreganized/blockstates/electrum_block.json @@ -27,10 +28,10 @@ c1e90c9548de4808e0903a7e18f9ff83ca476d28 assets/oreganized/blockstates/gargoyle. d9cf1c07d030b2f6303c81035e0037cb0c7c660e assets/oreganized/blockstates/glance_wall.json 9ea9fa8ac2f43c1effc054ea90d94cd083d1eba9 assets/oreganized/blockstates/gray_crystal_glass.json c72a5228ef929553df57844bee603f560e737100 assets/oreganized/blockstates/gray_crystal_glass_pane.json -0dca05c5d4b481a46b405c98b778477344a1b8ea assets/oreganized/blockstates/gray_vigil_candle.json +b4bc2e7b99fe5c04f5f83f7ddf1ab21ab1aff915 assets/oreganized/blockstates/gray_vigil_candle.json 8e259fefeef23ef07a4f72a5a22c47b99d65859f assets/oreganized/blockstates/green_crystal_glass.json 0f0f5654a1123c1bfa032e813f1f6cff21ec1dcb assets/oreganized/blockstates/green_crystal_glass_pane.json -e903ff61cb4b1ec9cb1df98a6ccdc6b12e5af0b2 assets/oreganized/blockstates/green_vigil_candle.json +96673948dc0033e506efa232b0ed211d7c8dd665 assets/oreganized/blockstates/green_vigil_candle.json 381580fe541332a18ae1a9efa69fb53201b66140 assets/oreganized/blockstates/grooved_blue_ice.json cd524e91f5482d84fea6e9352cdffb3d3ad1ec23 assets/oreganized/blockstates/grooved_ice.json fcaefc29cf8c2a1dc8707623a2148406e2df6df3 assets/oreganized/blockstates/grooved_packed_ice.json @@ -45,39 +46,41 @@ ac3dc34ee50ebc5c1ef49b1d5200bbcce6989806 assets/oreganized/blockstates/lead_bric 39bd9f24578399b63a72fa4938ce7fa061210992 assets/oreganized/blockstates/lead_trapdoor.json 13efbf997fc6c5f35827f6f3404fd41e0ef41e02 assets/oreganized/blockstates/light_blue_crystal_glass.json 2d73359fc7425188d9a469e5b9898322e1d2c457 assets/oreganized/blockstates/light_blue_crystal_glass_pane.json -b7356ff1ab248b4869851fa9d99c2ad0c0eadacc assets/oreganized/blockstates/light_blue_vigil_candle.json +af64ea823fe1e280b4904a2a06684374968e0c34 assets/oreganized/blockstates/light_blue_vigil_candle.json 27037bd6b3df11e3e08590d443f0c6eddf2095a2 assets/oreganized/blockstates/light_gray_crystal_glass.json 5e45ef9bf2d6081d6b736933e1b9d1985520297f assets/oreganized/blockstates/light_gray_crystal_glass_pane.json -223123b820571af3281ff6ee54aea835a17171ed assets/oreganized/blockstates/light_gray_vigil_candle.json +3f57cace0b0df538a70e575bc33c877f2c67a88a assets/oreganized/blockstates/light_gray_vigil_candle.json afb1d4d0ee24999ae3023290f97fdccda3979a19 assets/oreganized/blockstates/lime_crystal_glass.json c716019d58b098ac26affc31be09491e2de296e2 assets/oreganized/blockstates/lime_crystal_glass_pane.json -ae8b9cac3d228652ac72f6deea5dc26503dff7e0 assets/oreganized/blockstates/lime_vigil_candle.json +dd68b9a4dbb8e0a02b86c04820693ecaa9f64353 assets/oreganized/blockstates/lime_vigil_candle.json 23860a3cdce3dabc87834f8b22b164a9d12bad71 assets/oreganized/blockstates/magenta_crystal_glass.json b2da99204da7dab9df568e4bc6111eebcb057972 assets/oreganized/blockstates/magenta_crystal_glass_pane.json -d2f695030a291e15e9d20e26f1b0921a8a5e4114 assets/oreganized/blockstates/magenta_vigil_candle.json +c8c5c78cdd60dddba5986175c2f3336b728170c1 assets/oreganized/blockstates/magenta_vigil_candle.json 10ba525a3b9d3eddc1e79feed3ef2f7e7cfff0b8 assets/oreganized/blockstates/molten_lead_cauldron.json d9536dcff6be202d9b5d821c54ea54391f8ee1de assets/oreganized/blockstates/orange_crystal_glass.json 3468335e1b3d19afd9713cf2171f7f28771ff751 assets/oreganized/blockstates/orange_crystal_glass_pane.json -e8e784cd3ab0f03920fd154fb864db9bc0e7594b assets/oreganized/blockstates/orange_vigil_candle.json +a5950e518b6e6fb0ef6fa7400e05cc589ed03d86 assets/oreganized/blockstates/orange_vigil_candle.json ea33f3305a768cacbe05a2cdc8475284c39afcad assets/oreganized/blockstates/pink_crystal_glass.json 9503a106ce6a38698a3e6fce6b975e5d339105df assets/oreganized/blockstates/pink_crystal_glass_pane.json -aaf17187b5beca3c463212ca1ce108b729ae4efa assets/oreganized/blockstates/pink_vigil_candle.json +cafa6de0265b7265a7f55e25f6a598d1593693e0 assets/oreganized/blockstates/pink_vigil_candle.json d7cf04a9abcafbdf27a906caaaa71a4ab9db0851 assets/oreganized/blockstates/polished_glance.json e2cfbeacc6cd2556538c830fd063a9a9d2d34f2d assets/oreganized/blockstates/polished_glance_slab.json 57c980c45fd739c9f3c7bfdaa214de57c69bd521 assets/oreganized/blockstates/polished_glance_stairs.json a0d5aab21480fec3d1f2868400975f62e9588fb1 assets/oreganized/blockstates/purple_crystal_glass.json c9cb5c7d3dcf17e64b42b21b3ca32e2f872b32f7 assets/oreganized/blockstates/purple_crystal_glass_pane.json -134e5098f8f1c2e3b7ff90612131e04288647fb7 assets/oreganized/blockstates/purple_vigil_candle.json +3877cdb7386f42473beae8d7e417300a88fded79 assets/oreganized/blockstates/purple_vigil_candle.json 7cb5ce8c7b7d4d9f1a7a5d06d4aff60d6b8661a9 assets/oreganized/blockstates/raw_lead_block.json a8b05dbdd23fe1cf5ce82b267a4648b0629fc297 assets/oreganized/blockstates/raw_silver_block.json 5085b50121f91c56256b5f1189c8dc614c340d11 assets/oreganized/blockstates/red_crystal_glass.json 7a46fe801476209d2d5eb40213397140a7a06b8f assets/oreganized/blockstates/red_crystal_glass_pane.json -c03746b3cb60582e017ac4df94d7438f6ee75a00 assets/oreganized/blockstates/red_vigil_candle.json +7a3d3bae983b485febd1aa7ec3e53558b21731ad assets/oreganized/blockstates/red_vigil_candle.json +561d7cec28194806d6e4a3ae012f548b5d7ec679 assets/oreganized/blockstates/rotting_flesh.json +d977911dbf1e1f35accd414bf349f848f92b8849 assets/oreganized/blockstates/sepulcher.json 398fed72da8aa72d33e773d22a7fb5a5292e6fa5 assets/oreganized/blockstates/shrapnel_bomb.json dcdf3b0a7a2bb1bd00f698b3325e8ffadd0bf98c assets/oreganized/blockstates/silver_block.json 89f5cc8a105178b0b12f32963a320afc120bf868 assets/oreganized/blockstates/silver_ore.json 870599b8654e91dfb946d3e8afc4d0de08e49f9d assets/oreganized/blockstates/spotted_glance.json -99608526bc8053659abcddd11ec91c13d443369a assets/oreganized/blockstates/vigil_candle.json +6a0bb4469710e07620bb1ba40d3e9d8deb3bbd92 assets/oreganized/blockstates/vigil_candle.json 6992b8d448ed847ea9391428732a4f3aaddf258e assets/oreganized/blockstates/waxed_black_concrete_powder.json d3fb359d8a8f03c227be45819904dd16c13e3e00 assets/oreganized/blockstates/waxed_blue_concrete_powder.json 073c781dfa55e697c92eedd2e04f7d6e476298f2 assets/oreganized/blockstates/waxed_brown_concrete_powder.json @@ -97,10 +100,10 @@ afeb2ffdb9361c925ef9322c7303c0de3f4b39ee assets/oreganized/blockstates/waxed_whi 9e4d073c6804904639f89e3af04983dde1720efe assets/oreganized/blockstates/waxed_yellow_concrete_powder.json 0bc2464ae7dc6932baa23098183cf72c05980caa assets/oreganized/blockstates/white_crystal_glass.json 9bdc987f91dc587b97d6834523cac5392b7a0972 assets/oreganized/blockstates/white_crystal_glass_pane.json -d45feb3a92856e2ee2510a9f35587d29cc7bb1c2 assets/oreganized/blockstates/white_vigil_candle.json +2e79a7cb757a46f264b16b4b75c6f5a0527ad334 assets/oreganized/blockstates/white_vigil_candle.json c4f60492b52fe9b99177f6d8c47338beefb07d55 assets/oreganized/blockstates/yellow_crystal_glass.json 82873093c91346c863155b436c1c549e290de044 assets/oreganized/blockstates/yellow_crystal_glass_pane.json -2d9a6a21d143e10939b7ad5eb31b54e3553cb1a4 assets/oreganized/blockstates/yellow_vigil_candle.json +7e1e22d8be12025e372ec0534a0afcdd3df5b79c assets/oreganized/blockstates/yellow_vigil_candle.json a93c37505ed69e5e1b31c1803aebe021c8f5f28f assets/oreganized/models/block/black_concrete_powder.json b4c9e12da0a5bb4bcde8a94accf272d4ee1fb921 assets/oreganized/models/block/black_crystal_glass.json 7fab60622967f8444f480d47cf889d31c5ba3d2a assets/oreganized/models/block/black_crystal_glass_in.json @@ -128,12 +131,20 @@ f4f6ee7e2a37a51fa0bc870fcf3511c9c8265d54 assets/oreganized/models/block/black_cr 33222758f40a3b9aa5438d2da2a81ca007b2480b assets/oreganized/models/block/black_crystal_glass_rot.json 842d32af1476d1b29122e861732829c52ec35d09 assets/oreganized/models/block/black_vigil_candle_double.json 1eb523d23980f062aef5a34252a59c1a6b2b8a80 assets/oreganized/models/block/black_vigil_candle_double_ceiling.json +c65f76ed9f6477a4864bef65d3738995bb379220 assets/oreganized/models/block/black_vigil_candle_double_ceiling_lit.json +3d53df731b300ddea30c072330902f432378d465 assets/oreganized/models/block/black_vigil_candle_double_lit.json 7e78c467dda277e0f8fc1529967550f8f5321579 assets/oreganized/models/block/black_vigil_candle_quadruple.json a19821a3bbcb99827732e5383f32349857ee1d8d assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling.json +85eb7d7c0902883cc802b408ea9289aad94cdd02 assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling_lit.json +c2e56c24d56f7f4bb640249b19f82af5b8f75949 assets/oreganized/models/block/black_vigil_candle_quadruple_lit.json 6d570f156d82a76c16f2d8c190569fb39799b320 assets/oreganized/models/block/black_vigil_candle_single.json 39c478db982761237599e59fb97c5e02882e4cb4 assets/oreganized/models/block/black_vigil_candle_single_ceiling.json +d36b5179c14ca339a6e6c36b8679023a526b01de assets/oreganized/models/block/black_vigil_candle_single_ceiling_lit.json +ef1ac2afcbd63bb38690b009c72ed7c73ab67efd assets/oreganized/models/block/black_vigil_candle_single_lit.json 96d3d1a69c1a1ccc698439754144d9f0fc7cd1a5 assets/oreganized/models/block/black_vigil_candle_triple.json ee323c84d2591d360e6a54b603188fbe6dcf1bcb assets/oreganized/models/block/black_vigil_candle_triple_ceiling.json +d20b32a4ab5e5f95a43b7c82f190bbef3b40c9ac assets/oreganized/models/block/black_vigil_candle_triple_ceiling_lit.json +e13d3fc150d2504f4ea0725062d4b74bee40f767 assets/oreganized/models/block/black_vigil_candle_triple_lit.json 476579543338ee34282e824ae1b7f06f2d6fc24c assets/oreganized/models/block/blue_concrete_powder.json d268c1abcaca9de8544f616c43cfe52dcf1ab724 assets/oreganized/models/block/blue_crystal_glass.json 610d5a26dd77499724bb2a23cd79ab0c48994486 assets/oreganized/models/block/blue_crystal_glass_in.json @@ -161,12 +172,21 @@ bdd196da9ed9e727e7dc655ca020b467440d0126 assets/oreganized/models/block/blue_cry 636f4fd7e8311b57d7167bcbbec656bc6eeec034 assets/oreganized/models/block/blue_crystal_glass_rot.json fa202a3b74d1e76223b878b2ae1faef472b5737c assets/oreganized/models/block/blue_vigil_candle_double.json 13ed0c9a6a8c4f86766566ad7c2e1745a9c7440e assets/oreganized/models/block/blue_vigil_candle_double_ceiling.json +a134f279658d2a39fd24fb5e27d7db6d75e1dd25 assets/oreganized/models/block/blue_vigil_candle_double_ceiling_lit.json +97fe0739b10d39feaa12e9c63dc2db2337e760d9 assets/oreganized/models/block/blue_vigil_candle_double_lit.json 5ada68305834d5e470c29ae949ac61d922746ddf assets/oreganized/models/block/blue_vigil_candle_quadruple.json 3e5e04e8ceed9cc01d914a67d4cb540160557eef assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling.json +b7d18aeca83c95264de35a101c270aa246246eb0 assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling_lit.json +78a885d2fd668f152baaeb1c901f4865bf8688c7 assets/oreganized/models/block/blue_vigil_candle_quadruple_lit.json b9604285c20dab8232acc7ab7156e5f694f001d1 assets/oreganized/models/block/blue_vigil_candle_single.json b0f86aa8e5f54791259c12cfd2a5d41c163d6434 assets/oreganized/models/block/blue_vigil_candle_single_ceiling.json +f1c31eac2a732b3ad69526dcc3126855eac4bae0 assets/oreganized/models/block/blue_vigil_candle_single_ceiling_lit.json +fb733abb3258847ce7996d523cab2a01a06b6f24 assets/oreganized/models/block/blue_vigil_candle_single_lit.json 88c724993a5248e298f678ed53ef4bb247d143b9 assets/oreganized/models/block/blue_vigil_candle_triple.json 61febf388c292dbc8f5eaee75ce124b0cb9f4c92 assets/oreganized/models/block/blue_vigil_candle_triple_ceiling.json +ebec47765087796176a58ab2d4e4203cd9977dea assets/oreganized/models/block/blue_vigil_candle_triple_ceiling_lit.json +913e394fcdfec1679ca3ab5b1c327a4a68a4ce85 assets/oreganized/models/block/blue_vigil_candle_triple_lit.json +7f07c6ba4f4ac8276ed2a7531526a4228af36fc6 assets/oreganized/models/block/bone_pile.json 3296354cd0709abe6eb75e1fc39f1c72d0a9d0a7 assets/oreganized/models/block/brown_concrete_powder.json 4154dddb09563c888c73caa346d5a491ff902782 assets/oreganized/models/block/brown_crystal_glass.json 632ce280a6004238bf5ee88445904213ca67c413 assets/oreganized/models/block/brown_crystal_glass_in.json @@ -194,12 +214,20 @@ b5b65411b33249d560ae0af3fb44d1a2ad250522 assets/oreganized/models/block/brown_cr 7146bedcc663b9b4151fcbf89e573a2e2f636909 assets/oreganized/models/block/brown_crystal_glass_rot.json 0fdbe8cf74077b375f5c6ebb44e458f588644700 assets/oreganized/models/block/brown_vigil_candle_double.json d9c2708e407334b52d1a5e4fa73dad6fe08b0a86 assets/oreganized/models/block/brown_vigil_candle_double_ceiling.json +2994b4f8af137daf7df2f8ceed90b0e447076829 assets/oreganized/models/block/brown_vigil_candle_double_ceiling_lit.json +92916cbb0525a22c4a29367d15bc30985b10f61c assets/oreganized/models/block/brown_vigil_candle_double_lit.json ed6090b000b3c1414b52679a14cb54421fbabfd1 assets/oreganized/models/block/brown_vigil_candle_quadruple.json 055087101af4e8240d8368060aa41eef514da687 assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling.json +c1896459128a0f0481ac52570e24e238cf36ad94 assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling_lit.json +8a42234eb52dc4b6ff9aa2c12d89ee0651c04bd7 assets/oreganized/models/block/brown_vigil_candle_quadruple_lit.json bece6692d03e515eb1b6866b7612b31657caa974 assets/oreganized/models/block/brown_vigil_candle_single.json 57a6037516ab07a8d43142594f7ccc51aa0db632 assets/oreganized/models/block/brown_vigil_candle_single_ceiling.json +cb09e912da65868c107bbfb9171703782c5d8b8b assets/oreganized/models/block/brown_vigil_candle_single_ceiling_lit.json +6af5e61fb9575d7319955c6e2c7f2b1b4b296974 assets/oreganized/models/block/brown_vigil_candle_single_lit.json d6bb8eb53138bc0091f9e73c3c8990e005b3926b assets/oreganized/models/block/brown_vigil_candle_triple.json 3a20c447376d131b2691256c961da470ce87a6f9 assets/oreganized/models/block/brown_vigil_candle_triple_ceiling.json +d02f1462c0da981e9db0433370305d33fef769fa assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json +66d2fbfb6ffede8be2d217cb5e169a8e2a0f569d assets/oreganized/models/block/brown_vigil_candle_triple_lit.json 4f188c17f6b739d6090b40856dee05dae6b32316 assets/oreganized/models/block/chiseled_glance.json a9aeea1dec59b5c1594205bb9bc7034f30f447f0 assets/oreganized/models/block/cut_lead.json 65035089ce2758727d5b6cbc94c1a51c92ce613d assets/oreganized/models/block/cyan_concrete_powder.json @@ -229,22 +257,38 @@ e608b753dce2a8b19cb7dbee4045c14c15eecef7 assets/oreganized/models/block/cyan_cry 70e7d24a752911b20fe5ba6ab611abf3c358c136 assets/oreganized/models/block/cyan_crystal_glass_rot.json 39e129696cc32b5d812e1cd9a073fa4019b0a63c assets/oreganized/models/block/cyan_vigil_candle_double.json f597b22780faa2e7039fde378c03b95e7238f336 assets/oreganized/models/block/cyan_vigil_candle_double_ceiling.json +a1836fce56cd2e2ee0481911aa26517fb86d3537 assets/oreganized/models/block/cyan_vigil_candle_double_ceiling_lit.json +4af68a852b6655773c8796356793a2f295a11340 assets/oreganized/models/block/cyan_vigil_candle_double_lit.json 5de76a0b11ecb17851f35677b168eeb230145e89 assets/oreganized/models/block/cyan_vigil_candle_quadruple.json cb6319a43fa075acf8f1a7607632208e079a4d68 assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling.json +d9b916d2b4a285aa089bf84adfd6b260310476d9 assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json +ec433bac878582f2b75b0af0b88999ce70507613 assets/oreganized/models/block/cyan_vigil_candle_quadruple_lit.json 0b491fcacf51fee75cda04d2f7f8e136d67b4c26 assets/oreganized/models/block/cyan_vigil_candle_single.json b4602dfffed116c7ec93bd9db180e2924029b0be assets/oreganized/models/block/cyan_vigil_candle_single_ceiling.json +8b1a970d056ef9e9c1672022c66d5c8ea2ebb9e9 assets/oreganized/models/block/cyan_vigil_candle_single_ceiling_lit.json +05bc8e0af1e5b111e5456671bb91bd57a8c4726c assets/oreganized/models/block/cyan_vigil_candle_single_lit.json 051b88ba77a8f0708ba38cce5186d09e01fc8e18 assets/oreganized/models/block/cyan_vigil_candle_triple.json 690c75634e1d59a7e75f7dfaae30d3b8c518674f assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling.json +600c1c572159ab14a7b260cd57d75295b5c6ab08 assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling_lit.json +ba1e0078bc5cbeb87bc8502cc13455511f9ed076 assets/oreganized/models/block/cyan_vigil_candle_triple_lit.json 28e5c8efea3bcd11f22ff5d8fc42e027451a8c94 assets/oreganized/models/block/deepslate_lead_ore.json 5f9de10cb0e348003b4ad9fa8bfc1fa9278e3df1 assets/oreganized/models/block/deepslate_silver_ore.json b57b85aa4859656bbb0e466ea198bddd28dc9857 assets/oreganized/models/block/defaultvigil_candle_double.json 780445ad969863e0aeef46fc4c8de08040b71d3e assets/oreganized/models/block/defaultvigil_candle_double_ceiling.json +932cde59b3c1a674d353feb790eb2cc64a864921 assets/oreganized/models/block/defaultvigil_candle_double_ceiling_lit.json +9be68354f2dda01c42dc903d3537cdeb9b71ddf4 assets/oreganized/models/block/defaultvigil_candle_double_lit.json 1e440df4a73567cc92546655a48e0bf3e3c36346 assets/oreganized/models/block/defaultvigil_candle_quadruple.json 510154bf3b3cc453620ff7e51d79dc5a05498553 assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling.json +b756e73c6aaf3593dbb763db2cce24f84afcf746 assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling_lit.json +f6e85e7d3daf8fb9720a64258c91211fca101ed1 assets/oreganized/models/block/defaultvigil_candle_quadruple_lit.json 013c7b683388e5251d541a55d2131348f297c072 assets/oreganized/models/block/defaultvigil_candle_single.json 8329555e646a16fbb0a06e6414afd68cc0959aea assets/oreganized/models/block/defaultvigil_candle_single_ceiling.json +64b0c7837bb900d6f610d33f701b0bb526e4c816 assets/oreganized/models/block/defaultvigil_candle_single_ceiling_lit.json +b276edd645a5d94e69488cb2ef17dc163786a4c1 assets/oreganized/models/block/defaultvigil_candle_single_lit.json 8dd3f0a43f55cab31ad58d2290bd904529b2ece7 assets/oreganized/models/block/defaultvigil_candle_triple.json b51151158e1e0c0a5fc6aba3a3937882765a6118 assets/oreganized/models/block/defaultvigil_candle_triple_ceiling.json +cc7dea6b418c9ec2843e4338b72bbba4510eab45 assets/oreganized/models/block/defaultvigil_candle_triple_ceiling_lit.json +12bdf9cb76c23f6c8588478f58dc3da4432ee828 assets/oreganized/models/block/defaultvigil_candle_triple_lit.json 50b31e901f9c3d7db1fde987cfd547999e37cf67 assets/oreganized/models/block/dimmer_lead_bulb.json 70dd1a0c1846410be1610e21f3f6e7458dc530a3 assets/oreganized/models/block/electrum_block.json 9b44bee43c08518c3880b29784895a8ee563d01a assets/oreganized/models/block/glance.json @@ -314,12 +358,20 @@ bb2a21c4cc7db90599b1498cbdc64eb244311589 assets/oreganized/models/block/gray_cry 6a45988e05de5c086a9e8ece8642cf412dd466af assets/oreganized/models/block/gray_crystal_glass_rot.json 312025766b73eb9a1a9ce9323ae6f698649837e6 assets/oreganized/models/block/gray_vigil_candle_double.json 8b17d7f6b9f5c971d90f0058cb6448341968d8aa assets/oreganized/models/block/gray_vigil_candle_double_ceiling.json +77ccf395d15353879cb77ccb244c7422fb8e484e assets/oreganized/models/block/gray_vigil_candle_double_ceiling_lit.json +1d0b1f8843026ffdb9afa47699ba4f23ae049351 assets/oreganized/models/block/gray_vigil_candle_double_lit.json f92854375e41fcfffa2b8f72a22a0d86b4c9c032 assets/oreganized/models/block/gray_vigil_candle_quadruple.json b37bf483433e1631bc7b5e5e790fa701e8013f48 assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling.json +f9404750ab14d96c26edfb86eda3b19a4760e39e assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling_lit.json +72b7912fba39e009237e235d0017b41b4aa69a2f assets/oreganized/models/block/gray_vigil_candle_quadruple_lit.json 14b3a634a33fc5add230278e993c89b66996031f assets/oreganized/models/block/gray_vigil_candle_single.json c5a7c781065991d62db90e101d58119bd2a42656 assets/oreganized/models/block/gray_vigil_candle_single_ceiling.json +93bf875fd59c8b6a6098bfc814b58b927e712305 assets/oreganized/models/block/gray_vigil_candle_single_ceiling_lit.json +ad91047a3d49ad729b9c9ae8b0eccddaa669558e assets/oreganized/models/block/gray_vigil_candle_single_lit.json 90efc3f7e37e52d445599e56da14ff70bfb7061b assets/oreganized/models/block/gray_vigil_candle_triple.json f2239baa6628a50952a09c015cc75590115be792 assets/oreganized/models/block/gray_vigil_candle_triple_ceiling.json +c4b78b57aabbba5024e2f5184795710ccd6778d4 assets/oreganized/models/block/gray_vigil_candle_triple_ceiling_lit.json +ca003186b83eaa2dc9c5a12d15b99902c58bf105 assets/oreganized/models/block/gray_vigil_candle_triple_lit.json 7d9b9dd458a536627b1e22fe5ecb26ca9cfc8fb2 assets/oreganized/models/block/green_concrete_powder.json 169a2fb6047878118c082d9a710c265c99ec6345 assets/oreganized/models/block/green_crystal_glass.json 707b39ff895f28b54d9ecd784dcee6648e497451 assets/oreganized/models/block/green_crystal_glass_in.json @@ -347,12 +399,20 @@ f06c23bb719390bafdc75bda45d27d754cf5ca88 assets/oreganized/models/block/green_cr 0771143da48d3d7a50bd6bf5beb62fa778397c48 assets/oreganized/models/block/green_crystal_glass_rot.json 20e0bde7bf3a5ab7623b0842dd9d03c7a76036a9 assets/oreganized/models/block/green_vigil_candle_double.json 6b42741fc8df030598d37b79067cbab3974324b4 assets/oreganized/models/block/green_vigil_candle_double_ceiling.json +483beeff04f22a9273d67d016fb7f7101967ecc9 assets/oreganized/models/block/green_vigil_candle_double_ceiling_lit.json +3296655db3ee099776720e4308a3db80b26dca38 assets/oreganized/models/block/green_vigil_candle_double_lit.json 438074afd18ccd7d5444427a95b902905ed25881 assets/oreganized/models/block/green_vigil_candle_quadruple.json 4fecf4e3fc890f4e4cbb3433c93836a45f95b501 assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling.json +2d93d9e723f1ac8f85d893decc34be1f10111b36 assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling_lit.json +eeea091ceaf019aa50835152791c711702bcc5f5 assets/oreganized/models/block/green_vigil_candle_quadruple_lit.json 44c2d253145cb07e1bd1a6ad432a7bdfbe409edb assets/oreganized/models/block/green_vigil_candle_single.json 64dee37713056d3a1dfb5e0e4ec1a22f35920d21 assets/oreganized/models/block/green_vigil_candle_single_ceiling.json +5a5a464a651d053ce544db8545538a444e2bd51a assets/oreganized/models/block/green_vigil_candle_single_ceiling_lit.json +e9b0df9682f82f03fe4963489d95f508658cd203 assets/oreganized/models/block/green_vigil_candle_single_lit.json de59254958bddb3e7f04bcae4e2dd3771142fdc9 assets/oreganized/models/block/green_vigil_candle_triple.json ca04cf5553960ea2c0e0040e943c222248003d39 assets/oreganized/models/block/green_vigil_candle_triple_ceiling.json +db08ff3e53514164469fde7ec71fcd983d0e0a89 assets/oreganized/models/block/green_vigil_candle_triple_ceiling_lit.json +ca60f34d8a70a884984449366f5d329aa9c69c02 assets/oreganized/models/block/green_vigil_candle_triple_lit.json 6ac43f4b7a86ba2b1a3638637108659d12dfb006 assets/oreganized/models/block/grooved_blue_ice.json ff530b321353ded30d649ead0668faa2bcfe16a9 assets/oreganized/models/block/grooved_ice.json 2a0395c97d8caca1311c8b5181b324c228af84d7 assets/oreganized/models/block/grooved_packed_ice.json @@ -406,12 +466,20 @@ e63efa9348807c5d087b5efaf057109e22481a65 assets/oreganized/models/block/light_bl bef3c54f567c6ac71aad8184916114f6e6015e77 assets/oreganized/models/block/light_blue_crystal_glass_rot.json 434b4aced0a7e956178994b1c0903df9e385d7ee assets/oreganized/models/block/light_blue_vigil_candle_double.json 2968cf97a5f4896672615801af3d4f1dfd481ec1 assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling.json +9cac736b31114cc4c44a5ee35e6853552443f243 assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling_lit.json +896f85d55e09acd3bf07b875dd8fbeab225b5d76 assets/oreganized/models/block/light_blue_vigil_candle_double_lit.json 9db5b6020d6017aae0a64a67f7c8a3c66251c45b assets/oreganized/models/block/light_blue_vigil_candle_quadruple.json c40c964b990677f8f6dc8e638d039dc8fbb27000 assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling.json +ad0c12a7af1469057de57d5cc1f82e3ce6b2aa84 assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json +247cde2602f85d75dfd512c876ca52e0ef877a17 assets/oreganized/models/block/light_blue_vigil_candle_quadruple_lit.json 479c2b971f2787341a655f3207daf7a0588fd6da assets/oreganized/models/block/light_blue_vigil_candle_single.json 51686462226d1a3feace7ed0c04910f90de5319b assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling.json +7c97492bf2425a8baf831d1989e7252502b1ad64 assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling_lit.json +33251bfdab3a881ba0d9f1a34439b921f057c985 assets/oreganized/models/block/light_blue_vigil_candle_single_lit.json afb5d7d2e745ed293ae3e117cf127ee029de60a2 assets/oreganized/models/block/light_blue_vigil_candle_triple.json 7a9b0a10a910980c7318c7ee2eed16ad0b9b492d assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling.json +8454b8ba79785a5feecd346b3ea87e428f1c0f39 assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling_lit.json +8b99ac1b0dcb735432103066e2ad986064f51841 assets/oreganized/models/block/light_blue_vigil_candle_triple_lit.json cc3496c0dfc32a694af4f379cfb5f7cc1988e804 assets/oreganized/models/block/light_gray_concrete_powder.json cafbdfb97d41927e293dddebf8892932e0bdbe83 assets/oreganized/models/block/light_gray_crystal_glass.json 6b595a6115f76b8625b80611d861032411e4ba08 assets/oreganized/models/block/light_gray_crystal_glass_in.json @@ -439,12 +507,20 @@ c85f4e300b801bd4e5267a9cc51751fc208eaf09 assets/oreganized/models/block/light_gr 377e4dcda4ac0aea8fb99d05715eefc69c2f38e6 assets/oreganized/models/block/light_gray_crystal_glass_rot.json 16376b1c78cb6181dca4899b0b8def267df13fca assets/oreganized/models/block/light_gray_vigil_candle_double.json 01d2e6c90491d1f72b6d8722978aff814ef081ea assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling.json +d9d00c30b272b6f8ab41fdb7a6c5ad4fbceea045 assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling_lit.json +81f6ba18f19706b78ebc15b9942841e5142eb47b assets/oreganized/models/block/light_gray_vigil_candle_double_lit.json 9a3d2da2c9231bbcc9078a226cd5d54a22a5c11b assets/oreganized/models/block/light_gray_vigil_candle_quadruple.json 9f85726c9ba1c1ed7632404d52be9531fe03c3bd assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling.json +2d9f8d14e5d24763c15589162290514dc777d27a assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json +467ceb04a9eae8358c4d840ad64d31d79b4cf208 assets/oreganized/models/block/light_gray_vigil_candle_quadruple_lit.json 67dd91856757c8780e85de27ced5656903e952e5 assets/oreganized/models/block/light_gray_vigil_candle_single.json 14d60d2643ca5b55d88170be8a212869e313ee24 assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling.json +d4c331542ad6aee6d091369d15f5e93eaed016b3 assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling_lit.json +81429275a913dafcd2f3261597a91176df58e42f assets/oreganized/models/block/light_gray_vigil_candle_single_lit.json 7c44c6d0c31303a0847b092b194e695aa3b64b34 assets/oreganized/models/block/light_gray_vigil_candle_triple.json 39f68050d418e6489d070f90c4e307468355da72 assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling.json +82e87979ade43906d49b02e0a9f32e37c55e2018 assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling_lit.json +b534eed57dcd4a91b355a6f50c1c83d1355ebc51 assets/oreganized/models/block/light_gray_vigil_candle_triple_lit.json b667aed52d30f957bb5b8a674d72678074e1988a assets/oreganized/models/block/lime_concrete_powder.json 84a1cbd347232ebe94e1412ce552f542d0d4c04e assets/oreganized/models/block/lime_crystal_glass.json cab16fecfcf35558e07021a775ec0850e559dc73 assets/oreganized/models/block/lime_crystal_glass_in.json @@ -472,12 +548,20 @@ e48a604d3b2acbbf2df7b18b1dfabfc5add6fd2a assets/oreganized/models/block/lime_cry 467034c7b1573ec2c06170c287a7d43da218d223 assets/oreganized/models/block/lime_crystal_glass_rot.json 63f9a20454a89828d555d3525c67254bc90cde92 assets/oreganized/models/block/lime_vigil_candle_double.json daf43038a8c9aa972aadd64b668396a9dbf8cfe4 assets/oreganized/models/block/lime_vigil_candle_double_ceiling.json +6ab609410a53509358d5c508e34363ea9a7e8c76 assets/oreganized/models/block/lime_vigil_candle_double_ceiling_lit.json +b3c58baedfca9a8b2e1fc3399f2555f23f28c9a4 assets/oreganized/models/block/lime_vigil_candle_double_lit.json 92168134c510e5d611a258800532bf123d4b122e assets/oreganized/models/block/lime_vigil_candle_quadruple.json e756a8cbf170e749176b201737d42c22a2e6a096 assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling.json +c9daaaeea879efb471f082cf7387753b0f1b1cf1 assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling_lit.json +d99c977c46b9b71f874efc68016522af1ecdc60d assets/oreganized/models/block/lime_vigil_candle_quadruple_lit.json 236554b354bd2c4fb6b9c2f357bb951459d3df5c assets/oreganized/models/block/lime_vigil_candle_single.json 86dbf50fb1f1aae203b96dc85f3cd95f7a72c8cf assets/oreganized/models/block/lime_vigil_candle_single_ceiling.json +5542e7793eddbe7e8073ffc0b278b0c5c449ce30 assets/oreganized/models/block/lime_vigil_candle_single_ceiling_lit.json +fd1e57860ae9992ae366ef790ab29e682c2b97f0 assets/oreganized/models/block/lime_vigil_candle_single_lit.json a4c56d36a18cef42e1e05126453353943ebe2562 assets/oreganized/models/block/lime_vigil_candle_triple.json a2fda4b5def63301f38042bc481c4516ea2c3fed assets/oreganized/models/block/lime_vigil_candle_triple_ceiling.json +9991e48129a6ab7d89e161d07618fbf368d665ad assets/oreganized/models/block/lime_vigil_candle_triple_ceiling_lit.json +a5a43bd426f36abfc1d0af447bd36910ac150c89 assets/oreganized/models/block/lime_vigil_candle_triple_lit.json dcd8c9192f22a02c035f577021a787b876e57065 assets/oreganized/models/block/magenta_concrete_powder.json 84c88a72b4403008762910054f4f98f4a114defe assets/oreganized/models/block/magenta_crystal_glass.json cc5694ad1eae57281f46d880f32f40fa6e78e318 assets/oreganized/models/block/magenta_crystal_glass_in.json @@ -505,12 +589,20 @@ f61dd79a1da013e1fc0b59cf0991c6e5e97b0694 assets/oreganized/models/block/magenta_ 64b8bf65885c03ae44e23aee011008ccb67cb60d assets/oreganized/models/block/magenta_crystal_glass_rot.json b40ea71d12d7ea8190e25256de7b4e89da47a8c0 assets/oreganized/models/block/magenta_vigil_candle_double.json fcf2361774b7957f18f7a698be11d846f09dcd2c assets/oreganized/models/block/magenta_vigil_candle_double_ceiling.json +c14c7a6f0cd26270db121c62f733bf5d8de65c2b assets/oreganized/models/block/magenta_vigil_candle_double_ceiling_lit.json +195ddd247e6b91ec461b994eee62786e0123002c assets/oreganized/models/block/magenta_vigil_candle_double_lit.json 7f5c823a11c90f0ae9234cb9d467557ff82afe61 assets/oreganized/models/block/magenta_vigil_candle_quadruple.json 258fe7c2635ddbe633a6e870a65b5e93cf4ea27d assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling.json +f07a5e8ab0ec461fc625d997528bab067e4a2ee1 assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json +4d930414cf84a759a3bb9b99cfec8f8a5833623c assets/oreganized/models/block/magenta_vigil_candle_quadruple_lit.json ddcc6fafaf0ea7fc907d13d757add87a8ef466b9 assets/oreganized/models/block/magenta_vigil_candle_single.json fabd30145abb7643ff4f0166c48d2d05ef81198a assets/oreganized/models/block/magenta_vigil_candle_single_ceiling.json +78e05072eaec4a385945fdd893ca87733e034f4b assets/oreganized/models/block/magenta_vigil_candle_single_ceiling_lit.json +fb2a09c61a5847e9efbfa439a7e54adc98d0b8ff assets/oreganized/models/block/magenta_vigil_candle_single_lit.json ee4ad0de8f3efbc577e24f55ffbe2874a19e39c6 assets/oreganized/models/block/magenta_vigil_candle_triple.json b88bdc12514a05fee4b73664556ff0d00a64d49b assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling.json +4cd82e45f14632dec4e96df397bc1429a2f7ebb4 assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling_lit.json +179aad55fe75b5c528f0993ce53e93cce55c8b02 assets/oreganized/models/block/magenta_vigil_candle_triple_lit.json d6b67784754f6683734081c363b4f9b72f1f388b assets/oreganized/models/block/molten_lead_cauldron0.json e831cbb457d1314e3c0f5a7706992c90c35337a6 assets/oreganized/models/block/molten_lead_cauldron1.json e831cbb457d1314e3c0f5a7706992c90c35337a6 assets/oreganized/models/block/molten_lead_cauldron2.json @@ -542,12 +634,20 @@ dfa78dff5c2aaa56105176858237dc27e092990f assets/oreganized/models/block/orange_c 6c85eea8420c50d496cd7b91d90d0002e9b7042b assets/oreganized/models/block/orange_crystal_glass_rot.json 0aadd9133b00114fa0e6f3721021cad6fb17fa1f assets/oreganized/models/block/orange_vigil_candle_double.json 05cee0c922c66b6f17e9f46c0e457b01346d0f0f assets/oreganized/models/block/orange_vigil_candle_double_ceiling.json +9e32d59a158e9d934961eb82dc4ad21bd45a1b85 assets/oreganized/models/block/orange_vigil_candle_double_ceiling_lit.json +971813938307bc6c27ca819058701e535a8612dc assets/oreganized/models/block/orange_vigil_candle_double_lit.json 40674fea578d604477448647f70cb0f01ed63e66 assets/oreganized/models/block/orange_vigil_candle_quadruple.json 25ec52cffa046a1c8bbaa2ab7b8dbb9c98599cd4 assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling.json +52ef11889fe059e009d22ba57c96bb72a229f42c assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling_lit.json +23b721912ea8aae933f099218f23710b61483b90 assets/oreganized/models/block/orange_vigil_candle_quadruple_lit.json 61d361d939f386bbd8e2c2822960cd2eb571ffd3 assets/oreganized/models/block/orange_vigil_candle_single.json 3a8a40a066ef6a27b7a97a990eac788034e0f64a assets/oreganized/models/block/orange_vigil_candle_single_ceiling.json +8c45e1596aba122698819d2271fd3185a1d4885f assets/oreganized/models/block/orange_vigil_candle_single_ceiling_lit.json +057d94d199c831f17bdbf9b66d7c8794b1c09e81 assets/oreganized/models/block/orange_vigil_candle_single_lit.json 6e7da4687d273b35bdd825cd8a0086a2730dd15e assets/oreganized/models/block/orange_vigil_candle_triple.json 3216be395dcb7e8a40cb16491447c8d8eb454a64 assets/oreganized/models/block/orange_vigil_candle_triple_ceiling.json +fc6d049238e4091882e12acb019a5547306be641 assets/oreganized/models/block/orange_vigil_candle_triple_ceiling_lit.json +6436446aad1063c4bc20377bfffcc8653cabccab assets/oreganized/models/block/orange_vigil_candle_triple_lit.json 58f7913ed5ccbeabf87fc3cc4356d05fa9d98f13 assets/oreganized/models/block/pink_concrete_powder.json bd3378b8df075e77ca1b6f6ca1d4144f93b8b367 assets/oreganized/models/block/pink_crystal_glass.json d109817afcdf3118fa3efbd353850e8f55517d64 assets/oreganized/models/block/pink_crystal_glass_in.json @@ -575,12 +675,20 @@ f13030d6c143a9a06d323ad8442eabd9f0061f3c assets/oreganized/models/block/pink_cry 27b1d54dd7f8170d4a78c154a0bfd25ceaea6af9 assets/oreganized/models/block/pink_crystal_glass_rot.json 5251d72ec0a8e9403eb4bce46610541eaa907592 assets/oreganized/models/block/pink_vigil_candle_double.json 943872c2693db2b42b33e1a99788145082cc25a8 assets/oreganized/models/block/pink_vigil_candle_double_ceiling.json +79a15d4ed3cf7b980cce2bb8ac0b042f81170b8c assets/oreganized/models/block/pink_vigil_candle_double_ceiling_lit.json +1e73baf566e8a726e1cf9e5081c5d4e30c675f14 assets/oreganized/models/block/pink_vigil_candle_double_lit.json 8a3857e9f6a2cfadee78f3c3d77c02bbc7ac9d5a assets/oreganized/models/block/pink_vigil_candle_quadruple.json f1a01f45f35631bfd3159a69002fed8a55d14326 assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling.json +1d54fd20d8cc98f7123a54abf8708f6a0b1cfaff assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling_lit.json +eae1532b3911dd7c593fc592cf31a834f7bac69c assets/oreganized/models/block/pink_vigil_candle_quadruple_lit.json 35d501a14e6fda578345f82a4d7c2946e869cd91 assets/oreganized/models/block/pink_vigil_candle_single.json c7083e2c569304740554cee16b9c70c25b9468ec assets/oreganized/models/block/pink_vigil_candle_single_ceiling.json +1f30f95b4b59878dbd9915bad5424cd77020fb28 assets/oreganized/models/block/pink_vigil_candle_single_ceiling_lit.json +509cee19afe027380b67043457826ba900b970de assets/oreganized/models/block/pink_vigil_candle_single_lit.json 0d25a8ab0bba1e6199f1a5408b8589866b6244e8 assets/oreganized/models/block/pink_vigil_candle_triple.json eeb3bd9afaf723fabbcef5cd64992150be90fa7d assets/oreganized/models/block/pink_vigil_candle_triple_ceiling.json +cd98e3e47bd384eec27dd7138c0452919c9874e3 assets/oreganized/models/block/pink_vigil_candle_triple_ceiling_lit.json +2d373dcc1483eea06dc62c363eb7db692dbb3ff0 assets/oreganized/models/block/pink_vigil_candle_triple_lit.json 2817146acda72f5ba4cb468563da370757344205 assets/oreganized/models/block/polished_glance.json f18c05c0938bc4511c9a52080d4e21ccf889510b assets/oreganized/models/block/polished_glance_slab.json b0ef458d7e44703460bc3eff2baf7473a814760f assets/oreganized/models/block/polished_glance_slab_top.json @@ -614,12 +722,20 @@ a43e30367784b061022e86e51dfd4fcdd81fb44b assets/oreganized/models/block/purple_c f19346ca8fb8c7d4657c5d19666e190d6e39aa0d assets/oreganized/models/block/purple_crystal_glass_rot.json 9ebeab79a858ff18b9a201672c624f3287653cf2 assets/oreganized/models/block/purple_vigil_candle_double.json 0367d893b3e24a3bc10888befdbf4511f954dfa1 assets/oreganized/models/block/purple_vigil_candle_double_ceiling.json +f2eb36503f61263f7ce7a08be3987f7f2f34e240 assets/oreganized/models/block/purple_vigil_candle_double_ceiling_lit.json +0e0a7ea01d216a424b701ba38d2350f5fc2c96f5 assets/oreganized/models/block/purple_vigil_candle_double_lit.json fcca99fbd2c24f5e2c0cfd3e5339218a03516889 assets/oreganized/models/block/purple_vigil_candle_quadruple.json 9be75c169b03ff6a2ccd713a60ffab17b7dadd3c assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling.json +16ef05ba9721b9cf184225021d3886afcd2bf969 assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling_lit.json +2475dc3fa9859322264ab2eee98d55de9541329e assets/oreganized/models/block/purple_vigil_candle_quadruple_lit.json b478c2485b43c33b22bc8e69493163a4278c8b20 assets/oreganized/models/block/purple_vigil_candle_single.json 623ffadb2a50fe6c8ec60036663550e0bb8e9b54 assets/oreganized/models/block/purple_vigil_candle_single_ceiling.json +573370b7ef78ff1c58baf4106960946e3245f8f4 assets/oreganized/models/block/purple_vigil_candle_single_ceiling_lit.json +a4650f865ded763fdc7d0eb1e3d83a725e73179f assets/oreganized/models/block/purple_vigil_candle_single_lit.json 22edaf95a3ade377e60e62698bc437ff6145db76 assets/oreganized/models/block/purple_vigil_candle_triple.json ae929923c67188087ffe2f174fbde028bc8ff773 assets/oreganized/models/block/purple_vigil_candle_triple_ceiling.json +2b60c71b196dd29da971de94ac5dfbd5ea30a200 assets/oreganized/models/block/purple_vigil_candle_triple_ceiling_lit.json +2fd2c089efbbbfbea0fee5b9ce1e89a4b9a2b83c assets/oreganized/models/block/purple_vigil_candle_triple_lit.json 9f8bd8f481fe842bd6d61699c2476c854a3fa677 assets/oreganized/models/block/raw_lead_block.json 717355700c42d3a0433c39bce8dc8b8980590aa4 assets/oreganized/models/block/raw_silver_block.json 1fc924cf9356ef366175d8f7a692e2d629683656 assets/oreganized/models/block/red_concrete_powder.json @@ -667,12 +783,21 @@ d606f62302a9656482f8076d3592122a95ebda2a assets/oreganized/models/block/red_hot_ 1974b68a782c0fcbe8b00eaf5c913341456bcfc3 assets/oreganized/models/block/red_hot_lead_trapdoor_top.json 71439d934dcfba629cdb37deb8075ea97d1e46e3 assets/oreganized/models/block/red_vigil_candle_double.json ac8f8c425fe6508fbd57b69d55208e7b16372a54 assets/oreganized/models/block/red_vigil_candle_double_ceiling.json +a6f2823b484c45706940bc609bc1af234e9ebd45 assets/oreganized/models/block/red_vigil_candle_double_ceiling_lit.json +e6093559da26c1cd856d61eecf20da2f25d51ab2 assets/oreganized/models/block/red_vigil_candle_double_lit.json 9c0ad9b1b2fafe6d1bebce7c024ea71fb0027956 assets/oreganized/models/block/red_vigil_candle_quadruple.json c41cab2ffae47d0bd0a3142d76089c4379cd9ed9 assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling.json +2caf86740892cf990c2bb918bd1451224820ba5d assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling_lit.json +9baa38a0a168eb65511afdb928ae39a6a354e410 assets/oreganized/models/block/red_vigil_candle_quadruple_lit.json 09655e6e063d35f1aaa10e9f098d9dbbb81b2d14 assets/oreganized/models/block/red_vigil_candle_single.json f52d92eac9baa613960cf83707dee758e50a2f20 assets/oreganized/models/block/red_vigil_candle_single_ceiling.json +d909af984805090804513fd6393dee4e9ac4593f assets/oreganized/models/block/red_vigil_candle_single_ceiling_lit.json +57b229278f468b170f8a710699aa8865110dfe1a assets/oreganized/models/block/red_vigil_candle_single_lit.json 90c0acdcb495c49c48b5732ca2e5364cae0c4fe5 assets/oreganized/models/block/red_vigil_candle_triple.json ffaac09a1cb2bb59f917e95b11036aa50507186f assets/oreganized/models/block/red_vigil_candle_triple_ceiling.json +d93a2e671fde45d2918d741f3ec8a5538c13187a assets/oreganized/models/block/red_vigil_candle_triple_ceiling_lit.json +5c3d4f80f09d3dfe34f7b5ecc3e6bd7193a0dfc7 assets/oreganized/models/block/red_vigil_candle_triple_lit.json +67db22c53cba6aa2a32ccaa5345d3ea6dd65289a assets/oreganized/models/block/rotting_flesh.json 325f19d03a38f249bcceb44770d7af7a5d956821 assets/oreganized/models/block/shrapnel_bomb.json 8b672f8e74c40583b323d948f93266ac9dc51d4e assets/oreganized/models/block/silver_block.json e7ae7144c130a6d2636fe8e2702c99666720d878 assets/oreganized/models/block/silver_ore.json @@ -704,12 +829,20 @@ aa1f6469d6b10f6cff1543f6c11d33e700c6d7f3 assets/oreganized/models/block/white_cr c93d99db2aacfa2035548a055fd9d7d162811a23 assets/oreganized/models/block/white_crystal_glass_rot.json 9d70d384ac31f732744cf3ae47a28b43f5a3e730 assets/oreganized/models/block/white_vigil_candle_double.json 081349756c0413498897f6b27346e381b9502cc1 assets/oreganized/models/block/white_vigil_candle_double_ceiling.json +7d0fa77a17d7eb297a2e6569bc2d05ada2ac545d assets/oreganized/models/block/white_vigil_candle_double_ceiling_lit.json +2a422cd534a5f894933e7324f9d483e9c55b1817 assets/oreganized/models/block/white_vigil_candle_double_lit.json f9e08d0d6f302ea4ba8ffd2c7a46bf343ef4107b assets/oreganized/models/block/white_vigil_candle_quadruple.json b152d5e67e17621bfcb228d55153fd8971bfdb4a assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling.json +273925d84020d7a52c38e91aa27fe47cdf7608ad assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling_lit.json +f3562297c9d6f22ee20f891e91363b28168f1fd1 assets/oreganized/models/block/white_vigil_candle_quadruple_lit.json f8a9e166fa01f7033878818462a5a3b53dbdf20b assets/oreganized/models/block/white_vigil_candle_single.json c1b1bf6606c5051b0db49f93eaf82c874db8b315 assets/oreganized/models/block/white_vigil_candle_single_ceiling.json +63c961a00dd17b0364075029c58c02a164f5491d assets/oreganized/models/block/white_vigil_candle_single_ceiling_lit.json +10216ad29449cf34122c37e4cba31bd4ab47e236 assets/oreganized/models/block/white_vigil_candle_single_lit.json 5bff922ea7ca35b44b90ab1bb00b908e9baae376 assets/oreganized/models/block/white_vigil_candle_triple.json eb8d1fbd181f56018a64d5a11c48760ad3a8f795 assets/oreganized/models/block/white_vigil_candle_triple_ceiling.json +457e0d7e627cf3e031a65bb5aabcc341b6e44371 assets/oreganized/models/block/white_vigil_candle_triple_ceiling_lit.json +09291d28c1038ac3b101b82025b1e736dda07d37 assets/oreganized/models/block/white_vigil_candle_triple_lit.json 258d5907ef1cf646306b9f0acb50b29f03d35cde assets/oreganized/models/block/yellow_concrete_powder.json c8a10b096058a91665c2493b0790391262523f4c assets/oreganized/models/block/yellow_crystal_glass.json 6376fa01d03a4a3f025743c7d18b577894f89d27 assets/oreganized/models/block/yellow_crystal_glass_in.json @@ -737,9 +870,17 @@ bd4e3e2f6e513ee45511e5f6c4d725a50487ebee assets/oreganized/models/block/yellow_c 4fb7fdcfac066ff9d10fabb5fe52aabc28e4ac56 assets/oreganized/models/block/yellow_crystal_glass_rot.json 818bcdd17a07d662e4caa9878c134d99a1c5d21e assets/oreganized/models/block/yellow_vigil_candle_double.json fbf188b7cd2af885f9e0312b74188b5369d94868 assets/oreganized/models/block/yellow_vigil_candle_double_ceiling.json +c10b15d67c32de031c36c82b67af7bbbe8de049b assets/oreganized/models/block/yellow_vigil_candle_double_ceiling_lit.json +22b9c45b743a9f5715bf72bd2b905dfd8b6300c5 assets/oreganized/models/block/yellow_vigil_candle_double_lit.json 4c2b478aedb70b75078e59267d86a079a1bfce14 assets/oreganized/models/block/yellow_vigil_candle_quadruple.json 52131dc61ab08a6b63422d60546db64ba61d1ba8 assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling.json +e1c3543a42cc458dd049c6ffc8aabded8777ea7b assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json +15f72e79a625ac55c29367f373a554b2a53884d4 assets/oreganized/models/block/yellow_vigil_candle_quadruple_lit.json 0260d7850d77241594d4d176bb95aa4ee3823a47 assets/oreganized/models/block/yellow_vigil_candle_single.json 0639b7fb1d53c41ec090e81b113b62284e735d39 assets/oreganized/models/block/yellow_vigil_candle_single_ceiling.json +c05dd1caea949330496d7d5c798dea2eac077c78 assets/oreganized/models/block/yellow_vigil_candle_single_ceiling_lit.json +ace08e0dd10e7e2f32e2cc5168a215346c409366 assets/oreganized/models/block/yellow_vigil_candle_single_lit.json afe1c8aa355fcb57c42b710e7a8018c89881d00b assets/oreganized/models/block/yellow_vigil_candle_triple.json 6973b767d153cc1d5820455417028cb56fc69074 assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling.json +4797ea87fba730952f625f8bd4eb191d2ed158d5 assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling_lit.json +a0c3d66fde77758efed8dd9254b5a1215e0455a8 assets/oreganized/models/block/yellow_vigil_candle_triple_lit.json diff --git a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 b/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 index 3f0b3e2f..02795826 100644 --- a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 +++ b/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 @@ -1,10 +1,11 @@ -// 1.20.1 2024-10-14T22:19:49.9810347 oreganized Item Models +// 1.20.1 2024-10-22T21:24:48.3830539 oreganized Item Models 18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json 30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json e79054a9c107cbd9357eebf3aacbcd7c27955b9b assets/oreganized/models/item/black_vigil_candle.json 8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json dfe6f545297f948beacae59685c3bc29a88b68d1 assets/oreganized/models/item/blue_crystal_glass_pane.json fce6f4a24293b0fe701a564eb127f4efb3145c35 assets/oreganized/models/item/blue_vigil_candle.json +b7158c4246d64e83d23470e470f46e2afc0999b1 assets/oreganized/models/item/bone_pile.json ca77522dcfcf982429256fd99ca0e9f2c195bd73 assets/oreganized/models/item/brown_crystal_glass.json cc365240dd7450add26aeaf5e0e689e985a4e5ad assets/oreganized/models/item/brown_crystal_glass_pane.json 5ad09a7c21c27fa1710fd42e043558b61c872912 assets/oreganized/models/item/brown_vigil_candle.json @@ -140,6 +141,7 @@ b7e86f5c2d080a57b173bb058c8d3300297d30b3 assets/oreganized/models/item/purple_vi 1cbba207d199088dd85850ea56d55d5976e15f3c assets/oreganized/models/item/red_crystal_glass_pane.json d7caf3f0da6c4c0b8f979e58178c609462b78d72 assets/oreganized/models/item/red_vigil_candle.json 4c384b6c9ca85ea3aa0aca55eea89363d8355bd7 assets/oreganized/models/item/scribe.json +99a55278df5e10175dfe984338a6d6163e2cea24 assets/oreganized/models/item/sepulcher.json 2f15086e7865fc768aa268ec9b3797e818976165 assets/oreganized/models/item/shrapnel_bomb.json 0a859cda7510d7756a43cfdf4bac94b2ed57ddb6 assets/oreganized/models/item/shrapnel_bomb_minecart.json c644dd3b1845706977764c51e2bf8845fba82d07 assets/oreganized/models/item/silver_block.json diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 index 28b7b70d..f3fc75bd 100644 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-17T22:46:04.3663948 Oreganized Block Tags +// 1.20.1 2024-10-24T15:33:23.489208 Oreganized Block Tags 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json @@ -21,7 +21,7 @@ b85964d677734db0ac4bbc66f550f073ed0cb5e1 data/minecraft/tags/blocks/candles.json 0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/minecraft/tags/blocks/ice.json 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json -abb8283f25d49e1094364bfc91028dd0f3af9ad6 data/minecraft/tags/blocks/mineable/pickaxe.json +c67b7a8b928eab9314c1bf55632789b63a0c62f0 data/minecraft/tags/blocks/mineable/pickaxe.json 84a13f81c79f0c05f8f7a8cbf1d3c25129a97179 data/minecraft/tags/blocks/mineable/shovel.json bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/minecraft/tags/blocks/needs_stone_tool.json @@ -34,9 +34,10 @@ a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/blocks/walls.json 81fb1b18afaa14ae90800b23c32de565d1389bb3 data/oreganized/tags/blocks/crystal_glass.json f1dfddab1e3f2dec1e7ed1c3fbf9f6a7f261cf08 data/oreganized/tags/blocks/crystal_glass_panes.json 6b73bb0ce38222c428d54ee64e82ffa1d96c64d7 data/oreganized/tags/blocks/fire_source.json +b8aa17690b27ed9cdef06ded577fc79991acf1c4 data/oreganized/tags/blocks/heat_source.json eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/scribe.json 0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/oreganized/tags/blocks/no_silktouch_using_scribe.json cf3608bd187922aeb48c566c19e8482b0dca34c7 data/oreganized/tags/blocks/prevents_lead_cloud.json 06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json 3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json -cead6b906640efcd90a6dbb5f5e17623f3631b53 data/oreganized/tags/blocks/vigil_candles.json +d83fef2771b28de02bd241459bd9e94b38482fe9 data/oreganized/tags/blocks/vigil_candles.json diff --git a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e index 044ccd30..d5127027 100644 --- a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e +++ b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e @@ -1,2 +1,2 @@ -// 1.20.1 2024-08-13T20:16:24.7249289 Sound Definitions -1c624d0138bd1190491dbcf118dbe3556f4f0713 assets/oreganized/sounds.json +// 1.20.1 2024-10-24T14:51:12.3697524 Sound Definitions +f0ce8a86a30c0f36dd7616ac727c2eea030ff058 assets/oreganized/sounds.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index c6b5f8bf..beccc180 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,6 @@ -// 1.20.1 2024-10-14T22:19:49.9779525 Recipes +// 1.20.1 2024-10-22T23:35:54.703495 Recipes +c1dfd749997c4b830ca484062a948878ea0d34f3 data/minecraft/advancements/recipes/building_blocks/bone.json +a8cdf899ebdba8cace47683d027002ed7064ce5a data/minecraft/recipes/bone.json c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/building_blocks/black_crystal_glass_pane.json 3c820d9940640deff4179f3b02cc6218a88cd4f9 data/oreganized/advancements/recipes/building_blocks/black_vigil_candle.json @@ -6,6 +8,7 @@ ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/bu 40700c3f2f5c78c617650fdd16e2ba248967353f data/oreganized/advancements/recipes/building_blocks/blue_crystal_glass_pane.json 3afa8ff228b9bef52253d0f816bd8e324730ce50 data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle.json 7010475a07b130d021b53d46647f8ef59a172c48 data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json +0f05a751905eb5ce929fafdc1e799b6d5b5711c7 data/oreganized/advancements/recipes/building_blocks/bone_pile.json a54c0b8196d1a5179a9b51cb260df9d0c4c26d4e data/oreganized/advancements/recipes/building_blocks/brown_crystal_glass_pane.json ad566c9bc4c74028180df5929a3cb34323345d5b data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle.json dab087994daf9d6948e3eec6e875738de6156414 data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json @@ -120,6 +123,7 @@ d67b8fff946ef56ae53ba4718e5556f277799309 data/oreganized/advancements/recipes/de 0b1087608b38dcbdd8e77f856cd9fb469df1e358 data/oreganized/advancements/recipes/decorations/pink_crystal_glass.json 09b30e2267c1e9b9c804283a4e5927f909506768 data/oreganized/advancements/recipes/decorations/purple_crystal_glass.json 31db1a4b63de5199b3389872a24d8cbb463a98a2 data/oreganized/advancements/recipes/decorations/red_crystal_glass.json +2611d52bb502fe3a9cc32972727352f8c8ea2bef data/oreganized/advancements/recipes/decorations/sepulcher.json dbe2cf69f8eb30cff15328377c83ace6be8cb4a3 data/oreganized/advancements/recipes/decorations/waxed_black_concrete_powder.json 4a16c51ac08111b39ddac755d86f12c9f28c9119 data/oreganized/advancements/recipes/decorations/waxed_blue_concrete_powder.json 6b1858a1aee11d96bc6f5c7b4ced8dc5a3c6313e data/oreganized/advancements/recipes/decorations/waxed_brown_concrete_powder.json @@ -190,6 +194,7 @@ e44ee55f7ab6df42caecd2dde0963666975e06ef data/oreganized/recipes/blast_raw_silve 87854bacdbf7862b5c7fed3a7c295f87fc7eecf6 data/oreganized/recipes/blue_crystal_glass_pane.json 3ad5f5c16840d814d86e97743db4b7ac78534ffb data/oreganized/recipes/blue_vigil_candle.json 800273eeda90c6c19ff17b15746d3da029577235 data/oreganized/recipes/blue_vigil_candle_dyeing.json +f35f1d5302c5bc10652c4f7b90d707442b490955 data/oreganized/recipes/bone_pile.json 509c4b4713fb5d506d4c2ec7da3c63212e0f13ba data/oreganized/recipes/brown_crystal_glass.json c261b93b8e4cbe7c710f1165c1a554e8f29fb243 data/oreganized/recipes/brown_crystal_glass_pane.json 034d662b493d46058caf53a01d9f703bb4475f42 data/oreganized/recipes/brown_vigil_candle.json @@ -292,6 +297,7 @@ f143419602a22f529db20cea44e5e370e8e4d868 data/oreganized/recipes/red_crystal_gla 7b1ea45d203fa88ba577b2289c7bd7cd8f7bc88a data/oreganized/recipes/red_vigil_candle.json 50b836078acf7b537c8a231ab6b9635261a2e4e5 data/oreganized/recipes/red_vigil_candle_dyeing.json 06ea07eed909dbcff647ac8724355430c1817e0e data/oreganized/recipes/scribe.json +d864df7f745ee19a4a400abfad7c508d0637fd30 data/oreganized/recipes/sepulcher.json 194a5e4bfb1acbb98161ddeb6c0af5b21917e508 data/oreganized/recipes/shrapnel_bomb.json cedc682018d184f9f9f384afe3b157e6cbfff4b1 data/oreganized/recipes/shrapnel_bomb_minecart.json 07595b3d623aafa3ef700093ec0449ebafa1ed27 data/oreganized/recipes/silver_block.json diff --git a/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e b/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e index e72c15b2..7e8cab4b 100644 --- a/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e +++ b/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e @@ -1,2 +1,3 @@ -// 1.20.1 2023-08-24T20:32:13.551458979 Oreganized Entity Type Tags +// 1.20.1 2024-10-22T23:12:34.5305377 Oreganized Entity Type Tags +a35af8d4e9c9c8d45cb7e2335ce6bacc00d45a8d data/oreganized/tags/entity_types/fills_sepulcher.json 29671cfa11d074462c259806e9d60468451e3cdb data/oreganized/tags/entity_types/lighter_than_lead.json diff --git a/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json index c7fd50e1..c62d19ec 100644 --- a/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/black_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/black_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/black_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/black_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/black_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/black_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/black_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/black_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/black_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/black_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/black_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/black_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/black_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/black_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/black_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/black_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json index 1af85f3c..55457e45 100644 --- a/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/blue_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/blue_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/blue_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/blue_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/blue_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/blue_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/blue_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/blue_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/blue_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/blue_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/blue_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/blue_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/blue_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/blue_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/blue_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/blue_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/bone_pile.json b/src/generated/resources/assets/oreganized/blockstates/bone_pile.json new file mode 100644 index 00000000..81ead659 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/bone_pile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "oreganized:block/bone_pile" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json index 5a7553e9..89bd067f 100644 --- a/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/brown_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/brown_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/brown_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/brown_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/brown_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/brown_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/brown_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/brown_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/brown_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/brown_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/brown_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/brown_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/brown_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/brown_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/brown_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/brown_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json index 7ef52294..2b39029d 100644 --- a/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/cyan_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/cyan_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/cyan_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/cyan_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/cyan_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/cyan_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/cyan_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/cyan_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json index 9c438d79..cede69af 100644 --- a/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/gray_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/gray_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/gray_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/gray_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/gray_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/gray_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/gray_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/gray_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/gray_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/gray_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/gray_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/gray_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/gray_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/gray_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/gray_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/gray_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json index cacdf2d0..d0ab4307 100644 --- a/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/green_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/green_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/green_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/green_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/green_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/green_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/green_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/green_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/green_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/green_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/green_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/green_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/green_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/green_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/green_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/green_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json index 3095b47e..87613976 100644 --- a/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json index fc632576..fe894cb4 100644 --- a/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json index 43a417fe..a47be6e1 100644 --- a/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/lime_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/lime_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/lime_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/lime_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/lime_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/lime_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/lime_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/lime_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/lime_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/lime_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/lime_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/lime_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/lime_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/lime_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/lime_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/lime_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json index 26443f34..5c7a5064 100644 --- a/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/magenta_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/magenta_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/magenta_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/magenta_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/magenta_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/magenta_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/magenta_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/magenta_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json index a70d26ff..50aad872 100644 --- a/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/orange_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/orange_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/orange_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/orange_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/orange_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/orange_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/orange_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/orange_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/orange_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/orange_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/orange_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/orange_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/orange_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/orange_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/orange_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/orange_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json index bba4a5af..e1b55171 100644 --- a/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/pink_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/pink_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/pink_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/pink_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/pink_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/pink_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/pink_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/pink_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/pink_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/pink_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/pink_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/pink_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/pink_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/pink_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/pink_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/pink_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json index 59fc0483..aac1daf4 100644 --- a/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/purple_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/purple_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/purple_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/purple_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/purple_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/purple_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/purple_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/purple_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/purple_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/purple_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/purple_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/purple_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/purple_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/purple_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/purple_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/purple_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json index 3cc36743..152589d2 100644 --- a/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/red_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/red_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/red_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/red_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/red_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/red_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/red_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/red_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/red_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/red_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/red_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/red_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/red_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/red_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/red_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/red_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/rotting_flesh.json b/src/generated/resources/assets/oreganized/blockstates/rotting_flesh.json new file mode 100644 index 00000000..559fe19b --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/rotting_flesh.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "oreganized:block/rotting_flesh" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/sepulcher.json b/src/generated/resources/assets/oreganized/blockstates/sepulcher.json new file mode 100644 index 00000000..c5731bcc --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/sepulcher.json @@ -0,0 +1,61 @@ +{ + "variants": { + "level=0": { + "model": "oreganized:block/sepulcher" + }, + "level=1": { + "model": "oreganized:block/sepulcher_being_filled_1" + }, + "level=10": { + "model": "oreganized:block/sepulcher_being_filled_10" + }, + "level=11": { + "model": "oreganized:block/sepulcher_being_filled_11" + }, + "level=12": { + "model": "oreganized:block/sepulcher_being_filled_12" + }, + "level=13": { + "model": "oreganized:block/sepulcher_being_filled_13" + }, + "level=14": { + "model": "oreganized:block/sepulcher_sealed_1" + }, + "level=15": { + "model": "oreganized:block/sepulcher_sealed_2" + }, + "level=16": { + "model": "oreganized:block/sepulcher_sealed_3" + }, + "level=17": { + "model": "oreganized:block/sepulcher_sealed_4" + }, + "level=18": { + "model": "oreganized:block/sepulcher_sealed_5" + }, + "level=2": { + "model": "oreganized:block/sepulcher_being_filled_2" + }, + "level=3": { + "model": "oreganized:block/sepulcher_being_filled_3" + }, + "level=4": { + "model": "oreganized:block/sepulcher_being_filled_4" + }, + "level=5": { + "model": "oreganized:block/sepulcher_being_filled_5" + }, + "level=6": { + "model": "oreganized:block/sepulcher_being_filled_6" + }, + "level=7": { + "model": "oreganized:block/sepulcher_being_filled_7" + }, + "level=8": { + "model": "oreganized:block/sepulcher_being_filled_8" + }, + "level=9": { + "model": "oreganized:block/sepulcher_being_filled_9" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json index a96cdf92..6e907d31 100644 --- a/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/defaultvigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/defaultvigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/defaultvigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/defaultvigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/defaultvigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/defaultvigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/defaultvigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/defaultvigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/defaultvigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/defaultvigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/defaultvigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/defaultvigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/defaultvigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/defaultvigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/defaultvigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/defaultvigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json index 1f277810..45b3a042 100644 --- a/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/white_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/white_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/white_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/white_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/white_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/white_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/white_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/white_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/white_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/white_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/white_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/white_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/white_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/white_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/white_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/white_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json index 9351229d..293b0b00 100644 --- a/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/yellow_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/yellow_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/yellow_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/yellow_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/yellow_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/yellow_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/yellow_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/yellow_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/lang/en_us.json b/src/generated/resources/assets/oreganized/lang/en_us.json index 6c58dc7f..f870b06a 100644 --- a/src/generated/resources/assets/oreganized/lang/en_us.json +++ b/src/generated/resources/assets/oreganized/lang/en_us.json @@ -30,6 +30,7 @@ "block.oreganized.blue_crystal_glass": "Blue Crystal Glass", "block.oreganized.blue_crystal_glass_pane": "Blue Crystal Glass Pane", "block.oreganized.blue_vigil_candle": "Blue Vigil Candle", + "block.oreganized.bone_pile": "Pile of Bones", "block.oreganized.brown_crystal_glass": "Brown Crystal Glass", "block.oreganized.brown_crystal_glass_pane": "Brown Crystal Glass Pane", "block.oreganized.brown_vigil_candle": "Brown Vigil Candle", @@ -99,6 +100,8 @@ "block.oreganized.red_crystal_glass": "Red Crystal Glass", "block.oreganized.red_crystal_glass_pane": "Red Crystal Glass Pane", "block.oreganized.red_vigil_candle": "Red Vigil Candle", + "block.oreganized.rotting_flesh": "Rotting Flesh", + "block.oreganized.sepulcher": "Sepulcher", "block.oreganized.shrapnel_bomb": "Shrapnel Bomb", "block.oreganized.silver_block": "Block of Silver", "block.oreganized.silver_ore": "Silver Ore", diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..df602460 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_lit.json new file mode 100644 index 00000000..fd8443a5 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..3accefed --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..35608203 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..7c4737b5 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_lit.json new file mode 100644 index 00000000..bbbe1523 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..65390389 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_lit.json new file mode 100644 index 00000000..25849f9c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..39e1e40e --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_lit.json new file mode 100644 index 00000000..e0caafed --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..b89a39dd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..92667fec --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..0de7dba7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_lit.json new file mode 100644 index 00000000..f1abec39 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..c1bf1f9f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_lit.json new file mode 100644 index 00000000..da96db8c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/bone_pile.json b/src/generated/resources/assets/oreganized/models/block/bone_pile.json new file mode 100644 index 00000000..f7815a8b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/bone_pile.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "oreganized:block/sepulcher_rot_5", + "side": "oreganized:block/bone_pile_side" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..7a15560b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_lit.json new file mode 100644 index 00000000..ffe951d6 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..287c133d --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..033707a7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..fe899bfc --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_lit.json new file mode 100644 index 00000000..4d5afcd4 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..4c397aba --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_lit.json new file mode 100644 index 00000000..2b1ea699 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..975cb6b4 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_lit.json new file mode 100644 index 00000000..2022d478 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..50eda84c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..ebafba49 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..775c9df9 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_lit.json new file mode 100644 index 00000000..e3773197 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..8f742c63 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_lit.json new file mode 100644 index 00000000..ac459008 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..84858335 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_lit.json new file mode 100644 index 00000000..84820cf4 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..59d974ae --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_lit.json new file mode 100644 index 00000000..e94073f7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..72c431b1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_lit.json new file mode 100644 index 00000000..a4b52ad8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..fd1b2e55 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_lit.json new file mode 100644 index 00000000..cb8b50d7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..c26ec172 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_lit.json new file mode 100644 index 00000000..85ead585 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..1f9bb71f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..b35c7530 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..e6e74962 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_lit.json new file mode 100644 index 00000000..adae53e0 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..fba1957f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_lit.json new file mode 100644 index 00000000..4a645db7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..3cb72317 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_lit.json new file mode 100644 index 00000000..d0868757 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..0be8434f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..7f76343f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..1621d7ec --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_lit.json new file mode 100644 index 00000000..abc62665 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..e48f5b8d --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_lit.json new file mode 100644 index 00000000..e06e7be9 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..52a92241 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_lit.json new file mode 100644 index 00000000..c000ba82 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..8dc51a8c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..19d3def8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..69f20aed --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_lit.json new file mode 100644 index 00000000..1bd9b8c7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..c2dd93fd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_lit.json new file mode 100644 index 00000000..6d730e2c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..fe6e1d52 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_lit.json new file mode 100644 index 00000000..50980396 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..77b8faa7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..755204eb --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..104134b2 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_lit.json new file mode 100644 index 00000000..e194b4d7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..f364d962 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_lit.json new file mode 100644 index 00000000..df43acbb --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..d58a7044 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_lit.json new file mode 100644 index 00000000..4d77bf73 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..c1dd054a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..d7bcb7de --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..b15ac455 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_lit.json new file mode 100644 index 00000000..62802520 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..4b024764 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_lit.json new file mode 100644 index 00000000..30d63d4e --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..0fb0ddbd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_lit.json new file mode 100644 index 00000000..74cdfb34 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..5274afa6 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..75614c4d --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..0af0b6f6 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_lit.json new file mode 100644 index 00000000..285e2269 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..fa621699 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_lit.json new file mode 100644 index 00000000..7c5933d3 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..b55aa7ee --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_lit.json new file mode 100644 index 00000000..5bbb3b87 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..bbf5f04b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..afeac59a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..39104dcb --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_lit.json new file mode 100644 index 00000000..e5dc343b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..9ce90de7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_lit.json new file mode 100644 index 00000000..ca09d155 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..eea37bde --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_lit.json new file mode 100644 index 00000000..6479c3af --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..e3bb891e --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..85ae571a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..def31ff1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_lit.json new file mode 100644 index 00000000..a06255bf --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..2bff56d0 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_lit.json new file mode 100644 index 00000000..d5dd90f2 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..11a93748 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_lit.json new file mode 100644 index 00000000..41e1f910 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..ea39b0e5 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..712a0079 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..68863749 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_lit.json new file mode 100644 index 00000000..c7c7d372 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..dff3aff3 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_lit.json new file mode 100644 index 00000000..1752798b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..2ddd6ce7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_lit.json new file mode 100644 index 00000000..851ade06 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..b5e78168 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..2c3b77a5 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..ccbc85be --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_lit.json new file mode 100644 index 00000000..04ae01bd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..ee4a2e80 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_lit.json new file mode 100644 index 00000000..a0b3aefa --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/rotting_flesh.json b/src/generated/resources/assets/oreganized/models/block/rotting_flesh.json new file mode 100644 index 00000000..873a28fd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/rotting_flesh.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "oreganized:block/sepulcher_rot_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..8a4425db --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_lit.json new file mode 100644 index 00000000..f8c3bef1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..02047481 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..d6c96106 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..391c78de --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_lit.json new file mode 100644 index 00000000..8a914c98 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..5f6c49bf --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_lit.json new file mode 100644 index 00000000..a30b5e67 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..8a9a6097 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_lit.json new file mode 100644 index 00000000..51bfce19 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..891f7341 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..0f70cccd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..627d3f5c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_lit.json new file mode 100644 index 00000000..66490b24 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..14b5ff0b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_lit.json new file mode 100644 index 00000000..affed964 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/bone_pile.json b/src/generated/resources/assets/oreganized/models/item/bone_pile.json new file mode 100644 index 00000000..3de20456 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/bone_pile.json @@ -0,0 +1,3 @@ +{ + "parent": "oreganized:block/bone_pile" +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/sepulcher.json b/src/generated/resources/assets/oreganized/models/item/sepulcher.json new file mode 100644 index 00000000..9b246e4c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/sepulcher.json @@ -0,0 +1,3 @@ +{ + "parent": "oreganized:block/sepulcher" +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/sounds.json b/src/generated/resources/assets/oreganized/sounds.json index e7a72c26..a0c4add8 100644 --- a/src/generated/resources/assets/oreganized/sounds.json +++ b/src/generated/resources/assets/oreganized/sounds.json @@ -1,4 +1,51 @@ { + "block.bone_pile.break": { + "sounds": [ + "oreganized:block/bone_pile_break_0", + "oreganized:block/bone_pile_break_1", + "oreganized:block/bone_pile_break_2", + "oreganized:block/bone_pile_break_3", + "oreganized:block/bone_pile_break_4" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.bone_pile.fall": { + "sounds": [ + "oreganized:block/bone_pile_step_0", + "oreganized:block/bone_pile_step_1", + "oreganized:block/bone_pile_step_2", + "oreganized:block/bone_pile_step_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.bone_pile.hit": { + "sounds": [ + "oreganized:block/bone_pile_step_0", + "oreganized:block/bone_pile_step_1", + "oreganized:block/bone_pile_step_2", + "oreganized:block/bone_pile_step_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.bone_pile.place": { + "sounds": [ + "oreganized:block/bone_pile_break_0", + "oreganized:block/bone_pile_break_1", + "oreganized:block/bone_pile_break_2", + "oreganized:block/bone_pile_break_3", + "oreganized:block/bone_pile_break_4" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.bone_pile.step": { + "sounds": [ + "oreganized:block/bone_pile_step_0", + "oreganized:block/bone_pile_step_1", + "oreganized:block/bone_pile_step_2", + "oreganized:block/bone_pile_step_3" + ], + "subtitle": "subtitles.block.generic.place" + }, "block.gargoyle.growl": { "sounds": [ "oreganized:block/gargoyle_growl_1", @@ -7,6 +54,99 @@ ], "subtitle": "subtitles.block.gargoyle.growl" }, + "block.sepulcher.break": { + "sounds": [ + "oreganized:block/sepulcher_break_0", + "oreganized:block/sepulcher_break_1", + "oreganized:block/sepulcher_break_2", + "oreganized:block/sepulcher_break_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.corpse_stuffed": { + "sounds": [ + "oreganized:block/sepulcher_corpse_stuffed_0", + "oreganized:block/sepulcher_corpse_stuffed_1" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.fall": { + "sounds": [ + "oreganized:block/sepulcher_step_0", + "oreganized:block/sepulcher_step_1", + "oreganized:block/sepulcher_step_2", + "oreganized:block/sepulcher_step_3", + "oreganized:block/sepulcher_step_4" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.filled": { + "sounds": [ + "oreganized:block/sepulcher_filled_0", + "oreganized:block/sepulcher_filled_1", + "oreganized:block/sepulcher_filled_2", + "oreganized:block/sepulcher_filled_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.harvest": { + "sounds": [ + "oreganized:block/sepulcher_harvest_0", + "oreganized:block/sepulcher_harvest_1", + "oreganized:block/sepulcher_harvest_2" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.hit": { + "sounds": [ + "oreganized:block/sepulcher_step_0", + "oreganized:block/sepulcher_step_1", + "oreganized:block/sepulcher_step_2", + "oreganized:block/sepulcher_step_3", + "oreganized:block/sepulcher_step_4" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.place": { + "sounds": [ + "oreganized:block/sepulcher_break_0", + "oreganized:block/sepulcher_break_1", + "oreganized:block/sepulcher_break_2", + "oreganized:block/sepulcher_break_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.rotting": { + "sounds": [ + "oreganized:block/sepulcher_rotting_0", + "oreganized:block/sepulcher_rotting_1", + "oreganized:block/sepulcher_rotting_2", + "oreganized:block/sepulcher_rotting_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.sealing": { + "sounds": [ + "oreganized:block/sepulcher_sealing" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.step": { + "sounds": [ + "oreganized:block/sepulcher_step_0", + "oreganized:block/sepulcher_step_1", + "oreganized:block/sepulcher_step_2", + "oreganized:block/sepulcher_step_3", + "oreganized:block/sepulcher_step_4" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.unsealing": { + "sounds": [ + "oreganized:block/sepulcher_unsealing" + ], + "subtitle": "subtitles.block.generic.place" + }, "entity.bolt_hit": { "sounds": [ "oreganized:entity/bolt_hit" diff --git a/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json new file mode 100644 index 00000000..30795b03 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bone_pile": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:bone_pile" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:bone" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bone_pile", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:bone" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/bone.json b/src/generated/resources/data/minecraft/recipes/bone.json new file mode 100644 index 00000000..f3bb921a --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/bone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "oreganized:bone_pile" + } + ], + "result": { + "count": 9, + "item": "minecraft:bone" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index eacddb0c..f216d92e 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -35,6 +35,8 @@ "oreganized:grooved_ice", "oreganized:grooved_packed_ice", "oreganized:grooved_blue_ice", + "oreganized:sepulcher", + "oreganized:bone_pile", "#oreganized:vigil_candles" ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/bone_pile.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/bone_pile.json new file mode 100644 index 00000000..5820e015 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/bone_pile.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:bone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:bone_pile" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:bone_pile" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/decorations/sepulcher.json b/src/generated/resources/data/oreganized/advancements/recipes/decorations/sepulcher.json new file mode 100644 index 00000000..551089fb --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/decorations/sepulcher.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:sepulcher" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:sepulcher" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/bone_pile.json b/src/generated/resources/data/oreganized/loot_tables/blocks/bone_pile.json new file mode 100644 index 00000000..b0e43854 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/bone_pile.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "oreganized:bone_pile" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/bone_pile" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/rotting_flesh.json b/src/generated/resources/data/oreganized/loot_tables/blocks/rotting_flesh.json new file mode 100644 index 00000000..770c82f0 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/rotting_flesh.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:air" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/rotting_flesh" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json b/src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json new file mode 100644 index 00000000..4d150352 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json @@ -0,0 +1,40 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "oreganized:sepulcher" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "block": "oreganized:sepulcher", + "condition": "minecraft:block_state_property", + "properties": { + "level": "18" + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "oreganized:bone_pile" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/sepulcher" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/bone_pile.json b/src/generated/resources/data/oreganized/recipes/bone_pile.json new file mode 100644 index 00000000..481bfee9 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/bone_pile.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "A": { + "item": "minecraft:bone" + } + }, + "pattern": [ + "AAA", + "AAA", + "AAA" + ], + "result": { + "item": "oreganized:bone_pile" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/sepulcher.json b/src/generated/resources/data/oreganized/recipes/sepulcher.json new file mode 100644 index 00000000..5ea69eb8 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/sepulcher.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "# #", + "# #", + "###" + ], + "result": { + "item": "oreganized:sepulcher" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/blocks/heat_source.json b/src/generated/resources/data/oreganized/tags/blocks/heat_source.json new file mode 100644 index 00000000..437877ba --- /dev/null +++ b/src/generated/resources/data/oreganized/tags/blocks/heat_source.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:campfires" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json index de14c5b9..1f396b24 100644 --- a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json +++ b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json @@ -1,21 +1,21 @@ { "values": [ "oreganized:vigil_candle", - "oreganized:light_blue_vigil_candle", + "oreganized:cyan_vigil_candle", + "oreganized:brown_vigil_candle", + "oreganized:black_vigil_candle", + "oreganized:green_vigil_candle", + "oreganized:lime_vigil_candle", + "oreganized:magenta_vigil_candle", + "oreganized:pink_vigil_candle", "oreganized:blue_vigil_candle", + "oreganized:light_blue_vigil_candle", "oreganized:orange_vigil_candle", + "oreganized:yellow_vigil_candle", + "oreganized:white_vigil_candle", + "oreganized:light_gray_vigil_candle", "oreganized:red_vigil_candle", "oreganized:purple_vigil_candle", - "oreganized:light_gray_vigil_candle", - "oreganized:green_vigil_candle", - "oreganized:gray_vigil_candle", - "oreganized:magenta_vigil_candle", - "oreganized:white_vigil_candle", - "oreganized:yellow_vigil_candle", - "oreganized:black_vigil_candle", - "oreganized:brown_vigil_candle", - "oreganized:lime_vigil_candle", - "oreganized:cyan_vigil_candle", - "oreganized:pink_vigil_candle" + "oreganized:gray_vigil_candle" ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json b/src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json new file mode 100644 index 00000000..06226245 --- /dev/null +++ b/src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:player", + "minecraft:zombie", + "minecraft:zombie_villager", + "minecraft:villager" + ] +} \ No newline at end of file diff --git a/src/main/java/galena/oreganized/Oreganized.java b/src/main/java/galena/oreganized/Oreganized.java index c2ac1417..5f6c3ed5 100644 --- a/src/main/java/galena/oreganized/Oreganized.java +++ b/src/main/java/galena/oreganized/Oreganized.java @@ -334,7 +334,8 @@ public void buildCreativeModeTabContents(BuildCreativeModeTabContentsEvent event if (tab == CreativeModeTabs.FUNCTIONAL_BLOCKS) { putBefore(entries, Blocks.CHEST, OBlocks.LEAD_BOLT_CRATE); putAfter(entries, Blocks.LANTERN, OBlocks.VIGIL_CANDLE); - OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) ->putAfter(entries, OBlocks.VIGIL_CANDLE.get(), block)); + OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> putAfter(entries, OBlocks.VIGIL_CANDLE.get(), block)); + putAfter(entries, Blocks.COMPOSTER, OBlocks.SEPULCHER); } if (tab == CreativeModeTabs.COLORED_BLOCKS) { putBefore(entries, Items.SHULKER_BOX, OBlocks.WHITE_CRYSTAL_GLASS); @@ -380,6 +381,7 @@ public void buildCreativeModeTabContents(BuildCreativeModeTabContentsEvent event putAfter(entries, Blocks.ICE, OBlocks.GROOVED_ICE); putAfter(entries, Blocks.PACKED_ICE, OBlocks.GROOVED_PACKED_ICE); putAfter(entries, Blocks.BLUE_ICE, OBlocks.GROOVED_BLUE_ICE); + putAfter(entries, Blocks.BONE_BLOCK, OBlocks.BONE_PILE); } if (tab == CreativeModeTabs.REDSTONE_BLOCKS) { putBefore(entries, Items.NOTE_BLOCK, OBlocks.GARGOYLE); diff --git a/src/main/java/galena/oreganized/OreganizedConfig.java b/src/main/java/galena/oreganized/OreganizedConfig.java index 5b31f5b1..fc91c335 100644 --- a/src/main/java/galena/oreganized/OreganizedConfig.java +++ b/src/main/java/galena/oreganized/OreganizedConfig.java @@ -20,6 +20,7 @@ public static class Common { public final ConfigValue pillagerSpawnWithBolts; public final ConfigValue scribeSilkTouchStone; public final ConfigValue moltenLeadDelay; + public final ConfigValue sepulcherDuration; private Common(ForgeConfigSpec.Builder builder) { builder.comment("Common"); @@ -30,6 +31,7 @@ private Common(ForgeConfigSpec.Builder builder) { pillagerSpawnWithBolts = builder.comment("Pillagers have a chance to spawn with a lead bolt in their offhand").define("pillagerSpawnWithBolts", true); scribeSilkTouchStone = builder.comment("The scribe is able to silk-touch pickaxe-related blocks").define("scribeSilkTouchStone", true); moltenLeadDelay = builder.comment("Time in ticks molten lead waits until flowing downwards").defineInRange("moltenLeadDelay", 20 * 10, 0, 20 * 100); + sepulcherDuration = builder.comment("Time in ticks the sepulcher takes to turn meat into bones").defineInRange("sepulcherDuration", 20 * 30, 0, Integer.MAX_VALUE); builder.pop(); } diff --git a/src/main/java/galena/oreganized/client/OreganizedClient.java b/src/main/java/galena/oreganized/client/OreganizedClient.java index f2ae3cf3..87b6c8e4 100644 --- a/src/main/java/galena/oreganized/client/OreganizedClient.java +++ b/src/main/java/galena/oreganized/client/OreganizedClient.java @@ -79,6 +79,7 @@ private static void registerBlockRenderers() { render(OBlocks.LEAD_TRAPDOOR, cutout); render(OBlocks.LEAD_BARS, cutout); render(OBlocks.GARGOYLE, cutout); + render(OBlocks.SEPULCHER, cutout); OBlocks.vigilCandles().forEach(block -> render(block, cutout)); diff --git a/src/main/java/galena/oreganized/client/particle/BoneFragmentParticle.java b/src/main/java/galena/oreganized/client/particle/BoneFragmentParticle.java new file mode 100644 index 00000000..ae49ddce --- /dev/null +++ b/src/main/java/galena/oreganized/client/particle/BoneFragmentParticle.java @@ -0,0 +1,58 @@ +package galena.oreganized.client.particle; + +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleProvider; +import net.minecraft.client.particle.ParticleRenderType; +import net.minecraft.client.particle.SpriteSet; +import net.minecraft.client.particle.TextureSheetParticle; +import net.minecraft.core.particles.SimpleParticleType; + +public class BoneFragmentParticle extends TextureSheetParticle { + + protected BoneFragmentParticle(ClientLevel level, double x, double y, double z, double xd, double yd, double zd) { + super(level, x, y, z); + this.gravity = 0.04F; + this.xd = xd; + this.yd = yd; + this.zd = zd; + } + + @Override + public ParticleRenderType getRenderType() { + return ParticleRenderType.PARTICLE_SHEET_OPAQUE; + } + + @Override + public void tick() { + xo = x; + yo = y; + zo = z; + if (lifetime-- <= 0) { + remove(); + } else { + yd -= gravity; + move(xd, yd, zd); + xd *= 0.9800000190734863; + yd *= 0.9800000190734863; + zd *= 0.9800000190734863; + } + } + + public static class Provider implements ParticleProvider { + private final SpriteSet sprite; + + public Provider(SpriteSet sprites) { + sprite = sprites; + } + + @Override + public Particle createParticle(SimpleParticleType type, ClientLevel level, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { + var particle = new BoneFragmentParticle(level, x, y, z, xSpeed, ySpeed, zSpeed); + particle.setLifetime(level.random.nextInt(20, 20 * 4)); + particle.pickSprite(sprite); + return particle; + } + } + +} diff --git a/src/main/java/galena/oreganized/content/block/BonePileBlock.java b/src/main/java/galena/oreganized/content/block/BonePileBlock.java new file mode 100644 index 00000000..4e4b7958 --- /dev/null +++ b/src/main/java/galena/oreganized/content/block/BonePileBlock.java @@ -0,0 +1,99 @@ +package galena.oreganized.content.block; + +import galena.oreganized.index.OParticleTypes; +import galena.oreganized.index.OSoundEvents; +import net.minecraft.client.particle.ParticleEngine; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.item.FallingBlockEntity; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.FallingBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.EntityCollisionContext; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraftforge.client.extensions.common.IClientBlockExtensions; + +import java.util.function.Consumer; + +public class BonePileBlock extends FallingBlock { + + protected static final VoxelShape SHAPE = Block.box(0.0, 0.0, 0.0, 16.0, 13.0, 16.0); + + private static StatePredicate ALWAYS = (s, l, p) -> true; + + public BonePileBlock(Properties properties) { + super(properties.isRedstoneConductor(ALWAYS).isSuffocating(ALWAYS).isViewBlocking(ALWAYS).noParticlesOnBreak()); + } + + public VoxelShape getCollisionShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { + // For particles + if(context instanceof EntityCollisionContext ec && (ec.getEntity() == null || ec.getEntity() instanceof FallingBlockEntity)) return Shapes.block(); + return SHAPE; + } + + public VoxelShape getBlockSupportShape(BlockState state, BlockGetter level, BlockPos pos) { + return Shapes.block(); + } + + public VoxelShape getVisualShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { + return Shapes.block(); + } + + @Override + public void onLand(Level level, BlockPos pos, BlockState state, BlockState other, FallingBlockEntity entity) { + super.onLand(level, pos, state, other, entity); + if (!entity.isSilent()) + level.playSound(null, pos, OSoundEvents.BONE_PILE_FALL.get(), SoundSource.BLOCKS, 1F, 1F); + particles(level, Vec3.atCenterOf(pos), 10); + } + + @Override + public boolean addLandingEffects(BlockState state, ServerLevel level, BlockPos pos, BlockState other, LivingEntity entity, int numberOfParticles) { + particles(level, entity.position().add(0, 0.2, 0.0), numberOfParticles / 2); + return true; + } + + @Override + public boolean addRunningEffects(BlockState state, Level level, BlockPos pos, Entity entity) { + var vec = entity.position().add(0, 0.2, 0.0); + var speed = entity.isSprinting() ? 0.5F : 0.2F; + var halfSpeed = speed / 2; + level.addParticle(OParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, level.random.nextDouble() * speed - halfSpeed, level.random.nextDouble() * speed - halfSpeed, level.random.nextDouble() * speed - halfSpeed); + return true; + } + + @Override + public void initializeClient(Consumer consumer) { + consumer.accept(new ClientProperties()); + } + + private void particles(Level level, Vec3 vec, int numberOfParticles) { + if (level instanceof ServerLevel serverLevel) { + serverLevel.sendParticles(OParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, numberOfParticles, 0.35, 0.35, 0.35, 0.1); + } else for (int i = 0; i < numberOfParticles; i++) { + level.addParticle(OParticleTypes.BONE_FRAGMENT.get(), + vec.x + level.random.nextDouble() - 0.5, vec.y + level.random.nextDouble() - 0.5, vec.z + level.random.nextDouble() - 0.5, + level.random.nextDouble() * 0.3 - 0.15, level.random.nextDouble() * 0.3 - 0.15, level.random.nextDouble() * 0.3 - 0.15 + ); + } + } + + public class ClientProperties implements IClientBlockExtensions { + + @Override + public boolean addDestroyEffects(BlockState state, Level level, BlockPos pos, ParticleEngine manager) { + particles(level, Vec3.atCenterOf(pos), 10); + return IClientBlockExtensions.super.addDestroyEffects(state, level, pos, manager); + } + + } + +} diff --git a/src/main/java/galena/oreganized/content/block/GargoyleBlock.java b/src/main/java/galena/oreganized/content/block/GargoyleBlock.java index e27a2af3..944e2b14 100644 --- a/src/main/java/galena/oreganized/content/block/GargoyleBlock.java +++ b/src/main/java/galena/oreganized/content/block/GargoyleBlock.java @@ -16,10 +16,8 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DispenserBlock; -import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -35,7 +33,7 @@ import static net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING; -public class GargoyleBlock extends HorizontalDirectionalBlock implements EntityBlock { +public class GargoyleBlock extends HorizontalDirectionalBlock implements TickingEntityBlock { public static final EnumProperty ATTACHMENT = EnumProperty.create("attachment", AttachmentType.class); @@ -45,11 +43,11 @@ public class GargoyleBlock extends HorizontalDirectionalBlock implements EntityB var dispenser = source.getBlockState(); var facing = dispenser.getValue(DispenserBlock.FACING); var targetPos = source.getPos().relative(facing); - var target = source.getLevel().getBlockEntity(targetPos); + var target = source.getLevel().getBlockEntity(targetPos, OBlockEntities.GARGOYLE.get()); - if (target instanceof GargoyleBlockEntity gargoyle) { + target.ifPresent(gargoyle -> { gargoyle.interact(source.getLevel(), targetPos, null, stack, false); - } + }); return stack; }; @@ -78,15 +76,6 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { } } - @Nullable - @Override - public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { - if (type != OBlockEntities.GARGOYLE.get()) return null; - BlockEntityTicker ticker = GargoyleBlockEntity::tick; - //noinspection unchecked - return (BlockEntityTicker) ticker; - } - @Override public boolean hasAnalogOutputSignal(BlockState state) { return true; @@ -158,6 +147,11 @@ public String getSerializedName() { } } + @Override + public BlockEntityType getType() { + return OBlockEntities.GARGOYLE.get(); + } + protected VoxelShape getShapeFor(BlockState state) { var facing = state.getValue(FACING); var attachment = state.getValue(ATTACHMENT); diff --git a/src/main/java/galena/oreganized/content/block/HeavyDoorBlockEntity.java b/src/main/java/galena/oreganized/content/block/HeavyDoorBlockEntity.java index ada5d9f3..694a0c76 100644 --- a/src/main/java/galena/oreganized/content/block/HeavyDoorBlockEntity.java +++ b/src/main/java/galena/oreganized/content/block/HeavyDoorBlockEntity.java @@ -1,5 +1,6 @@ package galena.oreganized.content.block; +import galena.oreganized.content.entity.Ticking; import galena.oreganized.index.OBlockEntities; import galena.oreganized.index.OBlocks; import galena.oreganized.index.ODamageSources; @@ -11,8 +12,6 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockSetType; import net.minecraft.world.level.gameevent.GameEvent; @@ -23,7 +22,7 @@ import static galena.oreganized.content.block.LeadDoorBlock.ANIMATED; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.OPEN; -public class HeavyDoorBlockEntity extends BlockEntity { +public class HeavyDoorBlockEntity extends BlockEntity implements Ticking { private int pressure = 0; @@ -41,16 +40,7 @@ public static Optional getAt(LevelAccessor level, BlockPos return Optional.empty(); } - @SuppressWarnings("unchecked") - public static @Nullable BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { - if (type == OBlockEntities.HEAVY_DOOR.get()) { - BlockEntityTicker ticker = (l, p, s, be) -> be.tick(s, l, p); - return (BlockEntityTicker) ticker; - } - - return null; - } - + @Override public void tick(BlockState state, Level level, BlockPos pos) { if (pressure <= 0) return; diff --git a/src/main/java/galena/oreganized/content/block/LeadDoorBlock.java b/src/main/java/galena/oreganized/content/block/LeadDoorBlock.java index 95722f8d..26dd461b 100644 --- a/src/main/java/galena/oreganized/content/block/LeadDoorBlock.java +++ b/src/main/java/galena/oreganized/content/block/LeadDoorBlock.java @@ -1,5 +1,6 @@ package galena.oreganized.content.block; +import galena.oreganized.index.OBlockEntities; import galena.oreganized.index.OBlocks; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -13,9 +14,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DoorBlock; -import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -24,7 +23,7 @@ import net.minecraft.world.phys.BlockHitResult; import org.jetbrains.annotations.Nullable; -public class LeadDoorBlock extends DoorBlock implements IMeltableBlock, EntityBlock, IHeavyDoor { +public class LeadDoorBlock extends DoorBlock implements IMeltableBlock, TickingEntityBlock, IHeavyDoor { /** * Not fully implemented yet @@ -44,8 +43,8 @@ public LeadDoorBlock(Properties properties) { } @Override - public @Nullable BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { - return HeavyDoorBlockEntity.getTicker(level, state, type); + public BlockEntityType getType() { + return OBlockEntities.HEAVY_DOOR.get(); } @Override diff --git a/src/main/java/galena/oreganized/content/block/LeadTrapdoorBlock.java b/src/main/java/galena/oreganized/content/block/LeadTrapdoorBlock.java index 894dbcca..712147a5 100644 --- a/src/main/java/galena/oreganized/content/block/LeadTrapdoorBlock.java +++ b/src/main/java/galena/oreganized/content/block/LeadTrapdoorBlock.java @@ -1,5 +1,6 @@ package galena.oreganized.content.block; +import galena.oreganized.index.OBlockEntities; import galena.oreganized.index.OBlocks; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -11,17 +12,15 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.TrapDoorBlock; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.phys.BlockHitResult; import org.jetbrains.annotations.Nullable; -public class LeadTrapdoorBlock extends TrapDoorBlock implements IMeltableBlock, EntityBlock, IHeavyDoor { +public class LeadTrapdoorBlock extends TrapDoorBlock implements IMeltableBlock, TickingEntityBlock, IHeavyDoor { public LeadTrapdoorBlock(Properties properties) { super(properties, OBlocks.LEAD_BLOCK_SET); @@ -33,8 +32,8 @@ public LeadTrapdoorBlock(Properties properties) { } @Override - public @Nullable BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { - return HeavyDoorBlockEntity.getTicker(level, state, type); + public BlockEntityType getType() { + return OBlockEntities.HEAVY_DOOR.get(); } @Override diff --git a/src/main/java/galena/oreganized/content/block/SepulcherBlock.java b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java new file mode 100644 index 00000000..d869cfc7 --- /dev/null +++ b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java @@ -0,0 +1,145 @@ +package galena.oreganized.content.block; + +import galena.oreganized.content.entity.SepulcherBlockEntity; +import galena.oreganized.index.OBlockEntities; +import galena.oreganized.index.OBlocks; +import galena.oreganized.index.OSoundEvents; +import net.minecraft.Util; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.IntegerProperty; +import net.minecraft.world.level.gameevent.GameEvent; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.shapes.BooleanOp; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; +import org.jetbrains.annotations.Nullable; + +public class SepulcherBlock extends Block implements TickingEntityBlock { + + public static final int MAX_LEVEL = 13; + public static final int SEALED_LEVELS = 5; + public static final int READY = MAX_LEVEL + SEALED_LEVELS; + public static final IntegerProperty LEVEL = IntegerProperty.create("level", 0, READY); + + private static final VoxelShape OUTER_SHAPE = Shapes.block(); + private static final VoxelShape[] SHAPES = Util.make(new VoxelShape[MAX_LEVEL + 1], shapes -> { + for (int level = 0; level < shapes.length; level++) { + shapes[level] = Shapes.join(OUTER_SHAPE, Block.box(3.0, Math.max(2, 1 + level), 3.0, 13.0, 16.0, 13.0), BooleanOp.ONLY_FIRST); + } + }); + + public SepulcherBlock(Properties properties) { + super(properties); + registerDefaultState(defaultBlockState().setValue(LEVEL, 0)); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + super.createBlockStateDefinition(builder); + builder.add(LEVEL); + } + + @Override + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + int fillLevel = state.getValue(LEVEL); + + if (fillLevel == READY) { + extract(player, state, level, pos); + return InteractionResult.sidedSuccess(level.isClientSide()); + } + + var held = player.getItemInHand(hand); + + if (tryInsert(held, player, state, level, pos, false)) { + player.awardStat(Stats.ITEM_USED.get(held.getItem())); + if (!player.getAbilities().instabuild) { + held.shrink(1); + } + return InteractionResult.sidedSuccess(level.isClientSide()); + } + + return InteractionResult.PASS; + } + + public static boolean tryInsert(ItemStack stack, @Nullable Player player, BlockState state, Level level, BlockPos pos, boolean simulate) { + int fillLevel = state.getValue(LEVEL); + var food = stack.getFoodProperties(null); + + if (fillLevel < MAX_LEVEL && food != null && food.isMeat()) { + if (!simulate) insert(player, state, level, pos, level.random.nextIntBetweenInclusive(1, 2)); + return true; + } + + return false; + } + + public static void insert(@Nullable Entity user, BlockState state, Level level, BlockPos pos, int by) { + var newState = state.setValue(LEVEL, Math.min(MAX_LEVEL, state.getValue(LEVEL) + by)); + level.setBlock(pos, newState, 3); + level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(user, newState)); + + if(level instanceof ServerLevel serverLevel) { + var vec = Vec3.atCenterOf(pos); + serverLevel.sendParticles(ParticleTypes.COMPOSTER, vec.x, vec.y, vec.z, 10, 0.3, 0.3, 0.3, 0.0); + } + + level.playSound(null, pos, OSoundEvents.SEPULCHER_FILLED.get(), SoundSource.BLOCKS, 0.5F, 1.0F); + } + + public static void extract(@Nullable Entity user, BlockState state, Level level, BlockPos pos) { + if (!level.isClientSide()) { + Vec3 vec = Vec3.atLowerCornerWithOffset(pos, 0.5, 1.01, 0.5).offsetRandom(level.random, 0.7F); + ItemEntity item = new ItemEntity(level, vec.x(), vec.y(), vec.z(), new ItemStack(OBlocks.BONE_PILE.get())); + item.setDefaultPickUpDelay(); + level.addFreshEntity(item); + } + + clear(user, state, level, pos); + } + + public static void clear(@Nullable Entity user, BlockState state, Level level, BlockPos pos) { + var empty = state.setValue(LEVEL, 0); + level.setBlockAndUpdate(pos, empty); + level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(user, empty)); + + level.playSound(null, pos, OSoundEvents.SEPULCHER_HARVEST.get(), SoundSource.BLOCKS, 1.0F, 1.0F); + } + + @Override + public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { + int fillLevel = state.getValue(LEVEL); + if (fillLevel == READY) return SHAPES[0]; + if (fillLevel > MAX_LEVEL) return OUTER_SHAPE; + return SHAPES[fillLevel]; + } + + @Override + public @Nullable BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new SepulcherBlockEntity(pos, state); + } + + @Override + public BlockEntityType getType() { + return OBlockEntities.SEPULCHER.get(); + } + +} diff --git a/src/main/java/galena/oreganized/content/block/TickingEntityBlock.java b/src/main/java/galena/oreganized/content/block/TickingEntityBlock.java new file mode 100644 index 00000000..66f0e494 --- /dev/null +++ b/src/main/java/galena/oreganized/content/block/TickingEntityBlock.java @@ -0,0 +1,27 @@ +package galena.oreganized.content.block; + +import galena.oreganized.content.entity.Ticking; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.Nullable; + +public interface TickingEntityBlock extends EntityBlock { + + BlockEntityType getType(); + + @Override + @Nullable + @SuppressWarnings("unchecked") + default BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + if (type == getType()) { + BlockEntityTicker ticker = (l, p, s, be) -> be.tick(s, l, p); + return (BlockEntityTicker) ticker; + } + + return null; + } +} diff --git a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java index 03d54bcf..6ee3146a 100644 --- a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java +++ b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java @@ -14,10 +14,8 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.AbstractCandleBlock; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.LanternBlock; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -30,13 +28,14 @@ import org.jetbrains.annotations.Nullable; import java.util.Optional; +import java.util.function.ToIntFunction; import static net.minecraft.world.level.block.CandleBlock.LIT; import static net.minecraft.world.level.block.CandleBlock.MAX_CANDLES; import static net.minecraft.world.level.block.CandleBlock.MIN_CANDLES; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.CANDLES; -public class VigilCandleBlock extends LanternBlock implements EntityBlock { +public class VigilCandleBlock extends LanternBlock implements TickingEntityBlock { private static VoxelShape shape(double x, double y, double z) { return Block.box(x, y, z, 6 + x, 10 + y, 6 + z); @@ -66,6 +65,8 @@ private static VoxelShape[] createShapes(boolean hanging) { private static final VoxelShape[] SHAPES = createShapes(false); private static final VoxelShape[] HANGING_SHAPES = createShapes(true); + public static final ToIntFunction LIGHT_EMISSION = state -> state.getValue(LIT) ? 6 * state.getValue(CANDLES) : 0; + public VigilCandleBlock(Properties properties) { super(properties); registerDefaultState(defaultBlockState() @@ -91,17 +92,20 @@ public boolean canBeReplaced(BlockState state, BlockPlaceContext context) { @Override public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { var candles = state.getValue(CANDLES); - var handing = state.getValue(HANGING); + var hanging = state.getValue(HANGING); var index = candles - 1; - return (handing ? HANGING_SHAPES : SHAPES)[index]; + return createShapes(hanging)[index]; + //return (handing ? HANGING_SHAPES : SHAPES)[index]; } @Override public @Nullable BlockState getStateForPlacement(BlockPlaceContext context) { BlockState previous = context.getLevel().getBlockState(context.getClickedPos()); var candles = previous.is(this) ? Math.min(previous.getValue(CANDLES) + 1, MAX_CANDLES) : MIN_CANDLES; + var lit = previous.is(this) && previous.getValue(LIT); return Optional.ofNullable(super.getStateForPlacement(context)) .map(it -> it.setValue(CANDLES, candles)) + .map(it -> it.setValue(LIT, lit)) .orElse(null); } @@ -142,15 +146,13 @@ public boolean placeLiquid(LevelAccessor level, BlockPos pos, BlockState state, } @Override - public @Nullable BlockEntity newBlockEntity(BlockPos pos, BlockState state) { - return new VigilCandleBlockEntity(pos, state); + public BlockEntityType getType() { + return OBlockEntities.VIGIL_CANDLE.get(); } - @SuppressWarnings("unchecked") @Override - public @Nullable BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { - if(type != OBlockEntities.VIGIL_CANDLE.get()) return null; - BlockEntityTicker ticker = (l, p, s, be) -> be.tick(l, p, s); - return (BlockEntityTicker) ticker; + public @Nullable BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new VigilCandleBlockEntity(pos, state); } + } diff --git a/src/main/java/galena/oreganized/content/entity/GargoyleBlockEntity.java b/src/main/java/galena/oreganized/content/entity/GargoyleBlockEntity.java index 4048cc5a..ff926912 100644 --- a/src/main/java/galena/oreganized/content/entity/GargoyleBlockEntity.java +++ b/src/main/java/galena/oreganized/content/entity/GargoyleBlockEntity.java @@ -37,7 +37,7 @@ import java.util.Collection; -public class GargoyleBlockEntity extends BlockEntity { +public class GargoyleBlockEntity extends BlockEntity implements Ticking { private static final int COOLDOWN = 20 * 30; public static final String GROWL_COOLDOWN_TAG = Oreganized.MOD_ID + ":gargoyle_use_cooldown"; @@ -66,16 +66,16 @@ private static Collection getTargets(Level level, BlockPos pos) { return level.getEntitiesOfClass(Mob.class, box, it -> it.getMobType() == MobType.UNDEAD); } - public static void tick(Level level, BlockPos pos, BlockState state, GargoyleBlockEntity be) { - be.growlCooldown--; + public void tick(BlockState state, Level level, BlockPos pos) { + growlCooldown--; - if (be.updateCooldown % 2 == 0 && be.drippingFluid != null) { - GargoyleBlock.dripParticles(state, level, pos, level.random, be.drippingFluid); + if (updateCooldown % 2 == 0 && drippingFluid != null) { + GargoyleBlock.dripParticles(state, level, pos, level.random, drippingFluid); } - if (--be.updateCooldown > 0) return; + if (--updateCooldown > 0) return; - be.updateDripParticles(level, pos, state); + updateDripParticles(level, pos, state); var targets = getTargets(level, pos); var vec = Vec3.atCenterOf(pos); @@ -89,12 +89,12 @@ public static void tick(Level level, BlockPos pos, BlockState state, GargoyleBlo var newOutputSignal = Math.max(14 - (int) closestDistance, 0); - if (newOutputSignal != be.outputSignal) { - be.outputSignal = newOutputSignal; - level.updateNeighbourForOutputSignal(pos, be.getBlockState().getBlock()); + if (newOutputSignal != outputSignal) { + outputSignal = newOutputSignal; + level.updateNeighbourForOutputSignal(pos, getBlockState().getBlock()); } - be.updateCooldown = 10; + updateCooldown = 10; } private void updateDripParticles(Level level, BlockPos pos, BlockState state) { diff --git a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java new file mode 100644 index 00000000..f395a589 --- /dev/null +++ b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java @@ -0,0 +1,259 @@ +package galena.oreganized.content.entity; + +import galena.oreganized.Oreganized; +import galena.oreganized.OreganizedConfig; +import galena.oreganized.content.block.SepulcherBlock; +import galena.oreganized.index.OBlockEntities; +import galena.oreganized.index.OBlocks; +import galena.oreganized.index.OSoundEvents; +import galena.oreganized.index.OTags; +import galena.oreganized.network.OreganizedNetwork; +import galena.oreganized.network.packet.SepulcherConsumesDeathPacket; +import galena.oreganized.network.packet.SepulcherRotsPacket; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.Container; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.Pose; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.gameevent.BlockPositionSource; +import net.minecraft.world.level.gameevent.GameEvent; +import net.minecraft.world.level.gameevent.GameEventListener; +import net.minecraft.world.level.gameevent.PositionSource; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ForgeCapabilities; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.items.wrapper.InvWrapper; +import net.minecraftforge.network.PacketDistributor; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Supplier; + +public class SepulcherBlockEntity extends BlockEntity implements Ticking, Container, GameEventListener.Holder { + + private final DeathListener listener; + private LazyOptional itemHandler; + private int progress = 0; + private boolean heated = false; + + public SepulcherBlockEntity(BlockPos pos, BlockState state) { + super(OBlockEntities.SEPULCHER.get(), pos, state); + this.listener = new DeathListener(); + this.itemHandler = createItemHandler(); + } + + private int progressNeeded(int fillLevel) { + if (fillLevel == SepulcherBlock.MAX_LEVEL) return 20; + return OreganizedConfig.COMMON.sepulcherDuration.get() / (SepulcherBlock.SEALED_LEVELS - 1); + } + + @Override + public void tick(BlockState state, Level level, BlockPos pos) { + int fillLevel = state.getValue(SepulcherBlock.LEVEL); + if (fillLevel < SepulcherBlock.MAX_LEVEL) return; + if (fillLevel == SepulcherBlock.READY) return; + + if (level.getGameTime() % 20L == 0) { + checkHeatSource(level, pos); + } + + var step = heated ? 3 : 1; + progress += step; + + if (progress < progressNeeded(fillLevel)) return; + + int nextLevel = fillLevel + 1; + level.setBlockAndUpdate(pos, state.setValue(SepulcherBlock.LEVEL, nextLevel)); + progress = 0; + + if (fillLevel == SepulcherBlock.MAX_LEVEL) { + sound(OSoundEvents.SEPULCHER_SEALING, 1F); + } else if (nextLevel == SepulcherBlock.READY) { + sound(OSoundEvents.SEPULCHER_UNSEALING, 1F); + } else { + sound(OSoundEvents.SEPULCHER_ROTTING, 0.5F); + } + + OreganizedNetwork.CHANNEL.send( + PacketDistributor.NEAR.with(PacketDistributor.TargetPoint.p(pos.getX(), pos.getY(), pos.getZ(), 16.0, level.dimension())), + new SepulcherRotsPacket(pos) + ); + } + + private void sound(Supplier sound, float volume) { + if (!hasLevel()) return; + level.playSound(null, getBlockPos(), sound.get(), SoundSource.BLOCKS, volume, 1F); + } + + private void checkHeatSource(Level level, BlockPos pos) { + var below = pos.below(); + var belowState = level.getBlockState(below); + heated = belowState.is(OTags.Blocks.HEAT_SOURCE); + } + + @Override + protected void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); + nbt.putInt("progress", progress); + nbt.putBoolean("heated", heated); + } + + @Override + public void load(CompoundTag nbt) { + super.load(nbt); + progress = nbt.getInt("progress"); + heated = nbt.getBoolean("heated"); + } + + public static boolean wasConsumerBySepulcher(Entity entity) { + return entity.getPersistentData().getBoolean(DeathListener.TAG_KEY); + } + + @Override + public DeathListener getListener() { + return listener; + } + + public class DeathListener implements GameEventListener { + private final PositionSource listenerSource; + private final int listenerRadius; + + private static final String TAG_KEY = Oreganized.MOD_ID + ":sepulched"; + + public DeathListener() { + this.listenerSource = new BlockPositionSource(SepulcherBlockEntity.this.getBlockPos()); + this.listenerRadius = 3; + } + + public PositionSource getListenerSource() { + return this.listenerSource; + } + + public int getListenerRadius() { + return this.listenerRadius; + } + + public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Context context, Vec3 vec) { + if (event != GameEvent.ENTITY_DIE) return false; + + var entity = context.sourceEntity(); + if (entity == null) return false; + if (wasConsumerBySepulcher(entity)) return false; + + if (!entity.getType().is(OTags.Entities.FILLS_SEPULCHER)) return false; + + var state = getBlockState(); + var fillLevel = state.getValue(SepulcherBlock.LEVEL); + + if (fillLevel >= SepulcherBlock.MAX_LEVEL) return false; + + entity.getPersistentData().putBoolean(TAG_KEY, true); + + if (entity instanceof LivingEntity living && !(entity instanceof Player)) { + living.skipDropExperience(); + } + + SepulcherBlock.insert(null, state, level, getBlockPos(), level.random.nextIntBetweenInclusive(3, 4)); + + sound(OSoundEvents.SEPULCHER_CORPSE_STUFFED, 1F); + + OreganizedNetwork.CHANNEL.send( + PacketDistributor.NEAR.with(PacketDistributor.TargetPoint.p(vec.x, vec.y, vec.z, 16.0, entity.level().dimension())), + new SepulcherConsumesDeathPacket(vec) + ); + + entity.setPos(Vec3.atCenterOf(getBlockPos())); + if (entity.getPose() == Pose.DYING) entity.setPose(Pose.STANDING); + + return true; + } + } + + public void invalidateCaps() { + super.invalidateCaps(); + itemHandler.invalidate(); + } + + public void reviveCaps() { + super.reviveCaps(); + itemHandler = createItemHandler(); + } + + private LazyOptional createItemHandler() { + return LazyOptional.of(() -> new InvWrapper(this)); + } + + @Override + public int getContainerSize() { + return 1; + } + + @Override + public boolean isEmpty() { + var fillLevel = getBlockState().getValue(SepulcherBlock.LEVEL); + return fillLevel < SepulcherBlock.READY; + } + + @Override + public ItemStack getItem(int slot) { + var fillLevel = getBlockState().getValue(SepulcherBlock.LEVEL); + if (fillLevel == SepulcherBlock.READY) return new ItemStack(OBlocks.BONE_PILE.get()); + return ItemStack.EMPTY; + } + + @Override + public ItemStack removeItem(int slot, int count) { + var stack = getItem(slot); + if (!stack.isEmpty()) SepulcherBlock.clear(null, getBlockState(), getLevel(), getBlockPos()); + return stack; + } + + @Override + public ItemStack removeItemNoUpdate(int slot) { + return removeItem(slot, 1); + } + + @Override + public boolean canPlaceItem(int slot, ItemStack stack) { + return SepulcherBlock.tryInsert(stack, null, getBlockState(), getLevel(), getBlockPos(), true); + } + + @Override + public boolean canTakeItem(Container container, int slot, ItemStack stack) { + return getBlockState().getValue(SepulcherBlock.LEVEL) == SepulcherBlock.READY; + } + + @Override + public void setItem(int slot, ItemStack stack) { + SepulcherBlock.tryInsert(stack, null, getBlockState(), getLevel(), getBlockPos(), false); + } + + @Override + public boolean stillValid(Player player) { + return true; + } + + @Override + public void clearContent() { + SepulcherBlock.clear(null, getBlockState(), getLevel(), getBlockPos()); + } + + @Override + public @NotNull LazyOptional getCapability(@NotNull Capability capability, Direction facing) { + if (capability == ForgeCapabilities.ITEM_HANDLER && facing != null && !this.remove) { + return itemHandler.cast(); + } else { + return super.getCapability(capability, facing); + } + } +} diff --git a/src/main/java/galena/oreganized/content/entity/Ticking.java b/src/main/java/galena/oreganized/content/entity/Ticking.java new file mode 100644 index 00000000..ad84aece --- /dev/null +++ b/src/main/java/galena/oreganized/content/entity/Ticking.java @@ -0,0 +1,11 @@ +package galena.oreganized.content.entity; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; + +public interface Ticking { + + void tick(BlockState state, Level level, BlockPos pos); + +} diff --git a/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java b/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java index 11de43d7..3c28fc3a 100644 --- a/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java +++ b/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java @@ -11,13 +11,14 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; -public class VigilCandleBlockEntity extends BlockEntity { +public class VigilCandleBlockEntity extends BlockEntity implements Ticking { public VigilCandleBlockEntity(BlockPos pos, BlockState state) { super(OBlockEntities.VIGIL_CANDLE.get(), pos, state); } - public void tick(Level level, BlockPos pos, BlockState state) { + @Override + public void tick(BlockState state, Level level, BlockPos pos) { if (level.getGameTime() % 20L != 0) return; if (!state.getValue(CandleBlock.LIT)) return; diff --git a/src/main/java/galena/oreganized/data/OBlockStates.java b/src/main/java/galena/oreganized/data/OBlockStates.java index 18379c13..81efa792 100644 --- a/src/main/java/galena/oreganized/data/OBlockStates.java +++ b/src/main/java/galena/oreganized/data/OBlockStates.java @@ -113,6 +113,9 @@ protected void registerStatesAndModels() { simpleBlock(OBlocks.GROOVED_BLUE_ICE); gargoyleBlock(OBlocks.GARGOYLE); + sepulcherBlock(OBlocks.SEPULCHER); + simpleBlock(OBlocks.BONE_PILE.get(), models().cubeColumn(blockTexture(OBlocks.BONE_PILE.get()).getPath(), Oreganized.modLoc("block/bone_pile_side"), Oreganized.modLoc("block/sepulcher_rot_5"))); + simpleBlock(OBlocks.ROTTING_FLESH.get(), models().cubeAll(blockTexture(OBlocks.ROTTING_FLESH.get()).getPath(), Oreganized.modLoc("block/sepulcher_rot_1"))); vigilCandle(OBlocks.VIGIL_CANDLE, null); OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> vigilCandle(block, color.getSerializedName())); } diff --git a/src/main/java/galena/oreganized/data/OBlockTags.java b/src/main/java/galena/oreganized/data/OBlockTags.java index 4bcc17a6..9772f9ee 100644 --- a/src/main/java/galena/oreganized/data/OBlockTags.java +++ b/src/main/java/galena/oreganized/data/OBlockTags.java @@ -22,6 +22,7 @@ import static galena.oreganized.index.OTags.Blocks.CRYSTAL_GLASS; import static galena.oreganized.index.OTags.Blocks.CRYSTAL_GLASS_PANES; import static galena.oreganized.index.OTags.Blocks.FIRE_SOURCE; +import static galena.oreganized.index.OTags.Blocks.HEAT_SOURCE; import static galena.oreganized.index.OTags.Blocks.MELTS_LEAD; import static galena.oreganized.index.OTags.Blocks.MINEABLE_WITH_SCRIBE; import static galena.oreganized.index.OTags.Blocks.ORES_LEAD; @@ -139,7 +140,10 @@ protected void addTags(HolderLookup.Provider provider) { OBlocks.GROOVED_ICE.get(), OBlocks.GROOVED_PACKED_ICE.get(), - OBlocks.GROOVED_BLUE_ICE.get() + OBlocks.GROOVED_BLUE_ICE.get(), + + OBlocks.SEPULCHER.get(), + OBlocks.BONE_PILE.get() ); var vigilCandles = tag(VIGIL_CANDLES); @@ -149,6 +153,8 @@ protected void addTags(HolderLookup.Provider provider) { tag(BlockTags.CANDLES).addTags(VIGIL_CANDLES); tag(BlockTags.MINEABLE_WITH_PICKAXE).addTags(VIGIL_CANDLES); + tag(HEAT_SOURCE).addTags(BlockTags.CAMPFIRES); + tag(BlockTags.MINEABLE_WITH_SHOVEL).add( OBlocks.WAXED_WHITE_CONCRETE_POWDER.get(), OBlocks.WAXED_ORANGE_CONCRETE_POWDER.get(), diff --git a/src/main/java/galena/oreganized/data/OEntityTags.java b/src/main/java/galena/oreganized/data/OEntityTags.java index c63b8ff9..16384ce5 100644 --- a/src/main/java/galena/oreganized/data/OEntityTags.java +++ b/src/main/java/galena/oreganized/data/OEntityTags.java @@ -3,7 +3,6 @@ import galena.oreganized.Oreganized; import galena.oreganized.index.OTags; import net.minecraft.core.HolderLookup; -import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.EntityTypeTagsProvider; import net.minecraft.world.entity.EntityType; @@ -28,6 +27,12 @@ protected void addTags(HolderLookup.Provider provider) { // Oreganized tag(OTags.Entities.LIGHTER_THAN_LEAD).add(EntityType.IRON_GOLEM); + tag(OTags.Entities.FILLS_SEPULCHER) + .add(EntityType.PLAYER) + .add(EntityType.ZOMBIE) + .add(EntityType.ZOMBIE_VILLAGER) + .add(EntityType.VILLAGER); + // Vanilla //tag(EntityTypeTags.IMPACT_PROJECTILES).add(OEntityTypes.LEAD_BOLT.get()); } diff --git a/src/main/java/galena/oreganized/data/OItemModels.java b/src/main/java/galena/oreganized/data/OItemModels.java index 2d9998a2..18e088e1 100644 --- a/src/main/java/galena/oreganized/data/OItemModels.java +++ b/src/main/java/galena/oreganized/data/OItemModels.java @@ -130,6 +130,8 @@ protected void registerModels() { block(OBlocks.GROOVED_PACKED_ICE); block(OBlocks.GROOVED_BLUE_ICE); + block(OBlocks.SEPULCHER); + block(OBlocks.BONE_PILE); OBlocks.vigilCandles().forEach(this::normalItem); for (Supplier blocks : OBlocks.WAXED_CONRETE_POWDER) { diff --git a/src/main/java/galena/oreganized/data/OLang.java b/src/main/java/galena/oreganized/data/OLang.java index 121eb32a..e09fcf02 100644 --- a/src/main/java/galena/oreganized/data/OLang.java +++ b/src/main/java/galena/oreganized/data/OLang.java @@ -38,6 +38,7 @@ protected void addTranslations() { addBlock(OBlocks.CUT_LEAD, "Cut Lead"); addBlock(OBlocks.ELECTRUM_BLOCK, "Block of Electrum"); addBlock(OBlocks.LEAD_BOLT_CRATE, "Crate of Lead Bolts"); + addBlock(OBlocks.BONE_PILE, "Pile of Bones"); addEffect(OEffects.STUNNING, "Brain Damage"); addPotion(OPotions.STUNNING, "Brain Damage"); diff --git a/src/main/java/galena/oreganized/data/OLootTables.java b/src/main/java/galena/oreganized/data/OLootTables.java index 1a536f5b..42cdc6b1 100644 --- a/src/main/java/galena/oreganized/data/OLootTables.java +++ b/src/main/java/galena/oreganized/data/OLootTables.java @@ -2,6 +2,7 @@ import galena.oreganized.Oreganized; import galena.oreganized.content.block.IMeltableBlock; +import galena.oreganized.content.block.SepulcherBlock; import galena.oreganized.data.provider.OBlockLootProvider; import galena.oreganized.index.OBlocks; import galena.oreganized.index.OEntityTypes; @@ -128,6 +129,15 @@ protected void generate() { dropSelf(blocks); } + add(OBlocks.SEPULCHER.get(), it -> createSingleItemTable(it) + .withPool(LootPool.lootPool() + .setRolls(ConstantValue.exactly(1.0F)) + .add(LootItem.lootTableItem(OBlocks.BONE_PILE.get())) + .when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(it).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(SepulcherBlock.LEVEL, SepulcherBlock.READY))) + ) + ); + dropSelf(OBlocks.BONE_PILE); + dropNothing(OBlocks.ROTTING_FLESH); OBlocks.vigilCandles().forEach(this::vigilCandle); } diff --git a/src/main/java/galena/oreganized/data/ORecipes.java b/src/main/java/galena/oreganized/data/ORecipes.java index 29005077..9bda4919 100644 --- a/src/main/java/galena/oreganized/data/ORecipes.java +++ b/src/main/java/galena/oreganized/data/ORecipes.java @@ -253,7 +253,7 @@ protected void buildRecipes(Consumer consumer) { .save(consumer, Oreganized.modLoc("poisonous_potato_from_lead")); compact(OBlocks.LEAD_BOLT_CRATE.get().asItem(), OItems.LEAD_BOLT.get()).save(consumer); - unCompact(OItems.LEAD_BOLT.get(), OBlocks.LEAD_BOLT_CRATE.get().asItem()).save(consumer, Oreganized.modLoc( "lead_bolt_from_crate")); + unCompact(OItems.LEAD_BOLT.get(), OBlocks.LEAD_BOLT_CRATE.get().asItem()).save(consumer, Oreganized.modLoc("lead_bolt_from_crate")); ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, OBlocks.LEAD_BULB.get(), 1) .pattern(" I ") @@ -310,5 +310,16 @@ protected void buildRecipes(Consumer consumer) { .group("vigil_candle") .save(consumer, RecipeBuilder.getDefaultRecipeId(block.get()).withSuffix("_dyeing")); }); + + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, OBlocks.SEPULCHER.get()) + .pattern("# #") + .pattern("# #") + .pattern("###") + .define('#', OTags.Items.INGOTS_SILVER) + .unlockedBy("has_silver", has(OTags.Items.INGOTS_SILVER)) + .save(consumer); + + compact(OBlocks.BONE_PILE.get().asItem(), Items.BONE).save(consumer); + unCompact(Items.BONE, OBlocks.BONE_PILE.get().asItem()).save(consumer); } } diff --git a/src/main/java/galena/oreganized/data/OSoundDefinitions.java b/src/main/java/galena/oreganized/data/OSoundDefinitions.java index 8cba0600..6f1f0410 100644 --- a/src/main/java/galena/oreganized/data/OSoundDefinitions.java +++ b/src/main/java/galena/oreganized/data/OSoundDefinitions.java @@ -6,6 +6,8 @@ import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.common.data.SoundDefinitionsProvider; +import java.util.stream.Stream; + public class OSoundDefinitions extends SoundDefinitionsProvider { public OSoundDefinitions(PackOutput output, ExistingFileHelper helper) { @@ -22,11 +24,11 @@ public void registerSounds() { sound("minecraft:random/fuse") ).subtitle("subtitles.entity.shrapnel_bomb.primed")); - add(OSoundEvents.BOLT_HIT, definition().with( + add(OSoundEvents.BOLT_HIT, definition().with( sound(Oreganized.MOD_ID + ":entity/bolt_hit") ).subtitle("subtitles.entity.bolt_hit")); - add(OSoundEvents.BOLT_HIT_ARMOR, definition().with( + add(OSoundEvents.BOLT_HIT_ARMOR, definition().with( sound(Oreganized.MOD_ID + ":entity/bolt_hit_armor") ).subtitle("subtitles.entity.bolt_hit_armor")); @@ -35,5 +37,77 @@ public void registerSounds() { sound(Oreganized.MOD_ID + ":block/gargoyle_growl_2"), sound(Oreganized.MOD_ID + ":block/gargoyle_growl_3") ).subtitle("subtitles.block.gargoyle.growl")); + + Stream.of(OSoundEvents.BONE_PILE_BREAK, OSoundEvents.BONE_PILE_PLACE).forEach(it -> { + add(it, definition().with( + sound(Oreganized.MOD_ID + ":block/bone_pile_break_0"), + sound(Oreganized.MOD_ID + ":block/bone_pile_break_1"), + sound(Oreganized.MOD_ID + ":block/bone_pile_break_2"), + sound(Oreganized.MOD_ID + ":block/bone_pile_break_3"), + sound(Oreganized.MOD_ID + ":block/bone_pile_break_4") + ).subtitle("subtitles.block.generic.place")); + }); + + Stream.of(OSoundEvents.BONE_PILE_HIT, OSoundEvents.BONE_PILE_STEP, OSoundEvents.BONE_PILE_FALL).forEach(it -> { + add(it, definition().with( + sound(Oreganized.MOD_ID + ":block/bone_pile_step_0"), + sound(Oreganized.MOD_ID + ":block/bone_pile_step_1"), + sound(Oreganized.MOD_ID + ":block/bone_pile_step_2"), + sound(Oreganized.MOD_ID + ":block/bone_pile_step_3") + ).subtitle("subtitles.block.generic.place")); + }); + + Stream.of(OSoundEvents.SEPULCHER_BREAK, OSoundEvents.SEPULCHER_PLACE).forEach(it -> { + add(it, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_break_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_break_1"), + sound(Oreganized.MOD_ID + ":block/sepulcher_break_2"), + sound(Oreganized.MOD_ID + ":block/sepulcher_break_3") + ).subtitle("subtitles.block.generic.place")); + }); + + Stream.of(OSoundEvents.SEPULCHER_HIT, OSoundEvents.SEPULCHER_STEP, OSoundEvents.SEPULCHER_FALL).forEach(it -> { + add(it, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_step_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_step_1"), + sound(Oreganized.MOD_ID + ":block/sepulcher_step_2"), + sound(Oreganized.MOD_ID + ":block/sepulcher_step_3"), + sound(Oreganized.MOD_ID + ":block/sepulcher_step_4") + ).subtitle("subtitles.block.generic.place")); + }); + + add(OSoundEvents.SEPULCHER_CORPSE_STUFFED, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_corpse_stuffed_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_corpse_stuffed_1") + ).subtitle("subtitles.block.generic.place")); + + add(OSoundEvents.SEPULCHER_FILLED, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_filled_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_filled_1"), + sound(Oreganized.MOD_ID + ":block/sepulcher_filled_2"), + sound(Oreganized.MOD_ID + ":block/sepulcher_filled_3") + ).subtitle("subtitles.block.generic.place")); + + add(OSoundEvents.SEPULCHER_ROTTING, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_rotting_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_rotting_1"), + sound(Oreganized.MOD_ID + ":block/sepulcher_rotting_2"), + sound(Oreganized.MOD_ID + ":block/sepulcher_rotting_3") + ).subtitle("subtitles.block.generic.place")); + + add(OSoundEvents.SEPULCHER_HARVEST, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_harvest_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_harvest_1"), + sound(Oreganized.MOD_ID + ":block/sepulcher_harvest_2") + ).subtitle("subtitles.block.generic.place")); + + add(OSoundEvents.SEPULCHER_SEALING, definition() + .with(sound(Oreganized.MOD_ID + ":block/sepulcher_sealing")) + .subtitle("subtitles.block.generic.place")); + + add(OSoundEvents.SEPULCHER_UNSEALING, definition() + .with(sound(Oreganized.MOD_ID + ":block/sepulcher_unsealing")) + .subtitle("subtitles.block.generic.place")); } + } \ No newline at end of file diff --git a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java index d6c39977..04d971c9 100644 --- a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java +++ b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java @@ -8,6 +8,7 @@ import galena.oreganized.content.block.IMeltableBlock; import galena.oreganized.content.block.LeadDoorBlock; import galena.oreganized.content.block.MoltenLeadCauldronBlock; +import galena.oreganized.content.block.SepulcherBlock; import net.minecraft.core.Direction; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -379,6 +380,22 @@ public void gargoyleBlock(Supplier block) { }); } + private String sepulcherSuffix(int fillLevel) { + if (fillLevel == 0) return ""; + if (fillLevel > SepulcherBlock.MAX_LEVEL) return "_sealed_" + (fillLevel - SepulcherBlock.MAX_LEVEL); + return "_being_filled_" + fillLevel; + } + + public void sepulcherBlock(Supplier block) { + getVariantBuilder(block.get()).forAllStates(state -> { + var fillLevel = state.getValue(SepulcherBlock.LEVEL); + var name = blockTexture(block.get()).withSuffix(sepulcherSuffix(fillLevel)); + return ConfiguredModel.builder() + .modelFile(models().getExistingFile(name)) + .build(); + }); + } + private String candleSuffix(int amount) { switch (amount) { case 1: @@ -397,13 +414,15 @@ private String candleSuffix(int amount) { public void vigilCandle(Supplier block, @Nullable String prefix) { getVariantBuilder(block.get()).forAllStatesExcept(state -> { var candles = state.getValue(BlockStateProperties.CANDLES); - var hanging = state.getValue(BlockStateProperties.HANGING); + boolean hanging = state.getValue(BlockStateProperties.HANGING); + boolean lit = state.getValue(AbstractCandleBlock.LIT); var hangingSuffix = hanging ? "_ceiling" : ""; var parent = "vigil_candle_" + candleSuffix(candles) + hangingSuffix; var optionalPrefix = Optional.ofNullable(prefix).map(it -> it + "_"); - var name = optionalPrefix.orElse("default") + parent; - var texture = BLOCK_FOLDER + "/" + optionalPrefix.orElse("") + "vigil_candle"; + var litSuffix = lit ? "_lit" : ""; + var name = optionalPrefix.orElse("default") + parent + litSuffix; + var texture = BLOCK_FOLDER + "/" + optionalPrefix.orElse("") + "vigil_candle" + litSuffix; var model = models().withExistingParent(name, Oreganized.modLoc(parent)) .texture("0", texture); @@ -411,7 +430,7 @@ public void vigilCandle(Supplier block, @Nullable String prefix return ConfiguredModel.builder() .modelFile(model) .build(); - }, BlockStateProperties.WATERLOGGED, AbstractCandleBlock.LIT); + }, BlockStateProperties.WATERLOGGED); } public void crate(Supplier block) { diff --git a/src/main/java/galena/oreganized/index/OBlockEntities.java b/src/main/java/galena/oreganized/index/OBlockEntities.java index 8a1363be..9870673f 100644 --- a/src/main/java/galena/oreganized/index/OBlockEntities.java +++ b/src/main/java/galena/oreganized/index/OBlockEntities.java @@ -4,6 +4,7 @@ import galena.oreganized.Oreganized; import galena.oreganized.content.block.HeavyDoorBlockEntity; import galena.oreganized.content.entity.GargoyleBlockEntity; +import galena.oreganized.content.entity.SepulcherBlockEntity; import galena.oreganized.content.entity.VigilCandleBlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.fml.common.Mod; @@ -20,5 +21,6 @@ public class OBlockEntities { public static final RegistryObject> HEAVY_DOOR = HELPER.createBlockEntity("heavy_door", HeavyDoorBlockEntity::new, () -> Set.of(OBlocks.LEAD_DOOR.get(), OBlocks.LEAD_TRAPDOOR.get())); public static final RegistryObject> VIGIL_CANDLE = HELPER.createBlockEntity("vigil_candle", VigilCandleBlockEntity::new, () -> OBlocks.vigilCandles().map(RegistryObject::get).collect(Collectors.toSet())); + public static final RegistryObject> SEPULCHER = HELPER.createBlockEntity("sepulcher", SepulcherBlockEntity::new, () -> Set.of(OBlocks.SEPULCHER.get())); } diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index 438b8646..bf9a2c33 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -3,6 +3,7 @@ import com.google.common.collect.ImmutableBiMap; import com.teamabnormals.blueprint.core.util.registry.BlockSubRegistryHelper; import galena.oreganized.Oreganized; +import galena.oreganized.content.block.BonePileBlock; import galena.oreganized.content.block.BulbBlock; import galena.oreganized.content.block.CrystalGlassBlock; import galena.oreganized.content.block.CrystalGlassPaneBlock; @@ -16,6 +17,7 @@ import galena.oreganized.content.block.MeltablePillarBlock; import galena.oreganized.content.block.MoltenLeadBlock; import galena.oreganized.content.block.MoltenLeadCauldronBlock; +import galena.oreganized.content.block.SepulcherBlock; import galena.oreganized.content.block.ShrapnelBombBlock; import galena.oreganized.content.block.SpottedGlanceBlock; import galena.oreganized.content.block.VigilCandleBlock; @@ -26,7 +28,6 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.CandleBlock; import net.minecraft.world.level.block.DropExperienceBlock; import net.minecraft.world.level.block.IceBlock; import net.minecraft.world.level.block.LiquidBlock; @@ -204,7 +205,11 @@ private static BlockBehaviour.Properties leadDecoProperties() { new MoltenLeadBlock(OFluids.MOLTEN_LEAD, BlockBehaviour.Properties.copy(Blocks.LAVA).mapColor(MapColor.COLOR_PURPLE))); public static final RegistryObject MOLTEN_LEAD_CAULDRON = HELPER.createBlock("molten_lead_cauldron", () -> new MoltenLeadCauldronBlock(BlockBehaviour.Properties.copy(Blocks.LAVA_CAULDRON).randomTicks())); - private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(CandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); + public static final RegistryObject SEPULCHER = register("sepulcher", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.CAULDRON).sound(OSoundTypes.SEPULCHER))); + public static final RegistryObject BONE_PILE = register("bone_pile", () -> new BonePileBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).sound(OSoundTypes.BONE_PILE).strength(1F))); + public static final RegistryObject ROTTING_FLESH = HELPER.createBlock("rotting_flesh", () -> new Block(BlockBehaviour.Properties.copy(Blocks.DIRT))); + + private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(VigilCandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); public static final RegistryObject VIGIL_CANDLE = register("vigil_candle", () -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); public static final Map> COLORED_VIGIL_CANDLES = registerColored("vigil_candle", color -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get().mapColor(color))); diff --git a/src/main/java/galena/oreganized/index/OParticleTypes.java b/src/main/java/galena/oreganized/index/OParticleTypes.java index 7dbb89b8..163b6282 100644 --- a/src/main/java/galena/oreganized/index/OParticleTypes.java +++ b/src/main/java/galena/oreganized/index/OParticleTypes.java @@ -1,6 +1,7 @@ package galena.oreganized.index; import galena.oreganized.Oreganized; +import galena.oreganized.client.particle.BoneFragmentParticle; import galena.oreganized.client.particle.CustomDrippingParticle; import galena.oreganized.client.particle.KineticHitParticle; import galena.oreganized.client.particle.LeadCloudParticleProvider; @@ -32,6 +33,7 @@ public class OParticleTypes { public static final RegistryObject KINETIC_HIT = PARTICLES.register( "kinetic_hit", () -> new SimpleParticleType(true)); public static final RegistryObject LEAD_CLOUD = PARTICLES.register( "lead_cloud", () -> new SimpleParticleType(true)); public static final RegistryObject LEAD_BLOW = PARTICLES.register( "lead_blow", () -> new SimpleParticleType(true)); + public static final RegistryObject BONE_FRAGMENT = PARTICLES.register( "bone_fragment", () -> new SimpleParticleType(true)); @SubscribeEvent @@ -46,5 +48,7 @@ public static void registerParticleFactories(RegisterParticleProvidersEvent even engine.register(KINETIC_HIT.get(), KineticHitParticle.Provider::new); engine.register(LEAD_CLOUD.get(), LeadCloudParticleProvider::new); engine.register(LEAD_BLOW.get(), ExplodeParticle.Provider::new); + engine.register(LEAD_BLOW.get(), ExplodeParticle.Provider::new); + engine.register(BONE_FRAGMENT.get(), BoneFragmentParticle.Provider::new); } } diff --git a/src/main/java/galena/oreganized/index/OSoundEvents.java b/src/main/java/galena/oreganized/index/OSoundEvents.java index d80a889a..33d9c9d0 100644 --- a/src/main/java/galena/oreganized/index/OSoundEvents.java +++ b/src/main/java/galena/oreganized/index/OSoundEvents.java @@ -18,4 +18,22 @@ public class OSoundEvents { public static final RegistryObject BOLT_HIT = HELPER.createSoundEvent("entity.bolt_hit"); public static final RegistryObject BOLT_HIT_ARMOR = HELPER.createSoundEvent("entity.bolt_hit_armor"); + + public static final RegistryObject BONE_PILE_BREAK = HELPER.createSoundEvent("block.bone_pile.break"); + public static final RegistryObject BONE_PILE_STEP = HELPER.createSoundEvent("block.bone_pile.step"); + public static final RegistryObject BONE_PILE_FALL = HELPER.createSoundEvent("block.bone_pile.fall"); + public static final RegistryObject BONE_PILE_HIT = HELPER.createSoundEvent("block.bone_pile.hit"); + public static final RegistryObject BONE_PILE_PLACE = HELPER.createSoundEvent("block.bone_pile.place"); + + public static final RegistryObject SEPULCHER_BREAK = HELPER.createSoundEvent("block.sepulcher.break"); + public static final RegistryObject SEPULCHER_STEP = HELPER.createSoundEvent("block.sepulcher.step"); + public static final RegistryObject SEPULCHER_FALL = HELPER.createSoundEvent("block.sepulcher.fall"); + public static final RegistryObject SEPULCHER_HIT = HELPER.createSoundEvent("block.sepulcher.hit"); + public static final RegistryObject SEPULCHER_PLACE = HELPER.createSoundEvent("block.sepulcher.place"); + public static final RegistryObject SEPULCHER_CORPSE_STUFFED = HELPER.createSoundEvent("block.sepulcher.corpse_stuffed"); + public static final RegistryObject SEPULCHER_FILLED = HELPER.createSoundEvent("block.sepulcher.filled"); + public static final RegistryObject SEPULCHER_ROTTING = HELPER.createSoundEvent("block.sepulcher.rotting"); + public static final RegistryObject SEPULCHER_SEALING = HELPER.createSoundEvent("block.sepulcher.sealing"); + public static final RegistryObject SEPULCHER_UNSEALING = HELPER.createSoundEvent("block.sepulcher.unsealing"); + public static final RegistryObject SEPULCHER_HARVEST = HELPER.createSoundEvent("block.sepulcher.harvest"); } diff --git a/src/main/java/galena/oreganized/index/OSoundTypes.java b/src/main/java/galena/oreganized/index/OSoundTypes.java index 86fd2eab..0341cb15 100644 --- a/src/main/java/galena/oreganized/index/OSoundTypes.java +++ b/src/main/java/galena/oreganized/index/OSoundTypes.java @@ -1,9 +1,9 @@ package galena.oreganized.index; -import net.minecraft.sounds.SoundEvents; import net.minecraft.world.level.block.SoundType; import net.minecraftforge.common.util.ForgeSoundType; public class OSoundTypes { - public static final SoundType MOLTEN_LEAD = new ForgeSoundType(1.0F, 1.0F, ()-> SoundEvents.BUCKET_FILL_LAVA, ()-> SoundEvents.LAVA_AMBIENT, ()-> SoundEvents.BUCKET_EMPTY_LAVA, ()-> SoundEvents.LAVA_AMBIENT, ()-> SoundEvents.LAVA_POP); + public static final SoundType BONE_PILE = new ForgeSoundType(1.5F, 1.0F, OSoundEvents.BONE_PILE_BREAK, OSoundEvents.BONE_PILE_STEP, OSoundEvents.BONE_PILE_PLACE, OSoundEvents.BONE_PILE_HIT, OSoundEvents.BONE_PILE_FALL); + public static final SoundType SEPULCHER = new ForgeSoundType(1.0F, 1.0F, OSoundEvents.SEPULCHER_BREAK, OSoundEvents.SEPULCHER_STEP, OSoundEvents.SEPULCHER_PLACE, OSoundEvents.SEPULCHER_HIT, OSoundEvents.SEPULCHER_FALL); } diff --git a/src/main/java/galena/oreganized/index/OTags.java b/src/main/java/galena/oreganized/index/OTags.java index e2963eda..27686ba0 100644 --- a/src/main/java/galena/oreganized/index/OTags.java +++ b/src/main/java/galena/oreganized/index/OTags.java @@ -96,6 +96,7 @@ public static class Blocks { public static final TagKey BLOWS_LEAD_CLOUD = tag("blows_lead_cloud"); public static final TagKey VIGIL_CANDLES = tag("vigil_candles"); + public static final TagKey HEAT_SOURCE = tag("heat_source"); private static TagKey tag(String name) { return BlockTags.create(Oreganized.modLoc(name)); @@ -108,6 +109,7 @@ private static TagKey forgeTag(String name) { public static class Entities { public static final TagKey> LIGHTER_THAN_LEAD = tag("lighter_than_lead"); + public static final TagKey> FILLS_SEPULCHER = tag("fills_sepulcher"); private static TagKey> tag(String name) { return EntityTypeTags.create(Oreganized.modLoc(name).toString()); diff --git a/src/main/java/galena/oreganized/mixin/EntityMixin.java b/src/main/java/galena/oreganized/mixin/EntityMixin.java index bb0f3883..c5d8a9f0 100644 --- a/src/main/java/galena/oreganized/mixin/EntityMixin.java +++ b/src/main/java/galena/oreganized/mixin/EntityMixin.java @@ -1,5 +1,7 @@ package galena.oreganized.mixin; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import galena.oreganized.index.OBlocks; import galena.oreganized.world.IMotionHolder; import net.minecraft.world.entity.Entity; import org.spongepowered.asm.mixin.Mixin; @@ -9,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Entity.class) -public class EntityMixin implements IMotionHolder { +public abstract class EntityMixin implements IMotionHolder { @Unique private double oreganized$Motion = 0.0; @@ -29,4 +31,17 @@ private void updateMotion(CallbackInfo ci) { public double oreganised$getMotion() { return oreganized$Motion; } + + @ModifyExpressionValue( + method = "canSpawnSprintParticle()Z", + at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;isSprinting()Z") + ) + public boolean isSprinting(boolean original) { + var self = (Entity) (Object) this; + return original || ( + self.level().getBlockState(self.getBlockPosBelowThatAffectsMyMovement()).is(OBlocks.BONE_PILE.get()) + && (self.getDeltaMovement().x != 0.0 || self.getDeltaMovement().z != 0.0) + ); + } + } diff --git a/src/main/java/galena/oreganized/network/OreganizedNetwork.java b/src/main/java/galena/oreganized/network/OreganizedNetwork.java index b7a2af1a..5e51083a 100644 --- a/src/main/java/galena/oreganized/network/OreganizedNetwork.java +++ b/src/main/java/galena/oreganized/network/OreganizedNetwork.java @@ -4,6 +4,8 @@ import galena.oreganized.network.packet.DoorPushingPacket; import galena.oreganized.network.packet.GargoyleParticlePacket; import galena.oreganized.network.packet.KineticHitPacket; +import galena.oreganized.network.packet.SepulcherConsumesDeathPacket; +import galena.oreganized.network.packet.SepulcherRotsPacket; import net.minecraftforge.network.NetworkRegistry; import net.minecraftforge.network.simple.SimpleChannel; @@ -22,5 +24,7 @@ public static void register() { CHANNEL.registerMessage(id++, GargoyleParticlePacket.class, GargoyleParticlePacket::write, GargoyleParticlePacket::from, GargoyleParticlePacket::handle); CHANNEL.registerMessage(id++, DoorPushingPacket.class, DoorPushingPacket::write, DoorPushingPacket::from, DoorPushingPacket::handle); CHANNEL.registerMessage(id++, KineticHitPacket.class, KineticHitPacket::write, KineticHitPacket::from, KineticHitPacket::handle); + CHANNEL.registerMessage(id++, SepulcherConsumesDeathPacket.class, SepulcherConsumesDeathPacket::write, SepulcherConsumesDeathPacket::from, SepulcherConsumesDeathPacket::handle); + CHANNEL.registerMessage(id++, SepulcherRotsPacket.class, SepulcherRotsPacket::write, SepulcherRotsPacket::from, SepulcherRotsPacket::handle); } } diff --git a/src/main/java/galena/oreganized/network/packet/SepulcherConsumesDeathPacket.java b/src/main/java/galena/oreganized/network/packet/SepulcherConsumesDeathPacket.java new file mode 100644 index 00000000..8a1e9685 --- /dev/null +++ b/src/main/java/galena/oreganized/network/packet/SepulcherConsumesDeathPacket.java @@ -0,0 +1,40 @@ +package galena.oreganized.network.packet; + +import galena.oreganized.index.OBlocks; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.TerrainParticle; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.network.NetworkEvent; + +import java.util.function.Supplier; + +public record SepulcherConsumesDeathPacket(Vec3 at) { + + public void write(FriendlyByteBuf buffer) { + buffer.writeVector3f(at.toVector3f()); + } + + public void handle(Supplier contextSupplier) { + var context = contextSupplier.get(); + context.enqueueWork(() -> { + var level = Minecraft.getInstance().level; + if (level == null) return; + + var particles = Minecraft.getInstance().particleEngine; + var state = OBlocks.ROTTING_FLESH.get().defaultBlockState(); + for (int i = 0; i < 20; i++) { + var vec = at.add(level.random.nextDouble() - 0.5, level.random.nextDouble() * 2, level.random.nextDouble() - 0.5); + particles.add(new TerrainParticle(level, vec.x, vec.y, vec.z, 0.0, 0.0, 0.0, state)); + } + }); + + context.setPacketHandled(true); + } + + public static SepulcherConsumesDeathPacket from(FriendlyByteBuf buffer) { + var at = new Vec3(buffer.readVector3f()); + return new SepulcherConsumesDeathPacket(at); + } + +} diff --git a/src/main/java/galena/oreganized/network/packet/SepulcherRotsPacket.java b/src/main/java/galena/oreganized/network/packet/SepulcherRotsPacket.java new file mode 100644 index 00000000..e22f36ea --- /dev/null +++ b/src/main/java/galena/oreganized/network/packet/SepulcherRotsPacket.java @@ -0,0 +1,40 @@ +package galena.oreganized.network.packet; + +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.network.NetworkEvent; + +import java.awt.*; +import java.util.function.Supplier; + +public record SepulcherRotsPacket(BlockPos at) { + + public void write(FriendlyByteBuf buffer) { + buffer.writeBlockPos(at); + } + + public void handle(Supplier contextSupplier) { + var context = contextSupplier.get(); + context.enqueueWork(() -> { + var level = Minecraft.getInstance().level; + if (level == null) return; + + var effectColor = new Color(8889187); + for (int i = 0; i < 20; i++) { + var vec = Vec3.atBottomCenterOf(at).add(level.random.nextDouble() - 0.5, 0.8, level.random.nextDouble() - 0.5); + level.addParticle(ParticleTypes.ENTITY_EFFECT, vec.x, vec.y, vec.z, effectColor.getRed() / 255D, effectColor.getGreen() / 255D, effectColor.getBlue() / 255D); + } + }); + + context.setPacketHandled(true); + } + + public static SepulcherRotsPacket from(FriendlyByteBuf buffer) { + var at = buffer.readBlockPos(); + return new SepulcherRotsPacket(at); + } + +} diff --git a/src/main/java/galena/oreganized/world/event/PlayerEvents.java b/src/main/java/galena/oreganized/world/event/PlayerEvents.java index febe2657..dadf9903 100644 --- a/src/main/java/galena/oreganized/world/event/PlayerEvents.java +++ b/src/main/java/galena/oreganized/world/event/PlayerEvents.java @@ -1,14 +1,12 @@ package galena.oreganized.world.event; import galena.oreganized.Oreganized; -import galena.oreganized.OreganizedConfig; import galena.oreganized.content.block.MoltenLeadCauldronBlock; import galena.oreganized.content.entity.GargoyleBlockEntity; +import galena.oreganized.content.entity.SepulcherBlockEntity; import galena.oreganized.content.item.ScribeItem; import galena.oreganized.index.OAttributes; import galena.oreganized.index.OBlocks; -import galena.oreganized.index.OEffects; -import galena.oreganized.index.OFluids; import galena.oreganized.index.OItems; import galena.oreganized.index.OTags; import net.minecraft.advancements.CriteriaTriggers; @@ -18,10 +16,7 @@ import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.DiggerItem; @@ -36,7 +31,7 @@ import net.minecraftforge.common.ToolActions; import net.minecraftforge.event.ItemAttributeModifierEvent; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent; +import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.eventbus.api.EventPriority; @@ -152,4 +147,12 @@ public static void onItemAttributes(ItemAttributeModifierEvent event) { } } + @SubscribeEvent + public static void onLivingDrops(LivingDropsEvent event) { + if (event.getEntity() instanceof Player) return; + if (SepulcherBlockEntity.wasConsumerBySepulcher(event.getEntity())) { + event.setCanceled(true); + } + } + } diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 26438df9..79ce37b2 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -14,4 +14,5 @@ public net.minecraft.client.particle.SingleQuadParticle f_107663_ # quadSize # q public net.minecraft.world.entity.LivingEntity m_6125_()Z # shouldDropLoot public net.minecraft.client.gui.Gui$HeartType protected net.minecraft.world.level.block.DoorBlock m_245755_(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Z)V # playSound; -protected net.minecraft.client.particle.CritParticle (Lnet/minecraft/client/multiplayer/ClientLevel;DDDDDD)V # CritParticle \ No newline at end of file +protected net.minecraft.client.particle.CritParticle (Lnet/minecraft/client/multiplayer/ClientLevel;DDDDDD)V # CritParticle +public net.minecraft.world.entity.Entity m_20099_()Lnet/minecraft/core/BlockPos; # getBlockPosBelowThatAffectsMyMovement; \ No newline at end of file diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher.json b/src/main/resources/assets/oreganized/models/block/sepulcher.json index 0b3eb9ac..a01af8c3 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher.json @@ -1,9 +1,10 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_1.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_1.json index e810964b..16e54528 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_1.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_1.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_empty", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_empty", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_10.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_10.json index a330094e..e447c0de 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_10.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_10.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_05", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_05", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_11.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_11.json index 16a03555..1b5e3a31 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_11.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_11.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_06", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_06", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_12.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_12.json index d6056ebe..e75eeba2 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_12.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_12.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_06", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_06", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_13.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_13.json index e1325f45..33649b63 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_13.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_13.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_07", - "2": "sepulcher_rot_2", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_07", + "2": "oreganized:block/sepulcher_rot_2", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_2.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_2.json index 89945565..b8dc9e14 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_2.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_2.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_empty", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_empty", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_3.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_3.json index e5ff467a..d0e0a7c6 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_3.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_3.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_empty", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_empty", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_4.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_4.json index 71241c18..0fc1373c 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_4.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_4.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_01", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_01", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_5.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_5.json index 95065f50..d3099e95 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_5.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_5.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_02", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_02", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_6.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_6.json index 125a893c..68d29d95 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_6.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_6.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_03", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_03", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_7.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_7.json index 784e32d7..8af47361 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_7.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_7.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_03", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_03", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_8.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_8.json index 0eca6ffb..c09ef53b 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_8.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_8.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_04", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_04", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_9.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_9.json index 610c87da..b7d6535e 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_9.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_9.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_04", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_04", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_1.json b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_1.json index b835511c..1974fe08 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_1.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_1.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_07", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_07", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_2.json b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_2.json index 4972f113..fdc8d171 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_2.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_2.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_06", - "2": "sepulcher_rot_2", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_06", + "2": "oreganized:block/sepulcher_rot_2", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_3.json b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_3.json index f1db21e8..a35f8048 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_3.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_3.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_05", - "2": "sepulcher_rot_3", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_05", + "2": "oreganized:block/sepulcher_rot_3", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_4.json b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_4.json index e2c8a4c0..0d5c4cb2 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_4.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_4.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_04", - "2": "sepulcher_rot_4", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_04", + "2": "oreganized:block/sepulcher_rot_4", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_5.json b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_5.json index fd95564f..2dee6296 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_5.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_5.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_bones", - "2": "sepulcher_rot_5", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_bones", + "2": "oreganized:block/sepulcher_rot_5", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/particles/bone_fragment.json b/src/main/resources/assets/oreganized/particles/bone_fragment.json new file mode 100644 index 00000000..8c7b284c --- /dev/null +++ b/src/main/resources/assets/oreganized/particles/bone_fragment.json @@ -0,0 +1,9 @@ +{ + "textures": [ + "oreganized:bone_fragment_0", + "oreganized:bone_fragment_1", + "oreganized:bone_fragment_2", + "oreganized:bone_fragment_3", + "oreganized:bone_fragment_4" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_0.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_0.ogg new file mode 100644 index 00000000..1a864208 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_0.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_1.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_1.ogg new file mode 100644 index 00000000..8b0105b5 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_1.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_2.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_2.ogg new file mode 100644 index 00000000..79838ac6 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_2.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_3.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_3.ogg new file mode 100644 index 00000000..fdee771b Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_3.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_4.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_4.ogg new file mode 100644 index 00000000..556cc68f Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_4.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_0.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_0.ogg new file mode 100644 index 00000000..00f6a076 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_0.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_1.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_1.ogg new file mode 100644 index 00000000..3096f38f Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_1.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_2.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_2.ogg new file mode 100644 index 00000000..d2c7096c Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_2.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_3.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_3.ogg new file mode 100644 index 00000000..b410428c Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_3.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_0.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_0.ogg new file mode 100644 index 00000000..b0883ef6 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_0.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_1.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_1.ogg new file mode 100644 index 00000000..40bfd91b Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_1.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_2.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_2.ogg new file mode 100644 index 00000000..69fb2f87 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_2.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_3.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_3.ogg new file mode 100644 index 00000000..a8458b2b Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_3.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_corpse_stuffed_0.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_corpse_stuffed_0.ogg new file mode 100644 index 00000000..d44dcbad Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_corpse_stuffed_0.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_corpse_stuffed_1.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_corpse_stuffed_1.ogg new file mode 100644 index 00000000..e1f36ae4 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_corpse_stuffed_1.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_0.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_0.ogg new file mode 100644 index 00000000..8c3681b4 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_0.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_1.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_1.ogg new file mode 100644 index 00000000..e2a1f3a2 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_1.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_2.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_2.ogg new file mode 100644 index 00000000..b21ee369 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_2.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_3.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_3.ogg new file mode 100644 index 00000000..d2b55db2 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_3.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_0.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_0.ogg new file mode 100644 index 00000000..518b7028 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_0.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_1.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_1.ogg new file mode 100644 index 00000000..08bcec8b Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_1.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_2.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_2.ogg new file mode 100644 index 00000000..a09a5be3 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_2.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_0.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_0.ogg new file mode 100644 index 00000000..46e6b9ae Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_0.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_1.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_1.ogg new file mode 100644 index 00000000..f0e7345d Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_1.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_2.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_2.ogg new file mode 100644 index 00000000..71e1049c Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_2.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_3.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_3.ogg new file mode 100644 index 00000000..b9a44410 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_3.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_sealing.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_sealing.ogg new file mode 100644 index 00000000..e96dfc64 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_sealing.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_0.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_0.ogg new file mode 100644 index 00000000..79af8e76 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_0.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_1.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_1.ogg new file mode 100644 index 00000000..e1819827 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_1.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_2.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_2.ogg new file mode 100644 index 00000000..f55769c9 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_2.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_3.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_3.ogg new file mode 100644 index 00000000..83c304bd Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_3.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_4.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_4.ogg new file mode 100644 index 00000000..e0146d52 Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_4.ogg differ diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_unsealing.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_unsealing.ogg new file mode 100644 index 00000000..9ad35bce Binary files /dev/null and b/src/main/resources/assets/oreganized/sounds/block/sepulcher_unsealing.ogg differ diff --git a/src/main/resources/assets/oreganized/textures/block/black_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/black_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/black_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/blue_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/blue_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/blue_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/bone_pile_side.png b/src/main/resources/assets/oreganized/textures/block/bone_pile_side.png new file mode 100644 index 00000000..a431c1d4 Binary files /dev/null and b/src/main/resources/assets/oreganized/textures/block/bone_pile_side.png differ diff --git a/src/main/resources/assets/oreganized/textures/block/brown_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/brown_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/brown_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/cyan_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/cyan_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/cyan_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/gray_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/gray_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/gray_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/green_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/green_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/green_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/light_blue_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/light_blue_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/light_blue_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/light_gray_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/light_gray_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/light_gray_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/lime_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/lime_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/lime_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/magenta_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/magenta_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/magenta_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/orange_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/orange_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/orange_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/pink_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/pink_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/pink_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/purple_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/purple_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/purple_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/red_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/red_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/red_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/white_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/white_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/white_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/yellow_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/yellow_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/yellow_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/particle/bone_fragment_0.png b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_0.png new file mode 100644 index 00000000..b5db0892 Binary files /dev/null and b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_0.png differ diff --git a/src/main/resources/assets/oreganized/textures/particle/bone_fragment_1.png b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_1.png new file mode 100644 index 00000000..33f0bf38 Binary files /dev/null and b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_1.png differ diff --git a/src/main/resources/assets/oreganized/textures/particle/bone_fragment_2.png b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_2.png new file mode 100644 index 00000000..3b253edb Binary files /dev/null and b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_2.png differ diff --git a/src/main/resources/assets/oreganized/textures/particle/bone_fragment_3.png b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_3.png new file mode 100644 index 00000000..1f501d10 Binary files /dev/null and b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_3.png differ diff --git a/src/main/resources/assets/oreganized/textures/particle/bone_fragment_4.png b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_4.png new file mode 100644 index 00000000..84a8a9dd Binary files /dev/null and b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_4.png differ diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json index 97e5978c..1948a8ab 100644 --- a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json @@ -3,6 +3,7 @@ "entries": [ "oreganized:electrum_upgrade_smithing_template", "oreganized:lead_bolts_in_outpost", - "oreganized:scribe_in_ancient_cities" + "oreganized:scribe_in_ancient_cities", + "oreganized:bone_piles_in_desert_temples" ] } \ No newline at end of file diff --git a/src/main/resources/data/oreganized/loot_modifiers/bone_piles_in_desert_temples.json b/src/main/resources/data/oreganized/loot_modifiers/bone_piles_in_desert_temples.json new file mode 100644 index 00000000..1664bfc2 --- /dev/null +++ b/src/main/resources/data/oreganized/loot_modifiers/bone_piles_in_desert_temples.json @@ -0,0 +1,17 @@ +{ + "type": "oreganized:add_item", + "conditions": [ + { + "condition": "forge:loot_table_id", + "loot_table_id": "minecraft:chests/desert_pyramid" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.4 + } + ], + "item": { + "id": "oreganized:bone_pile", + "Count": 2 + } +} \ No newline at end of file