diff --git a/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 b/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 index eaaf6fff..f83fa9e7 100644 --- a/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 +++ b/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 @@ -1,4 +1,4 @@ -// 1.21 2024-06-17T00:01:49.8529801 Extravaganza!/Model Definitions +// 1.21 2024-06-17T23:04:12.9776553 Extravaganza!/Model Definitions 09069aeb77e14004aeda8fa0146eb6ccff536f60 assets\extravaganza\models\block\brown_split_festive_rubber_wall_post.json d1ed7f65065fc79cfeedfa82dca34a19eedecb03 assets\extravaganza\blockstates\light_gray_festive_rubber_grate_wall.json 875af43ba13f0c507f90a04acd0ffc1d8260b000 assets\extravaganza\models\block\plant_padded_festive_rubber_slab_top.json @@ -380,8 +380,8 @@ fb07e98d22a05479b92876f342b9e92208f66962 assets\extravaganza\blockstates\brown_s 353d179b4e2b9125f595726b27ddc262cd2a721d assets\extravaganza\models\block\black_wooded_festive_rubber_wall_side_tall.json 757de408b3e4351e94149a4b8b2f23e91eb354f3 assets\extravaganza\models\block\red_curved_festive_rubber_wall_side_tall.json 16e362c2271bd78f628b4f71955f65c83e293b43 assets\extravaganza\models\block\plant_sharped_festive_rubber_wall_inventory.json -4c026736850261e82adcb163602320faee2a7f99 assets\extravaganza\blockstates\nymph_screwed_festive_rubber.json 967acd6654260c6f86f63f4d3e37af73b8cdc38a assets\extravaganza\blockstates\tomato_curved_festive_rubber_stairs.json +4c026736850261e82adcb163602320faee2a7f99 assets\extravaganza\blockstates\nymph_screwed_festive_rubber.json ef6f358f1e7364f14a2dc5108a6b3fc38266e61d assets\extravaganza\models\block\tear_windowed_festive_rubber_wall_post.json 1581000e483f43c2d2e7fce1c4723d8200693be9 assets\extravaganza\models\item\tomato_tiled_festive_rubber.json 15c8d4ce5d420ba2ac02cf5a04fa675832ca481d assets\extravaganza\models\block\black_tiled_festive_rubber_stairs.json @@ -454,8 +454,8 @@ cbc63125c1a9d82ced96a6aab0249f5fb6f2e5f7 assets\extravaganza\blockstates\plant_w 10fa925c71f2a541ee8d4c31f6cd6d375d6aae9c assets\extravaganza\blockstates\gray_festive_rubber_grate.json 0d962f5d9e2b6161e658e9f7e48f2e76b4ffdc58 assets\extravaganza\models\item\purple_dotted_festive_rubber_slab.json 1852d3cdf2355ff23e642ba40883e9643ec28179 assets\extravaganza\blockstates\red_sharped_festive_rubber.json -74794f41207db64f577e455e53e01402c53986b8 assets\extravaganza\blockstates\magenta_sharped_festive_rubber_wall.json 311af2b6977847b4b33316ae0a58e0db768f7e90 assets\extravaganza\blockstates\light_blue_poured_festive_rubber_stairs.json +74794f41207db64f577e455e53e01402c53986b8 assets\extravaganza\blockstates\magenta_sharped_festive_rubber_wall.json fba72213233f7d7f2acca1be8ae9a1e0e4f0d9b4 assets\extravaganza\models\item\magenta_poured_festive_rubber_wall.json 864a177db6dfed1bb837b295184e3a269c186b8e assets\extravaganza\models\item\light_blue_curved_festive_rubber_wall.json 588cb75f44d7d1da9fe4951563c4c9ae07ffe9a5 assets\extravaganza\blockstates\brown_slipped_festive_rubber_stairs.json @@ -751,8 +751,8 @@ b6619926a6b4402eb761049d7eded1090627a504 assets\extravaganza\models\block\white_ b5761bced5f78589758ca457353aaae6b51c6ff0 assets\extravaganza\models\item\common_festive_coin.json b8fea835bfb4633c9ee3a52fca75687d1724ef02 assets\extravaganza\blockstates\orange_curved_festive_rubber_slab.json 5b4a8df356cf05a60f8f5b93cd19a94916d274ab assets\extravaganza\models\item\yellow_wooded_festive_rubber.json -30f6e62028a23446a9b5d764d13016f36b579e94 assets\extravaganza\blockstates\light_gray_curved_festive_rubber_stairs.json 93c7d08d28ab8f4fffb47bb98048dcf3d50e75fc assets\extravaganza\blockstates\black_festive_rubber_ladder.json +30f6e62028a23446a9b5d764d13016f36b579e94 assets\extravaganza\blockstates\light_gray_curved_festive_rubber_stairs.json 6d05c5c9304cd3b1689ff5e7ad344ef062928390 assets\extravaganza\models\block\black_festive_rubber_stairs.json 358fe3dbaf281f968f776f9f327a1aa306569cf8 assets\extravaganza\models\block\black_perforated_festive_rubber_stairs_outer.json ae19a6e03b27746fc9b177ace612b9770cb247a2 assets\extravaganza\models\block\pink_slipped_festive_rubber_stairs_inner.json @@ -804,11 +804,11 @@ a079279328aea7641eb0b3959eb58a02ae17c4d0 assets\extravaganza\blockstates\purple_ 445069cd9b2c2c0b961102666457e75290e86204 assets\extravaganza\models\item\light_gray_perforated_festive_rubber.json 718d7393467e63f3e44a6e4343a791de08d6dede assets\extravaganza\models\block\black_wooded_festive_rubber_slab_top.json 177b69d0605464ce30eefa2548fff335b3b81ddc assets\extravaganza\models\item\orange_slipped_festive_rubber_stairs.json -fef86f1c1e4d0c32292c76b7b1b503499ae12bca assets\extravaganza\blockstates\plant_screwed_festive_rubber_wall.json 50072a7dfdd30143662755fa0ce9958682d4216c assets\extravaganza\blockstates\nymph_wooded_festive_rubber.json +fef86f1c1e4d0c32292c76b7b1b503499ae12bca assets\extravaganza\blockstates\plant_screwed_festive_rubber_wall.json ffd574e461d5e36a699cd0567edf63407c8d5683 assets\extravaganza\models\block\light_blue_striped_festive_rubber_wall_post.json -bb153d14d8ef0bceab99535210ad812d5c15d243 assets\extravaganza\models\block\gray_scratched_festive_rubber_slab.json a39a3688505dd9057420b5b4825a8833bde1e8e9 assets\extravaganza\models\block\brown_festive_rubber_grate.json +bb153d14d8ef0bceab99535210ad812d5c15d243 assets\extravaganza\models\block\gray_scratched_festive_rubber_slab.json c424297837e98b2cd46261eb6ee7d52375cccd1d assets\extravaganza\blockstates\lime_festive_rubber.json a82d502e412efd7b1c151a457c25c99df2f2bea8 assets\extravaganza\models\block\brown_windowed_festive_rubber_stairs_outer.json add9d6fcf0738cbdf22f760a180673b487b01ff8 assets\extravaganza\models\block\orange_split_festive_rubber_stairs_outer.json @@ -833,8 +833,8 @@ acd2482f3921d207e9fc17eccc2a7336fb7d5ce7 assets\extravaganza\models\item\magenta 706ecabdf6193d995aeecdc9e24d5b86d7511b39 assets\extravaganza\blockstates\red_festive_rubber.json 2ba88bd3764c269beddbb2d5ee192f78a1080d3c assets\extravaganza\models\item\pink_sharped_festive_rubber_slab.json 522bdcaa2bc83eaced18f07ce0464061451f9220 assets\extravaganza\models\block\pink_slipped_festive_rubber_stairs.json -39c95be2bd6e502fbb4996c55d5583467562f576 assets\extravaganza\blockstates\light_gray_tiled_festive_rubber_slab.json 42534ff5efee081c9bf0818182836c939caeee81 assets\extravaganza\blockstates\purple_barred_festive_rubber_stairs.json +39c95be2bd6e502fbb4996c55d5583467562f576 assets\extravaganza\blockstates\light_gray_tiled_festive_rubber_slab.json 627db16d3d80ce9356906747d331d4fb907fd82f assets\extravaganza\blockstates\pink_split_festive_rubber.json 395b9d4af3c7bc94fbe3ad78bd31fbe0c06895a2 assets\extravaganza\models\block\plant_screwed_festive_rubber_slab_top.json c2b24af0b164587bb1a9d607124b48775c63fb42 assets\extravaganza\models\block\black_split_festive_rubber_wall_side.json @@ -1075,8 +1075,8 @@ d3c2a10094356828fc5ddf6e20c5043f9c54f041 assets\extravaganza\models\block\brown_ 087450cd211cedc6695be10f6a391c534c71e62c assets\extravaganza\models\item\pink_slipped_festive_rubber_wall.json 5fd58258a7e5dace73d5926201555247dfa2a868 assets\extravaganza\models\item\light_blue_windowed_festive_rubber.json 4cc0ff233750a4e2c8723e90003951f54983a21f assets\extravaganza\blockstates\green_wooded_festive_rubber_stairs.json -1ccacf040c334baa078c8c113990f246927cd70b assets\extravaganza\blockstates\white_dotted_festive_rubber_wall.json 7f4997eed6e3ceeafdb920a11f87f4f301c8e52b assets\extravaganza\blockstates\brown_split_festive_rubber_slab.json +1ccacf040c334baa078c8c113990f246927cd70b assets\extravaganza\blockstates\white_dotted_festive_rubber_wall.json 127f0512459f2c72004d0fbccfd205660d104a9d assets\extravaganza\blockstates\light_blue_bent_festive_rubber_wall.json 7d02caff0eb290267ffe9523ebaf9279a0309c5c assets\extravaganza\blockstates\purple_sharped_festive_rubber_stairs.json 09f39073650af508330afb1ee404ee63c75a9ad1 assets\extravaganza\blockstates\magenta_tiled_festive_rubber_slab.json @@ -1170,8 +1170,8 @@ ec853f24d6dbad57b124b813cb6ead6ffce015d0 assets\extravaganza\models\block\black_ 3bd5dc5bfa12656e797d69e85fd08d192cd2c321 assets\extravaganza\models\block\nymph_tiled_festive_rubber_wall_side_tall.json 51ca6861430758540a642528963a63233ad4f850 assets\extravaganza\models\block\red_perforated_festive_rubber_wall_inventory.json d68f7e21620502b56636936b39a0d2e33fab1bb0 assets\extravaganza\models\block\black_padded_festive_rubber_stairs.json -d2101b88cc49c40662ed5afb33200ea608cf77d1 assets\extravaganza\blockstates\white_curved_festive_rubber_wall.json ece4f3a33e5833ad08e6e094543643eb84114379 assets\extravaganza\blockstates\blue_tiled_festive_rubber_stairs.json +d2101b88cc49c40662ed5afb33200ea608cf77d1 assets\extravaganza\blockstates\white_curved_festive_rubber_wall.json 88d7f7bef83a4b2ee771ed1b3ad3857e3b2bcb84 assets\extravaganza\models\block\lime_dotted_festive_rubber_wall_side_tall.json 3a0fbea6c22c7a0bc1fb0285b551dce1c0193a03 assets\extravaganza\models\item\blue_striped_festive_rubber.json fa6765294661c7aa458f142c3a2155cfaf08cc92 assets\extravaganza\models\block\tomato_padded_festive_rubber_slab.json @@ -1295,8 +1295,8 @@ ee98b40a35d0ae5dd218f6268ba287f4f80e1660 assets\extravaganza\models\block\tear_b 17cde1f390b7e6c8fe278401c609df0b206decd5 assets\extravaganza\blockstates\tear_festive_rubber_grate.json 8ea5d49495e05c9d6289ecf8b7e4677dd684a19a assets\extravaganza\models\block\gray_slipped_festive_rubber_slab_top.json b38902e5a4ee2ff506640bc1378c1350406896bc assets\extravaganza\models\block\lime_slipped_festive_rubber_wall_post.json -9575ef39e2d880eca036b171775f34daae902dc8 assets\extravaganza\models\item\light_blue_barred_festive_rubber_slab.json b8a56d7f280f057866d1fec64b98552fdc889d2b assets\extravaganza\models\block\white_curved_festive_rubber_stairs_inner.json +9575ef39e2d880eca036b171775f34daae902dc8 assets\extravaganza\models\item\light_blue_barred_festive_rubber_slab.json 9f6f232bf8b1c71e900032e2093ec7d3ac8c08bd assets\extravaganza\blockstates\cyan_padded_festive_rubber_wall.json 4b6c7a469a23ef05c6c6c325e6b0ffea4948deba assets\extravaganza\models\block\plant_striped_festive_rubber_wall_inventory.json 5e22742789a147d78c998bcf991618d1124b2379 assets\extravaganza\models\block\nymph_barred_festive_rubber_stairs_inner.json @@ -2191,8 +2191,8 @@ ee153799fa7cf0a0dd053bc802c6827e963eeeb6 assets\extravaganza\models\block\light_ 8f09fddc0732e76a9819fe61e5a0149b5a5ff70e assets\extravaganza\models\item\light_blue_screwed_festive_rubber_slab.json 86de1ea60653bd47d4e35dcef4863593425b5093 assets\extravaganza\models\block\tear_barred_festive_rubber_wall_side.json 459a1fbec1262f9a66f508e7f02f94d3a10ef888 assets\extravaganza\models\block\pink_wooded_festive_rubber_wall_side_tall.json -f4d42ec8c5a836883ee7b2a2af1eafb7b0ec9500 assets\extravaganza\models\block\light_blue_curved_festive_rubber_wall_inventory.json d743a954ecd72288d957020064ff73b5932e43a4 assets\extravaganza\models\block\plant_windowed_festive_rubber_wall_side.json +f4d42ec8c5a836883ee7b2a2af1eafb7b0ec9500 assets\extravaganza\models\block\light_blue_curved_festive_rubber_wall_inventory.json f58e3818d60d30d5bc0819e4943c6ad6d2b43cf9 assets\extravaganza\models\block\green_dotted_festive_rubber_wall_side_tall.json 1a43a713d6fe1246648bcacbf8fa1082791466ef assets\extravaganza\models\block\magenta_slipped_festive_rubber_wall_post.json 428f5b8aa64e6ed39206461728f5c842f85feff2 assets\extravaganza\models\block\plant_dotted_festive_rubber_wall_inventory.json @@ -2327,8 +2327,8 @@ b5671def716e2e9ed900b76cb47a652fba17e7ff assets\extravaganza\models\item\brown_p 0af97cc099a18a2b0b03cc840e44ddfa7a777cd0 assets\extravaganza\models\block\pink_perforated_festive_rubber_wall_side_tall.json 4f4f7636390f23331778de57417ca1e035a49c5a assets\extravaganza\models\block\green_striped_festive_rubber_stairs.json 4f0188ec4e0cd8a8fa9aeca9823cbc1080c2c56f assets\extravaganza\models\item\gray_festive_ball.json -c80eaa0aec56f1b510a686de74eec5e578482aa4 assets\extravaganza\models\block\purple_screwed_festive_rubber_slab.json 74c3cbcddbf10003927c343bfd89fbc3ebc9eb32 assets\extravaganza\models\block\yellow_padded_festive_rubber.json +c80eaa0aec56f1b510a686de74eec5e578482aa4 assets\extravaganza\models\block\purple_screwed_festive_rubber_slab.json 105ee07b7981dcf1f6497e5050ff44ce15fd0b0a assets\extravaganza\blockstates\magenta_barred_festive_rubber_slab.json feaa89a1509c27039ef6ea17b576fe5db0d2bab9 assets\extravaganza\models\block\red_slipped_festive_rubber_slab_top.json 3a5d4727b95f0a9e25681504cb6de0270faded56 assets\extravaganza\models\block\tomato_striped_festive_rubber_wall_side.json @@ -2346,8 +2346,8 @@ d528ddb4c1dff42f74d4062662614ac4a0529502 assets\extravaganza\blockstates\orange_ 460ab92709a045b76d51afec096ec0204cc8bac7 assets\extravaganza\models\block\yellow_dotted_festive_rubber_wall_post.json 6b951dc88f59095760def21f15fb4e0ea9175cb8 assets\extravaganza\models\block\yellow_padded_festive_rubber_stairs.json 5d474d1676e228fc5810e3a09ed250d7f5e498e8 assets\extravaganza\blockstates\purple_windowed_festive_rubber_slab.json -2ac8b1db228a6f018ddcb39ec4f1a8442c56b3b1 assets\extravaganza\blockstates\nymph_festive_rubber_grate.json ccee97f5cfb0c1b94b5d84da39192509b17bb9e8 assets\extravaganza\blockstates\plant_tiled_festive_rubber_slab.json +2ac8b1db228a6f018ddcb39ec4f1a8442c56b3b1 assets\extravaganza\blockstates\nymph_festive_rubber_grate.json 2e20989a83a2a7af7ea119ddc102817449f10030 assets\extravaganza\models\block\orange_padded_festive_rubber_slab.json 8612e66d8993f30b4eeda47048743b789fcf3ea0 assets\extravaganza\models\block\black_split_festive_rubber_slab.json 92104a482a85bf96884e9a177f4c9551ea7ebed3 assets\extravaganza\models\item\blue_festive_rubber_grate_wall.json @@ -2368,13 +2368,13 @@ b080a111bda00ef909d99bc0dbf94d46012bbf40 assets\extravaganza\blockstates\brown_p 1c12cf2402e4b7db61d79f60c1db5b7c8bad9e2b assets\extravaganza\models\block\blue_windowed_festive_rubber_slab_top.json b6e1d01f793acc9e19f62104c2ce9f53990f47fd assets\extravaganza\models\item\light_blue_striped_festive_rubber_stairs.json 9d0f32056964561ce680727749b78f1cc7c6890f assets\extravaganza\models\block\brown_padded_festive_rubber_wall_side_tall.json -661354a90d788dc130244a388d36f3a852ab376e assets\extravaganza\blockstates\red_split_festive_rubber_stairs.json 8101211c9c04ccda2840a2c85c8a5c19dbb6b544 assets\extravaganza\blockstates\brown_scratched_festive_rubber_stairs.json +661354a90d788dc130244a388d36f3a852ab376e assets\extravaganza\blockstates\red_split_festive_rubber_stairs.json 5cda1d989bb1895274e22c77c3f19ab38336920c assets\extravaganza\models\block\gray_dotted_festive_rubber_wall_post.json 090b582248e89eb7b41951cedd7d41bef3359b7e assets\extravaganza\models\item\light_gray_scratched_festive_rubber_slab.json 186929b27ec846f8e65098703974ec5311ce3852 assets\extravaganza\models\item\red_dotted_festive_rubber_stairs.json -4fda12152f30e0bc2715f33d35b93cdd170b2cfb assets\extravaganza\blockstates\orange_barred_festive_rubber_stairs.json 8498eb76d443f63555598b8fedf3848f4a95e0c1 assets\extravaganza\blockstates\orange_festive_rubber_slab.json +4fda12152f30e0bc2715f33d35b93cdd170b2cfb assets\extravaganza\blockstates\orange_barred_festive_rubber_stairs.json 60bdb01c0ca8211150e2dade53c73cb7c64bf52b assets\extravaganza\models\block\brown_wooded_festive_rubber_slab_top.json 454de238ddba0c11d501a65d81909f42491906b6 assets\extravaganza\models\block\white_wooded_festive_rubber_stairs.json d1d826a8c2117001dd66610904aa2373e7f00132 assets\extravaganza\models\block\red_scratched_festive_rubber_stairs_inner.json @@ -2770,8 +2770,8 @@ fa97ff0ce5e8ed713c1f11a100e3eb429f955868 assets\extravaganza\blockstates\cyan_fe 674b29ed07ce7be285724c56f8575c1bf49da284 assets\extravaganza\models\item\brown_windowed_festive_rubber_slab.json 731e8641c8d858683d8fbc3065becd03567a2a99 assets\extravaganza\models\block\white_scratched_festive_rubber_slab.json 0bdb64d422299d50ef682d0270efe1f0a0a1e864 assets\extravaganza\models\block\light_blue_festive_rubber_grate_wall_side.json -c51cfc50d9dd4a6face3773984c66894ee6596ab assets\extravaganza\blockstates\plant_wooded_festive_rubber_wall.json d16e51bc5f4f5a3457a3a327f0b454496d0e7380 assets\extravaganza\blockstates\green_festive_rubber_stairs.json +c51cfc50d9dd4a6face3773984c66894ee6596ab assets\extravaganza\blockstates\plant_wooded_festive_rubber_wall.json c25f987d37c15795f2db73c93217ea458913e589 assets\extravaganza\models\block\blue_wooded_festive_rubber_wall_side.json 63fd2b39bf0094f932b1347d39694e8aefc10109 assets\extravaganza\models\item\orange_wooded_festive_rubber_slab.json 196ec68c0b8bb7883bb947f19d7369086fe622fd assets\extravaganza\models\block\light_blue_slipped_festive_rubber.json @@ -2859,8 +2859,8 @@ a32e1ec6012f9df989d453e310e9293e052aef3f assets\extravaganza\models\block\lime_f c73ac64625976b7bfb2c27fa505cae381b6df6a2 assets\extravaganza\blockstates\magenta_slipped_festive_rubber_slab.json c9d800dc33beba4e5f7343d3ad5764e6aeeb6bbb assets\extravaganza\models\block\brown_poured_festive_rubber_wall_inventory.json 62052b943f01ddf954e7172c86802c2bfad4435e assets\extravaganza\models\block\white_bent_festive_rubber_wall_side_tall.json -0a90aaafc65c2d614afd9b7598f38439d4370403 assets\extravaganza\blockstates\purple_poured_festive_rubber_stairs.json 666c8789b4e346e011e24862f1f212915f0a96c7 assets\extravaganza\blockstates\cyan_slipped_festive_rubber.json +0a90aaafc65c2d614afd9b7598f38439d4370403 assets\extravaganza\blockstates\purple_poured_festive_rubber_stairs.json 8b018ce60a7551bc2edfc205560a47dcbb980c4b assets\extravaganza\models\block\pink_padded_festive_rubber_wall_side_tall.json ff5c5d3451258d454820dc598b84e7c446e078db assets\extravaganza\models\item\blue_barred_festive_rubber_slab.json 144dd90c52d1de9174885d75f3e5db084a53ad9f assets\extravaganza\models\block\pink_windowed_festive_rubber_wall_post.json @@ -3025,8 +3025,8 @@ cf1f65aa578c19704783cb9c259c13b5276c6e10 assets\extravaganza\models\block\white_ 66e265a3eca2c16857927b169a06f4e7121f8e06 assets\extravaganza\models\item\gray_striped_festive_rubber.json 526e5c69e46bb7718a164e00b83277a1c450225c assets\extravaganza\models\block\tear_festive_rubber_slab_top.json b67eb9cc2e5058599f86b740b3e5e556deac286c assets\extravaganza\models\block\green_tiled_festive_rubber.json -fbe9a123d71a2a5d8fdc9c4c5341ab9066681dfe assets\extravaganza\blockstates\blue_sharped_festive_rubber_stairs.json d255d6c84dca411a73c37c15a569ffee23b284d9 assets\extravaganza\blockstates\black_bent_festive_rubber_stairs.json +fbe9a123d71a2a5d8fdc9c4c5341ab9066681dfe assets\extravaganza\blockstates\blue_sharped_festive_rubber_stairs.json 70161055fe76a7939704941321cc59fbfad40bb0 assets\extravaganza\models\item\yellow_slipped_festive_rubber.json 92a96cb39c4f84ec2d822ea17fca2ddf81343868 assets\extravaganza\models\block\orange_slipped_festive_rubber_wall_post.json d7612159db2b78b1ebdf571c764713fcd05eb30f assets\extravaganza\models\item\blue_barred_festive_rubber_wall.json @@ -3123,8 +3123,8 @@ d385d20dea2ca29d50144705d373e2753550fc0f assets\extravaganza\models\block\light_ 57a8a24b57d000d2f1d6d70dd1f63fe508702960 assets\extravaganza\models\item\purple_scratched_festive_rubber_wall.json 95879d1233f0d5b36a99e7004784874554867dce assets\extravaganza\models\block\brown_wooded_festive_rubber_stairs_inner.json b3db280093b02a33f64c3bc6f34fa767011900e5 assets\extravaganza\models\block\purple_curved_festive_rubber_wall_inventory.json -cacbe4e968d124332bb90930fbe230f1761e8a59 assets\extravaganza\blockstates\tomato_scratched_festive_rubber_wall.json a3c97ddf1eb33b1134b7040ec390c0cdb742c77e assets\extravaganza\blockstates\gray_bent_festive_rubber_slab.json +cacbe4e968d124332bb90930fbe230f1761e8a59 assets\extravaganza\blockstates\tomato_scratched_festive_rubber_wall.json 8a73e36463cb43714454e2219b35fdea51b40e25 assets\extravaganza\models\block\magenta_tiled_festive_rubber_wall_side.json 00d6bc833cea0cbf6da1e51724b97b2f8866ad6e assets\extravaganza\models\item\light_blue_poured_festive_rubber_wall.json 027ec7a83861b9cf9e0387cf2bcc198e5bb1b1f8 assets\extravaganza\models\item\plant_padded_festive_rubber_stairs.json @@ -3504,8 +3504,8 @@ af6bbcc7b798d964a6a2c1184e2f4ddb90cf979d assets\extravaganza\models\block\red_sh c6222e9a4bfa9015355032451ef8797b0a985654 assets\extravaganza\models\block\brown_festive_rubber_grate_wall_post.json 5f0582d51aed0fd31a2e221c8e42a7bf25e329bf assets\extravaganza\models\block\purple_bent_festive_rubber.json eff848815c6770a525c0309e98ba576a45579f48 assets\extravaganza\models\item\tear_padded_festive_rubber_wall.json -2419b287e01aea374467cfb0cbe5eafeb31d8d23 assets\extravaganza\blockstates\yellow_screwed_festive_rubber_wall.json 76c9b98ebecd6afcd35a09501f66d4103cd1b9ce assets\extravaganza\blockstates\tear_striped_festive_rubber.json +2419b287e01aea374467cfb0cbe5eafeb31d8d23 assets\extravaganza\blockstates\yellow_screwed_festive_rubber_wall.json 23923430609d7c9edf121fcb95acb7e623c2296a assets\extravaganza\models\block\blue_bent_festive_rubber_stairs.json 4771569b55d1a91ec46937562f5a69ab643584f0 assets\extravaganza\models\block\brown_striped_festive_rubber_stairs.json 29b2d8d76eb1d05181672134f4a5a6e2ae162b01 assets\extravaganza\models\block\plant_scratched_festive_rubber_wall_inventory.json @@ -3538,8 +3538,8 @@ b4d5c252df13500b980b49fe566cc1d5b3777b32 assets\extravaganza\models\item\red_fes c36451cd74bcd39d236794ab2331740012a0411f assets\extravaganza\models\block\brown_poured_festive_rubber_slab_top.json 10b7391616130c45354bc647ce4f816855567fef assets\extravaganza\blockstates\black_festive_rubber_grate_wall.json 72900c117af783071b04a610f7c42cf2371baa81 assets\extravaganza\models\block\tomato_slipped_festive_rubber_stairs.json -3b6ddaa1b49f2968e8953bcd92827cb57681c666 assets\extravaganza\blockstates\cyan_dotted_festive_rubber_slab.json cde7533031aa3981b3a04faccb7b356f9e9be802 assets\extravaganza\blockstates\yellow_split_festive_rubber_wall.json +3b6ddaa1b49f2968e8953bcd92827cb57681c666 assets\extravaganza\blockstates\cyan_dotted_festive_rubber_slab.json 20c1e25ccd9e0104682205f2766ac2e7c750546f assets\extravaganza\models\block\nymph_split_festive_rubber_wall_side.json 505364688e0a992b062de0734fcfc106626c9ac5 assets\extravaganza\blockstates\orange_festive_rubber_grate_slab.json 7e6607ee3c0539acec5073a7994e6ac2ea152d8b assets\extravaganza\models\item\tomato_festive_ball.json @@ -3621,9 +3621,9 @@ f9e642777606643379ea1566f9df055a3a203a16 assets\extravaganza\models\block\cyan_f b129b594fb56c6ceb1a93cebb91e4f3d612e1338 assets\extravaganza\models\item\magenta_curved_festive_rubber.json 8b2ed5e7de7f20defd94fba9415e7dd5f9df9626 assets\extravaganza\blockstates\nymph_windowed_festive_rubber.json e95246c3b8818a65d483b5d6e19f56a7c8e0b01f assets\extravaganza\models\block\lime_poured_festive_rubber_wall_side_tall.json +758ff06e3ca47043d926b01e81be8ff48f653a5f assets\extravaganza\blockstates\cyan_bent_festive_rubber_stairs.json 7e42a766f37fdaf442b0abcb1d7e47c88a4d334d assets\extravaganza\blockstates\pink_windowed_festive_rubber_stairs.json d6c33b7b8ee4eb99dc7e84e881998e4e46361d5e assets\extravaganza\blockstates\blue_slipped_festive_rubber.json -758ff06e3ca47043d926b01e81be8ff48f653a5f assets\extravaganza\blockstates\cyan_bent_festive_rubber_stairs.json cd95ce073953ce4a91dc628722f6a3746abce0d2 assets\extravaganza\models\block\nymph_screwed_festive_rubber.json 767a066f7242f967b2a277d1a2286a0c375085ae assets\extravaganza\models\block\black_dotted_festive_rubber_wall_side_tall.json 42dde90e4dfde78c99d6e4ceb9dda37674108d2c assets\extravaganza\blockstates\cyan_slipped_festive_rubber_wall.json @@ -3767,8 +3767,8 @@ e8b05e1802922e84358c590904f0aafc06728246 assets\extravaganza\models\block\blue_s a4acc8bc03af63c94f135c9b5ece79c599c1fd31 assets\extravaganza\blockstates\gray_festive_rubber_grate_slab.json 3f42c69a77739a652523db4b6b106b4861e989d3 assets\extravaganza\models\item\white_screwed_festive_rubber.json b4e835b362f6d9c30e05ffe04c08ec13e536b3b2 assets\extravaganza\models\item\light_blue_barred_festive_rubber.json -5ab810649381e77dda00cc90903ba62968de4d41 assets\extravaganza\models\block\light_gray_padded_festive_rubber_stairs_inner.json d4229da77ae75a547ca4a3bc2294c7bf62adaaff assets\extravaganza\models\block\brown_festive_rubber_grate_wall_inventory.json +5ab810649381e77dda00cc90903ba62968de4d41 assets\extravaganza\models\block\light_gray_padded_festive_rubber_stairs_inner.json 5fef93d437793889d424e56ee7bff01dc6cf287d assets\extravaganza\models\item\pink_curved_festive_rubber_stairs.json 819eae33cec0b86b1fb723d8f6ad1d6314e48aa5 assets\extravaganza\blockstates\tomato_sharped_festive_rubber_stairs.json b35d84c71a9d1b4adb53ab621c87b286a89ce135 assets\extravaganza\blockstates\pink_padded_festive_rubber_stairs.json @@ -3818,8 +3818,8 @@ a7c43c741e76dc940c16105114f44afc6251a5e4 assets\extravaganza\blockstates\pink_cu 76a7139d5637c1dc6f7ef4c24545fb9ce419b8a3 assets\extravaganza\models\block\pink_poured_festive_rubber_stairs_inner.json ff55daadd114fa77eb7d3332fa32a6cb149394f1 assets\extravaganza\models\block\light_blue_bent_festive_rubber_wall_post.json 7a1741a910cbe97c1716e606cee3e6cbeac0294f assets\extravaganza\blockstates\light_gray_dotted_festive_rubber_wall.json -c225be97e330b5ea615afd29478af0693d48ba09 assets\extravaganza\blockstates\magenta_screwed_festive_rubber_slab.json d15aeaf4a19cc22425541d3833a7d1b4b2fa76c0 assets\extravaganza\blockstates\white_screwed_festive_rubber_wall.json +c225be97e330b5ea615afd29478af0693d48ba09 assets\extravaganza\blockstates\magenta_screwed_festive_rubber_slab.json 82d86febd3cf12e41f251767222765c6cae4f743 assets\extravaganza\models\item\plant_slipped_festive_rubber_wall.json d1b153479486e9caf202140cda0d7bee88e783c7 assets\extravaganza\models\item\nymph_windowed_festive_rubber_slab.json c6214ccf9d4fbc682c5501941b5b5c31c04ccdf2 assets\extravaganza\models\block\magenta_curved_festive_rubber_stairs_inner.json @@ -3854,8 +3854,8 @@ fcb02f78ca9618c8f85126569b522c9ec2c9c8fe assets\extravaganza\models\block\lime_p 3221aa05c6558aeee6f9243348213907a04d4eab assets\extravaganza\models\block\lime_windowed_festive_rubber_stairs_outer.json 6ce236fa7e0e599b14de5ffd969e35478cf50cf7 assets\extravaganza\blockstates\magenta_screwed_festive_rubber_stairs.json 6383ae082b9441fafdd3225b0c6f610d8c357bd3 assets\extravaganza\models\block\green_curved_festive_rubber_slab.json -3da4b23e7111214d06b5c66a42863751656ab278 assets\extravaganza\blockstates\light_gray_screwed_festive_rubber_stairs.json 1e36c53e97b02ea39889e35423469281c9208c74 assets\extravaganza\blockstates\red_windowed_festive_rubber_wall.json +3da4b23e7111214d06b5c66a42863751656ab278 assets\extravaganza\blockstates\light_gray_screwed_festive_rubber_stairs.json 161b7d164ea217848c47a72cd8cfbf24668fe5b7 assets\extravaganza\models\block\green_festive_rubber_grate_wall_inventory.json 81fc987dbd52828f82bba0ba9e13c61e75b2077a assets\extravaganza\models\item\nymph_slipped_festive_rubber.json c6e17afac7682a16a9b8999e0e9da9050062b1bb assets\extravaganza\models\block\magenta_screwed_festive_rubber_stairs.json @@ -4186,8 +4186,8 @@ e2feedd9f4537c62f09f0cf5e7a498962c2b973f assets\extravaganza\blockstates\black_s a544de918bfcd47b3ae5f0014d923409e2092ded assets\extravaganza\models\block\lime_poured_festive_rubber_stairs_inner.json d64717e42e0f9cf9cf0a0b75fa31781ce839b583 assets\extravaganza\models\item\blue_dotted_festive_rubber_slab.json 66f6ebe381f3ae4b516b6453ed85dc21629fbeac assets\extravaganza\models\block\nymph_striped_festive_rubber_wall_post.json -d0a43e0cb141385aae0ed737778f88c918cea0b6 assets\extravaganza\blockstates\gray_perforated_festive_rubber_stairs.json e2b414f321d8f78e95bda0b61a8e3bd597c53126 assets\extravaganza\blockstates\lime_screwed_festive_rubber.json +d0a43e0cb141385aae0ed737778f88c918cea0b6 assets\extravaganza\blockstates\gray_perforated_festive_rubber_stairs.json b837f8dc7f0f31a24bd83c24d482fe597d6574af assets\extravaganza\models\block\purple_wooded_festive_rubber.json 72f174e8f107c4cf79c6086692b9346421ddcfe7 assets\extravaganza\blockstates\magenta_tiled_festive_rubber_wall.json ad0783abb87d630f2da0b6624fe0f24b0dc63703 assets\extravaganza\models\block\yellow_poured_festive_rubber_stairs.json @@ -4528,8 +4528,8 @@ bf80ae2a816f6716649d5c464dbb94c1259e960d assets\extravaganza\models\item\pink_sl e36e3153946e18b08843405c2866a53f34c13ae6 assets\extravaganza\models\item\green_slipped_festive_rubber.json 68e69f5ef3bdb4cbe3acc84bfccb5417c01d4dc6 assets\extravaganza\models\block\gray_tiled_festive_rubber_wall_side_tall.json 818cfd0fc9198dc6043a78038532e2fd24230831 assets\extravaganza\models\block\cyan_screwed_festive_rubber_slab_top.json -4a74b20ebf1eeff6b40cdb0e769c00820c9cbf9e assets\extravaganza\blockstates\orange_tiled_festive_rubber.json 10646d5022cea0752c6180650fda05cc2974c2e1 assets\extravaganza\blockstates\blue_perforated_festive_rubber_wall.json +4a74b20ebf1eeff6b40cdb0e769c00820c9cbf9e assets\extravaganza\blockstates\orange_tiled_festive_rubber.json 7c3806d5d01f097debea03e43c5441d57dae7ccd assets\extravaganza\models\block\gray_perforated_festive_rubber_stairs_outer.json e98e369c38fe6cf6c22353a3a07176e2c48dd348 assets\extravaganza\blockstates\orange_wooded_festive_rubber.json c6410a2f665131be3591796fe6f9b8e054fa61c0 assets\extravaganza\blockstates\nymph_curved_festive_rubber_wall.json @@ -4542,13 +4542,13 @@ ff514abf9cd1910e30be44bcc68f8c33de8329d6 assets\extravaganza\models\block\purple 1e30e6b1dd6fb83ea2c43027f3d047fc6172a3f5 assets\extravaganza\models\item\black_slipped_festive_rubber_wall.json 56fbdbf9da226d10196dec101a9f5bea3e041c56 assets\extravaganza\models\block\brown_sharped_festive_rubber_stairs.json 8f2237ac84355c743c4e45b4b70fb93071a9675b assets\extravaganza\models\item\blue_bent_festive_rubber_stairs.json -2be29468270c0893027a50aaea649b3d25fd5da6 assets\extravaganza\blockstates\orange_dotted_festive_rubber_stairs.json 9ffe6df29976a74a96335bb063ec8208cfdee506 assets\extravaganza\blockstates\orange_festive_rubber_grate.json +2be29468270c0893027a50aaea649b3d25fd5da6 assets\extravaganza\blockstates\orange_dotted_festive_rubber_stairs.json 03bd5a188edf452aed1cdc2b36f5c7b7aa1ecac5 assets\extravaganza\models\block\magenta_festive_rubber_stairs.json 78a4bc45efaaa1b69e2c4455f2bccaa1c19e4c71 assets\extravaganza\models\block\cyan_poured_festive_rubber_slab_top.json f03a598ea2a3afdb90082b3eeecd1f847369831f assets\extravaganza\models\block\purple_barred_festive_rubber_stairs_inner.json -e8369e551d2fe5d068d02a2f7a89d87b1a71b7fd assets\extravaganza\blockstates\cyan_screwed_festive_rubber_stairs.json 6664f516afad2a13415dcc4fa58a9ee666499499 assets\extravaganza\blockstates\tear_tiled_festive_rubber.json +e8369e551d2fe5d068d02a2f7a89d87b1a71b7fd assets\extravaganza\blockstates\cyan_screwed_festive_rubber_stairs.json 687260825f448c1960b21fff5061fdcb1e06c642 assets\extravaganza\blockstates\gray_scratched_festive_rubber_wall.json 157d88dc082f1404c3968ef99c9eedfb1b908c29 assets\extravaganza\models\block\orange_dotted_festive_rubber.json 20457d5fe3a5772544c61edabcf960a51d64e057 assets\extravaganza\models\block\green_perforated_festive_rubber_slab_top.json @@ -4749,8 +4749,8 @@ f05ef4708fc23cce9ce6d796ed209b2b4e735c0e assets\extravaganza\models\block\cyan_s d3324e35c8afa42cbd9826f1014684ddda27957a assets\extravaganza\models\block\brown_tiled_festive_rubber_stairs_outer.json 25244e5f2b30987be294f46b01861e7b7ce816c5 assets\extravaganza\blockstates\orange_slipped_festive_rubber.json 8a1a698d3acc569a78893ffa21d8bfdda8e3091b assets\extravaganza\models\block\tear_festive_rubber_wall_inventory.json -0e068142317a0662496cf594cc99007e7d38ff1c assets\extravaganza\blockstates\orange_slipped_festive_rubber_stairs.json 1c75b66ceae5d06e0e419a08931ccf2d4968273b assets\extravaganza\blockstates\gray_screwed_festive_rubber_wall.json +0e068142317a0662496cf594cc99007e7d38ff1c assets\extravaganza\blockstates\orange_slipped_festive_rubber_stairs.json c7953d222febfcceb8335863a2051e29d65f0395 assets\extravaganza\blockstates\black_dotted_festive_rubber.json af4636f4c5685709b220b71862c72a316538f393 assets\extravaganza\models\block\nymph_scratched_festive_rubber_stairs_outer.json 940eae3f54492cfe4bf83343e976b135643976f3 assets\extravaganza\models\block\purple_striped_festive_rubber_wall_side.json @@ -5046,8 +5046,8 @@ baf03301d2ec247075a0e9d605dc3ee408e7bedd assets\extravaganza\models\item\brown_s 0c72cf290e8d02cd94a916754e5f2570bce6c5cb assets\extravaganza\blockstates\light_gray_perforated_festive_rubber_wall.json cefac4aa9370214f8ff8d1e2c45ad11d7bb56dbf assets\extravaganza\models\block\tear_scratched_festive_rubber_wall_post.json 6e0f2528093273f0a7eb35a7ac33dfd3282cf216 assets\extravaganza\models\item\green_curved_festive_rubber_slab.json -3893495e18b2d6a88609fa51d75ef12ebdf3f492 assets\extravaganza\blockstates\tomato_barred_festive_rubber_wall.json cfff5395bd57a14d0d687cb122e8f683bed964ed assets\extravaganza\blockstates\green_windowed_festive_rubber_wall.json +3893495e18b2d6a88609fa51d75ef12ebdf3f492 assets\extravaganza\blockstates\tomato_barred_festive_rubber_wall.json 19ac6270d6391dd51070276b28b71e1e1b669a5e assets\extravaganza\models\item\lime_padded_festive_rubber_stairs.json 8eaff8633c98ac6c3e2e86c6b5482b3df4f7d301 assets\extravaganza\blockstates\red_wooded_festive_rubber_wall.json 4cbc5b50e7e253516fee2937916eaaf7aa549cbf assets\extravaganza\models\item\light_blue_windowed_festive_rubber_slab.json @@ -5094,8 +5094,8 @@ fcff73c8afa12f47b1ed6051c141342e2259746f assets\extravaganza\models\item\tear_st a14f708d346053cd0e3a589e202ceb606f697feb assets\extravaganza\models\block\purple_split_festive_rubber_stairs_inner.json 99c213eb544f0e419b3008cbcfae8888b1f9b02a assets\extravaganza\blockstates\white_sharped_festive_rubber_wall.json eaaf9bb3a049436721ccbb6e21aa73bce1d21133 assets\extravaganza\blockstates\pink_slipped_festive_rubber_wall.json -d591284d9eba42e36afea0a848bae988151e26ac assets\extravaganza\blockstates\black_dotted_festive_rubber_slab.json a1cef0bc6de522f56460ec9fb7ce9aac2d0d812b assets\extravaganza\blockstates\lime_perforated_festive_rubber_slab.json +d591284d9eba42e36afea0a848bae988151e26ac assets\extravaganza\blockstates\black_dotted_festive_rubber_slab.json 1914a2a934b24f136dbfe526b4c4fa1707957101 assets\extravaganza\blockstates\nymph_perforated_festive_rubber_stairs.json e7588970b12edccc487e4e58b084141aae91dc97 assets\extravaganza\models\block\tear_striped_festive_rubber_wall_inventory.json a2d0adafc2d2e9bd3998aa39b6c9c69fac0bfa0d assets\extravaganza\models\item\green_striped_festive_rubber_stairs.json @@ -5120,8 +5120,8 @@ bc32adf5e4bc33b438c0ab7a256159f3784fb15c assets\extravaganza\models\block\purple 3166152ddab08534d06021cbedcdc0507a593d2a assets\extravaganza\models\item\purple_striped_festive_rubber.json 270c3685eebd855163c3f42acd520ec5d9d74a48 assets\extravaganza\blockstates\nymph_dotted_festive_rubber_slab.json 49fab71b9f1e9b6f9fe65e905882b0a2d72ef968 assets\extravaganza\models\item\orange_split_festive_rubber_wall.json -8b402110c1fd96c1d622b7dcbd72fd41683aec9b assets\extravaganza\blockstates\orange_split_festive_rubber_stairs.json b8121bc74e9706549fd29bd1fcb0e62b3f1b7602 assets\extravaganza\blockstates\magenta_split_festive_rubber_stairs.json +8b402110c1fd96c1d622b7dcbd72fd41683aec9b assets\extravaganza\blockstates\orange_split_festive_rubber_stairs.json 0c0584506dcb890225d4e7423510b04c561cbd9f assets\extravaganza\models\item\gray_screwed_festive_rubber.json e3906d1029df47e948b11848d3f66f9938cf7c5d assets\extravaganza\models\block\lime_striped_festive_rubber_stairs_inner.json aa2d675035c73bfd443d4317311208d41f94cc3a assets\extravaganza\models\block\yellow_wooded_festive_rubber_wall_post.json @@ -5180,11 +5180,11 @@ a39e1d83621fc0d9ce2d14137c14f84249a1fff2 assets\extravaganza\models\block\black_ 50ffc8408e97c580d198cb29cf39871b6174b980 assets\extravaganza\models\item\black_perforated_festive_rubber_wall.json f45a74fea45086bee21c03f7031f5b1005c2b112 assets\extravaganza\models\block\light_blue_bent_festive_rubber_slab.json 7f99e6136cb4c6479840ad92b2d170290382035e assets\extravaganza\models\block\tear_sharped_festive_rubber_wall_side.json -2f6f8cfe03779ab39d35d3fe0112076820515b1d assets\extravaganza\blockstates\tomato_dotted_festive_rubber_wall.json c005641f894b1858480bab0292cfb2898b54b38a assets\extravaganza\blockstates\nymph_screwed_festive_rubber_wall.json +2f6f8cfe03779ab39d35d3fe0112076820515b1d assets\extravaganza\blockstates\tomato_dotted_festive_rubber_wall.json f091ac42705f8298522053360f0e9d9e2f28531e assets\extravaganza\models\block\lime_scratched_festive_rubber_slab_top.json -8ac7e0fd9b0f3666981e4d2b902c9fdc8ab5a575 assets\extravaganza\blockstates\pink_festive_rubber_grate.json 34b69d11d4a08839848e969dc4da19e684a27c51 assets\extravaganza\blockstates\magenta_festive_rubber_grate_wall.json +8ac7e0fd9b0f3666981e4d2b902c9fdc8ab5a575 assets\extravaganza\blockstates\pink_festive_rubber_grate.json 40bd9a5f12fe6cabe4b46e244f2171b884adbef9 assets\extravaganza\blockstates\green_windowed_festive_rubber_slab.json f002545d9c4093b1f59b34c4cca810ece9464816 assets\extravaganza\models\block\blue_curved_festive_rubber_stairs_outer.json 997aa90a8e4171c4b75702eefc335aace034df2c assets\extravaganza\models\block\lime_bent_festive_rubber_wall_post.json @@ -5265,6 +5265,7 @@ f5008542d2a0eb907568f1a51d40bda1b106fd4a assets\extravaganza\models\item\green_p ffce78574bdd4574ee4754b16b45fc129c12fca6 assets\extravaganza\models\block\tear_barred_festive_rubber.json c9a18bc510cb3ff96b64b0cafa251c34171f4dfd assets\extravaganza\models\item\pink_striped_festive_rubber_stairs.json 13bcc28c8775dd4210a9dcb52461a30c9336932b assets\extravaganza\models\item\light_gray_striped_festive_rubber.json +229a0eadc88926e02b33c94b3e8991f35e4b14bc assets\extravaganza\blockstates\garland.json dcdc087edb80ce749bdba4772dbade24e7e170c7 assets\extravaganza\models\block\nymph_bent_festive_rubber_slab_top.json f119616795dd7cde48ba1e57c5aaf900f1575b4c assets\extravaganza\models\block\plant_curved_festive_rubber_stairs.json b362e8b6cad903e1160a948876d5868e2dd0e0d6 assets\extravaganza\models\block\light_gray_striped_festive_rubber_wall_post.json @@ -5461,8 +5462,8 @@ e12cf4e74ce056109768081210d3f0f0031bc454 assets\extravaganza\models\block\green_ 64791f3820e948eb9484465a0a35f92480b98fed assets\extravaganza\blockstates\brown_windowed_festive_rubber_slab.json 0b23a24364293e950c688ed5723615e6a4213de7 assets\extravaganza\models\block\white_screwed_festive_rubber.json b66c835f2ca681ec2d3f089145fc9bc8bd0bbb3c assets\extravaganza\models\block\purple_striped_festive_rubber_wall_side_tall.json -62ca56e5aeff9798d250332366c4c7fa39ded700 assets\extravaganza\blockstates\red_festive_rubber_stairs.json ee9cf571957d195658c50daf63446426f533958b assets\extravaganza\blockstates\tear_bent_festive_rubber_slab.json +62ca56e5aeff9798d250332366c4c7fa39ded700 assets\extravaganza\blockstates\red_festive_rubber_stairs.json e1492a267563d5c235f6ff8908765ac9289e3fbc assets\extravaganza\models\block\nymph_scratched_festive_rubber.json 316c8e83c219ca7d1176e2dd0fc7ba0b11bb3648 assets\extravaganza\models\block\lime_striped_festive_rubber_slab.json 3b5712f08810cc01887258c403b171e59b51daca assets\extravaganza\models\item\light_blue_padded_festive_rubber_slab.json @@ -5715,8 +5716,8 @@ becf28611cfaa075a7a50785c3e56f527675cf3f assets\extravaganza\blockstates\brown_s c5952752e780c1846f2b83cc8f94e3ebdddb8990 assets\extravaganza\models\block\light_gray_sharped_festive_rubber_wall_side.json 3274a501e16d7b000e73611df8708937f3088c95 assets\extravaganza\models\block\gray_poured_festive_rubber_stairs_inner.json 00fce8dec6c49adceb53f4952a6f25e012d3144c assets\extravaganza\models\block\lime_curved_festive_rubber_wall_side_tall.json -78be7af9643198271f68733d0bc5cf2daa9725b9 assets\extravaganza\blockstates\nymph_dotted_festive_rubber_stairs.json 064089b76f2cd592dd07d6f2820e5c861ed93e82 assets\extravaganza\blockstates\plant_padded_festive_rubber.json +78be7af9643198271f68733d0bc5cf2daa9725b9 assets\extravaganza\blockstates\nymph_dotted_festive_rubber_stairs.json 5d00a5b6abd19adb57483d45ef703262b3ba959c assets\extravaganza\models\block\blue_poured_festive_rubber_stairs_outer.json 5a31705ccfb30b40b79e80d423b1f7666b6b230d assets\extravaganza\models\block\orange_scratched_festive_rubber_stairs_inner.json c1bb646764fbb26e1422b299f983f0b3c1f2ea8d assets\extravaganza\models\item\magenta_dotted_festive_rubber_slab.json @@ -5916,6 +5917,7 @@ a554a259037cadd4a420f829075ad4fafc1bd2e9 assets\extravaganza\models\block\light_ 7a13754320bb749c7897057b30a21f214b48c184 assets\extravaganza\blockstates\tomato_curved_festive_rubber_wall.json 1c6d5c5a17da53b10dc1b57fbeff70ae1f526b7c assets\extravaganza\models\item\light_blue_festive_ball.json 3f913b14fa475439f31fa33fe83fb52a8ec16b4e assets\extravaganza\models\block\tear_curved_festive_rubber_wall_post.json +e2071512ae20af1938b0472f501e7b873906d3ae assets\extravaganza\models\item\garland.json e4029d593a180038f8c69b009dd80d139ca67ba3 assets\extravaganza\models\item\blue_festive_rubber_stairs.json 33cd302eb981675857ba712d0265b6198bf511a3 assets\extravaganza\models\block\light_gray_screwed_festive_rubber_wall_side.json 0fc732a4e0bfeb14349420771e6208ba1cd77f40 assets\extravaganza\blockstates\plant_striped_festive_rubber.json @@ -6102,8 +6104,8 @@ ff9d604c5d926931eed7e31de0eecfd337b5f15e assets\extravaganza\blockstates\white_c d6b2505e9c146e724f5a49ab31ff9860e308c73e assets\extravaganza\models\block\red_bent_festive_rubber_stairs_outer.json 26cb57ac0a5f3a42defb8a1f214ee8c675dff9a6 assets\extravaganza\blockstates\brown_striped_festive_rubber_stairs.json 843998c4776af34be57fdc4522b0e9f336d91655 assets\extravaganza\models\block\magenta_dotted_festive_rubber_slab_top.json -eb7524778abf35ff8ffc21012ccdfc96edbf151c assets\extravaganza\blockstates\orange_windowed_festive_rubber_slab.json 635c9999e5b55e360da467d3cf02f4ad32e36613 assets\extravaganza\blockstates\tomato_curved_festive_rubber_slab.json +eb7524778abf35ff8ffc21012ccdfc96edbf151c assets\extravaganza\blockstates\orange_windowed_festive_rubber_slab.json 2ebfc2b8cf217dfcde121d43dc870d65424adc03 assets\extravaganza\models\item\red_windowed_festive_rubber.json 367ea8801dc94d25b3b7b708434d43ccf0ea3b34 assets\extravaganza\models\item\lime_dotted_festive_rubber_stairs.json 707463c81d9a27225044f549baf2bdb332212169 assets\extravaganza\blockstates\cyan_festive_rubber_grate_stairs.json @@ -6126,8 +6128,8 @@ c14acadf742aa8eaba394f643ce4a14302643826 assets\extravaganza\models\block\tomato 00da8edb56271fc236d89e86a6393af7bd2f5810 assets\extravaganza\models\item\orange_windowed_festive_rubber_wall.json 3541ac917e77499c9233732a6fa78d133df7e293 assets\extravaganza\models\block\light_gray_windowed_festive_rubber.json 24d444b8fb49ef45b0297334cd1b6f36e8a9d016 assets\extravaganza\models\block\plant_curved_festive_rubber_wall_side.json -64f8ee7fa7b1ae025481ab8081696f8b4fa7270a assets\extravaganza\blockstates\yellow_split_festive_rubber_stairs.json 514b68f8fd0edd77bebc104f2ab9d4f4f631716e assets\extravaganza\blockstates\brown_barred_festive_rubber_wall.json +64f8ee7fa7b1ae025481ab8081696f8b4fa7270a assets\extravaganza\blockstates\yellow_split_festive_rubber_stairs.json 4a93121455dda8bd0672b6faacdff89eb54c9e8d assets\extravaganza\models\block\black_tiled_festive_rubber_slab.json 3b61d7236ae3902ebb11aa1b1cd7253165df49af assets\extravaganza\blockstates\tomato_bent_festive_rubber_wall.json 3fa9c2aa04e7c708787f89a7e73dcb477c1603c6 assets\extravaganza\models\block\black_padded_festive_rubber_slab_top.json @@ -6191,8 +6193,8 @@ c56b5123dc82e4635e5d01fa34a3b195407b14f5 assets\extravaganza\models\item\blue_po 3d7482cfd6e31ea1eadb562ff0f90728ff75f0ec assets\extravaganza\models\item\nymph_barred_festive_rubber_slab.json 1af12b3cc4e7c7f1ce7ce3eb28fc84ee6c007877 assets\extravaganza\models\block\purple_poured_festive_rubber_slab.json 35e7b944aede334b5732ee5c95d7a50431e90f97 assets\extravaganza\models\block\nymph_tiled_festive_rubber.json -d06bc54db4095e3b172bc2ac80d30ffbfcc6002a assets\extravaganza\blockstates\lime_festive_rubber_slab.json 1b74a61789d9d4fd89763e38a55a4a0022a5b162 assets\extravaganza\blockstates\blue_poured_festive_rubber.json +d06bc54db4095e3b172bc2ac80d30ffbfcc6002a assets\extravaganza\blockstates\lime_festive_rubber_slab.json eae6d454f0320eba378c0ddfb0529094822c6ea5 assets\extravaganza\blockstates\brown_sharped_festive_rubber_slab.json 54c24f580e87bf112fa478301e8720893e16b62c assets\extravaganza\models\item\pink_slipped_festive_rubber_stairs.json b9a9428d57a3eeacd540341d633f699ded553be4 assets\extravaganza\models\block\red_split_festive_rubber_wall_inventory.json @@ -6438,8 +6440,8 @@ ad568389b03da6ebb9649234c738f2f5a0bb6129 assets\extravaganza\models\block\pink_s 6d3d17d7e5e3dfd5d383e0a19ff3240c1b222fdc assets\extravaganza\models\item\nymph_slipped_festive_rubber_stairs.json b73099104070a20900aca36f27d68bbdf7f859b5 assets\extravaganza\models\block\yellow_barred_festive_rubber_stairs_inner.json 1bc0233286b3397f5836d9b6d76bf556ca0af2f6 assets\extravaganza\models\block\magenta_barred_festive_rubber_wall_inventory.json -96725bfedb240fbc1f131094ac7d096460874b9b assets\extravaganza\blockstates\purple_bent_festive_rubber_wall.json ee70e21220322abd7351d994e8859c45e756afa0 assets\extravaganza\blockstates\red_dotted_festive_rubber_stairs.json +96725bfedb240fbc1f131094ac7d096460874b9b assets\extravaganza\blockstates\purple_bent_festive_rubber_wall.json b0732643e28d65b80bbba1f16f069f8ff514232d assets\extravaganza\models\block\black_scratched_festive_rubber_slab.json 2fab1aa456d596f95c32c9ca6b11b9d87ccdc2cd assets\extravaganza\models\block\tear_split_festive_rubber_wall_inventory.json 0ca8ff8acd77b9bf17f0fecf58f234c47a287b2e assets\extravaganza\blockstates\nymph_festive_rubber_grate_slab.json @@ -6451,8 +6453,8 @@ d03a44816e7378fb31e778f34eae811b5c1a6c53 assets\extravaganza\models\block\pink_p 84ed3c7d2ae80c1119463d6b41fd1967f11d2f8f assets\extravaganza\models\block\magenta_wooded_festive_rubber_slab_top.json 4e56e41a996c0fdc75a7fe4879052dfffcb9a0d7 assets\extravaganza\models\block\gray_split_festive_rubber.json 62f5501e611ac774d139c515c8bc80b5b8cd9410 assets\extravaganza\models\block\tear_slipped_festive_rubber_stairs_inner.json -5a1bc45863bab089aca389a8405d2dc572d1b2ab assets\extravaganza\models\block\tomato_scratched_festive_rubber_stairs_outer.json 5d70810d53f21080ee1554fed43f84eb6ad4a96b assets\extravaganza\models\block\white_dotted_festive_rubber_slab_top.json +5a1bc45863bab089aca389a8405d2dc572d1b2ab assets\extravaganza\models\block\tomato_scratched_festive_rubber_stairs_outer.json 106e1bf7c97247ddbbccfbdcddf49548ce2d7174 assets\extravaganza\models\block\green_dotted_festive_rubber_wall_post.json 3ba6aa658cff3f27d87e2b78d5729b5d1d2627e7 assets\extravaganza\models\block\magenta_screwed_festive_rubber_slab.json 9bd2bca6ed77b4e61f67668aa48c19baea5d9953 assets\extravaganza\models\block\purple_split_festive_rubber_wall_side_tall.json @@ -6494,8 +6496,8 @@ fbc3ccd342e547ee3d76c697e02f0128fa0c9f3d assets\extravaganza\models\block\pink_b 2daa0bdb35f8e8189037ffe8c6beda1f3707d3ae assets\extravaganza\models\block\gray_bent_festive_rubber_stairs_inner.json 36cd86d429136a73d08c428f7caf7a5d353059e5 assets\extravaganza\models\block\light_gray_festive_rubber_slab_top.json 2214aa2fb886ec39bec0f98c9ea50358e9d7ad31 assets\extravaganza\models\block\nymph_tiled_festive_rubber_stairs_outer.json -7f3f229199f3ed14466def7f521c576ddc0cee14 assets\extravaganza\blockstates\magenta_scratched_festive_rubber.json 5a2898efe6aa48836099f59bc73b8ea8d002e2cb assets\extravaganza\blockstates\blue_dotted_festive_rubber_stairs.json +7f3f229199f3ed14466def7f521c576ddc0cee14 assets\extravaganza\blockstates\magenta_scratched_festive_rubber.json 2a0ad5035834ee85a984e0437b148a8dfa544704 assets\extravaganza\models\block\white_poured_festive_rubber_stairs_inner.json 43a9a1ed976e464dcd5d1f338a30fe8d7219779b assets\extravaganza\models\block\green_striped_festive_rubber_stairs_inner.json f784b89dd16513467c306e8fafbe6ffe0406b5f6 assets\extravaganza\models\item\tear_dotted_festive_rubber_wall.json diff --git a/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 b/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 index 4f1afc15..a54a53f1 100644 --- a/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 +++ b/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 @@ -1,4 +1,4 @@ -// 1.21 2024-06-17T00:01:49.8879779 Extravaganza!/Recipes +// 1.21 2024-06-17T23:04:13.0227123 Extravaganza!/Recipes bd2e4393c47b28a8b8218e719d7c282e9ede79d8 data\extravaganza\recipe\purple_scratched_festive_rubber.json 21521f4eb0157c8b0d8b5b2fa64fddff24daf54f data\extravaganza\advancement\recipes\building_blocks\light_blue_festive_rubber_grate.json f2bf9ea512a216af780810b0cdd6cfcaed8a3f4d data\extravaganza\advancement\recipes\building_blocks\lime_sharped_festive_rubber.json @@ -36,8 +36,8 @@ fe3f44bd33789351d203b3974ceabe2d57d77115 data\extravaganza\advancement\recipes\b 10a20e09dad8491fcc956e282136128ad548c2a7 data\extravaganza\recipe\pink_scratched_festive_rubber.json 6676cc927d3e2a60cae0b377037b8bc95b35102c data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber.json a43b60afc43b793acf6637632d6967f9e9548f56 data\extravaganza\advancement\recipes\building_blocks\magenta_windowed_festive_rubber.json -1af3b2dc3466ab021761d34a7e73eea8d47703e6 data\extravaganza\recipe\magenta_perforated_festive_rubber.json cdb7fa91a1c19f8d0a0b5bbfc29c797f25992bd5 data\extravaganza\recipe\lime_festive_rubber.json +1af3b2dc3466ab021761d34a7e73eea8d47703e6 data\extravaganza\recipe\magenta_perforated_festive_rubber.json 05c5425b9c36dc6cf06a773a3c86842eb673e4e3 data\extravaganza\advancement\recipes\building_blocks\black_barred_festive_rubber.json 6ed1524d8c0cda50755a55bfa3018ac88d292c2a data\extravaganza\advancement\recipes\building_blocks\tomato_slipped_festive_rubber.json 432949753566be6efaf368ddb895c60fdcabeb7f data\extravaganza\advancement\recipes\building_blocks\black_sharped_festive_rubber.json @@ -101,8 +101,8 @@ ff7dc437fce94a18cea0449e988b84f81a5d771a data\extravaganza\advancement\recipes\b 6b86ffa457b1367a1735963dcee51ab8851c8664 data\extravaganza\advancement\recipes\building_blocks\lime_festive_rubber_grate.json a827db198461a9f438ceb2ec4e286572adaf7af8 data\extravaganza\recipe\green_slipped_festive_rubber.json e29b48aaae44f97c415789486e5ea4c3691e43dd data\extravaganza\recipe\white_striped_festive_rubber.json -6f78b584d1cd8ef5fce16453598fd675e8a614f2 data\extravaganza\advancement\recipes\building_blocks\brown_festive_rubber_grate.json e1b60aca1725f800d15f248ec563949b03080b21 data\extravaganza\recipe\brown_curved_festive_rubber.json +6f78b584d1cd8ef5fce16453598fd675e8a614f2 data\extravaganza\advancement\recipes\building_blocks\brown_festive_rubber_grate.json a3df349fe6c89b9c935f311832d17d12b42cdd10 data\extravaganza\recipe\blue_festive_rubber_grate.json 213da59d14fc58db396c1ace5e9e230265e38b7d data\extravaganza\recipe\green_windowed_festive_rubber.json 40cd7482b4a04d291e65f8cb2501c82d76a21931 data\extravaganza\recipe\tomato_split_festive_rubber.json @@ -125,8 +125,8 @@ a50137a10063d83e91d1eea2b5a709539cf4e560 data\extravaganza\recipe\tear_tiled_fes fbb989442cf83d633e79831ea7c1d77ec08a40e9 data\extravaganza\advancement\recipes\building_blocks\lime_tiled_festive_rubber.json 574483465a1c633c8eb507501ab84aaa309ba85e data\extravaganza\recipe\purple_sharped_festive_rubber.json ccd0e519765283c11b3d4eb898a1b9d4ff23d932 data\extravaganza\advancement\recipes\building_blocks\blue_screwed_festive_rubber.json -cf7f4c052fe96bea2e9b2c8064f907c679b7c585 data\extravaganza\recipe\tomato_barred_festive_rubber.json e17e25e5b7d84ee02b420d0000c66a0eafc179fe data\extravaganza\advancement\recipes\building_blocks\tomato_windowed_festive_rubber.json +cf7f4c052fe96bea2e9b2c8064f907c679b7c585 data\extravaganza\recipe\tomato_barred_festive_rubber.json f796210b2f8759afdff1f15e466466c9de7f885d data\extravaganza\advancement\recipes\building_blocks\nymph_slipped_festive_rubber.json 066a7435919afa54ef8ea2eb955921df96de4afd data\extravaganza\advancement\recipes\building_blocks\orange_scratched_festive_rubber.json bb11e200d025adb326174d7b47577b60289442f3 data\extravaganza\recipe\tear_curved_festive_rubber.json @@ -141,8 +141,8 @@ bc1d5a417db0fc6ade10acb5cfba27ad4d00154b data\extravaganza\advancement\recipes\b 5e6e4ffaa724596cd8ee7edf45cd271578f0162c data\extravaganza\advancement\recipes\building_blocks\brown_padded_festive_rubber.json 07a5c0191f7bba4fc49c0cac5dcfea66289131ad data\extravaganza\recipe\black_striped_festive_rubber.json 28c2bc81d158f5cf96d71093c883b66ba9101934 data\extravaganza\advancement\recipes\building_blocks\nymph_scratched_festive_rubber.json -813c6038499be489a8446543a298742d5e8497eb data\extravaganza\recipe\cyan_poured_festive_rubber.json 1ba9ba30483ed1318bf85a98ef62c2b15d74f3bc data\extravaganza\recipe\brown_wooded_festive_rubber.json +813c6038499be489a8446543a298742d5e8497eb data\extravaganza\recipe\cyan_poured_festive_rubber.json 791dd51b0829e70f253688d016e06bc998ef0bfc data\extravaganza\recipe\brown_slipped_festive_rubber.json f4079a84b126a6228244530afeb0e2915e77fca3 data\extravaganza\advancement\recipes\building_blocks\orange_tiled_festive_rubber.json 435dee86e8ef10a966e53e0edf7166d769980759 data\extravaganza\advancement\recipes\building_blocks\yellow_barred_festive_rubber.json @@ -236,8 +236,8 @@ ef186ae8f0fa1630933e658f5371fa2550e41fc9 data\extravaganza\advancement\recipes\b b150ae09bbfbc54d1c17bf9ea5df449e30b29b85 data\extravaganza\recipe\orange_padded_festive_rubber.json 6b89ebbcaf72e1da2215a4a8fc80bf44761d100a data\extravaganza\recipe\black_festive_rubber_grate.json 10da1365a63f43b09b2e671ab4487dca897aeca6 data\extravaganza\advancement\recipes\building_blocks\lime_dotted_festive_rubber.json -1f72c3cd3941763bd091d3a8528a564fc1891f89 data\extravaganza\recipe\nymph_dotted_festive_rubber.json 29bace3e5069325339eb72ca7b3a732668837019 data\extravaganza\recipe\nymph_tiled_festive_rubber.json +1f72c3cd3941763bd091d3a8528a564fc1891f89 data\extravaganza\recipe\nymph_dotted_festive_rubber.json c232e7e3e6c0791ae268233d5a2a32e954d0ddf7 data\extravaganza\advancement\recipes\building_blocks\light_gray_sharped_festive_rubber.json 8293ee518b66d750436a2e74020cdb23035cf4c1 data\extravaganza\recipe\gray_slipped_festive_rubber.json 27b270b9661dd289d12eca5074f53955bf1344c0 data\extravaganza\advancement\recipes\building_blocks\light_blue_poured_festive_rubber.json @@ -448,8 +448,8 @@ ebb9b1debdce7ec3973062dffbe2af56d23d8fc8 data\extravaganza\recipe\tear_barred_fe 0009817b0203d3d99dd6e16ca311e7a5ea505d34 data\extravaganza\advancement\recipes\building_blocks\light_blue_dotted_festive_rubber.json 211748dba3cd6ff9896fb1b52ef6a4862c488a73 data\extravaganza\recipe\lime_padded_festive_rubber.json e9c8687686e54a1c700c8115b77ddead7b69bff5 data\extravaganza\advancement\recipes\building_blocks\cyan_screwed_festive_rubber.json -d456c679f8f187c23e2ca2acb316b139ae0ebdd7 data\extravaganza\advancement\recipes\building_blocks\light_gray_barred_festive_rubber.json 0a9567956b1dcfd90ecce83e5ccc4522fa9ecf4f data\extravaganza\advancement\recipes\building_blocks\light_gray_split_festive_rubber.json +d456c679f8f187c23e2ca2acb316b139ae0ebdd7 data\extravaganza\advancement\recipes\building_blocks\light_gray_barred_festive_rubber.json 74484a617231a71f821fd1e9ebb6066a4cd7bd48 data\extravaganza\advancement\recipes\building_blocks\magenta_dotted_festive_rubber.json e2538d8bdd6f26fa35ac97d2be8c450fc98c9f11 data\extravaganza\advancement\recipes\building_blocks\tomato_padded_festive_rubber.json 7d5384935b94af14c992e591594beabfddb526a8 data\extravaganza\advancement\recipes\building_blocks\cyan_windowed_festive_rubber.json @@ -524,16 +524,16 @@ d9109f345496f755810f629b9c8b031bc08a351a data\extravaganza\recipe\light_blue_spl d7a04f9dbc378ef7f91483836ba7616c80472dfa data\extravaganza\recipe\green_festive_rubber_grate.json acfd695fef5194e2894e49f307dde971450c382a data\extravaganza\advancement\recipes\building_blocks\tear_scratched_festive_rubber.json 448f972d54f235adcdfdeadc8fdd9e82af9578a7 data\extravaganza\recipe\blue_festive_rubber.json -1b98de179c1da2d45abaa95b1f10dc08a42e2f4b data\extravaganza\advancement\recipes\building_blocks\lime_perforated_festive_rubber.json eebe10f7f398e6f19a6b4d264e877b0361021597 data\extravaganza\recipe\lime_windowed_festive_rubber.json +1b98de179c1da2d45abaa95b1f10dc08a42e2f4b data\extravaganza\advancement\recipes\building_blocks\lime_perforated_festive_rubber.json 9c320417f0705690e41fd177c56d455dbbb9e44e data\extravaganza\advancement\recipes\building_blocks\green_curved_festive_rubber.json 78dd7b8fdad82680b5b348bed7b637d45932adb6 data\extravaganza\recipe\plant_windowed_festive_rubber.json dca71368987251f429e057dae0c77878d67b2f3f data\extravaganza\advancement\recipes\building_blocks\cyan_festive_rubber.json 4cda7e419abc57df9e7eca4ecdf31bd4ca19d498 data\extravaganza\recipe\light_gray_festive_rubber.json 7e395819c0e98da79ca174b84c3dba01f41c6592 data\extravaganza\advancement\recipes\building_blocks\blue_split_festive_rubber.json 905f7f0c41d95afbf819442d1dd9fac04e39e655 data\extravaganza\recipe\white_curved_festive_rubber.json -fee983a4083fb1dc28a0e5a3f9e98ef57dfb4874 data\extravaganza\advancement\recipes\building_blocks\orange_dotted_festive_rubber.json 001ddb7760ee1646658efe15125b3dadb60cbf06 data\extravaganza\advancement\recipes\building_blocks\orange_poured_festive_rubber.json +fee983a4083fb1dc28a0e5a3f9e98ef57dfb4874 data\extravaganza\advancement\recipes\building_blocks\orange_dotted_festive_rubber.json bfa7ec87c4d198006960c8e1989dd43159018a94 data\extravaganza\advancement\recipes\building_blocks\orange_perforated_festive_rubber.json 0e63ec306397147ce34a3d73cb78e38e906f6877 data\extravaganza\advancement\recipes\building_blocks\plant_screwed_festive_rubber.json 5249ff4b060532359eaadcbe553bc66d03f0a4e1 data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_grate.json @@ -543,8 +543,8 @@ bfa7ec87c4d198006960c8e1989dd43159018a94 data\extravaganza\advancement\recipes\b 7501a7d684a8ecd24168661ea2c168aed74ccdad data\extravaganza\recipe\white_poured_festive_rubber.json 9f650ba0476631fa0380181b06557cb0dd3c3b1c data\extravaganza\recipe\light_blue_padded_festive_rubber.json 7bb4c7a1db771cf7bc3d52f0d43f25034b7fe037 data\extravaganza\advancement\recipes\building_blocks\yellow_poured_festive_rubber.json -da1abd6be70dcbd0fa4bad376b7940aaa3f9fab5 data\extravaganza\advancement\recipes\building_blocks\purple_barred_festive_rubber.json ba74d995c7532622e3df8e04afcadeba2a84308a data\extravaganza\advancement\recipes\building_blocks\purple_split_festive_rubber.json +da1abd6be70dcbd0fa4bad376b7940aaa3f9fab5 data\extravaganza\advancement\recipes\building_blocks\purple_barred_festive_rubber.json 714361cff4ab2cc3e5b2302b38090bf0f9c0d640 data\extravaganza\advancement\recipes\building_blocks\brown_festive_rubber.json 3365bb6bd2c5eea95a450b348cd49dcfc1fa4d84 data\extravaganza\recipe\green_perforated_festive_rubber.json 89835ae1845cdb2a1f075303604580895629fbd6 data\extravaganza\advancement\recipes\building_blocks\purple_curved_festive_rubber.json @@ -709,5 +709,5 @@ a96535299ad0b635596e9840ebb639a9c03a2029 data\extravaganza\advancement\recipes\b d63fb69c1c3740a9c6269d3940618415a42560d1 data\extravaganza\recipe\purple_barred_festive_rubber.json 2d27fd9e5b23eee4fca3576b43e155ae55ec5552 data\extravaganza\recipe\green_curved_festive_rubber.json 8b8620d41e9aaa6b939c2ca5349c28b93d84d647 data\extravaganza\recipe\red_barred_festive_rubber.json -f3602d74259d7abedbddb81151b425148a13e737 data\extravaganza\recipe\lime_wooded_festive_rubber.json c2537c50f7cb9ebea1462fcbf3e77f3621b1e3e4 data\extravaganza\advancement\recipes\building_blocks\lime_screwed_festive_rubber.json +f3602d74259d7abedbddb81151b425148a13e737 data\extravaganza\recipe\lime_wooded_festive_rubber.json diff --git a/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 b/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 index 5ba52bb3..040b96af 100644 --- a/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 +++ b/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 @@ -1,2 +1,2 @@ -// 1.21 2024-06-17T00:01:49.8869773 Extravaganza!/Language (en_us) -724452bbe679c89b0bda839b487d04fdda6a23a5 assets\extravaganza\lang\en_us.json +// 1.21 2024-06-17T23:04:13.0211809 Extravaganza!/Language (en_us) +124a09de090360547560443ecfb77a5d1e70dbf6 assets\extravaganza\lang\en_us.json diff --git a/src/main/generated/assets/extravaganza/blockstates/garland.json b/src/main/generated/assets/extravaganza/blockstates/garland.json new file mode 100644 index 00000000..499dae94 --- /dev/null +++ b/src/main/generated/assets/extravaganza/blockstates/garland.json @@ -0,0 +1,193 @@ +{ + "multipart": [ + { + "apply": { + "model": "extravaganza:block/garland" + }, + "when": { + "OR": [ + { + "AND": [ + { + "up": "false" + }, + { + "down": "false" + }, + { + "north": "false" + }, + { + "south": "false" + }, + { + "west": "false" + }, + { + "east": "false" + } + ] + }, + { + "OR": [ + { + "up": "true" + }, + { + "down": "true" + }, + { + "north": "true" + }, + { + "south": "true" + } + ] + } + ] + } + }, + { + "apply": { + "model": "extravaganza:block/garland_horizontal" + }, + "when": { + "OR": [ + { + "AND": [ + { + "up": "false" + }, + { + "down": "false" + }, + { + "north": "false" + }, + { + "south": "false" + }, + { + "west": "false" + }, + { + "east": "false" + } + ] + }, + { + "OR": [ + { + "north": "true" + }, + { + "south": "true" + }, + { + "west": "true" + }, + { + "east": "true" + } + ] + } + ] + } + }, + { + "apply": { + "model": "extravaganza:block/garland_vertical" + }, + "when": { + "OR": [ + { + "AND": [ + { + "up": "false" + }, + { + "down": "false" + }, + { + "north": "false" + }, + { + "south": "false" + }, + { + "west": "false" + }, + { + "east": "false" + } + ] + }, + { + "OR": [ + { + "up": "true" + }, + { + "down": "true" + }, + { + "west": "true" + }, + { + "east": "true" + } + ] + } + ] + } + }, + { + "apply": { + "model": "extravaganza:block/garland_up" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/garland_down" + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/garland_north" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/garland_south" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/garland_west" + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/garland_east" + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/src/main/generated/assets/extravaganza/lang/en_us.json b/src/main/generated/assets/extravaganza/lang/en_us.json index 8aa2b4e7..59165bce 100644 --- a/src/main/generated/assets/extravaganza/lang/en_us.json +++ b/src/main/generated/assets/extravaganza/lang/en_us.json @@ -294,6 +294,7 @@ "block.extravaganza.cyan_wooded_festive_rubber_slab": "Cyan Wooded Festive Rubber Slab", "block.extravaganza.cyan_wooded_festive_rubber_stairs": "Cyan Wooded Festive Rubber Stairs", "block.extravaganza.cyan_wooded_festive_rubber_wall": "Cyan Wooded Festive Rubber Wall", + "block.extravaganza.garland": "Garland", "block.extravaganza.gray_barred_festive_rubber": "Gray Barred Festive Rubber", "block.extravaganza.gray_barred_festive_rubber_slab": "Gray Barred Festive Rubber Slab", "block.extravaganza.gray_barred_festive_rubber_stairs": "Gray Barred Festive Rubber Stairs", diff --git a/src/main/generated/assets/extravaganza/models/item/garland.json b/src/main/generated/assets/extravaganza/models/item/garland.json new file mode 100644 index 00000000..e05f8a85 --- /dev/null +++ b/src/main/generated/assets/extravaganza/models/item/garland.json @@ -0,0 +1,3 @@ +{ + "parent": "extravaganza:block/garland" +} \ No newline at end of file diff --git a/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java b/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java index 7f5cfb25..cda6d86c 100644 --- a/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java +++ b/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java @@ -22,6 +22,7 @@ import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.state.property.Properties; import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; @@ -75,6 +76,7 @@ public static class ExtravaganzaModelProvider extends FabricModelProvider { block.equals(ExtravaganzaBlocks.BALL_POOL_CORE) || block.equals(ExtravaganzaBlocks.BALL_POOL_CONTENT) || block.equals(ExtravaganzaBlocks.BALL_DISTRIBUTOR) || + block.equals(ExtravaganzaBlocks.GARLAND) || block.equals(ExtravaganzaBlocks.PINATA); private static final Predicate UNCOMMON_ITEMS = item -> @@ -104,6 +106,70 @@ else if (block instanceof LadderBlock) { blockStateModelGenerator.registerNorthDefaultHorizontalRotation(block); blockStateModelGenerator.registerItemModel(block); } + else if (block.equals(ExtravaganzaBlocks.GARLAND)) { + Identifier garland = Extravaganza.createId("block/garland"); + Identifier horizontal = Extravaganza.createId("block/garland_horizontal"); + Identifier vertical = Extravaganza.createId("block/garland_vertical"); + Identifier up = Extravaganza.createId("block/garland_up"); + Identifier down = Extravaganza.createId("block/garland_down"); + Identifier north = Extravaganza.createId("block/garland_north"); + Identifier south = Extravaganza.createId("block/garland_south"); + Identifier west = Extravaganza.createId("block/garland_west"); + Identifier east = Extravaganza.createId("block/garland_east"); + When none = When.allOf( + When.create().set(Properties.UP, false), + When.create().set(Properties.DOWN, false), + When.create().set(Properties.NORTH, false), + When.create().set(Properties.SOUTH, false), + When.create().set(Properties.WEST, false), + When.create().set(Properties.EAST, false) + ); + blockStateModelGenerator.blockStateCollector.accept( + MultipartBlockStateSupplier.create(ExtravaganzaBlocks.GARLAND) + .with( + When.anyOf( + none, + When.anyOf( + When.create().set(Properties.UP, true), + When.create().set(Properties.DOWN, true), + When.create().set(Properties.NORTH, true), + When.create().set(Properties.SOUTH, true) + ) + ), + BlockStateVariant.create().put(VariantSettings.MODEL, garland) + ) + .with( + When.anyOf( + none, + When.anyOf( + When.create().set(Properties.NORTH, true), + When.create().set(Properties.SOUTH, true), + When.create().set(Properties.WEST, true), + When.create().set(Properties.EAST, true) + ) + ), + BlockStateVariant.create().put(VariantSettings.MODEL, horizontal) + ) + .with( + When.anyOf( + none, + When.anyOf( + When.create().set(Properties.UP, true), + When.create().set(Properties.DOWN, true), + When.create().set(Properties.WEST, true), + When.create().set(Properties.EAST, true) + ) + ), + BlockStateVariant.create().put(VariantSettings.MODEL, vertical) + ) + .with(When.create().set(Properties.UP, true), BlockStateVariant.create().put(VariantSettings.MODEL, up)) + .with(When.create().set(Properties.DOWN, true), BlockStateVariant.create().put(VariantSettings.MODEL, down)) + .with(When.create().set(Properties.NORTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, north)) + .with(When.create().set(Properties.SOUTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, south)) + .with(When.create().set(Properties.WEST, true), BlockStateVariant.create().put(VariantSettings.MODEL, west)) + .with(When.create().set(Properties.EAST, true), BlockStateVariant.create().put(VariantSettings.MODEL, east)) + ); + } else if (block.equals(ExtravaganzaBlocks.BALL_DISTRIBUTOR)) { Identifier up = Extravaganza.createId("block/ball_distributor_up"); Identifier down = Extravaganza.createId("block/ball_distributor_down"); diff --git a/src/main/java/com/mmodding/extravaganza/block/GarlandBlock.java b/src/main/java/com/mmodding/extravaganza/block/GarlandBlock.java new file mode 100644 index 00000000..a5d73363 --- /dev/null +++ b/src/main/java/com/mmodding/extravaganza/block/GarlandBlock.java @@ -0,0 +1,74 @@ +package com.mmodding.extravaganza.block; + +import com.mmodding.extravaganza.init.ExtravaganzaBlocks; +import com.mojang.serialization.MapCodec; +import net.minecraft.block.*; +import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldAccess; + +public class GarlandBlock extends ConnectingBlock { + + public static final MapCodec CODEC = GarlandBlock.createCodec(GarlandBlock::new); + + public GarlandBlock(Settings settings) { + super(0.3125F, settings); + this.setDefaultState( + this.getDefaultState() + .with(NORTH, false) + .with(EAST, false) + .with(SOUTH, false) + .with(WEST, false) + .with(UP, false) + .with(DOWN, false) + ); + } + + @Override + public MapCodec getCodec() { + return GarlandBlock.CODEC; + } + + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + return withConnectionProperties(ctx.getWorld(), ctx.getBlockPos(), this.getDefaultState()); + } + + public static BlockState withConnectionProperties(BlockView world, BlockPos pos, BlockState state) { + BlockState downState = world.getBlockState(pos.down()); + BlockState upState = world.getBlockState(pos.up()); + BlockState northState = world.getBlockState(pos.north()); + BlockState eastState = world.getBlockState(pos.east()); + BlockState southState = world.getBlockState(pos.south()); + BlockState westState = world.getBlockState(pos.west()); + Block block = state.getBlock(); + return state.withIfExists(DOWN, downState.isOf(block) || downState.isOf(ExtravaganzaBlocks.PINATA)) + .withIfExists(UP, upState.isOf(block)) + .withIfExists(NORTH, northState.isOf(block)) + .withIfExists(EAST, eastState.isOf(block)) + .withIfExists(SOUTH, southState.isOf(block)) + .withIfExists(WEST, westState.isOf(block)); + } + + @Override + protected BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + return state.with( + GarlandBlock.FACING_PROPERTIES.get(direction), + neighborState.isOf(this) || direction == Direction.DOWN && neighborState.isOf(ExtravaganzaBlocks.PINATA) + ); + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(NORTH, EAST, SOUTH, WEST, UP, DOWN); + } + + @Override + protected boolean canPathfindThrough(BlockState state, NavigationType type) { + return false; + } +} diff --git a/src/main/java/com/mmodding/extravaganza/client/init/ExtravaganzaRenderLayers.java b/src/main/java/com/mmodding/extravaganza/client/init/ExtravaganzaRenderLayers.java index 19c63ab5..6021ef73 100644 --- a/src/main/java/com/mmodding/extravaganza/client/init/ExtravaganzaRenderLayers.java +++ b/src/main/java/com/mmodding/extravaganza/client/init/ExtravaganzaRenderLayers.java @@ -12,7 +12,7 @@ public class ExtravaganzaRenderLayers { public static void register() { Extravaganza.executeKeyForRegistry(Registries.BLOCK, key -> { Predicate checker = word -> key.getValue().getPath().contains(word); - if (checker.test("pinata") || checker.test("grate") || checker.test("windowed") || checker.test("ladder")) { + if (checker.test("garland") || checker.test("pinata") || checker.test("grate") || checker.test("windowed") || checker.test("ladder")) { BlockRenderLayerMap.INSTANCE.putBlock(Registries.BLOCK.get(key), RenderLayer.getCutout()); } else if(checker.test("distributor") || checker.test("stained")) { diff --git a/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlocks.java b/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlocks.java index 6a4ad4dd..e6b4b9fd 100644 --- a/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlocks.java +++ b/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlocks.java @@ -2,10 +2,7 @@ import com.mmodding.extravaganza.Extravaganza; import com.mmodding.extravaganza.ExtravaganzaColor; -import com.mmodding.extravaganza.block.BallDistributorBlock; -import com.mmodding.extravaganza.block.BallPoolContentBlock; -import com.mmodding.extravaganza.block.BallPoolCoreBlock; -import com.mmodding.extravaganza.block.PinataBlock; +import com.mmodding.extravaganza.block.*; import net.minecraft.block.*; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; @@ -20,6 +17,8 @@ public class ExtravaganzaBlocks { public static final Block BALL_DISTRIBUTOR = new BallDistributorBlock(AbstractBlock.Settings.create().nonOpaque().sounds(BlockSoundGroup.LANTERN)); + public static final Block GARLAND = new GarlandBlock(AbstractBlock.Settings.create().nonOpaque().sounds(BlockSoundGroup.WOOD)); + public static final Block PINATA = new PinataBlock(AbstractBlock.Settings.create().nonOpaque().sounds(BlockSoundGroup.WOOL)); public static final Block TEAR_STAINED_GLASS = new TransparentBlock(AbstractBlock.Settings.create().nonOpaque().sounds(BlockSoundGroup.GLASS)); @@ -31,6 +30,7 @@ public static void register() { ExtravaganzaBlocks.registerBlockWithItem("ball_pool_core", ExtravaganzaBlocks.BALL_POOL_CORE); ExtravaganzaBlocks.registerBlockWithItem("ball_pool_content", ExtravaganzaBlocks.BALL_POOL_CONTENT); ExtravaganzaBlocks.registerBlockWithItem("ball_distributor", ExtravaganzaBlocks.BALL_DISTRIBUTOR); + ExtravaganzaBlocks.registerBlockWithItem("garland", ExtravaganzaBlocks.GARLAND); ExtravaganzaBlocks.registerBlockWithItem("pinata", ExtravaganzaBlocks.PINATA); ExtravaganzaBlocks.registerBlockWithItem("tear_stained_glass", ExtravaganzaBlocks.TEAR_STAINED_GLASS); ExtravaganzaBlocks.registerBlockWithItem("plant_stained_glass", ExtravaganzaBlocks.PLANT_STAINED_GLASS); diff --git a/src/main/resources/assets/extravaganza/icon.png b/src/main/resources/assets/extravaganza/icon.png index 4ac42269..470f6bd5 100644 Binary files a/src/main/resources/assets/extravaganza/icon.png and b/src/main/resources/assets/extravaganza/icon.png differ diff --git a/src/main/resources/assets/extravaganza/models/block/garland.json b/src/main/resources/assets/extravaganza/models/block/garland.json new file mode 100644 index 00000000..3616db59 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/garland.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "main": "extravaganza:block/garland", + "particle": "extravaganza:block/garland" + }, + "elements": [ + { + "from": [8, 6, 6], + "to": [8, 10, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#main"}, + "east": {"uv": [4, 6, 8, 10], "texture": "#main"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#main"}, + "west": {"uv": [4, 6, 8, 10], "texture": "#main"}, + "up": {"uv": [0, 0, 0, 4], "texture": "#main"}, + "down": {"uv": [0, 0, 0, 4], "texture": "#main"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/garland_down.json b/src/main/resources/assets/extravaganza/models/block/garland_down.json new file mode 100644 index 00000000..27c2c750 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/garland_down.json @@ -0,0 +1,34 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland" + }, + "elements": [ + { + "from": [8, 0, 6], + "to": [8, 6, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "east": {"uv": [4, 10, 8, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "west": {"uv": [4, 10, 8, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [6, 0, 8], + "to": [10, 6, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [6, -6, 8]}, + "faces": { + "north": {"uv": [0, 10, 4, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "south": {"uv": [0, 10, 4, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 4, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 4, 0], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/garland_east.json b/src/main/resources/assets/extravaganza/models/block/garland_east.json new file mode 100644 index 00000000..ce2717a8 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/garland_east.json @@ -0,0 +1,34 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland" + }, + "elements": [ + { + "from": [10, 6, 8], + "to": [16, 10, 8], + "rotation": {"angle": 0, "axis": "z", "origin": [14, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "rotation": 270, "texture": "#1"}, + "east": {"uv": [0, 0, 4, 0], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 4, 6], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 0, 4, 0], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [10, 8, 6], + "to": [16, 8, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "rotation": 270, "texture": "#1"}, + "east": {"uv": [0, 0, 4, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 0, 4, 0], "rotation": 180, "texture": "#1"}, + "up": {"uv": [8, 0, 12, 6], "rotation": 90, "texture": "#1"}, + "down": {"uv": [8, 0, 12, 6], "rotation": 90, "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/garland_horizontal.json b/src/main/resources/assets/extravaganza/models/block/garland_horizontal.json new file mode 100644 index 00000000..efde9289 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/garland_horizontal.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "main": "extravaganza:block/garland", + "particle": "extravaganza:block/garland" + }, + "elements": [ + { + "from": [6, 8, 6], + "to": [10, 8, 10], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 0], "rotation": 180, "texture": "#main"}, + "east": {"uv": [0, 0, 0, 16], "rotation": 270, "texture": "#main"}, + "south": {"uv": [0, 0, 4, 0], "texture": "#main"}, + "west": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#main"}, + "up": {"uv": [8, 6, 12, 10], "rotation": 180, "texture": "#main"}, + "down": {"uv": [8, 6, 12, 10], "texture": "#main"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/garland_north.json b/src/main/resources/assets/extravaganza/models/block/garland_north.json new file mode 100644 index 00000000..c19f337b --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/garland_north.json @@ -0,0 +1,34 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland" + }, + "elements": [ + { + "from": [8, 6, 0], + "to": [8, 10, 6], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 3]}, + "faces": { + "north": {"uv": [0, 0, 0, 4], "rotation": 180, "texture": "#1"}, + "east": {"uv": [4, 10, 8, 16], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#1"}, + "west": {"uv": [4, 10, 8, 16], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [6, 8, 0], + "to": [10, 8, 6], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 4]}, + "faces": { + "north": {"uv": [0, 0, 4, 0], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 0, 0, 16], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 4, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#1"}, + "up": {"uv": [8, 10, 12, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [8, 10, 12, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/garland_south.json b/src/main/resources/assets/extravaganza/models/block/garland_south.json new file mode 100644 index 00000000..b2070941 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/garland_south.json @@ -0,0 +1,34 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland" + }, + "elements": [ + { + "from": [8, 6, 10], + "to": [8, 10, 16], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 13]}, + "faces": { + "north": {"uv": [0, 0, 0, 4], "rotation": 180, "texture": "#1"}, + "east": {"uv": [4, 0, 8, 6], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 0, 4], "texture": "#1"}, + "west": {"uv": [4, 0, 8, 6], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [6, 8, 10], + "to": [10, 8, 16], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 14]}, + "faces": { + "north": {"uv": [0, 0, 4, 0], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 0, 0, 16], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 4, 0], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#1"}, + "up": {"uv": [8, 0, 12, 6], "rotation": 180, "texture": "#1"}, + "down": {"uv": [8, 0, 12, 6], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/garland_up.json b/src/main/resources/assets/extravaganza/models/block/garland_up.json new file mode 100644 index 00000000..4afd0655 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/garland_up.json @@ -0,0 +1,34 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland" + }, + "elements": [ + { + "from": [8, 10, 6], + "to": [8, 16, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "west": {"uv": [4, 0, 8, 6], "texture": "#1"}, + "up": {"uv": [0, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [6, 10, 8], + "to": [10, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 4, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 4, 6], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 4, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 4, 0], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/garland_vertical.json b/src/main/resources/assets/extravaganza/models/block/garland_vertical.json new file mode 100644 index 00000000..1130046b --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/garland_vertical.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "main": "extravaganza:block/garland", + "particle": "extravaganza:block/garland" + }, + "elements": [ + { + "from": [6, 6, 8], + "to": [10, 10, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 8]}, + "faces": { + "north": {"uv": [0, 6, 4, 10], "texture": "#main"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#main"}, + "south": {"uv": [0, 6, 4, 10], "texture": "#main"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#main"}, + "up": {"uv": [0, 0, 4, 0], "texture": "#main"}, + "down": {"uv": [0, 0, 4, 0], "texture": "#main"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/garland_west.json b/src/main/resources/assets/extravaganza/models/block/garland_west.json new file mode 100644 index 00000000..cf858130 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/garland_west.json @@ -0,0 +1,34 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland" + }, + "elements": [ + { + "from": [0, 6, 8], + "to": [6, 10, 8], + "rotation": {"angle": 0, "axis": "z", "origin": [4, 8, 8]}, + "faces": { + "north": {"uv": [0, 10, 4, 16], "rotation": 270, "texture": "#1"}, + "east": {"uv": [0, 0, 4, 0], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 10, 4, 16], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 0, 4, 0], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [0, 8, 6], + "to": [6, 8, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "rotation": 270, "texture": "#1"}, + "east": {"uv": [0, 0, 4, 0], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 0, 4, 0], "rotation": 180, "texture": "#1"}, + "up": {"uv": [8, 10, 12, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [8, 10, 12, 16], "rotation": 90, "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/textures/block/garland.png b/src/main/resources/assets/extravaganza/textures/block/garland.png new file mode 100644 index 00000000..9c13f178 Binary files /dev/null and b/src/main/resources/assets/extravaganza/textures/block/garland.png differ