diff --git a/gradle.properties b/gradle.properties index 52d84881..8f83ce2a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.21+build.1 loader_version=0.15.11 # Mod Properties -mod_version=0.1.4-beta +mod_version=0.1.5-beta maven_group=com.mmodding.extravaganza archives_base_name=extravaganza diff --git a/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 b/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 index 02ddacae..5b15e6ea 100644 --- a/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 +++ b/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 @@ -1,4 +1,4 @@ -// 1.21 2024-06-28T01:02:39.970263 Extravaganza!/Tags for minecraft:block +// 1.21 2024-07-01T03:10:22.4788059 Extravaganza!/Tags for minecraft:block dbff392afc55efca744c56e3454d0e5de2012e20 data\minecraft\tags\block\fences.json 95046486087e22ae6d1b1f59624db082c3d0408e data\minecraft\tags\block\walls.json 55786c9bbcdceb69fa2bf2b3be010a0cac171f71 data\minecraft\tags\block\mineable\pickaxe.json diff --git a/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f b/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f index ac5e2f93..429ab4f1 100644 --- a/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f +++ b/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f @@ -1,4 +1,4 @@ -// 1.21 2024-06-28T01:02:39.9747859 Extravaganza!/Block Loot Tables +// 1.21 2024-07-01T03:10:22.4808046 Extravaganza!/Block Loot Tables 047f4622b601aa9f2a91ea58c6bf4065fd357ca1 data\extravaganza\loot_table\blocks\blue_barred_festive_rubber_slab.json ffe446da77e41bdb66d3f9427f14d362b99601e4 data\extravaganza\loot_table\blocks\pink_split_festive_rubber_stairs.json 719e535381fa142502da80877e274a4d93aa2d81 data\extravaganza\loot_table\blocks\pink_dotted_festive_rubber_stairs.json @@ -458,8 +458,8 @@ b5c071a3db03db0ccd26b7e723a7a2cefe92f888 data\extravaganza\loot_table\blocks\bla 4456ffcf2e4917abb0212f0e78241604d8274fd3 data\extravaganza\loot_table\blocks\tomato_slipped_festive_rubber.json 9fabbbe6fe79d96296956ab69505df54813c3fbf data\extravaganza\loot_table\blocks\cyan_padded_festive_rubber_slab.json 82336bb39a7e3ab26e4cdffb65348b218067e8ed data\extravaganza\loot_table\blocks\tear_festive_rubber_grate_slab.json -ba42c23a40690010ee9c3a254ea28d87685fe9a2 data\extravaganza\loot_table\blocks\nymph_slipped_festive_rubber_stairs.json fa35c25650931cbcf08a8906965de30c1bdc3ffb data\extravaganza\loot_table\blocks\cyan_tiled_festive_rubber_wall.json +ba42c23a40690010ee9c3a254ea28d87685fe9a2 data\extravaganza\loot_table\blocks\nymph_slipped_festive_rubber_stairs.json 8a42e87994fa7db98c530a7de5ce5f7edb20b334 data\extravaganza\loot_table\blocks\yellow_perforated_festive_rubber_slab.json 3db1efbf32434447804c2bdd4462689a1f7fd09b data\extravaganza\loot_table\blocks\lime_screwed_festive_rubber_wall.json 6e46409fde2bbc6dada457ee1109c6406b444932 data\extravaganza\loot_table\blocks\orange_slipped_festive_rubber_slab.json @@ -571,8 +571,8 @@ ad8ab6e44a2b8d2be006eacaa32cafce5b8c1466 data\extravaganza\loot_table\blocks\lim d75e81df0bb53b19c9287b6666611c9cd692b8a4 data\extravaganza\loot_table\blocks\yellow_windowed_festive_rubber_stairs.json 09e340203e918bea26fe2abaa9bec5b389b7a995 data\extravaganza\loot_table\blocks\nymph_stained_glass.json 81e4c2040748ba14b69c60854a236ea949c01c2a data\extravaganza\loot_table\blocks\orange_sharped_festive_rubber_stairs.json -c0cfa90392aa874b96e391af99d66c62022dff3a data\extravaganza\loot_table\blocks\blue_split_festive_rubber.json 81f3303437376d39a077751935d9d45118a59018 data\extravaganza\loot_table\blocks\orange_barred_festive_rubber_slab.json +c0cfa90392aa874b96e391af99d66c62022dff3a data\extravaganza\loot_table\blocks\blue_split_festive_rubber.json 1ebb6d157c5b0328d6a41e679755e18762a2de34 data\extravaganza\loot_table\blocks\orange_windowed_festive_rubber.json 2d16be2f8b124bc6c2cd303811995592b0506732 data\extravaganza\loot_table\blocks\gray_split_festive_rubber_wall.json 8a6232b828322268d7ac69d20b19753dea9f8c42 data\extravaganza\loot_table\blocks\brown_barred_festive_rubber.json @@ -990,8 +990,8 @@ dc0e799b3e912158f39965d18c1c952497e5eff0 data\extravaganza\loot_table\blocks\lig 428564cfacda752af72307efed9ceff40c4680b1 data\extravaganza\loot_table\blocks\plant_tiled_festive_rubber_wall.json 60b194057ea0f4d7389ff5b1dcf97cab05322706 data\extravaganza\loot_table\blocks\brown_festive_rubber_grate_stairs.json 013ee5eeb01b82be8786446857f00b02b3cb63ec data\extravaganza\loot_table\blocks\cyan_bent_festive_rubber_stairs.json -52f059f61781f630cb05ec0c96288604b62801e8 data\extravaganza\loot_table\blocks\magenta_festive_rubber_wall.json 5fd263c24dda56e3fe96bd9e8166aa822b716c66 data\extravaganza\loot_table\blocks\blue_wooded_festive_rubber.json +52f059f61781f630cb05ec0c96288604b62801e8 data\extravaganza\loot_table\blocks\magenta_festive_rubber_wall.json f5d2e82418f807d8795ffd81f323b7cd355f1631 data\extravaganza\loot_table\blocks\red_slipped_festive_rubber.json b1228516fefee1de848a97dbeb92c6915a54bba2 data\extravaganza\loot_table\blocks\purple_curved_festive_rubber_slab.json a342739c7310a987e67d6427f49b3ae27e158f84 data\extravaganza\loot_table\blocks\red_scratched_festive_rubber_wall.json @@ -1184,8 +1184,8 @@ ef20322af6291926acfe3a32b988a1427ab2ec21 data\extravaganza\loot_table\blocks\ora 1a869eb3961c501e2b92843b7ea99e340f9c2ba2 data\extravaganza\loot_table\blocks\blue_scratched_festive_rubber_slab.json 8ef0328f1e7da4b3e40610bd43653c326dd25c14 data\extravaganza\loot_table\blocks\light_blue_wooded_festive_rubber_stairs.json 690a72e685ef8d0082159ceecbe65a2eb17d6ce3 data\extravaganza\loot_table\blocks\gray_scratched_festive_rubber_slab.json -e93567a3ef956bfdc465a7d55fdaa6642cbad08c data\extravaganza\loot_table\blocks\tear_wooded_festive_rubber.json 366c298a14e94b63a6d8b2d5f0af47ba4d049925 data\extravaganza\loot_table\blocks\tear_wooded_festive_rubber_slab.json +e93567a3ef956bfdc465a7d55fdaa6642cbad08c data\extravaganza\loot_table\blocks\tear_wooded_festive_rubber.json c1f17aefae9f37a5f049db8e19138aaaa523a0cd data\extravaganza\loot_table\blocks\nymph_festive_rubber_grate_slab.json d3725d068eadf9fd44554541f84c571cfa314efd data\extravaganza\loot_table\blocks\brown_festive_rubber_grate_slab.json 5575e129f3abc70b5657472df10afd26994e8925 data\extravaganza\loot_table\blocks\tear_curved_festive_rubber_stairs.json @@ -1484,8 +1484,8 @@ c6c0d7a71d64329a777bb9ac1f643cb0cce187e3 data\extravaganza\loot_table\blocks\yel a61bbd6ee24a28130867ad003fe64118e9d6b0a0 data\extravaganza\loot_table\blocks\light_gray_bent_festive_rubber_stairs.json 2ad91033a4f0eac3312a34b430dba1dbdb9b0ca9 data\extravaganza\loot_table\blocks\nymph_tiled_festive_rubber_wall.json 97d7e3dfc488a8e9b33dcf736eac7fba51962b70 data\extravaganza\loot_table\blocks\light_blue_scratched_festive_rubber_wall.json -525a19d23f12b281e059087f652a873ad6acb86a data\extravaganza\loot_table\blocks\green_festive_rubber.json 70f21cb7ae2c8d8760065b2280f0fa7071401550 data\extravaganza\loot_table\blocks\lime_windowed_festive_rubber_wall.json +525a19d23f12b281e059087f652a873ad6acb86a data\extravaganza\loot_table\blocks\green_festive_rubber.json efb0f544fb7363ea63465d2f11b5c7754817c9c7 data\extravaganza\loot_table\blocks\light_gray_padded_festive_rubber.json c25741d77171254f155630e9c72cca1de11a4954 data\extravaganza\loot_table\blocks\green_festive_rubber_ladder.json da050284e42abc90ed1791f809246fb168150f80 data\extravaganza\loot_table\blocks\purple_tiled_festive_rubber_slab.json diff --git a/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 b/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 index ae439152..2151f430 100644 --- a/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 +++ b/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 @@ -1,4 +1,4 @@ -// 1.21 2024-06-28T01:02:39.9853399 Extravaganza!/Tags for minecraft:damage_type +// 1.21 2024-07-01T03:10:22.4873209 Extravaganza!/Tags for minecraft:damage_type 39f9f1e2b4c18274a69f8bd4854abf0411fd28e0 data\minecraft\tags\damage_type\bypasses_armor.json 39f9f1e2b4c18274a69f8bd4854abf0411fd28e0 data\minecraft\tags\damage_type\no_knockback.json 39f9f1e2b4c18274a69f8bd4854abf0411fd28e0 data\minecraft\tags\damage_type\always_most_significant_fall.json diff --git a/src/main/generated/.cache/584c1a43949a9c899dc112415674d20efb051ed8 b/src/main/generated/.cache/584c1a43949a9c899dc112415674d20efb051ed8 index f0fa7ebd..b465ebd9 100644 --- a/src/main/generated/.cache/584c1a43949a9c899dc112415674d20efb051ed8 +++ b/src/main/generated/.cache/584c1a43949a9c899dc112415674d20efb051ed8 @@ -1,4 +1,4 @@ -// 1.21 2024-06-28T01:02:40.0059701 Extravaganza!/Extravaganza DynamicRegistries Generation +// 1.21 2024-07-01T03:10:22.4998323 Extravaganza!/Extravaganza DynamicRegistries Generation af252b8e234c0211c3ebf74eb225bd64e0187fcf data\extravaganza\damage_type\trash.json 4b7657ecaf6253a401fc80be063f3a21b060687d data\extravaganza\worldgen\configured_feature\hevea_brasiliensis.json cf3a85bd6efafc61465f552813771baf982ab901 data\extravaganza\worldgen\placed_feature\hevea_brasiliensis_checked.json diff --git a/src/main/generated/.cache/90eeb0d915a79c389c7026cb5e3cb8d595013f56 b/src/main/generated/.cache/90eeb0d915a79c389c7026cb5e3cb8d595013f56 index 38e304d8..c65f87e9 100644 --- a/src/main/generated/.cache/90eeb0d915a79c389c7026cb5e3cb8d595013f56 +++ b/src/main/generated/.cache/90eeb0d915a79c389c7026cb5e3cb8d595013f56 @@ -1,2 +1,2 @@ -// 1.21 2024-06-28T01:02:40.0049696 Extravaganza!/Tags for minecraft:item +// 1.21 2024-07-01T03:10:22.4988321 Extravaganza!/Tags for minecraft:item 12fafce95f6a2e9842735796145b2d610a1eb57a data\extravaganza\tags\item\festive_balls.json diff --git a/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 b/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 index 17253aa0..2fcf6901 100644 --- a/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 +++ b/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 @@ -1,4 +1,4 @@ -// 1.21 2024-06-28T01:02:39.8349502 Extravaganza!/Model Definitions +// 1.21 2024-07-01T03:10:22.4355561 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 @@ -44,8 +44,8 @@ a34fbb90f2458e62fcae5dbb39e2eabd8b97fe55 assets\extravaganza\models\block\green_ eb059a62a5d3cc879df2240a920158057f37a418 assets\extravaganza\blockstates\magenta_festive_rubber.json 5e5c0a6271fa944b908a487d46d69b1593cdd52d assets\extravaganza\models\block\white_screwed_festive_rubber_wall_side_tall.json e82fe213be68e74c261c19ede1a2d120871de79c assets\extravaganza\models\block\purple_festive_rubber_grate_slab.json -060d3cdd7a45b0e81e6d5cb4c2f4a59245c4cd84 assets\extravaganza\blockstates\black_festive_rubber_grate_slab.json 70c8f51e0e46de002f0eabfe910a2f4a4a7cea19 assets\extravaganza\blockstates\plant_perforated_festive_rubber_wall.json +060d3cdd7a45b0e81e6d5cb4c2f4a59245c4cd84 assets\extravaganza\blockstates\black_festive_rubber_grate_slab.json 5953c2f793400d3a69a14f1b7932fee5be87e0d0 assets\extravaganza\models\item\blue_screwed_festive_rubber_slab.json a66071bc1fccd7648ea51979ab02fed54319525a assets\extravaganza\blockstates\green_trash_can.json b93f8eaf44883bc60b1c7b314e048612c012eb4d assets\extravaganza\models\item\cyan_bent_festive_rubber_stairs.json @@ -261,8 +261,8 @@ f17ba933e01b1f8253a1f34e1a1b4274bc2aedef assets\extravaganza\models\block\light_ 73002ccaac046ce36639b35bf1bd8b0336c247aa assets\extravaganza\models\block\cyan_split_festive_rubber_wall_side.json 0fa4a38bb83af5b4546a7ebba9b3692496b8bd64 assets\extravaganza\models\item\plant_dotted_festive_rubber_wall.json 6651a82080b4c26786afa06a66ec33c82892734a assets\extravaganza\models\block\brown_striped_festive_rubber_slab_top.json -6aa79e5e3132c875996faddddf234370ca35f293 assets\extravaganza\blockstates\lime_curved_festive_rubber_wall.json f090e9858fc4be8adcb1fcce20aea867c0d53398 assets\extravaganza\blockstates\light_gray_screwed_festive_rubber_wall.json +6aa79e5e3132c875996faddddf234370ca35f293 assets\extravaganza\blockstates\lime_curved_festive_rubber_wall.json c6eac12c4f85f2772de479969482b49df10585b7 assets\extravaganza\blockstates\brown_slipped_festive_rubber_slab.json cc8be6a6b5eb4453d492cbaf20db8387224f440c assets\extravaganza\models\block\purple_screwed_festive_rubber_slab_top.json 6e418d6860bc60f816945b74125ec8d97edfc55d assets\extravaganza\blockstates\white_bent_festive_rubber_wall.json @@ -356,8 +356,8 @@ f269adf80a50571c8da22587ee788ac786454613 assets\extravaganza\models\block\cyan_s 3443eb81474cd0379a00a13c6984431c8a7e9475 assets\extravaganza\models\item\brown_striped_festive_rubber.json 28b91e440edb39090a4d5e6569deb88b99391c13 assets\extravaganza\models\block\plant_curved_festive_rubber_wall_post.json 825f877183bdba94d1808b4aa3f1d94f3ffc20c8 assets\extravaganza\models\item\tear_padded_festive_rubber_stairs.json -7396836acfc76c38fe9b1496898c636b858d188b assets\extravaganza\blockstates\pink_windowed_festive_rubber_wall.json fadd5a6c3815e1f8e4cea2b62b6a2abb8d27cb67 assets\extravaganza\models\block\light_gray_barred_festive_rubber_wall_side_tall.json +7396836acfc76c38fe9b1496898c636b858d188b assets\extravaganza\blockstates\pink_windowed_festive_rubber_wall.json 94028566dfc5ff9b8a270cad8837f9635b6cbd9a assets\extravaganza\blockstates\tear_festive_rubber_grate_slab.json 84cf389a78d90b6d0171c1570ffa3ed6f42a8f81 assets\extravaganza\models\block\light_blue_poured_festive_rubber.json 9e06bbada79e954207ce4398de04dc92db961c7a assets\extravaganza\models\block\tear_festive_rubber.json @@ -376,9 +376,9 @@ ddcba266bcee5f23084297a5c9fbb12892536d4d assets\extravaganza\models\block\gray_p 80aac20c2436d9424fba84471a7317de15e9881a assets\extravaganza\models\item\magenta_padded_festive_rubber_wall.json c52883571d36c8501c304033446f1d10ceb06403 assets\extravaganza\models\block\white_padded_festive_rubber_slab.json 422e93c891660c28749274d019c56db880dd0bae assets\extravaganza\blockstates\red_wooded_festive_rubber_stairs.json -9b7187e87567497aa4523fc712c6ba6e8eedb56c assets\extravaganza\models\item\yellow_poured_festive_rubber_slab.json 9286dcace05690f4cec2043de0a90a5a9f2403d4 assets\extravaganza\models\block\nymph_poured_festive_rubber_slab_top.json d5a8ba12da514b670ee81df03f0fed11f75428f6 assets\extravaganza\models\item\blue_festive_rubber.json +9b7187e87567497aa4523fc712c6ba6e8eedb56c assets\extravaganza\models\item\yellow_poured_festive_rubber_slab.json 0655a4b94a1ce2393e81d51be2b4174eedcd53a1 assets\extravaganza\models\block\magenta_split_festive_rubber_slab_top.json 0d548962ab20a6136e3f3abda14b05367b187dd0 assets\extravaganza\models\block\white_wooded_festive_rubber_slab_top.json 5d6828cd85e70238f300c0976185bd73eac69088 assets\extravaganza\models\block\brown_festive_rubber.json @@ -391,13 +391,13 @@ bd3cc51cb090966b8482cebd3aa0ae9d8f1de6e2 assets\extravaganza\models\item\red_til c5edc0310659bec79fdfbe6a43f174523944c7c7 assets\extravaganza\models\block\lime_curved_festive_rubber_stairs_inner.json 2dcb8f9eb2e6235deb313a039915cf1372c62c85 assets\extravaganza\models\block\tomato_scratched_festive_rubber_wall_side_tall.json 30993462334890b5b9a42f34916a9ce0ecf3fa50 assets\extravaganza\models\block\nymph_split_festive_rubber_wall_inventory.json -500554fff2aaed1b22b744f30527b92b21b0bd91 assets\extravaganza\blockstates\red_slipped_festive_rubber_stairs.json fb07e98d22a05479b92876f342b9e92208f66962 assets\extravaganza\blockstates\brown_striped_festive_rubber_slab.json +500554fff2aaed1b22b744f30527b92b21b0bd91 assets\extravaganza\blockstates\red_slipped_festive_rubber_stairs.json 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 -967acd6654260c6f86f63f4d3e37af73b8cdc38a assets\extravaganza\blockstates\tomato_curved_festive_rubber_stairs.json 4c026736850261e82adcb163602320faee2a7f99 assets\extravaganza\blockstates\nymph_screwed_festive_rubber.json +967acd6654260c6f86f63f4d3e37af73b8cdc38a assets\extravaganza\blockstates\tomato_curved_festive_rubber_stairs.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 @@ -471,8 +471,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 @@ -772,8 +772,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 @@ -825,11 +825,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 @@ -854,8 +854,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 @@ -1046,8 +1046,8 @@ af690f579c74a457cb195421accc422b19acc412 assets\extravaganza\models\block\cyan_s db34bef5cac260f0e05cb74e842de3c45111c300 assets\extravaganza\models\block\orange_scratched_festive_rubber_stairs.json 380e3f57985edee33d6a731e380b808be98a8868 assets\extravaganza\models\block\light_blue_barred_festive_rubber_stairs_inner.json 0669f76bb3fba6821c5f434db6f84f83b965313a assets\extravaganza\models\block\blue_screwed_festive_rubber_wall_post.json -0f40ebcdf863e75d480bcdb75573df2a31437101 assets\extravaganza\models\block\plant_perforated_festive_rubber.json 770f5a7a5c39749504091bffbc5e92ab7aebf655 assets\extravaganza\models\block\pink_windowed_festive_rubber_stairs.json +0f40ebcdf863e75d480bcdb75573df2a31437101 assets\extravaganza\models\block\plant_perforated_festive_rubber.json 05cf2fe2a85dd923f37be4b903deeb34db7d284a assets\extravaganza\models\block\pink_screwed_festive_rubber_slab_top.json 9af389387ffa833ede377394f82ddd4ef3cf245e assets\extravaganza\models\item\nymph_dotted_festive_rubber_wall.json 6dc49f14a1dfadf80426c8059ab0abf1e45743ac assets\extravaganza\models\block\red_scratched_festive_rubber_wall_inventory.json @@ -1104,8 +1104,8 @@ d3c2a10094356828fc5ddf6e20c5043f9c54f041 assets\extravaganza\models\block\brown_ 7f4997eed6e3ceeafdb920a11f87f4f301c8e52b assets\extravaganza\blockstates\brown_split_festive_rubber_slab.json 127f0512459f2c72004d0fbccfd205660d104a9d assets\extravaganza\blockstates\light_blue_bent_festive_rubber_wall.json 7d02caff0eb290267ffe9523ebaf9279a0309c5c assets\extravaganza\blockstates\purple_sharped_festive_rubber_stairs.json -311c66ea1155d307ec0f05afd1d18bc893b8242f assets\extravaganza\blockstates\blue_wooded_festive_rubber_slab.json 09f39073650af508330afb1ee404ee63c75a9ad1 assets\extravaganza\blockstates\magenta_tiled_festive_rubber_slab.json +311c66ea1155d307ec0f05afd1d18bc893b8242f assets\extravaganza\blockstates\blue_wooded_festive_rubber_slab.json 2df7dd1a65dc6b1020def278bcf07a0087211084 assets\extravaganza\models\block\white_bent_festive_rubber_stairs_inner.json a41c976c5a9b9feffb7e8fe1c0e87b301c3dfd84 assets\extravaganza\models\item\white_perforated_festive_rubber_stairs.json 295e01f4b52813885967527aa1a398b2fdc5d448 assets\extravaganza\models\block\orange_windowed_festive_rubber_stairs.json @@ -1731,8 +1731,8 @@ c36c8f0673673759f5ad1261903072464e94986d assets\extravaganza\models\block\green_ 1a3827ec0ad667af16cf8873931fddb50e72cad9 assets\extravaganza\models\item\blue_bent_festive_rubber.json 0966de014979d8aae8f94247f731b7172b1c68f4 assets\extravaganza\blockstates\light_blue_barred_festive_rubber_stairs.json 7f4094ccaf25b022f213394b8de27f5efb0bbebf assets\extravaganza\models\item\tomato_scratched_festive_rubber_wall.json -3e0ff96983e1b9328911fb84eaa5a5400752ea01 assets\extravaganza\blockstates\yellow_padded_festive_rubber.json d02986f7c75221feb60a43c708ebc3b7f1009c17 assets\extravaganza\blockstates\blue_scratched_festive_rubber_stairs.json +3e0ff96983e1b9328911fb84eaa5a5400752ea01 assets\extravaganza\blockstates\yellow_padded_festive_rubber.json 2781736fab0b6efc7d1928e2f94472d0609c3e28 assets\extravaganza\models\item\brown_scratched_festive_rubber_stairs.json fa1aa88485633b8816ddb05582cc4187a0229a16 assets\extravaganza\models\block\red_festive_rubber_wall_inventory.json ce66dc9233aa7361ec036a7d90aa92c405609438 assets\extravaganza\models\block\orange_tiled_festive_rubber_wall_side.json @@ -2262,8 +2262,8 @@ d7caa0672cd17aaa6b619a75894006124ff83563 assets\extravaganza\blockstates\orange_ 44cbd2735d4be1ad3534e0cf2d11fe4d0a446692 assets\extravaganza\models\block\nymph_sharped_festive_rubber_wall_side_tall.json 07c8cb0e276557c66d712085901959d6d2b27497 assets\extravaganza\models\block\tear_slipped_festive_rubber_slab.json e93b4f90eadf9f1ad0be95a6a308a75b39a4d162 assets\extravaganza\models\block\plant_slipped_festive_rubber_wall_inventory.json -54b669abfe85a622d4a3faa062632fb4973a4dd5 assets\extravaganza\blockstates\blue_scratched_festive_rubber_wall.json 1b8744484fd0741ef62c008820a39125ec285e21 assets\extravaganza\blockstates\magenta_barred_festive_rubber_wall.json +54b669abfe85a622d4a3faa062632fb4973a4dd5 assets\extravaganza\blockstates\blue_scratched_festive_rubber_wall.json c4271fe2e16ab5511d47f4f55d8cc5b0e77c1edf assets\extravaganza\models\block\nymph_perforated_festive_rubber_slab.json 6cf48fd0118719a8930e8ce4ed9e9e397284a3a7 assets\extravaganza\models\item\plant_sharped_festive_rubber_wall.json f49ec91a2242160652af15052795bdfa556375cf assets\extravaganza\blockstates\red_tiled_festive_rubber_stairs.json @@ -2845,8 +2845,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 @@ -2974,8 +2974,8 @@ f5b7aa211a456feff04a834f27bf9586f604d66d assets\extravaganza\models\item\light_b 8d50b0c7fb724ae79e229a3c4a207ceb0cd08cfd assets\extravaganza\models\item\gray_tiled_festive_rubber_stairs.json bded7850420c9dd11dd0e2a708bdc57ff131db80 assets\extravaganza\models\item\orange_wooded_festive_rubber_wall.json c3547bb76d8734811f880922f6ec707018c57f6b assets\extravaganza\blockstates\white_split_festive_rubber_stairs.json -621417d21a9bd9e43c27e55d9880850dd25568d5 assets\extravaganza\blockstates\yellow_screwed_festive_rubber.json 4f73b92b76725b592ac562da05220fa211d782ba assets\extravaganza\blockstates\red_padded_festive_rubber_wall.json +621417d21a9bd9e43c27e55d9880850dd25568d5 assets\extravaganza\blockstates\yellow_screwed_festive_rubber.json b561a992965d09853c1b8b52f37f17dc3d6698ac assets\extravaganza\models\block\black_festive_rubber_wall_post.json a5a322de80e6408b4f36b1f2b7a0399105f8f948 assets\extravaganza\models\block\tear_wooded_festive_rubber_slab.json fdd05166394270c4345301261af3a16871e6a3c9 assets\extravaganza\models\block\light_gray_striped_festive_rubber_slab_top.json @@ -3070,8 +3070,8 @@ ac8c7d3ca1097cdc944b714cd62d026c8d21a151 assets\extravaganza\models\block\gray_p 29d8e6361ff2122f857474f6ed94cf00cd1136c6 assets\extravaganza\models\block\light_blue_striped_festive_rubber_stairs_inner.json 21f2c79c187627ec40482da7c792d0ab7d6e52f1 assets\extravaganza\models\block\white_barred_festive_rubber_slab_top.json ee62261bb42902250036c96bcd67551620867ef3 assets\extravaganza\blockstates\magenta_perforated_festive_rubber_slab.json -ea34b509673581781e10a666ea40fd83dbe5aa11 assets\extravaganza\blockstates\magenta_screwed_festive_rubber.json 87c720f955e2c751b58c3a1d103250f9f9e4a081 assets\extravaganza\blockstates\light_gray_split_festive_rubber_wall.json +ea34b509673581781e10a666ea40fd83dbe5aa11 assets\extravaganza\blockstates\magenta_screwed_festive_rubber.json fe1504e0136dee8bc137d84eb6d8493a9a297381 assets\extravaganza\models\block\tomato_striped_festive_rubber.json 2b5868f4e378ea58263b7cc8b29448f8f0e31f85 assets\extravaganza\blockstates\orange_trash_can.json 51a63b19618583bd74216ead25c31a535ce9cc07 assets\extravaganza\models\block\cyan_screwed_festive_rubber_wall_post.json @@ -3207,8 +3207,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 @@ -3598,8 +3598,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 -76c9b98ebecd6afcd35a09501f66d4103cd1b9ce assets\extravaganza\blockstates\tear_striped_festive_rubber.json 2419b287e01aea374467cfb0cbe5eafeb31d8d23 assets\extravaganza\blockstates\yellow_screwed_festive_rubber_wall.json +76c9b98ebecd6afcd35a09501f66d4103cd1b9ce assets\extravaganza\blockstates\tear_striped_festive_rubber.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 @@ -3634,8 +3634,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 @@ -3719,15 +3719,15 @@ b129b594fb56c6ceb1a93cebb91e4f3d612e1338 assets\extravaganza\models\item\magenta 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 +7e42a766f37fdaf442b0abcb1d7e47c88a4d334d assets\extravaganza\blockstates\pink_windowed_festive_rubber_stairs.json cd95ce073953ce4a91dc628722f6a3746abce0d2 assets\extravaganza\models\block\nymph_screwed_festive_rubber.json 57da538a9eada0fecb9268fd1492036a4cbef5cd assets\extravaganza\models\block\light_blue_trash_can.json 767a066f7242f967b2a277d1a2286a0c375085ae assets\extravaganza\models\block\black_dotted_festive_rubber_wall_side_tall.json 42dde90e4dfde78c99d6e4ceb9dda37674108d2c assets\extravaganza\blockstates\cyan_slipped_festive_rubber_wall.json e84e5894426315abeeb1529771856166bdbefa1f assets\extravaganza\blockstates\white_bent_festive_rubber_slab.json -c630c948d2ad3d86919f75aea7548382ace15180 assets\extravaganza\blockstates\light_gray_striped_festive_rubber_stairs.json e9f096a318e346166fba1f7a0ee64a78e0e8cf4c assets\extravaganza\models\block\tomato_curved_festive_rubber_slab.json +c630c948d2ad3d86919f75aea7548382ace15180 assets\extravaganza\blockstates\light_gray_striped_festive_rubber_stairs.json e850e3a676839071f5dc001ed021270483e9eeea assets\extravaganza\blockstates\gray_bent_festive_rubber.json a2b9d7e942be1bc1e642dbb4632e7f8f7e0cce9c assets\extravaganza\models\block\brown_screwed_festive_rubber_slab_top.json 6144fcb36a4e6454f75682ec6d5045be8f783266 assets\extravaganza\models\item\light_blue_bent_festive_rubber_stairs.json @@ -3841,8 +3841,8 @@ dea911584d17999283c43690ee21690b83b3785f assets\extravaganza\models\block\pink_t 69dcbbbe70d6071d031b6a42e5547bf1f942c65b assets\extravaganza\models\block\white_trash_can_lid.json 53c534da8e7955866acb73be4ef6c45ee529c69a assets\extravaganza\blockstates\light_gray_striped_festive_rubber.json c808910bc15238c7f259382403cc2cc5ba4cffcd assets\extravaganza\models\block\light_blue_sharped_festive_rubber_stairs_outer.json -2db7a374eb502eae8b01e8c537d921ae2216a561 assets\extravaganza\blockstates\yellow_festive_rubber_grate_stairs.json dba4de97b18daa02f99b16201f36ce196057eb05 assets\extravaganza\blockstates\purple_trash_can.json +2db7a374eb502eae8b01e8c537d921ae2216a561 assets\extravaganza\blockstates\yellow_festive_rubber_grate_stairs.json ba02d777a2a66c5cce11fa3045e951e9a316c3cf assets\extravaganza\models\block\purple_striped_festive_rubber_slab_top.json 211e714d96cb0b06af5e9dc1249761efe36a639d assets\extravaganza\blockstates\magenta_trash_can.json 5e2834a7bd0aef3b39a635fa180ac5f56479ce28 assets\extravaganza\models\block\light_blue_scratched_festive_rubber_slab.json @@ -3926,8 +3926,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 @@ -3964,8 +3964,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 @@ -4026,9 +4026,9 @@ a0282b1532ce75548ee8b72e5a2a2258a509bb77 assets\extravaganza\blockstates\magenta def29c400fc01085af81a44ecbababc06ebb8dbf assets\extravaganza\models\block\nymph_striped_festive_rubber_wall_inventory.json ee2275c92385fbaf81a9ee0a9e6802eba63bd643 assets\extravaganza\models\block\light_gray_festive_rubber_wall_side_tall.json 0166c6e00e3ef21ddee6d63992eee57bb328b5a3 assets\extravaganza\models\block\orange_barred_festive_rubber_stairs_inner.json -53a0f5f6964ef6ea1ea2b5975d5f131acc236f80 assets\extravaganza\models\block\hevea_brasiliensis_button.json 6f72ccde575cd1079ef8ae175c5cad847ef540b3 assets\extravaganza\models\block\orange_striped_festive_rubber.json e4d5b2c9403444f6fc95a6797aa0ac9aa64106b3 assets\extravaganza\blockstates\nymph_festive_rubber.json +53a0f5f6964ef6ea1ea2b5975d5f131acc236f80 assets\extravaganza\models\block\hevea_brasiliensis_button.json 08e2e1e9a3ae0bb66957cce57fe42296ab2ff151 assets\extravaganza\models\item\pinata.json 3d3117c9f90eaae8dcc67025271a9609cb5dc28e assets\extravaganza\models\block\tear_slipped_festive_rubber_wall_post.json 774daecef635adc3fbf134ff5c38dbc291f1ca3b assets\extravaganza\models\item\cyan_barred_festive_rubber.json @@ -4668,13 +4668,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 -6664f516afad2a13415dcc4fa58a9ee666499499 assets\extravaganza\blockstates\tear_tiled_festive_rubber.json e8369e551d2fe5d068d02a2f7a89d87b1a71b7fd assets\extravaganza\blockstates\cyan_screwed_festive_rubber_stairs.json +6664f516afad2a13415dcc4fa58a9ee666499499 assets\extravaganza\blockstates\tear_tiled_festive_rubber.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 @@ -4869,8 +4869,8 @@ e3308232953bdda451c832d303e73460af85a5f1 assets\extravaganza\models\block\blue_p 6da850b4bdc613efaa914179674525b129b29201 assets\extravaganza\models\block\green_tiled_festive_rubber_wall_side.json abf5b35b602e3b2b5f95102ed5c77b6a1b94192e assets\extravaganza\models\item\purple_striped_festive_rubber_stairs.json 68b78c52189095ce749e5b7b58902819a1261d9f assets\extravaganza\models\item\red_bent_festive_rubber_stairs.json -632aece41cf09ea257c25708ff905a55e62b25ee assets\extravaganza\blockstates\white_festive_rubber_slab.json 596c9c387d1207133aa995b68a2b529ca661ffc3 assets\extravaganza\blockstates\cyan_scratched_festive_rubber_wall.json +632aece41cf09ea257c25708ff905a55e62b25ee assets\extravaganza\blockstates\white_festive_rubber_slab.json d92ae3bda42dec29816b113db89aaebaf33b54e2 assets\extravaganza\models\block\light_gray_curved_festive_rubber_stairs_inner.json e7060be467ed95ea3ddb293f10fd35fe76ab31f2 assets\extravaganza\models\item\tomato_curved_festive_rubber_wall.json 036fa481218cdd159fe4042a19996541f1220909 assets\extravaganza\models\item\plant_barred_festive_rubber_wall.json @@ -5162,8 +5162,8 @@ a75a40aa8252885b6419a9ab3abf050ebb3ca04a assets\extravaganza\blockstates\brown_t 06968a757ecf86b72e77b2035b9f60178d7c9459 assets\extravaganza\models\block\nymph_padded_festive_rubber_wall_side_tall.json 527e4bf730fed798ba636d938bbb3884969c6f8a assets\extravaganza\models\block\light_gray_trash_can_lid_open.json 7539c79026e09d54eb4ace2ae7ad555dcd7cde34 assets\extravaganza\models\item\blue_slipped_festive_rubber.json -f39dbe0c75565313344f87890c3964e6eeca6828 assets\extravaganza\blockstates\red_festive_rubber_grate_slab.json aa3c5e3268d62bb0bf0b4c54fec637030b0c3653 assets\extravaganza\blockstates\nymph_dotted_festive_rubber.json +f39dbe0c75565313344f87890c3964e6eeca6828 assets\extravaganza\blockstates\red_festive_rubber_grate_slab.json 84f7ebbe92b521648ca004b65f7a98d628982a5b assets\extravaganza\models\block\tear_slipped_festive_rubber_stairs_outer.json e170ea025f3dd35f249cc4cbfa4540d6aeb69fcc assets\extravaganza\models\block\gray_split_festive_rubber_slab.json 108eea473a30e76966b36ae95244357239bd33cb assets\extravaganza\models\item\white_slipped_festive_rubber_slab.json @@ -5236,8 +5236,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 @@ -5410,7 +5410,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 +e115a42f127e303db685cea213cc600ca38e7a21 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 1adee061b2c5bcf726365f8c9e474d15b8650224 assets\extravaganza\blockstates\hevea_brasiliensis_door.json @@ -5541,16 +5541,16 @@ a7830f71ffa2b210ba9f9ceb142864402f04deb1 assets\extravaganza\models\block\magent aeba3361cf5c7c36b5699da458dff2c9884650e6 assets\extravaganza\models\block\pink_striped_festive_rubber_slab_top.json aeb7d4241821f0b6798d5606ee58ef23dca039f1 assets\extravaganza\models\item\plant_padded_festive_rubber_wall.json 88693d24f768698ad3d614944d4f334932a6df3e assets\extravaganza\models\block\plant_striped_festive_rubber_slab.json -7b89eb10808b5b4f32b9a2c97cd75e90c9c51cef assets\extravaganza\models\block\magenta_screwed_festive_rubber_wall_post.json 8389169546fb7f483fc9889ef1a97c3b09b9fede assets\extravaganza\models\block\blue_dotted_festive_rubber_stairs_outer.json +7b89eb10808b5b4f32b9a2c97cd75e90c9c51cef assets\extravaganza\models\block\magenta_screwed_festive_rubber_wall_post.json 199f59d73a6f57cc4689c4a6e66cbd648452d176 assets\extravaganza\models\block\purple_padded_festive_rubber_slab_top.json fae78713b8485a79f8ff6438337a228a7192a918 assets\extravaganza\models\block\yellow_scratched_festive_rubber_stairs_inner.json 7bdaafa9d882dfd9c4ab9a0be3b2b0689f2d969d assets\extravaganza\models\block\blue_wooded_festive_rubber.json d22c04acb15aa91e6f6a94fbef2cec4ed02a54af assets\extravaganza\blockstates\white_tiled_festive_rubber.json 3ba757ff420251336cac4c91411b5e1599537fac assets\extravaganza\models\block\nymph_bent_festive_rubber_stairs_inner.json 007a44f312d0cb38df3dc156ca6ddbe4413f9ef7 assets\extravaganza\models\block\brown_tiled_festive_rubber_wall_post.json -c0eb14011283c63cbecfb3bc43dff737767c1655 assets\extravaganza\models\block\nymph_poured_festive_rubber_wall_inventory.json 35f147f990b1f0220788a34b444236f2d403c23a assets\extravaganza\models\block\plant_poured_festive_rubber.json +c0eb14011283c63cbecfb3bc43dff737767c1655 assets\extravaganza\models\block\nymph_poured_festive_rubber_wall_inventory.json 32a52c692eb53372adf7f4d6a293909800b22d0d assets\extravaganza\models\item\nymph_windowed_festive_rubber_stairs.json 63898b78b2128078d649915319693639b9f24d3a assets\extravaganza\models\block\lime_trash_can.json 6e7a1e8831ae71ce0eea846e6e84febe57bc560b assets\extravaganza\models\item\plant_striped_festive_rubber_stairs.json @@ -5619,8 +5619,8 @@ e1492a267563d5c235f6ff8908765ac9289e3fbc assets\extravaganza\models\block\nymph_ 316c8e83c219ca7d1176e2dd0fc7ba0b11bb3648 assets\extravaganza\models\block\lime_striped_festive_rubber_slab.json 3b5712f08810cc01887258c403b171e59b51daca assets\extravaganza\models\item\light_blue_padded_festive_rubber_slab.json ac2263221639d61cd8c53d7d6d92dbdfba0ba768 assets\extravaganza\models\block\plant_split_festive_rubber_slab_top.json -2910875650941d23854f361c054ab45d0dc20c78 assets\extravaganza\blockstates\brown_festive_rubber_grate.json 056dff8ca95dfef01bec6c76899f65ab7afe6b17 assets\extravaganza\models\item\green_festive_rubber_wall.json +2910875650941d23854f361c054ab45d0dc20c78 assets\extravaganza\blockstates\brown_festive_rubber_grate.json 12bb0b3abd0656b42c26d5888eb64529f14c6812 assets\extravaganza\models\item\blue_split_festive_rubber_slab.json 492a2d495321d4eaa2ddc8e8fe9868ea6c714b5d assets\extravaganza\models\item\tear_festive_rubber_grate_wall.json a125bfc4ce4aac7c648010eb0a4fbd8395348c46 assets\extravaganza\blockstates\black_perforated_festive_rubber_wall.json @@ -5835,8 +5835,8 @@ e9e0f345e397e581373399265266585f453f6359 assets\extravaganza\models\item\cyan_pa d439837e6cc006c9cd07ec6dec3b660a76ec36ab assets\extravaganza\blockstates\magenta_striped_festive_rubber_slab.json 874e111cc54e6e1ea4ecc528e471a2ee29868805 assets\extravaganza\models\block\blue_festive_rubber_wall_post.json ec2fdbfd80f41fefe015d628158049336e5b941e assets\extravaganza\models\block\pink_tiled_festive_rubber_wall_inventory.json -6db72434aeb3371f616a98855c73ccded111ecee assets\extravaganza\blockstates\light_blue_padded_festive_rubber_slab.json da6fb29bd901bd8602978ae2c446d0e1eceaeac0 assets\extravaganza\blockstates\orange_scratched_festive_rubber_slab.json +6db72434aeb3371f616a98855c73ccded111ecee assets\extravaganza\blockstates\light_blue_padded_festive_rubber_slab.json 1354ca9c2196317ab0b0e12937566c43a5b863da assets\extravaganza\models\block\blue_tiled_festive_rubber.json 57a86ee4e7f9722648299897f976b439de11fb63 assets\extravaganza\models\item\magenta_perforated_festive_rubber.json 9435c65c1cf13614498708fa960cd19910f4a8c1 assets\extravaganza\models\block\light_gray_slipped_festive_rubber_slab_top.json @@ -5878,8 +5878,8 @@ c5952752e780c1846f2b83cc8f94e3ebdddb8990 assets\extravaganza\models\block\light_ 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 -9af92050a611a445ec74efd63d3477553aa2673c assets\extravaganza\blockstates\pink_slipped_festive_rubber_slab.json 464ff20b2e6cc1fc7bf3512f258f0eec67127d8d assets\extravaganza\blockstates\brown_windowed_festive_rubber_wall.json +9af92050a611a445ec74efd63d3477553aa2673c assets\extravaganza\blockstates\pink_slipped_festive_rubber_slab.json ddae50671347f6632de1d1da61c0494f37d50138 assets\extravaganza\models\item\orange_slipped_festive_rubber.json 7b7273e214c6ba503121c52e86726c0b977ba190 assets\extravaganza\blockstates\magenta_poured_festive_rubber_wall.json 8fda98d8b62452ec25e64fb8f9176166b52f788d assets\extravaganza\models\block\yellow_slipped_festive_rubber_wall_side.json @@ -6272,8 +6272,8 @@ d6b2505e9c146e724f5a49ab31ff9860e308c73e assets\extravaganza\models\block\red_be 26cb57ac0a5f3a42defb8a1f214ee8c675dff9a6 assets\extravaganza\blockstates\brown_striped_festive_rubber_stairs.json 843998c4776af34be57fdc4522b0e9f336d91655 assets\extravaganza\models\block\magenta_dotted_festive_rubber_slab_top.json 21d3a340a52b52cecbed7450a4a74343d78d3ca0 assets\extravaganza\models\block\hevea_brasiliensis_stairs.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 @@ -6473,8 +6473,8 @@ f8beee1f2af0de49259d32d0ba6763a346b797fc assets\extravaganza\models\block\white_ 5a9a5b8d9f566f919ca3e33853f2063307ee21ca assets\extravaganza\models\block\gray_slipped_festive_rubber_wall_side_tall.json 5b97f4c31cc02b1a6ab8a6792144fd865b68c828 assets\extravaganza\blockstates\yellow_tiled_festive_rubber_wall.json 23ccc36ee5868a5ed2a081d24de46324c3f4f4ec assets\extravaganza\models\block\yellow_bent_festive_rubber_slab_top.json -bd33053e603066b8b58b1b35f7bd239a0b75f3f3 assets\extravaganza\models\block\white_curved_festive_rubber_wall_post.json 8c648087de8c8a517b33a8c3a9ac5562f7d83579 assets\extravaganza\models\block\yellow_poured_festive_rubber_wall_post.json +bd33053e603066b8b58b1b35f7bd239a0b75f3f3 assets\extravaganza\models\block\white_curved_festive_rubber_wall_post.json 5081df8d368c13d90c1c2d6a57bc6fd574d1e392 assets\extravaganza\blockstates\orange_sharped_festive_rubber_stairs.json 4a3cf29a174569f94e41eac1bd1f9efdbd449c3f assets\extravaganza\blockstates\white_barred_festive_rubber_slab.json 13b4abc8203d6a3ddba07cf8ac62e14166f6af3e assets\extravaganza\models\item\orange_wooded_festive_rubber_stairs.json @@ -6611,8 +6611,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 -ee70e21220322abd7351d994e8859c45e756afa0 assets\extravaganza\blockstates\red_dotted_festive_rubber_stairs.json 96725bfedb240fbc1f131094ac7d096460874b9b assets\extravaganza\blockstates\purple_bent_festive_rubber_wall.json +ee70e21220322abd7351d994e8859c45e756afa0 assets\extravaganza\blockstates\red_dotted_festive_rubber_stairs.json b0732643e28d65b80bbba1f16f069f8ff514232d assets\extravaganza\models\block\black_scratched_festive_rubber_slab.json ae2b490a921c737f203ee7fc2755f55e113a208e assets\extravaganza\models\block\brown_trash_can_lid.json 2fab1aa456d596f95c32c9ca6b11b9d87ccdc2cd assets\extravaganza\models\block\tear_split_festive_rubber_wall_inventory.json @@ -6671,8 +6671,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 -5a2898efe6aa48836099f59bc73b8ea8d002e2cb assets\extravaganza\blockstates\blue_dotted_festive_rubber_stairs.json 7f3f229199f3ed14466def7f521c576ddc0cee14 assets\extravaganza\blockstates\magenta_scratched_festive_rubber.json +5a2898efe6aa48836099f59bc73b8ea8d002e2cb assets\extravaganza\blockstates\blue_dotted_festive_rubber_stairs.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 8ae5703b..6a502770 100644 --- a/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 +++ b/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 @@ -1,4 +1,4 @@ -// 1.21 2024-06-28T01:02:39.9863435 Extravaganza!/Recipes +// 1.21 2024-07-01T03:10:22.4883201 Extravaganza!/Recipes 14757121f11829a476e40623edfab73d3b5ec9bc data\extravaganza\advancement\recipes\combat\bat.json 70927e53212cc00fa479d5b18b1d0b985f663c72 data\extravaganza\advancement\recipes\building_blocks\lime_bent_festive_rubber_wall.json c511653c05fc8450e6112ec98733104232be725e data\extravaganza\recipe\light_blue_festive_rubber_wall.json @@ -117,8 +117,8 @@ f333660d765a8b0f7e992a6be5b5d66a64ec1896 data\extravaganza\recipe\yellow_scratch 70edb66f093d5b2f3fbd6f226a9d4de6d8a67938 data\extravaganza\recipe\lime_scratched_festive_rubber_stairs.json 950165f14b4b21e54e1f074696e695b4bd30476a data\extravaganza\recipe\blue_wooded_festive_rubber_stairs.json 9c9c7f48eae6df46c4b51febfc5cfd32221462ed data\extravaganza\recipe\gray_wooded_festive_rubber_slab.json -f6b56167e7c577bef45abc3c3eb4aec8e3e2f78c data\extravaganza\advancement\recipes\building_blocks\cyan_sharped_festive_rubber_wall.json 744b5fd8ca65de559e1533c4e56077b3b9805b46 data\extravaganza\advancement\recipes\redstone\hevea_brasiliensis_button.json +f6b56167e7c577bef45abc3c3eb4aec8e3e2f78c data\extravaganza\advancement\recipes\building_blocks\cyan_sharped_festive_rubber_wall.json bb11e200d025adb326174d7b47577b60289442f3 data\extravaganza\recipe\tear_curved_festive_rubber.json 9340a637b6672341a33cae901e00d03a2b61fba9 data\extravaganza\recipe\blue_bent_festive_rubber.json 09a8dd6e792794831462e3773da1334854247af8 data\extravaganza\advancement\recipes\building_blocks\nymph_poured_festive_rubber_wall.json @@ -208,8 +208,8 @@ eca59fb1099d1c912ef6040049c1023e3fe3f756 data\extravaganza\recipe\yellow_windowe 87554f21168450a530aa45e452826aeea51b53de data\extravaganza\recipe\light_blue_wooded_festive_rubber.json 87a3192545a23d8f6b01cb2b13527e90e5e1a939 data\extravaganza\advancement\recipes\building_blocks\brown_barred_festive_rubber_stairs.json 3a7d0e2ad55ba568c9a2f3b8fe604b8b5e430e0f data\extravaganza\recipe\yellow_festive_rubber_grate_wall.json -fbb6e22720728d62e4d60cb244f7f49288c7b792 data\extravaganza\recipe\lime_wooded_festive_rubber_stairs.json 200cf581021b76d39ecc6e12ceac1e9dcf09ac3d data\extravaganza\recipe\blue_perforated_festive_rubber_stairs.json +fbb6e22720728d62e4d60cb244f7f49288c7b792 data\extravaganza\recipe\lime_wooded_festive_rubber_stairs.json 1ebed3b882f5e85a3f3259f3b52de6db5129dcf9 data\extravaganza\recipe\green_tiled_festive_rubber_slab.json 1af58ec071e3d47946dadcb1fc7276cc891601f0 data\extravaganza\advancement\recipes\building_blocks\nymph_windowed_festive_rubber_wall.json 8c859c1ae4ab1777ad7a00da7c88af4f5a3d8fa8 data\extravaganza\advancement\recipes\building_blocks\white_bent_festive_rubber.json @@ -260,8 +260,8 @@ b36fe6fbac25874c380f0ff79282c1e179694849 data\extravaganza\recipe\red_windowed_f 2fb9150d1d550e9013ba0fd9349d75d02c4b66ec data\extravaganza\recipe\light_blue_padded_festive_rubber_wall.json 1ece676b3a43c1108705cef546c64b5e99cdcf1d data\extravaganza\recipe\red_sharped_festive_rubber_stairs.json 13312789542eb531db380606656e3233f2c5d63b data\extravaganza\recipe\tear_sharped_festive_rubber_stairs.json -f4cc910c4bdb2eae65a5c09b62292865f1b542b6 data\extravaganza\advancement\recipes\building_blocks\gray_padded_festive_rubber.json 4888e7a21cc903859fc1653fa8b159b781887c20 data\extravaganza\advancement\recipes\building_blocks\magenta_padded_festive_rubber_wall.json +f4cc910c4bdb2eae65a5c09b62292865f1b542b6 data\extravaganza\advancement\recipes\building_blocks\gray_padded_festive_rubber.json fb6fbc19e7c73fbc40e31dbadf23efc40916df79 data\extravaganza\recipe\pink_festive_rubber_wall.json 07d6917dc686b1803cd4ca585f1acc97588bf0d8 data\extravaganza\recipe\light_blue_festive_rubber_ladder.json 653f8cd672adff24a422c82c03bb8fa974b5ca0e data\extravaganza\advancement\recipes\building_blocks\gray_bent_festive_rubber.json @@ -325,8 +325,8 @@ b44c2b964399f1d31097f2ab18a4f75fdaa3a8da data\extravaganza\recipe\black_poured_f 5a80215afd59781ffedb5a4e4ca4962f330356d8 data\extravaganza\advancement\recipes\building_blocks\white_barred_festive_rubber_slab.json aaf0064aa177fb24149d8cddac8b0c795116de6a data\extravaganza\recipe\pink_tiled_festive_rubber_stairs.json 629658da39a726c9c3c5ef9aec40d264016e3dca data\extravaganza\recipe\plant_split_festive_rubber_stairs.json -97e266f37df5833d1192511f82537adcec004269 data\extravaganza\recipe\black_curved_festive_rubber_slab.json e1af5d0e60825e05b53c514408fd4ac1f32e179f data\extravaganza\recipe\brown_tiled_festive_rubber_wall.json +97e266f37df5833d1192511f82537adcec004269 data\extravaganza\recipe\black_curved_festive_rubber_slab.json 69bc5337c7e6f1069143e736c77a587d262362c0 data\extravaganza\advancement\recipes\building_blocks\tear_curved_festive_rubber_wall.json df69696b47460448837488fe41a3f21120fc7778 data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_grate_slab.json f7bbf870a6bd7850a7980b3beaa62b80488cd401 data\extravaganza\advancement\recipes\building_blocks\green_striped_festive_rubber.json @@ -361,8 +361,8 @@ e96ffb7752b2196801503a3d32b79f6d83f232d1 data\extravaganza\advancement\recipes\b e152faf573f48bfbee098e26d10cc5190479e950 data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber_slab.json a3bbd4c520bb47cd74067b0f8b5dc0edc0cc9002 data\extravaganza\advancement\recipes\building_blocks\orange_striped_festive_rubber.json b1c8e80a0cef956bdf905b92ec1e6ef421bd500a data\extravaganza\recipe\brown_striped_festive_rubber_stairs.json -b8565aefa174dadae9f7347bcf2444a4fb6ce198 data\extravaganza\advancement\recipes\building_blocks\orange_dotted_festive_rubber_stairs.json 132c16b23dd6f2fe9e397b499f7f375b82b8b562 data\extravaganza\recipe\orange_slipped_festive_rubber_stairs.json +b8565aefa174dadae9f7347bcf2444a4fb6ce198 data\extravaganza\advancement\recipes\building_blocks\orange_dotted_festive_rubber_stairs.json 0b68bab7be053b1672714580e36c681a646e5e7f data\extravaganza\advancement\recipes\building_blocks\blue_sharped_festive_rubber_wall.json 3ed72494ca5d00a66470be192b443bbf9504844c data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_wall.json 66e37c48915e820077503679f744c0b1f00589e0 data\extravaganza\recipe\pink_screwed_festive_rubber_stairs.json @@ -453,8 +453,8 @@ ee1c5c50b04c02cd457e0ee8c1aba2683e055cf6 data\extravaganza\recipe\light_gray_ben a4caa4599809d226006209d874154f989fa4fa31 data\extravaganza\advancement\recipes\building_blocks\orange_perforated_festive_rubber_slab.json 6640f381f48058e83faef30c0fe47eaad63e5181 data\extravaganza\recipe\green_slipped_festive_rubber_stairs.json ee84810b927c51fd6e8063f1898f1138feec85cd data\extravaganza\advancement\recipes\building_blocks\black_poured_festive_rubber_slab.json -856d55bfbc55f8e65104cc80107bd12a87e8378e data\extravaganza\advancement\recipes\building_blocks\nymph_screwed_festive_rubber_stairs.json a633186f820b444d4ee989b524c602e7ad9659fd data\extravaganza\recipe\nymph_tiled_festive_rubber_stairs.json +856d55bfbc55f8e65104cc80107bd12a87e8378e data\extravaganza\advancement\recipes\building_blocks\nymph_screwed_festive_rubber_stairs.json d456c679f8f187c23e2ca2acb316b139ae0ebdd7 data\extravaganza\advancement\recipes\building_blocks\light_gray_barred_festive_rubber.json e9c8687686e54a1c700c8115b77ddead7b69bff5 data\extravaganza\advancement\recipes\building_blocks\cyan_screwed_festive_rubber.json 09038eee8d1a0641b211b9fe3c55f0ae8eb54bfc data\extravaganza\recipe\orange_screwed_festive_rubber_wall.json @@ -474,8 +474,8 @@ a26a0b3c77fed33e984503b4cedb7ab7a67e7402 data\extravaganza\recipe\gray_dotted_fe ee5bfe460e0987a1c079175d977b4a3c7f908b87 data\extravaganza\advancement\recipes\misc\merry_go_round.json 311d7d3727b3e285cecf1e3cb792253a77b86d60 data\extravaganza\recipe\blue_tiled_festive_rubber_slab.json 2a72c18b7059273098feb11e67ba168fb812ea25 data\extravaganza\advancement\recipes\building_blocks\tomato_striped_festive_rubber_wall.json -1792747a7f9b80d3f67a0e62c93d5914ce58f7e9 data\extravaganza\advancement\recipes\building_blocks\gray_screwed_festive_rubber_stairs.json 0b3175025b17b20731fc8644f72d032ccc6d2fc3 data\extravaganza\recipe\black_padded_festive_rubber_stairs.json +1792747a7f9b80d3f67a0e62c93d5914ce58f7e9 data\extravaganza\advancement\recipes\building_blocks\gray_screwed_festive_rubber_stairs.json b1d8642a43783249b3d0b35bc4e90261cf624b3f data\extravaganza\advancement\recipes\building_blocks\nymph_curved_festive_rubber.json c67cfabf6975b5f57e4b3fc7cb7b9cfcc2e912f7 data\extravaganza\advancement\recipes\building_blocks\purple_screwed_festive_rubber_stairs.json f432e8122a5e35c753542d15d994b1f3a6d43f92 data\extravaganza\advancement\recipes\building_blocks\red_curved_festive_rubber_slab.json @@ -523,8 +523,8 @@ ae3863215cf66206a5c789569f065c051feca8b2 data\extravaganza\advancement\recipes\b 664bdc0f04c58b65eb618fa3b76aac0b0c7ffb43 data\extravaganza\recipe\orange_split_festive_rubber_wall.json 067e1bb257279bfc9204787463d50432900bf4f0 data\extravaganza\recipe\light_blue_slipped_festive_rubber_stairs.json f93bad502f8e74185d07126b174041e0e3327981 data\extravaganza\advancement\recipes\building_blocks\yellow_sharped_festive_rubber_wall.json -26edbcd03de079b717f8e4d486a0a9eccf744708 data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_slab.json e808e5ed5954afbd2067ae1934d4ef3d3423cef8 data\extravaganza\advancement\recipes\building_blocks\blue_perforated_festive_rubber_slab.json +26edbcd03de079b717f8e4d486a0a9eccf744708 data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_slab.json 72b7d647141f515bdb4d9f1a524a11b24d61e2f1 data\extravaganza\advancement\recipes\building_blocks\lime_split_festive_rubber_wall.json 4cda7e419abc57df9e7eca4ecdf31bd4ca19d498 data\extravaganza\recipe\light_gray_festive_rubber.json 26eac7f72c95757df9d8295212f2284240fcd911 data\extravaganza\advancement\recipes\building_blocks\purple_curved_festive_rubber_slab.json @@ -677,13 +677,13 @@ a942ac2d9a7964ac6b8269e3ba8ff95f0402c7e0 data\extravaganza\advancement\recipes\b 414429127621f139d9eb1f9f6b8cf036b1455ec8 data\extravaganza\advancement\recipes\building_blocks\pinata.json 76442c72a27cb09aaf01e0cae2078ee663d9ad49 data\extravaganza\recipe\orange_festive_rubber.json 17f723a6dcdf01ef1ca3783bd84d15dae817d837 data\extravaganza\recipe\plant_bent_festive_rubber_slab.json -488ab58434f8510a5058fbb46c4d6a883150e676 data\extravaganza\recipe\pink_screwed_festive_rubber_slab.json 2eb1630b8809a3c8d660d13fea8f3aeff4238267 data\extravaganza\recipe\pink_festive_rubber_slab.json +488ab58434f8510a5058fbb46c4d6a883150e676 data\extravaganza\recipe\pink_screwed_festive_rubber_slab.json 52168d5fdc6f8e7a51b26506c147820d3a8e1a8d data\extravaganza\recipe\black_curved_festive_rubber_wall.json b47e988102f8ae0359f3081a5b3ae0fa578db4d1 data\extravaganza\recipe\orange_barred_festive_rubber_slab.json 10c10103576eb363c10fa87cd1cba8697c1ab81d data\extravaganza\advancement\recipes\building_blocks\tear_tiled_festive_rubber_stairs.json -87767bd42f3fdb4db666489a2caa4bbcf9a69db5 data\extravaganza\recipe\black_poured_festive_rubber_slab.json aae1887425ed593cf91d3375b8053eea251d6d60 data\extravaganza\advancement\recipes\building_blocks\magenta_tiled_festive_rubber_wall.json +87767bd42f3fdb4db666489a2caa4bbcf9a69db5 data\extravaganza\recipe\black_poured_festive_rubber_slab.json acd88c3b1ed219826991ffe2cc5c1157f6386ddb data\extravaganza\recipe\magenta_perforated_festive_rubber_stairs.json 3736a3b59cf0f50ecd0abc349c7d3366f475ad8a data\extravaganza\advancement\recipes\building_blocks\tomato_slipped_festive_rubber_slab.json ae2dee884ccf6f082b2439946b5633eeb2ce981e data\extravaganza\advancement\recipes\building_blocks\yellow_slipped_festive_rubber_stairs.json @@ -692,8 +692,8 @@ ae2dee884ccf6f082b2439946b5633eeb2ce981e data\extravaganza\advancement\recipes\b a006ba0595d0f7c7df55451112573d64ff04c676 data\extravaganza\advancement\recipes\building_blocks\purple_dotted_festive_rubber.json 1f08849383c872244d32698cafec5deba8bbfc63 data\extravaganza\advancement\recipes\building_blocks\pink_festive_rubber_grate_wall.json 16c1f9b1c713bf7f03c62e8ebf8ce31853ff4053 data\extravaganza\recipe\light_blue_curved_festive_rubber_slab.json -557d313f2b80989baba40faac061c77b32928968 data\extravaganza\recipe\red_slipped_festive_rubber_stairs.json 8c9947bb77a86460d6580518c66fa1b51bf6c961 data\extravaganza\advancement\recipes\building_blocks\red_festive_rubber_stairs.json +557d313f2b80989baba40faac061c77b32928968 data\extravaganza\recipe\red_slipped_festive_rubber_stairs.json 69419a1a5693ec66a8fa0e469682da39b2ebcb58 data\extravaganza\recipe\brown_striped_festive_rubber_slab.json c1008fb066f0a2421c75cfcb1c45f88db91271f4 data\extravaganza\recipe\magenta_windowed_festive_rubber_slab.json 9bb8c3a92b4012adc4f98cb4a32920f432b051cb data\extravaganza\recipe\yellow_perforated_festive_rubber_stairs.json @@ -770,9 +770,9 @@ d37ba310c86ff8bd8cea8e29638d3f8a978cb4ff data\extravaganza\recipe\cyan_padded_fe 432949753566be6efaf368ddb895c60fdcabeb7f data\extravaganza\advancement\recipes\building_blocks\black_sharped_festive_rubber.json fa30833aa297d6924d59c5835af78add913ec12c data\extravaganza\advancement\recipes\building_blocks\magenta_curved_festive_rubber_stairs.json 29a59c95d8030c752701a2d4789f42e57d6f94bc data\extravaganza\recipe\pink_bent_festive_rubber_wall.json -881a5c6e939dbb8070f3e689db3554ddf81ffdd4 data\extravaganza\advancement\recipes\building_blocks\blue_trash_can.json -55f97d6d7e225a91f29123f6e7db17d52c30a50f data\extravaganza\recipe\black_windowed_festive_rubber_slab.json a6ae9fa6d999f2ee051471832be5b5c02e6329c8 data\extravaganza\advancement\recipes\building_blocks\black_dotted_festive_rubber_slab.json +55f97d6d7e225a91f29123f6e7db17d52c30a50f data\extravaganza\recipe\black_windowed_festive_rubber_slab.json +881a5c6e939dbb8070f3e689db3554ddf81ffdd4 data\extravaganza\advancement\recipes\building_blocks\blue_trash_can.json b54a9ad782e6c587428d4bf11cc90751c45740fc data\extravaganza\advancement\recipes\building_blocks\light_gray_curved_festive_rubber_wall.json 4936351634522260a292babc0bb0b3606842895a data\extravaganza\advancement\recipes\building_blocks\tomato_bent_festive_rubber.json e8869126955c0dea5122bb01c92ee729a5109ce8 data\extravaganza\advancement\recipes\building_blocks\light_gray_poured_festive_rubber.json @@ -784,8 +784,8 @@ dfee07d7287dddcf4461df98dce8959969260436 data\extravaganza\advancement\recipes\b 49c17f486ac3cbbf785fba3d6fe75e1e3ee2fe4d data\extravaganza\advancement\recipes\building_blocks\white_dotted_festive_rubber_stairs.json 830d82d564e8b3015b94c35a5692ba12031b577b data\extravaganza\recipe\plant_dotted_festive_rubber.json 87ad058a239c4cde74339fadf015a7b86081e186 data\extravaganza\recipe\blue_sharped_festive_rubber_slab.json -adbb70cd92e3ef3347b353aefc9753f1b5c55460 data\extravaganza\advancement\recipes\building_blocks\blue_screwed_festive_rubber_wall.json b9ff049d17495efaeb0368848c3803a4a16918dd data\extravaganza\advancement\recipes\building_blocks\blue_dotted_festive_rubber.json +adbb70cd92e3ef3347b353aefc9753f1b5c55460 data\extravaganza\advancement\recipes\building_blocks\blue_screwed_festive_rubber_wall.json 0aebcf3bad44f22048362d05172719dcd79b95bb data\extravaganza\recipe\magenta_sharped_festive_rubber_stairs.json a466ba672e1beb456e5f629eb83e489db872574a data\extravaganza\recipe\lime_tiled_festive_rubber.json a84cbed23a6cabdc73fc9320ccc383e1af8bf4d8 data\extravaganza\advancement\recipes\building_blocks\black_striped_festive_rubber_wall.json @@ -1008,8 +1008,8 @@ d96ebbe85cb7a9a66fede32bb820d5e8756415a3 data\extravaganza\recipe\nymph_festive_ b150ae09bbfbc54d1c17bf9ea5df449e30b29b85 data\extravaganza\recipe\orange_padded_festive_rubber.json 6b89ebbcaf72e1da2215a4a8fc80bf44761d100a data\extravaganza\recipe\black_festive_rubber_grate.json d31652c4b048f387141965cf8fd51405c4cf753d data\extravaganza\advancement\recipes\building_blocks\white_slipped_festive_rubber_slab.json -f1c9da7421b8ee48a487ebe418a640e43385403a data\extravaganza\advancement\recipes\building_blocks\yellow_scratched_festive_rubber_wall.json 428153decb06c40771c84ff6975c9c5b77e0d62e data\extravaganza\advancement\recipes\building_blocks\yellow_dotted_festive_rubber_wall.json +f1c9da7421b8ee48a487ebe418a640e43385403a data\extravaganza\advancement\recipes\building_blocks\yellow_scratched_festive_rubber_wall.json 392f6e228943d9fd42c13436cd0f1846feaca694 data\extravaganza\advancement\recipes\building_blocks\blue_screwed_festive_rubber_slab.json 10da1365a63f43b09b2e671ab4487dca897aeca6 data\extravaganza\advancement\recipes\building_blocks\lime_dotted_festive_rubber.json 7c29c50f89541f930b147c2ed406b6e4af05f8f3 data\extravaganza\advancement\recipes\building_blocks\plant_screwed_festive_rubber_stairs.json @@ -1033,8 +1033,8 @@ ceccd9cac8b8a904ab3bb1108ddf1f966108b657 data\extravaganza\advancement\recipes\b cddcf3b6f6d88c64a060c75b90903fcd5a029273 data\extravaganza\advancement\recipes\building_blocks\gray_dotted_festive_rubber_slab.json eb48f35e7c4b5b60930d7c3b98c5f7bad8341769 data\extravaganza\advancement\recipes\building_blocks\yellow_sharped_festive_rubber.json fdecf8df18c0c072a17cdd30669fde8e1f73d021 data\extravaganza\recipe\black_bent_festive_rubber_wall.json -314bfa9361dbe71bd8e88c48228379a054c8f4bf data\extravaganza\recipe\nymph_slipped_festive_rubber.json 6e05e00d2a2829d38fb00b95f6657f998c4c4fc6 data\extravaganza\recipe\nymph_festive_rubber_slab.json +314bfa9361dbe71bd8e88c48228379a054c8f4bf data\extravaganza\recipe\nymph_slipped_festive_rubber.json 4e3d9f1e70908ff5cd15c302bb09224dabb094dc data\extravaganza\recipe\blue_scratched_festive_rubber_wall.json 3f82c0d0a66a099b7d6cc3baab0f4538db95c973 data\extravaganza\advancement\recipes\building_blocks\red_sharped_festive_rubber_stairs.json 936b80db3da1ad88a38099365499c89359519831 data\extravaganza\recipe\brown_scratched_festive_rubber_wall.json @@ -1075,8 +1075,8 @@ e875cd0f021ccdbc2cee46b1684ba762a3541f0e data\extravaganza\advancement\recipes\b d6a51427ec78bdbd300c440da64f53f2681ac773 data\extravaganza\advancement\recipes\building_blocks\tear_striped_festive_rubber_wall.json 79bcae0f26508327ef9f1291eec92b5c42d073da data\extravaganza\advancement\recipes\building_blocks\tomato_split_festive_rubber.json f02b959450bda8adfc52e816dbdf25cf741b7018 data\extravaganza\recipe\light_blue_poured_festive_rubber_slab.json -51ed46bc43f41a94ec8405ce5e84ce4719afbfa2 data\extravaganza\advancement\recipes\building_blocks\cyan_perforated_festive_rubber_wall.json 7b336aed2c73c996dcb53a241178a99866e40324 data\extravaganza\advancement\recipes\building_blocks\cyan_wooded_festive_rubber_stairs.json +51ed46bc43f41a94ec8405ce5e84ce4719afbfa2 data\extravaganza\advancement\recipes\building_blocks\cyan_perforated_festive_rubber_wall.json fe7487b4a464878190a07aea1cd33175a17ff5f4 data\extravaganza\advancement\recipes\building_blocks\cyan_perforated_festive_rubber.json 363c2cf493cbd447cd9fb3b1a0d47ba12317236d data\extravaganza\advancement\recipes\building_blocks\black_windowed_festive_rubber_slab.json 8b31f527daf0df09de24b97101a9ff5ac186c5eb data\extravaganza\recipe\red_trash_can.json @@ -1162,8 +1162,8 @@ fef3ae9ba2668e6c46f27e77cab2e3b26ec2619d data\extravaganza\advancement\recipes\b 81fc12c8876c2c7000d6be2654d661ded8f75982 data\extravaganza\advancement\recipes\building_blocks\red_screwed_festive_rubber_slab.json 1a265bd156b86adb52f0b58b57eb7244c84cab37 data\extravaganza\recipe\cyan_festive_rubber.json 158fa0b550cd928c9f1d115d1b36be9eca22899a data\extravaganza\advancement\recipes\building_blocks\nymph_windowed_festive_rubber_slab.json -59025247d978c9cd4b3f127b0bd716c99f1ec099 data\extravaganza\advancement\recipes\building_blocks\magenta_bent_festive_rubber_stairs.json 913f39242d0ffb83cad606e709b634346cb52f46 data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber_stairs.json +59025247d978c9cd4b3f127b0bd716c99f1ec099 data\extravaganza\advancement\recipes\building_blocks\magenta_bent_festive_rubber_stairs.json a45d3507498f95e156ce933bef5720f4457229b7 data\extravaganza\recipe\nymph_poured_festive_rubber_wall.json 6f52f2e5e0f61af1d2308ef19606b1d26068e444 data\extravaganza\recipe\white_split_festive_rubber_wall.json a1786e35343bb6aac4243455a6015daaa4fb0a79 data\extravaganza\advancement\recipes\building_blocks\yellow_split_festive_rubber_wall.json @@ -1186,9 +1186,9 @@ dfb8cd66111179802aeac0741390bdf8994522a6 data\extravaganza\recipe\pink_festive_r 29bcfbefe3e47853353c98e29984e041aecaa153 data\extravaganza\recipe\magenta_dotted_festive_rubber_slab.json 4ef7612e63dd2d7a3759ac26c86306c78ad73308 data\extravaganza\advancement\recipes\building_blocks\cyan_striped_festive_rubber_wall.json 2c4d2247f2f22e95461be4cb47ebac0aad58be0a data\extravaganza\recipe\green_screwed_festive_rubber.json +f38393579e6f1d0e6bd72f68d74a5c005c020e5a data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber_grate_stairs.json 8fb40a984024875a533308808c4fd960a5cb35e8 data\extravaganza\recipe\light_gray_striped_festive_rubber_slab.json 2ec1f1a4629dfc3b1ae56e966c859bcf402a9975 data\extravaganza\advancement\recipes\building_blocks\cyan_padded_festive_rubber_wall.json -f38393579e6f1d0e6bd72f68d74a5c005c020e5a data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber_grate_stairs.json 8d549528ca90faf5d69f65d6816bec3c51da02ec data\extravaganza\advancement\recipes\building_blocks\nymph_sharped_festive_rubber_stairs.json 8a2d791abcd2f5a4bc4adf6f8dd41485ec28a1fd data\extravaganza\recipe\purple_slipped_festive_rubber_wall.json 6bff9a33b8b75de3987d37190b88ff89021ccb0a data\extravaganza\advancement\recipes\building_blocks\gray_striped_festive_rubber_slab.json @@ -1204,8 +1204,8 @@ da75748654904bf00fea3ee47cd509bb6f10ea5c data\extravaganza\advancement\recipes\b 62392a818dd1064f2eeec1cf3e833534339ab4f7 data\extravaganza\advancement\recipes\building_blocks\red_striped_festive_rubber_slab.json c1e470124a1b5d13603aafcd44a9961f182798b6 data\extravaganza\advancement\recipes\building_blocks\tomato_split_festive_rubber_slab.json 3a2c148785255804a5c54f83fd68e1ba4a8ff518 data\extravaganza\recipe\light_blue_barred_festive_rubber_stairs.json -e20213688a18d7d6cff41727a9540cfa0769e742 data\extravaganza\recipe\magenta_curved_festive_rubber_wall.json cce343273dd76164a2f2ec71dd19c75d65f47d3c data\extravaganza\advancement\recipes\building_blocks\magenta_split_festive_rubber.json +e20213688a18d7d6cff41727a9540cfa0769e742 data\extravaganza\recipe\magenta_curved_festive_rubber_wall.json 96e08e905e66f2a4d473a8db6d02eb93ceb404d9 data\extravaganza\advancement\recipes\building_blocks\light_gray_screwed_festive_rubber_wall.json 2e6c9aee1062a38b127fe6c8fb28f142a3bbdec5 data\extravaganza\advancement\recipes\building_blocks\plant_scratched_festive_rubber_stairs.json 1da7cc9a48f5888b7858c7f341488c04ab3e2a15 data\extravaganza\advancement\recipes\building_blocks\pink_scratched_festive_rubber_wall.json @@ -1290,8 +1290,8 @@ e46515b9358aaca694ef53d821ed5fbe216ba064 data\extravaganza\advancement\recipes\b 37889e82b44ff6090ce123d0ae619a6fefc79142 data\extravaganza\advancement\recipes\building_blocks\tomato_tiled_festive_rubber.json 87d0726fab29351e0fba47bcc0ba0b629958ae3e data\extravaganza\advancement\recipes\building_blocks\brown_windowed_festive_rubber.json 5efb2c461e46ed1ccf11ec5eb8588319e91de4b3 data\extravaganza\advancement\recipes\building_blocks\gray_curved_festive_rubber_slab.json -27dd888dab2f3bdc346169eac3aba01ca38b7158 data\extravaganza\recipe\purple_padded_festive_rubber_stairs.json 08fde85ceb30705fc0f153f7de8f4328817abff5 data\extravaganza\advancement\recipes\building_blocks\purple_slipped_festive_rubber.json +27dd888dab2f3bdc346169eac3aba01ca38b7158 data\extravaganza\recipe\purple_padded_festive_rubber_stairs.json d1ade4ad7bc0f6c8bcf14f0042df703c622660ec data\extravaganza\advancement\recipes\building_blocks\plant_festive_rubber_grate_stairs.json 2f13d26c221a1f8e6eb4eae9db39bdf0e8933fbe data\extravaganza\advancement\recipes\tools\rubber_extractor.json 48b2e4b88bbae99a63216aa4efba8ddb008f74b2 data\extravaganza\advancement\recipes\building_blocks\cyan_wooded_festive_rubber_slab.json @@ -1332,12 +1332,12 @@ abc6f5fa238595c45083b01035841e6f3c4ca664 data\extravaganza\recipe\yellow_split_f 89e2dbff09c7c46b071ec3606b90a4905ae705e7 data\extravaganza\advancement\recipes\building_blocks\brown_scratched_festive_rubber_wall.json aeb9aa7ccb2aea9c9a8907b942f3cb56aacc90f3 data\extravaganza\recipe\cyan_split_festive_rubber_stairs.json b6a49be8089524e771c51d05c0570cc3d18677b2 data\extravaganza\advancement\recipes\building_blocks\tomato_perforated_festive_rubber_stairs.json -d46d1b716dc9ea72d5b2d9d9f7eb4d7d1fc0027e data\extravaganza\advancement\recipes\building_blocks\light_gray_bent_festive_rubber_slab.json 81191527f7be79de4d0760d32369808ebc93ceb8 data\extravaganza\recipe\light_gray_perforated_festive_rubber_stairs.json +d46d1b716dc9ea72d5b2d9d9f7eb4d7d1fc0027e data\extravaganza\advancement\recipes\building_blocks\light_gray_bent_festive_rubber_slab.json f9297e83800a7c29defb7882eda1fe35b6e986c4 data\extravaganza\recipe\lime_perforated_festive_rubber_stairs.json 835ac7783c65e7fde862c8fe7726908f9eb29875 data\extravaganza\advancement\recipes\building_blocks\black_festive_rubber_wall.json -225e2de9682850f74327a65fe5cf2d79cd249fbe data\extravaganza\advancement\recipes\building_blocks\nymph_wooded_festive_rubber_stairs.json e1a52d2ca28e548830617df53e674ae2f813ef59 data\extravaganza\recipe\nymph_perforated_festive_rubber_wall.json +225e2de9682850f74327a65fe5cf2d79cd249fbe data\extravaganza\advancement\recipes\building_blocks\nymph_wooded_festive_rubber_stairs.json b204793691c84825c18acd3639e5c81abe2c8786 data\extravaganza\advancement\recipes\food\hot_dog_with_mayonnaise.json 106e4befa087610c91b4bd6a99053d95b3a38a44 data\extravaganza\recipe\white_slipped_festive_rubber.json 73aa0db6f49c310c55c5c15964809229db248cb9 data\extravaganza\recipe\orange_scratched_festive_rubber_stairs.json @@ -1381,8 +1381,8 @@ e2cf53b4cdde94acaf0c52fe31cf563f581295b8 data\extravaganza\recipe\red_candy_cane e5aa137d13410548a42ab801e158e312cecefc7d data\extravaganza\advancement\recipes\building_blocks\tear_perforated_festive_rubber_slab.json 2d6b4ccae6df71415bf46a241f5ef24e58cb6ad6 data\extravaganza\advancement\recipes\building_blocks\orange_windowed_festive_rubber.json 7378b87d5b3f5e8c265e005ca288fe124bdc7a70 data\extravaganza\recipe\purple_wooded_festive_rubber_wall.json -fe41a422100ff6d399043539b23b28fa3b7c2ce3 data\extravaganza\advancement\recipes\building_blocks\plant_bent_festive_rubber.json 771ffdd199a8e5b94f15a47c243bb800fffbc1d4 data\extravaganza\recipe\plant_wooded_festive_rubber.json +fe41a422100ff6d399043539b23b28fa3b7c2ce3 data\extravaganza\advancement\recipes\building_blocks\plant_bent_festive_rubber.json f446556cfe48b17a6f16040c1aea8f9bef355209 data\extravaganza\advancement\recipes\building_blocks\magenta_dotted_festive_rubber_wall.json ae7debe86f335529a823cb2a292db4c07d007cec data\extravaganza\recipe\tomato_barred_festive_rubber_slab.json 31672f4fdee1088df505e1dde3972576a0094875 data\extravaganza\recipe\pink_festive_rubber.json @@ -1416,10 +1416,10 @@ e5a19cc3a0fefd77af9290b49999bf30da7fd682 data\extravaganza\recipe\lime_windowed_ c7fa90adda5f714689250b41155eb9476bba8dc2 data\extravaganza\recipe\black_bent_festive_rubber_slab.json f4574a225bda43f4e968f511dab9147d8e172104 data\extravaganza\recipe\tear_screwed_festive_rubber_stairs.json e578b006ca59df722c45e61afca42968b3a8af27 data\extravaganza\advancement\recipes\building_blocks\plant_padded_festive_rubber_wall.json -ef782305ca318d3d94a377f7ab1423bc0b6eb8fb data\extravaganza\advancement\recipes\building_blocks\yellow_padded_festive_rubber_wall.json 4fb5bc473307729fd0828099b8ef5a9d13dec44a data\extravaganza\advancement\recipes\building_blocks\yellow_slipped_festive_rubber_wall.json -200c07de64d3e4fbd80fef91a12df5015f2e50cc data\extravaganza\recipe\black_split_festive_rubber_wall.json +ef782305ca318d3d94a377f7ab1423bc0b6eb8fb data\extravaganza\advancement\recipes\building_blocks\yellow_padded_festive_rubber_wall.json c83d09cbd029945ae55f2c9e99cbf68908d03a62 data\extravaganza\recipe\black_sharped_festive_rubber_stairs.json +200c07de64d3e4fbd80fef91a12df5015f2e50cc data\extravaganza\recipe\black_split_festive_rubber_wall.json 420f88305579af751628dd9d793ac1d2a8b2e3c3 data\extravaganza\advancement\recipes\building_blocks\plant_slipped_festive_rubber_slab.json 1df70975f340da138d9e2e12135b17bf3fd39a78 data\extravaganza\advancement\recipes\building_blocks\magenta_curved_festive_rubber_slab.json 27635f0dc89d29c5ce0c0c24acec12bfefeb3e11 data\extravaganza\recipe\brown_scratched_festive_rubber_slab.json @@ -1472,8 +1472,8 @@ ddd31fc2370befaa2ddfc4b757f98ff2640b5b5d data\extravaganza\advancement\recipes\b 9dabe9a48d75ece708f23bcb44ea6a06cd620d73 data\extravaganza\advancement\recipes\building_blocks\green_trash_can.json ec44fd001bc321727b3562b864a9b90c32d159af data\extravaganza\recipe\light_gray_striped_festive_rubber_wall.json b4f2a2d5b9452fa7696b7eff3ced7322014f457a data\extravaganza\advancement\recipes\building_blocks\purple_split_festive_rubber_stairs.json -030f22297aa84e55cd43327c76a95f57faa26ae6 data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_grate_wall.json 5b6570af748802a96fc94ea5ca28f3c2f8ee8417 data\extravaganza\advancement\recipes\building_blocks\lime_striped_festive_rubber.json +030f22297aa84e55cd43327c76a95f57faa26ae6 data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_grate_wall.json 1e43f68c8da17f0cb2e339d8bca251037471c60a data\extravaganza\advancement\recipes\building_blocks\yellow_curved_festive_rubber_wall.json 02ce5e73eabbb617108e89e6a834e7a3533a0f26 data\extravaganza\recipe\orange_dotted_festive_rubber_wall.json 12a71ec3ec597f3023949be5573c6f6da90740b3 data\extravaganza\advancement\recipes\building_blocks\purple_slipped_festive_rubber_stairs.json @@ -1548,8 +1548,8 @@ cdb7fa91a1c19f8d0a0b5bbfc29c797f25992bd5 data\extravaganza\recipe\lime_festive_r 53adf6ac89b7ec3f03bc5e19c70a4e1a75f43cc8 data\extravaganza\advancement\recipes\building_blocks\tear_barred_festive_rubber_wall.json e4a96b5d790e8cca0d9544c230f64113f24489c2 data\extravaganza\recipe\pink_wooded_festive_rubber_stairs.json 9b41f56be24a67b1a6b8837f44bb07381ee83e92 data\extravaganza\advancement\recipes\building_blocks\nymph_windowed_festive_rubber.json -05b6f230136fcaed3d62138415afc98df6933a06 data\extravaganza\advancement\recipes\building_blocks\orange_padded_festive_rubber_stairs.json 3b6e86bb038eda697e761d985ef1c833f4a42ee1 data\extravaganza\recipe\orange_perforated_festive_rubber.json +05b6f230136fcaed3d62138415afc98df6933a06 data\extravaganza\advancement\recipes\building_blocks\orange_padded_festive_rubber_stairs.json 007da9008f564f7a7613eb389fe4b8e8dfe5813b data\extravaganza\recipe\purple_festive_rubber_wall.json e0895b209282172f50ac8e628e7ed23f34998cd3 data\extravaganza\advancement\recipes\building_blocks\red_dotted_festive_rubber_wall.json 536b029ad9400b52e7584029db321698fe596e89 data\extravaganza\recipe\blue_dotted_festive_rubber_slab.json @@ -1569,8 +1569,8 @@ f97d6cd2108465f5f8bc5d8b783df2fccc0d74b1 data\extravaganza\advancement\recipes\b fce2ffa917cfa67f12857f0feb27b56a97acd5dc data\extravaganza\recipe\plant_sharped_festive_rubber.json bae1b4c7911ff6c120d61014ccfd5f6ef4bf1871 data\extravaganza\advancement\recipes\building_blocks\magenta_windowed_festive_rubber_wall.json d98053e7804af44c9b4f201a1784f01820b26e19 data\extravaganza\advancement\recipes\building_blocks\pink_bent_festive_rubber.json -9105af92d50359c043909bf9d7398401bb34dfec data\extravaganza\advancement\recipes\building_blocks\green_windowed_festive_rubber_wall.json 700b4faca99a0c2cb5a16067f8e07ead843343fb data\extravaganza\advancement\recipes\building_blocks\green_perforated_festive_rubber_slab.json +9105af92d50359c043909bf9d7398401bb34dfec data\extravaganza\advancement\recipes\building_blocks\green_windowed_festive_rubber_wall.json 55a8c9fdd1b2f82e5edb8d6a5f3e9ff1dc82eb03 data\extravaganza\advancement\recipes\building_blocks\orange_dotted_festive_rubber_slab.json 9c6bdb5e935d5e861a919e0280eba48ee87be37b data\extravaganza\advancement\recipes\building_blocks\tomato_barred_festive_rubber_stairs.json 9aa43dba3669e6322ec642f3f4e23643e73c9772 data\extravaganza\recipe\nymph_split_festive_rubber_slab.json @@ -1581,8 +1581,8 @@ d98053e7804af44c9b4f201a1784f01820b26e19 data\extravaganza\advancement\recipes\b 5a99b7b8028aadb436130d9e758b572cb8c4816f data\extravaganza\advancement\recipes\building_blocks\purple_scratched_festive_rubber_stairs.json 88ab54b801b99987762420ab457eb997e5bb2aa7 data\extravaganza\recipe\light_blue_split_festive_rubber_slab.json 0c97058995f3fcb677256f00e859f6dcc367d671 data\extravaganza\advancement\recipes\building_blocks\brown_sharped_festive_rubber_slab.json -d205169db3e1aec420eef38640fff67d93731a1d data\extravaganza\advancement\recipes\building_blocks\nymph_bent_festive_rubber_stairs.json c374de19ff94b967edb47eb362c8a727a1bb687e data\extravaganza\recipe\nymph_striped_festive_rubber_slab.json +d205169db3e1aec420eef38640fff67d93731a1d data\extravaganza\advancement\recipes\building_blocks\nymph_bent_festive_rubber_stairs.json 5b2f6b4ded636d6f8e39e051f7120d3a0e8ab3e0 data\extravaganza\recipe\plant_barred_festive_rubber_stairs.json 56f925944ed14e35450c4749c251ba06998a426a data\extravaganza\advancement\recipes\building_blocks\orange_bent_festive_rubber_wall.json b3ff4a612274be4d274b2e5cdee7493fdb6e2d4a data\extravaganza\advancement\recipes\building_blocks\pink_festive_rubber_grate.json @@ -1619,16 +1619,16 @@ f20ccd5d832763ee8cfa434d8553a035003863bb data\extravaganza\advancement\recipes\b cd1d540e8512dce49b5fe14be7d5e90b6cbc8e04 data\extravaganza\advancement\recipes\building_blocks\lime_tiled_festive_rubber_slab.json de54733d97180aafe33b30e795c5ab4187e848a0 data\extravaganza\recipe\tear_perforated_festive_rubber_stairs.json 7248e935d91ecab449136ab7d36549b69937335e data\extravaganza\advancement\recipes\building_blocks\pink_striped_festive_rubber_wall.json -e5c94d0f6393c9d113aad9120a474f2a2274a33a data\extravaganza\recipe\black_screwed_festive_rubber.json 56249fb0e4eb9c56338b7480c9dcbc5531a8a343 data\extravaganza\recipe\gray_bent_festive_rubber_wall.json +e5c94d0f6393c9d113aad9120a474f2a2274a33a data\extravaganza\recipe\black_screwed_festive_rubber.json a50137a10063d83e91d1eea2b5a709539cf4e560 data\extravaganza\recipe\tear_tiled_festive_rubber.json 6e830f69617f6defe4e849efaebb25730baa54f1 data\extravaganza\advancement\recipes\building_blocks\pink_bent_festive_rubber_slab.json fbb989442cf83d633e79831ea7c1d77ec08a40e9 data\extravaganza\advancement\recipes\building_blocks\lime_tiled_festive_rubber.json b14bb0e3b35b0077248fb7dd4739f22d9ec93769 data\extravaganza\recipe\yellow_tiled_festive_rubber_stairs.json 867b6f7a5131ca39c87c034917b346aeda85fb8e data\extravaganza\recipe\white_trash_can.json 3b272a4865c7cd7b769a7df7b1665c1ecfc01945 data\extravaganza\recipe\cyan_wooded_festive_rubber_stairs.json -e17e25e5b7d84ee02b420d0000c66a0eafc179fe data\extravaganza\advancement\recipes\building_blocks\tomato_windowed_festive_rubber.json cf7f4c052fe96bea2e9b2c8064f907c679b7c585 data\extravaganza\recipe\tomato_barred_festive_rubber.json +e17e25e5b7d84ee02b420d0000c66a0eafc179fe data\extravaganza\advancement\recipes\building_blocks\tomato_windowed_festive_rubber.json 921676634b328518ff5637dac311fe575c3578d9 data\extravaganza\advancement\recipes\building_blocks\lime_slipped_festive_rubber_wall.json 455da9a9aa634381bd77fce6489736e45015092e data\extravaganza\advancement\recipes\building_blocks\tomato_tiled_festive_rubber_stairs.json 066a7435919afa54ef8ea2eb955921df96de4afd data\extravaganza\advancement\recipes\building_blocks\orange_scratched_festive_rubber.json @@ -1762,8 +1762,8 @@ c3d679c91ff2e35f3ae52d225af59dc8567290e8 data\extravaganza\recipe\red_split_fest 6d62dcb320f140a50e9d03de28966c4e82edd8f6 data\extravaganza\advancement\recipes\building_blocks\nymph_padded_festive_rubber_stairs.json e24b9a2bd1c452aaf74c9f25800f1d2a087e9640 data\extravaganza\advancement\recipes\building_blocks\green_festive_rubber_slab.json 975fc3f7b1fe4a23738eac45adfc8625eff67037 data\extravaganza\advancement\recipes\building_blocks\white_festive_rubber_grate_wall.json -dd82e28bfd814934490c1bfab2f9b73c5b54985d data\extravaganza\recipe\tomato_bent_festive_rubber_slab.json 8038aabbc2a87ea1c54cedb20cb800228ce8474a data\extravaganza\advancement\recipes\building_blocks\tomato_striped_festive_rubber.json +dd82e28bfd814934490c1bfab2f9b73c5b54985d data\extravaganza\recipe\tomato_bent_festive_rubber_slab.json aa59f13fb595ddc0b06130aced5f6f30d5b2c75e data\extravaganza\recipe\tear_padded_festive_rubber.json edea7e209fcfd15d52b0b6f08f7159d373931a2b data\extravaganza\recipe\light_gray_tiled_festive_rubber.json 791a76ce90777a3820df9731e62e552af10439b9 data\extravaganza\recipe\tomato_trash_can.json @@ -1796,8 +1796,8 @@ a78c890fb0ee929481d4f080798f9c341b155234 data\extravaganza\advancement\recipes\b 093c0d286b556770d1fb9e2d535af0b35e3c3992 data\extravaganza\advancement\recipes\building_blocks\white_sharped_festive_rubber.json d3c41581f76eaf9e00d5a13fd8242df08035cd96 data\extravaganza\advancement\recipes\building_blocks\plant_festive_rubber_grate_slab.json d9d6c8abbe575232d7aa9c766b626e14088e2468 data\extravaganza\recipe\purple_wooded_festive_rubber_slab.json -4614f2661381d2deccf0eaaab70a96b71bda130f data\extravaganza\advancement\recipes\building_blocks\gray_padded_festive_rubber_stairs.json fd72cbe80050c096ab39b022cc78c087fc990ac5 data\extravaganza\recipe\gray_perforated_festive_rubber_slab.json +4614f2661381d2deccf0eaaab70a96b71bda130f data\extravaganza\advancement\recipes\building_blocks\gray_padded_festive_rubber_stairs.json ceb8675e8c1e91852bd4acf1eb8635c41fdbb97b data\extravaganza\advancement\recipes\building_blocks\black_scratched_festive_rubber_stairs.json 759a2f2324e16e7effa7aef0b67c7e74dbf3e056 data\extravaganza\recipe\tomato_windowed_festive_rubber_slab.json 563def4d6b5e5b5efbf46c19d4fb2c1a7cce1884 data\extravaganza\recipe\green_split_festive_rubber_slab.json @@ -1828,9 +1828,9 @@ b10eca20168c4227ba774a0d27bbf8d3ba0504f4 data\extravaganza\advancement\recipes\b 5441156ce6c66fa403ba722ed05eead2c117d446 data\extravaganza\advancement\recipes\building_blocks\lime_striped_festive_rubber_wall.json c3b4fafe5d8b1401b38121c0fe5100a26fec9c45 data\extravaganza\advancement\recipes\building_blocks\black_festive_rubber.json 3853d410b2efbaad07a3fd391bb1d7044776c9a7 data\extravaganza\recipe\orange_festive_rubber_grate_slab.json +4efc724299b44c6c897b926ad94794811b2a3012 data\extravaganza\advancement\recipes\building_blocks\cyan_barred_festive_rubber_stairs.json d9d52352726f64b90e2625f5a5d07643d0435b7d data\extravaganza\advancement\recipes\building_blocks\brown_screwed_festive_rubber.json c75581d6b1daecc5029b02cb900b7eedad06a5d6 data\extravaganza\recipe\black_curved_festive_rubber_stairs.json -4efc724299b44c6c897b926ad94794811b2a3012 data\extravaganza\advancement\recipes\building_blocks\cyan_barred_festive_rubber_stairs.json 7a0e77a93af2c38c1889e5cff566705f9106e71e data\extravaganza\recipe\cyan_poured_festive_rubber_slab.json c03b10ae7d7d2837a3cd11fc96c5f3918d4fe9a7 data\extravaganza\advancement\recipes\building_blocks\light_blue_screwed_festive_rubber.json 95ae4f0beb3504cc28658c19285b21eae6009373 data\extravaganza\advancement\recipes\building_blocks\red_perforated_festive_rubber_slab.json @@ -2191,15 +2191,15 @@ c4c4ca95d014ed228a9782190a36d40bca57d903 data\extravaganza\recipe\blue_padded_fe 9906522d0ffbab70e98294b8a6ac0550025f492f data\extravaganza\advancement\recipes\building_blocks\yellow_barred_festive_rubber_wall.json 5821f93d1304191a449dede5c3fb440abaed4b9d data\extravaganza\advancement\recipes\building_blocks\green_sharped_festive_rubber_stairs.json 99ce08c9fd0cab5909a6de1fec76feb0f553538b data\extravaganza\recipe\plant_split_festive_rubber.json -21b52fe84082d2f0ea464bd2b98f2602a5ad6aed data\extravaganza\recipe\magenta_wooded_festive_rubber_stairs.json a907cc83697c57d199304b730c54028c91e7f298 data\extravaganza\advancement\recipes\building_blocks\brown_padded_festive_rubber_wall.json +21b52fe84082d2f0ea464bd2b98f2602a5ad6aed data\extravaganza\recipe\magenta_wooded_festive_rubber_stairs.json 5669414b2b880116bb31f3925b9e343d41826a48 data\extravaganza\recipe\gray_festive_rubber_slab.json e31717579e2c6ce7d0005dff89970ae445a51251 data\extravaganza\advancement\recipes\building_blocks\green_festive_rubber_ladder.json bd628a083b8cb7b9be9f9bf7b9c978c7764c3de1 data\extravaganza\advancement\recipes\building_blocks\pink_padded_festive_rubber_slab.json c9c45793474257a648f8b7c5d9f567fb8fa89e9d data\extravaganza\recipe\magenta_curved_festive_rubber_stairs.json ef91251df1cbb36aa460ec8acae596030341730e data\extravaganza\recipe\ball_pool_registration_table.json -05e4ff5aba6b1e4011c7dc52e51d07a98719a9aa data\extravaganza\advancement\recipes\building_blocks\green_scratched_festive_rubber_wall.json cd1bfee72524da311045c64d8f80c56e123c9f08 data\extravaganza\advancement\recipes\building_blocks\green_striped_festive_rubber_slab.json +05e4ff5aba6b1e4011c7dc52e51d07a98719a9aa data\extravaganza\advancement\recipes\building_blocks\green_scratched_festive_rubber_wall.json a50ab85cd005e1d35a9a1914f59b52a1782b467a data\extravaganza\recipe\light_gray_poured_festive_rubber_stairs.json 414aeb7f1d88c81b87117d79a511a398a4a6f347 data\extravaganza\recipe\brown_dotted_festive_rubber.json cfae3fbe92b0512a0060dc87c71f26d371bc141d data\extravaganza\advancement\recipes\building_blocks\magenta_curved_festive_rubber.json @@ -2216,8 +2216,8 @@ f7591e571d6e1a47bdaa94a2e62913270b468fc7 data\extravaganza\advancement\recipes\b 6b93ec462b685b19dfe174ccfbd764d53ea1d932 data\extravaganza\advancement\recipes\building_blocks\magenta_perforated_festive_rubber.json 2d27fd9e5b23eee4fca3576b43e155ae55ec5552 data\extravaganza\recipe\green_curved_festive_rubber.json 5bf4132e60dee4e16c39ba167e3618c84e68a97c data\extravaganza\advancement\recipes\building_blocks\plant_wooded_festive_rubber_stairs.json -10cf94b6423047728e8601b8a562a18c4b9b644a data\extravaganza\recipe\gray_festive_rubber_grate_wall.json cf6da016acf8d69cdaf296f1a66c56fbd1b8a39b data\extravaganza\recipe\cyan_perforated_festive_rubber_stairs.json +10cf94b6423047728e8601b8a562a18c4b9b644a data\extravaganza\recipe\gray_festive_rubber_grate_wall.json bd2e4393c47b28a8b8218e719d7c282e9ede79d8 data\extravaganza\recipe\purple_scratched_festive_rubber.json 9254774aec4cbeacd0e6e33f91c6f687521c28e0 data\extravaganza\advancement\recipes\building_blocks\magenta_striped_festive_rubber_wall.json d7d7d225ba905d660925adf566be8978b557195b data\extravaganza\advancement\recipes\decorations\hevea_brasiliensis_fence.json @@ -2312,8 +2312,8 @@ daa8794586e9c08a6e1e7238c000cb72cb5c8bca data\extravaganza\recipe\gray_perforate dc3a96600d7856e2458e3392e8aeb04763574349 data\extravaganza\recipe\yellow_padded_festive_rubber_wall.json 0611d8b5d5c6a62344004f006c7200c21216d33b data\extravaganza\recipe\blue_padded_festive_rubber.json e637519e52e5419672547ea8b7be1a3a8b6392f5 data\extravaganza\recipe\brown_dotted_festive_rubber_wall.json -852aee2d343b9be2700467373e58196bec3b767c data\extravaganza\advancement\recipes\building_blocks\lime_windowed_festive_rubber_slab.json 51417a3552d5c7e1db94d55615d5e78437f8c599 data\extravaganza\recipe\lime_festive_rubber_slab.json +852aee2d343b9be2700467373e58196bec3b767c data\extravaganza\advancement\recipes\building_blocks\lime_windowed_festive_rubber_slab.json 7d3a177556c00cce12335be85f03880fce8539a6 data\extravaganza\advancement\recipes\building_blocks\pink_poured_festive_rubber_wall.json 9dc6962182c591a9f88d5db0d6ccfd51804c62d5 data\extravaganza\advancement\recipes\building_blocks\yellow_windowed_festive_rubber.json ad07816e7f5e27661493a946e5c1e76d7a4b7a99 data\extravaganza\advancement\recipes\building_blocks\light_blue_striped_festive_rubber_slab.json @@ -2370,8 +2370,8 @@ bc1d5a417db0fc6ade10acb5cfba27ad4d00154b data\extravaganza\advancement\recipes\b 49346b9b2d2d4140f01922be88d428c9e66f328b data\extravaganza\recipe\brown_wooded_festive_rubber_wall.json 1ba9ba30483ed1318bf85a98ef62c2b15d74f3bc data\extravaganza\recipe\brown_wooded_festive_rubber.json f4a617c2ada1c94541b79f853728c71c8da51a7c data\extravaganza\advancement\recipes\building_blocks\orange_trash_can.json -292668978f5599cc71f07c9cb9e369b5594e5dc3 data\extravaganza\recipe\tear_screwed_festive_rubber_slab.json 0042e781eaa26c76bc62ab490e603bdc6375c26c data\extravaganza\advancement\recipes\building_blocks\tear_dotted_festive_rubber_slab.json +292668978f5599cc71f07c9cb9e369b5594e5dc3 data\extravaganza\recipe\tear_screwed_festive_rubber_slab.json a86817b1a742f4f2ac422787983be75a8db9a5c3 data\extravaganza\advancement\recipes\building_blocks\brown_striped_festive_rubber_wall.json fb7fabd4b181fb825c62554008aa115f5dc4c41c data\extravaganza\advancement\recipes\building_blocks\magenta_dotted_festive_rubber_stairs.json 23322a3b38ccaf4cc3779fd1ab4425c3229436fb data\extravaganza\recipe\black_festive_rubber_stairs.json @@ -2509,8 +2509,8 @@ ea8b6d60ae448e399cff3d46170dd413a19d7a60 data\extravaganza\recipe\yellow_dotted_ 13136e496991ec16593bc7576825b31c4f1f8b99 data\extravaganza\recipe\blue_sharped_festive_rubber_stairs.json 72fddf6ca830d8521fe3b2477b87b20807eac25b data\extravaganza\advancement\recipes\building_blocks\tear_split_festive_rubber_stairs.json 6d5bf1cfd554371b1cdaab4a01bf6fd92485a913 data\extravaganza\recipe\magenta_screwed_festive_rubber.json -941d57eac8595ceef290b3bbf8fb38ae2f8ebbd0 data\extravaganza\advancement\recipes\building_blocks\purple_windowed_festive_rubber_wall.json ed4909d0510c92ec994ac8746e9489a5cbe66ea7 data\extravaganza\recipe\purple_festive_rubber_stairs.json +941d57eac8595ceef290b3bbf8fb38ae2f8ebbd0 data\extravaganza\advancement\recipes\building_blocks\purple_windowed_festive_rubber_wall.json f646413b806990d17528caff16fb72719c189427 data\extravaganza\advancement\recipes\building_blocks\red_scratched_festive_rubber_wall.json 1da4c165129d7a0fda2ef6dae0c18625a28eeb7e data\extravaganza\recipe\plant_scratched_festive_rubber_slab.json 22ae370cc120132c739537c73fad4d85e4aec753 data\extravaganza\recipe\tear_sharped_festive_rubber_wall.json @@ -2676,8 +2676,8 @@ f536e706606fa93f2d1def2854bdcf2b7ae4c065 data\extravaganza\advancement\recipes\b dd017b7a54d24aa65648d2b26e327ce757350281 data\extravaganza\advancement\recipes\building_blocks\light_blue_scratched_festive_rubber_wall.json 1e8f096533d2476fcbbc6a01512b9a3ad90cf345 data\extravaganza\advancement\recipes\building_blocks\yellow_scratched_festive_rubber_stairs.json e62469b707bd93722c488c5a10bc0f1d1df8f1e6 data\extravaganza\recipe\gray_barred_festive_rubber.json -791a10d44f0c0dc18fee59ed65a1cf113b6f49ea data\extravaganza\recipe\magenta_poured_festive_rubber.json 43586e8dfda0e3d76620626bd1864ae32206d8f5 data\extravaganza\recipe\green_windowed_festive_rubber_stairs.json +791a10d44f0c0dc18fee59ed65a1cf113b6f49ea data\extravaganza\recipe\magenta_poured_festive_rubber.json e9de8040663d7de41b2d9e4f17842bf2013b6398 data\extravaganza\advancement\recipes\building_blocks\stripped_hevea_brasiliensis_wood.json 72d671fc9fc04c0bdebe47d9bb7f2a630157a102 data\extravaganza\advancement\recipes\building_blocks\magenta_scratched_festive_rubber_stairs.json 0ca238eec876ffeb3d4a8d7d0f2890335fcd1942 data\extravaganza\recipe\pink_wooded_festive_rubber.json @@ -2710,14 +2710,14 @@ b79b62ffcd0bf00f92de6ec977dad7715d9eecc0 data\extravaganza\recipe\pink_padded_fe e7c0cc47642f08df7fde7f9ff9b226a34358accb data\extravaganza\recipe\light_blue_bent_festive_rubber.json d1675453e29ffdc167daf4b2e02ee9da3fd7700c data\extravaganza\advancement\recipes\building_blocks\cyan_dotted_festive_rubber_stairs.json 9260b79ecfb244f77f3be4654495992fa4bb5f5b data\extravaganza\advancement\recipes\building_blocks\orange_scratched_festive_rubber_wall.json +af1908ed2d3fe2aa04177730c77d91ca325d6a2c data\extravaganza\recipe\magenta_festive_rubber_stairs.json 031e9263a6119d884e7baee3cfe00f61516f5406 data\extravaganza\advancement\recipes\building_blocks\light_gray_scratched_festive_rubber_stairs.json 863c807cd43e4093ac715a0d4c48b79d931c2dda data\extravaganza\recipe\light_gray_bent_festive_rubber.json -af1908ed2d3fe2aa04177730c77d91ca325d6a2c data\extravaganza\recipe\magenta_festive_rubber_stairs.json f70033ca28942be2130b85449471554f70ae1e1d data\extravaganza\recipe\light_blue_dotted_festive_rubber_stairs.json c518f13c4461e4f70f017f46ac59bf6975a8bed9 data\extravaganza\recipe\light_blue_sharped_festive_rubber_wall.json ad1460f31be9e017e026ed6b7568a5c6a9ed6fe4 data\extravaganza\recipe\brown_curved_festive_rubber_slab.json -b3f05067297c1b6ca88c72d8ff7555e2b4d30ad7 data\extravaganza\recipe\yellow_screwed_festive_rubber_wall.json 2de793ea3b9ff29289fed783a5900efe353f7bb6 data\extravaganza\advancement\recipes\building_blocks\yellow_tiled_festive_rubber.json +b3f05067297c1b6ca88c72d8ff7555e2b4d30ad7 data\extravaganza\recipe\yellow_screwed_festive_rubber_wall.json 16b7e51e63ac6b396fda6af851e5465a33f1b517 data\extravaganza\advancement\recipes\building_blocks\pink_windowed_festive_rubber_stairs.json a3c9e13ae1f0a27aa92e84f4a446904fea283966 data\extravaganza\advancement\recipes\building_blocks\tomato_screwed_festive_rubber_wall.json 2fdb3dc731a28c6980bab453bff5491c32d6fdaa data\extravaganza\recipe\tear_tiled_festive_rubber_slab.json @@ -2732,8 +2732,8 @@ c6f27f69dafef0a0aa61a8a9c2417b516b068bbd data\extravaganza\recipe\yellow_dotted_ d21f746754929c701bab9930137c00cfcd5529ee data\extravaganza\recipe\light_blue_sharped_festive_rubber_slab.json 4312db40b0c410c4082024cadf533a898e950a9d data\extravaganza\recipe\orange_perforated_festive_rubber_slab.json bfaff3155883881ae63e8b9226d4d043fe402ed0 data\extravaganza\recipe\white_screwed_festive_rubber_stairs.json -3db4f94bb40baf1c1d65690a3efd4ed864754ada data\extravaganza\recipe\light_gray_windowed_festive_rubber_stairs.json 79ccdb8649dde243a622bb1af95cc30e484adc83 data\extravaganza\recipe\light_gray_striped_festive_rubber_stairs.json +3db4f94bb40baf1c1d65690a3efd4ed864754ada data\extravaganza\recipe\light_gray_windowed_festive_rubber_stairs.json e873033490a4089cb9b1b4ae58270b6e5e874523 data\extravaganza\advancement\recipes\building_blocks\orange_poured_festive_rubber_stairs.json ebb9b1debdce7ec3973062dffbe2af56d23d8fc8 data\extravaganza\recipe\tear_barred_festive_rubber.json 0009817b0203d3d99dd6e16ca311e7a5ea505d34 data\extravaganza\advancement\recipes\building_blocks\light_blue_dotted_festive_rubber.json @@ -2764,8 +2764,8 @@ f5da5afa73008c05825db95ba5a238336a6e5351 data\extravaganza\recipe\brown_striped_ 0a0ead5009f526951441d475cb993fd2106b385e data\extravaganza\recipe\brown_dotted_festive_rubber_slab.json 1380500e782c77d341d6b24993041c44c86967d7 data\extravaganza\recipe\black_dotted_festive_rubber_slab.json 596a13cd08be06ea36cd407f571c324b6264a521 data\extravaganza\recipe\green_festive_rubber.json -04c9415127c3a1998d4b734048fe36501c141522 data\extravaganza\advancement\recipes\building_blocks\pink_scratched_festive_rubber_stairs.json cf336981d07f7d2a26335fb70d973856fedd9720 data\extravaganza\recipe\pink_dotted_festive_rubber.json +04c9415127c3a1998d4b734048fe36501c141522 data\extravaganza\advancement\recipes\building_blocks\pink_scratched_festive_rubber_stairs.json aa0ea62d53847919bdc249f74d9def9b398965a3 data\extravaganza\recipe\yellow_scratched_festive_rubber_stairs.json 5e3ba82d4469a750f0d9bd7dc9fb639453c49a5a data\extravaganza\recipe\tomato_screwed_festive_rubber_wall.json 7f7e48b702752cc89971783e319cef0bf75ab0fa data\extravaganza\advancement\recipes\building_blocks\yellow_screwed_festive_rubber_stairs.json @@ -2818,8 +2818,8 @@ bb5421363a4bf914688a47ecc9b5f887a7472cea data\extravaganza\advancement\recipes\b 5b26e92f4cd02e3f76345b8742249cd2bd7c73f5 data\extravaganza\recipe\white_slipped_festive_rubber_wall.json 3979536c0f0fef55018d2801020e42eb47cfce6c data\extravaganza\recipe\yellow_tiled_festive_rubber_wall.json 1b98de179c1da2d45abaa95b1f10dc08a42e2f4b data\extravaganza\advancement\recipes\building_blocks\lime_perforated_festive_rubber.json -2b7858a2359159b331e500e287710c72f7adcce2 data\extravaganza\advancement\recipes\building_blocks\red_slipped_festive_rubber_slab.json 216dcee4b6e545b16437b9bae3116cfa1bb703a5 data\extravaganza\recipe\red_tiled_festive_rubber_slab.json +2b7858a2359159b331e500e287710c72f7adcce2 data\extravaganza\advancement\recipes\building_blocks\red_slipped_festive_rubber_slab.json 4090eb8cb113e8dc18f098483539c96c00067f4c data\extravaganza\recipe\cyan_poured_festive_rubber_wall.json 52f24f47eca05821f8a864b8b196e181907532f3 data\extravaganza\recipe\brown_slipped_festive_rubber_stairs.json 3a78b2533a0fa507b4893149ef3d1dc445a10d05 data\extravaganza\recipe\black_striped_festive_rubber_stairs.json @@ -2841,8 +2841,8 @@ a38b4f02f9b6a38c87dcdc915ec7fafdc805e9e7 data\extravaganza\recipe\light_gray_dot 7bb4c7a1db771cf7bc3d52f0d43f25034b7fe037 data\extravaganza\advancement\recipes\building_blocks\yellow_poured_festive_rubber.json 4a8c1028cf03a41384e5567a0840ada9f25317c5 data\extravaganza\recipe\light_blue_festive_rubber_grate_wall.json a90129da71225ef60c69cfc3ac3fc8b45afeaa5b data\extravaganza\advancement\recipes\building_blocks\orange_padded_festive_rubber_slab.json -ba74d995c7532622e3df8e04afcadeba2a84308a data\extravaganza\advancement\recipes\building_blocks\purple_split_festive_rubber.json 484db206f20454397f875e6f28a77e290c789e40 data\extravaganza\recipe\purple_poured_festive_rubber_slab.json +ba74d995c7532622e3df8e04afcadeba2a84308a data\extravaganza\advancement\recipes\building_blocks\purple_split_festive_rubber.json c97e18b2ccc5e67f424d054b7b10ea32cd8054ab data\extravaganza\advancement\recipes\building_blocks\orange_wooded_festive_rubber_slab.json 7fb8049f59adf1313e5a586b9d985faa635a3f4f data\extravaganza\recipe\creeper_balloon.json 517a5629cd63cb5bf50bd0ae184e7f2a056a63ee data\extravaganza\advancement\recipes\building_blocks\lime_sharped_festive_rubber_wall.json @@ -2993,8 +2993,8 @@ f022fd867ee1c6f26f1a9ed98ce62e7cdbc962ac data\extravaganza\recipe\magenta_perfor 0a1aab919b24b60f21d4834bc3d8de72bb54a039 data\extravaganza\advancement\recipes\building_blocks\pink_split_festive_rubber_wall.json 44d6f85f5887af95e2a20c8c17438558a329d44f data\extravaganza\advancement\recipes\building_blocks\gray_poured_festive_rubber.json 06aeb8dc621b4c15ff346c8a36197f3bf8ed9034 data\extravaganza\recipe\brown_tiled_festive_rubber_stairs.json -459b75890fcab492466ae5072fdb00154549a961 data\extravaganza\advancement\recipes\building_blocks\black_festive_rubber_grate.json d8b1c0bc7c5142cc22e718bf023ffe19d7217dec data\extravaganza\recipe\black_poured_festive_rubber_stairs.json +459b75890fcab492466ae5072fdb00154549a961 data\extravaganza\advancement\recipes\building_blocks\black_festive_rubber_grate.json 45d8b9fe0ea944ab60516aa4b676dcb88b44d5a1 data\extravaganza\advancement\recipes\building_blocks\light_blue_tiled_festive_rubber_slab.json 848888af17e5bac2908e4a054dfdad5bea3bd592 data\extravaganza\advancement\recipes\building_blocks\light_blue_perforated_festive_rubber_stairs.json a96535299ad0b635596e9840ebb639a9c03a2029 data\extravaganza\advancement\recipes\building_blocks\nymph_tiled_festive_rubber.json diff --git a/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 b/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 index 2b555f66..8f6cbc91 100644 --- a/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 +++ b/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 @@ -1,2 +1,2 @@ -// 1.21 2024-06-28T01:02:39.9737868 Extravaganza!/Language (en_us) +// 1.21 2024-07-01T03:10:22.4798061 Extravaganza!/Language (en_us) cbccb91f33768fcb7db25fa4b5817ea6bf2012a6 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 index 499dae94..edc0eade 100644 --- a/src/main/generated/assets/extravaganza/blockstates/garland.json +++ b/src/main/generated/assets/extravaganza/blockstates/garland.json @@ -146,6 +146,7 @@ "model": "extravaganza:block/garland_up" }, "when": { + "attached_up": "false", "up": "true" } }, @@ -154,6 +155,7 @@ "model": "extravaganza:block/garland_down" }, "when": { + "attached_down": "false", "down": "true" } }, @@ -162,6 +164,7 @@ "model": "extravaganza:block/garland_north" }, "when": { + "attached_north": "false", "north": "true" } }, @@ -170,6 +173,7 @@ "model": "extravaganza:block/garland_south" }, "when": { + "attached_south": "false", "south": "true" } }, @@ -178,6 +182,7 @@ "model": "extravaganza:block/garland_west" }, "when": { + "attached_west": "false", "west": "true" } }, @@ -186,6 +191,61 @@ "model": "extravaganza:block/garland_east" }, "when": { + "attached_east": "false", + "east": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/attached_garland_up" + }, + "when": { + "attached_up": "true", + "up": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/attached_garland_down" + }, + "when": { + "attached_down": "true", + "down": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/attached_garland_north" + }, + "when": { + "attached_north": "true", + "north": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/attached_garland_south" + }, + "when": { + "attached_south": "true", + "south": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/attached_garland_west" + }, + "when": { + "attached_west": "true", + "west": "true" + } + }, + { + "apply": { + "model": "extravaganza:block/attached_garland_east" + }, + "when": { + "attached_east": "true", "east": "true" } } diff --git a/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java b/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java index ca335a94..05b8a19f 100644 --- a/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java +++ b/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java @@ -1,6 +1,7 @@ package com.mmodding.extravaganza; import com.mmodding.extravaganza.block.BallDistributorBlock; +import com.mmodding.extravaganza.block.GarlandBlock; import com.mmodding.extravaganza.block.HeveaBrasiliensisLog; import com.mmodding.extravaganza.block.TrashCanBlock; import com.mmodding.extravaganza.init.ExtravaganzaBlocks; @@ -307,68 +308,7 @@ else if (block instanceof LadderBlock) { 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)) - ); + this.generateGarlandModel(blockStateModelGenerator); } else if (block.equals(ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE) || block.equals(ExtravaganzaBlocks.POPCORN_MACHINE)) { blockStateModelGenerator.registerNorthDefaultHorizontalRotation(block); @@ -443,6 +383,143 @@ else if (block.equals(ExtravaganzaBlocks.BALL_DISTRIBUTOR)) { }); } + private void generateGarlandModel(BlockStateModelGenerator blockStateModelGenerator) { + 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"); + Identifier attachedUp = Extravaganza.createId("block/attached_garland_up"); + Identifier attachedDown = Extravaganza.createId("block/attached_garland_down"); + Identifier attachedNorth = Extravaganza.createId("block/attached_garland_north"); + Identifier attachedSouth = Extravaganza.createId("block/attached_garland_south"); + Identifier attachedWest = Extravaganza.createId("block/attached_garland_west"); + Identifier attachedEast = Extravaganza.createId("block/attached_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) + .set(GarlandBlock.ATTACHED_UP, false), + BlockStateVariant.create().put(VariantSettings.MODEL, up) + ) + .with( + When.create() + .set(Properties.DOWN, true) + .set(GarlandBlock.ATTACHED_DOWN, false), + BlockStateVariant.create().put(VariantSettings.MODEL, down) + ) + .with( + When.create() + .set(Properties.NORTH, true) + .set(GarlandBlock.ATTACHED_NORTH, false), + BlockStateVariant.create().put(VariantSettings.MODEL, north) + ) + .with( + When.create() + .set(Properties.SOUTH, true) + .set(GarlandBlock.ATTACHED_SOUTH, false), + BlockStateVariant.create().put(VariantSettings.MODEL, south) + ) + .with( + When.create() + .set(Properties.WEST, true) + .set(GarlandBlock.ATTACHED_WEST, false), + BlockStateVariant.create().put(VariantSettings.MODEL, west) + ) + .with( + When.create() + .set(Properties.EAST, true) + .set(GarlandBlock.ATTACHED_EAST, false), + BlockStateVariant.create().put(VariantSettings.MODEL, east) + ) + .with( + When.create() + .set(Properties.UP, true) + .set(GarlandBlock.ATTACHED_UP, true), + BlockStateVariant.create().put(VariantSettings.MODEL, attachedUp) + ) + .with( + When.create() + .set(Properties.DOWN, true) + .set(GarlandBlock.ATTACHED_DOWN, true), + BlockStateVariant.create().put(VariantSettings.MODEL, attachedDown) + ) + .with( + When.create() + .set(Properties.NORTH, true) + .set(GarlandBlock.ATTACHED_NORTH, true), + BlockStateVariant.create().put(VariantSettings.MODEL, attachedNorth) + ) + .with( + When.create() + .set(Properties.SOUTH, true) + .set(GarlandBlock.ATTACHED_SOUTH, true), + BlockStateVariant.create().put(VariantSettings.MODEL, attachedSouth) + ) + .with( + When.create() + .set(Properties.WEST, true) + .set(GarlandBlock.ATTACHED_WEST, true), + BlockStateVariant.create().put(VariantSettings.MODEL, attachedWest) + ) + .with( + When.create() + .set(Properties.EAST, true) + .set(GarlandBlock.ATTACHED_EAST, true), + BlockStateVariant.create().put(VariantSettings.MODEL, attachedEast) + ) + ); + } + @Override public void generateItemModels(ItemModelGenerator itemModelGenerator) { Extravaganza.executeForRegistry(Registries.ITEM, item -> { diff --git a/src/main/java/com/mmodding/extravaganza/block/BallPoolRegistrationTableBlock.java b/src/main/java/com/mmodding/extravaganza/block/BallPoolRegistrationTableBlock.java index d8524482..fd741961 100644 --- a/src/main/java/com/mmodding/extravaganza/block/BallPoolRegistrationTableBlock.java +++ b/src/main/java/com/mmodding/extravaganza/block/BallPoolRegistrationTableBlock.java @@ -2,6 +2,7 @@ import com.mmodding.extravaganza.block.entity.BallPoolRegistrationTableBlockEntity; import com.mmodding.extravaganza.init.ExtravaganzaBlockEntities; +import com.mmodding.extravaganza.init.ExtravaganzaBlocks; import com.mmodding.extravaganza.init.ExtravaganzaDataAttachments; import com.mmodding.extravaganza.init.ExtravaganzaItems; import com.mojang.serialization.MapCodec; @@ -26,6 +27,7 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; @@ -86,17 +88,42 @@ protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, Worl @Override protected void onBlockBreakStart(BlockState state, World world, BlockPos pos, PlayerEntity player) { if (world.getBlockEntity(pos) instanceof BallPoolRegistrationTableBlockEntity bpitbe && !world.getBlockState(pos).get(BallPoolRegistrationTableBlock.LOCK_SCAN)) { - bpitbe.switchSelectionMode(); - if (!world.isClient()) { - Object object; - if (bpitbe.getSelectionMode().equals(BallPoolRegistrationTableBlockEntity.SelectionMode.SOURCE)) { - object = bpitbe.isSource(); - } else { - object = bpitbe.getScannedCurrent(); + if (!player.isSneaking() || world.getBlockState(pos).get(BallPoolRegistrationTableBlock.LOCK_SETTINGS)) { + bpitbe.switchSelectionMode(); + if (!world.isClient()) { + Object object; + if (bpitbe.getSelectionMode().equals(BallPoolRegistrationTableBlockEntity.SelectionMode.SOURCE)) { + object = bpitbe.isSource(); + } else { + object = bpitbe.getScannedCurrent(); + } + player.sendMessage(Text.literal(bpitbe.getSelectionMode().asString() + ": " + object), true); } - player.sendMessage(Text.literal(bpitbe.getSelectionMode().asString() + ": " + object), true); } + else { + if (bpitbe.getPoolSettings().power < 15) { + bpitbe.getPoolSettings().power = MathHelper.clamp(bpitbe.getPoolSettings().power + 1, 1, 15); + } + else { + bpitbe.getPoolSettings().power = 1; + } + if (!world.isClient()) { + player.sendMessage(Text.translatable("enchantment.minecraft.power").append(": " + bpitbe.getPoolSettings().power), true); + } + } + } + } + + @Override + public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) { + if (world.getBlockEntity(pos) instanceof BallPoolRegistrationTableBlockEntity bpitbe) { + BlockPos.iterate(bpitbe.getRelativeScannedStart(pos), bpitbe.getRelativeScannedEnd(pos)).forEach(blockPos -> { + if (world.getBlockState(blockPos).isOf(ExtravaganzaBlocks.BALL_POOL_PROTECTION)) { + world.removeBlock(blockPos, false); + } + }); } + return super.onBreak(world, pos, state, player); } @Override diff --git a/src/main/java/com/mmodding/extravaganza/block/GarlandBlock.java b/src/main/java/com/mmodding/extravaganza/block/GarlandBlock.java index a5d73363..408966fb 100644 --- a/src/main/java/com/mmodding/extravaganza/block/GarlandBlock.java +++ b/src/main/java/com/mmodding/extravaganza/block/GarlandBlock.java @@ -1,30 +1,61 @@ package com.mmodding.extravaganza.block; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.mmodding.extravaganza.init.ExtravaganzaBlocks; +import com.mmodding.extravaganza.init.ExtravaganzaItems; import com.mojang.serialization.MapCodec; import net.minecraft.block.*; import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.item.ItemStack; import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.Property; +import net.minecraft.util.Hand; +import net.minecraft.util.ItemActionResult; +import net.minecraft.util.Util; +import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.BlockView; +import net.minecraft.world.World; import net.minecraft.world.WorldAccess; +import java.util.Map; + public class GarlandBlock extends ConnectingBlock { public static final MapCodec CODEC = GarlandBlock.createCodec(GarlandBlock::new); + public static final BooleanProperty ATTACHED_NORTH = BooleanProperty.of("attached_north"); + public static final BooleanProperty ATTACHED_EAST = BooleanProperty.of("attached_east"); + public static final BooleanProperty ATTACHED_SOUTH = BooleanProperty.of("attached_south"); + public static final BooleanProperty ATTACHED_WEST = BooleanProperty.of("attached_west"); + public static final BooleanProperty ATTACHED_UP = BooleanProperty.of("attached_up"); + public static final BooleanProperty ATTACHED_DOWN = BooleanProperty.of("attached_down"); + + public static final Map ATTACHED_FACING_PROPERTIES = ImmutableMap.copyOf(Util.make(Maps.newEnumMap(Direction.class), directions -> { + directions.put(Direction.NORTH, ATTACHED_NORTH); + directions.put(Direction.EAST, ATTACHED_EAST); + directions.put(Direction.SOUTH, ATTACHED_SOUTH); + directions.put(Direction.WEST, ATTACHED_WEST); + directions.put(Direction.UP, ATTACHED_UP); + directions.put(Direction.DOWN, ATTACHED_DOWN); + })); + public GarlandBlock(Settings settings) { - super(0.3125F, settings); + super(0.15f, settings); this.setDefaultState( this.getDefaultState() - .with(NORTH, false) - .with(EAST, false) - .with(SOUTH, false) - .with(WEST, false) - .with(UP, false) - .with(DOWN, false) + .with(NORTH, false).with(EAST, false) + .with(SOUTH, false).with(WEST, false) + .with(UP, false).with(DOWN, false) + .with(ATTACHED_NORTH, false).with(ATTACHED_EAST, false) + .with(ATTACHED_SOUTH, false).with(ATTACHED_WEST, false) + .with(ATTACHED_UP, false).with(ATTACHED_DOWN, false) ); } @@ -33,9 +64,73 @@ public MapCodec getCodec() { return GarlandBlock.CODEC; } + private Direction determineDirection(BlockHitResult hit) { + double x = hit.getPos().x + -1 * Math.floor(hit.getPos().x); + double y = hit.getPos().y + -1 * Math.floor(hit.getPos().y); + double z = hit.getPos().z + -1 * Math.floor(hit.getPos().z); + Vec3d vector = new Vec3d(x >= 0 ? x - 0.5 : x + 0.5, y >= 0 ? y - 0.5 : y + 0.5, z >= 0 ? z - 0.5 : z + 0.5); + if (Math.abs(vector.x) == 0.5) { + return hit.getSide(); + } + else if (Math.abs(vector.x) >= Math.abs(vector.y) && Math.abs(vector.x) >= Math.abs(vector.z)) { + if (vector.x > 0.0) { + return Direction.EAST; + } + else if (vector.x < -0.0) { + return Direction.WEST; + } + } + if (Math.abs(vector.y) == 0.5) { + return hit.getSide(); + } + else if (Math.abs(vector.y) >= Math.abs(vector.x) && Math.abs(vector.y) >= Math.abs(vector.z)) { + if (vector.y > 0.0) { + return Direction.UP; + } + else if (vector.y < -0.0) { + return Direction.DOWN; + } + } + if (Math.abs(vector.z) == 0.5) { + return hit.getSide(); + } + else if (Math.abs(vector.z) >= Math.abs(vector.x) && Math.abs(vector.z) >= Math.abs(vector.y)) { + if (vector.z > 0.0) { + return Direction.SOUTH; + } + else if (vector.z < -0.0) { + return Direction.NORTH; + } + } + return hit.getSide(); + } + + @Override + protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + BlockState blockState = world.getBlockState(pos.offset(this.determineDirection(hit))); + Property property = GarlandBlock.FACING_PROPERTIES.get(this.determineDirection(hit).getOpposite()); + boolean bool = !blockState.contains(property) || !blockState.get(property); + if (stack.isOf(ExtravaganzaItems.WRENCH_AGANZA) && bool) { + world.setBlockState( + pos, + state.with( + GarlandBlock.FACING_PROPERTIES.get(this.determineDirection(hit)), + !state.get(GarlandBlock.ATTACHED_FACING_PROPERTIES.get(this.determineDirection(hit))) + ).with( + GarlandBlock.ATTACHED_FACING_PROPERTIES.get(this.determineDirection(hit)), + !state.get(GarlandBlock.ATTACHED_FACING_PROPERTIES.get(this.determineDirection(hit))) + ) + ); + return ItemActionResult.SUCCESS; + } + else { + return super.onUseWithItem(stack, state, world, pos, player, hand, hit); + } + } + @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - return withConnectionProperties(ctx.getWorld(), ctx.getBlockPos(), this.getDefaultState()); + return GarlandBlock.withConnectionProperties(ctx.getWorld(), ctx.getBlockPos(), this.getDefaultState()); } public static BlockState withConnectionProperties(BlockView world, BlockPos pos, BlockState state) { @@ -58,13 +153,17 @@ public static BlockState withConnectionProperties(BlockView world, BlockPos pos, 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) + neighborState.isOf(this) || state.get(GarlandBlock.ATTACHED_FACING_PROPERTIES.get(direction)) + ).with( + GarlandBlock.ATTACHED_FACING_PROPERTIES.get(direction), + !neighborState.isOf(this) && state.get(GarlandBlock.ATTACHED_FACING_PROPERTIES.get(direction)) ); } @Override protected void appendProperties(StateManager.Builder builder) { builder.add(NORTH, EAST, SOUTH, WEST, UP, DOWN); + builder.add(ATTACHED_NORTH, ATTACHED_EAST, ATTACHED_SOUTH, ATTACHED_WEST, ATTACHED_UP, ATTACHED_DOWN); } @Override diff --git a/src/main/java/com/mmodding/extravaganza/block/entity/BallPoolRegistrationTableBlockEntity.java b/src/main/java/com/mmodding/extravaganza/block/entity/BallPoolRegistrationTableBlockEntity.java index 4c13c502..b42d34eb 100644 --- a/src/main/java/com/mmodding/extravaganza/block/entity/BallPoolRegistrationTableBlockEntity.java +++ b/src/main/java/com/mmodding/extravaganza/block/entity/BallPoolRegistrationTableBlockEntity.java @@ -17,6 +17,8 @@ import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; +import java.util.function.Consumer; + public class BallPoolRegistrationTableBlockEntity extends BlockEntity { private final PoolSettings poolSettings = new PoolSettings(); @@ -37,6 +39,7 @@ protected void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLo NbtCompound scannedPoolContent = nbt.getCompound("scanned_pool_content"); NbtCompound startPos = scannedPoolContent.getCompound("start_pos"); NbtCompound endPos = scannedPoolContent.getCompound("end_pos"); + this.scannedStart = new BlockPos(startPos.getInt("x"), startPos.getInt("y"), startPos.getInt("z")); this.scannedEnd = new BlockPos(endPos.getInt("x"), endPos.getInt("y"), endPos.getInt("z")); this.poolSettings.fromNbt(nbt.getCompound("pool_settings")); @@ -127,20 +130,36 @@ public BlockPos getScannedCurrent() { return this.isSource() ? this.getScannedStart() : this.getScannedEnd(); } - public void setScannedStart(BlockPos pos) { + public void setScannedStart(BlockPos pos, Consumer deleter) { + BlockPos previousStart = this.scannedStart; this.scannedStart = pos; + BlockPos.iterate(this.getPos().add(previousStart), this.getPos().add(this.scannedEnd)).forEach( + current -> { + if (!this.getFullScanned().contains(Vec3d.of(current))) { + deleter.accept(current); + } + } + ); } - public void setScannedEnd(BlockPos pos) { + public void setScannedEnd(BlockPos pos, Consumer deleter) { + BlockPos previousEnd = this.scannedEnd; this.scannedEnd = pos; + BlockPos.iterate(this.getPos().add(this.scannedStart), this.getPos().add(previousEnd)).forEach( + current -> { + if (!this.getFullScanned().contains(Vec3d.of(current))) { + deleter.accept(current); + } + } + ); } - public void setScannedCurrent(BlockPos pos) { + public void setScannedCurrent(BlockPos pos, Consumer deleter) { if (this.isSource()) { - this.setScannedStart(pos); + this.setScannedStart(pos, deleter); } else { - this.setScannedEnd(pos); + this.setScannedEnd(pos, deleter); } } @@ -149,7 +168,7 @@ public void switchSelectionMode() { } public void switchSource() { - this.source = !source; + this.source = !this.source; } public static class PoolSettings { diff --git a/src/main/java/com/mmodding/extravaganza/item/WrenchAganzaItem.java b/src/main/java/com/mmodding/extravaganza/item/WrenchAganzaItem.java index fc85242d..6eed514b 100644 --- a/src/main/java/com/mmodding/extravaganza/item/WrenchAganzaItem.java +++ b/src/main/java/com/mmodding/extravaganza/item/WrenchAganzaItem.java @@ -2,6 +2,7 @@ import com.mmodding.extravaganza.block.BallPoolRegistrationTableBlock; import com.mmodding.extravaganza.block.entity.BallPoolRegistrationTableBlockEntity; +import com.mmodding.extravaganza.init.ExtravaganzaBlocks; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -12,6 +13,8 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import java.util.function.Consumer; + public class WrenchAganzaItem extends Item { public WrenchAganzaItem(Settings settings) { @@ -21,15 +24,28 @@ public WrenchAganzaItem(Settings settings) { @Override public boolean canMine(BlockState state, World world, BlockPos pos, PlayerEntity miner) { if (world.getBlockEntity(pos) instanceof BallPoolRegistrationTableBlockEntity bpitbe && !world.getBlockState(pos).get(BallPoolRegistrationTableBlock.LOCK_SCAN)) { - bpitbe.switchSelectionMode(); - if (!world.isClient()) { - Object object; - if (bpitbe.getSelectionMode().equals(BallPoolRegistrationTableBlockEntity.SelectionMode.SOURCE)) { - object = bpitbe.isSource(); - } else { - object = bpitbe.getScannedCurrent(); + if (!miner.isSneaking() || world.getBlockState(pos).get(BallPoolRegistrationTableBlock.LOCK_SETTINGS)) { + bpitbe.switchSelectionMode(); + if (!world.isClient()) { + Object object; + if (bpitbe.getSelectionMode().equals(BallPoolRegistrationTableBlockEntity.SelectionMode.SOURCE)) { + object = bpitbe.isSource(); + } else { + object = bpitbe.getScannedCurrent(); + } + miner.sendMessage(Text.literal(bpitbe.getSelectionMode().asString() + ": " + object), true); + } + } + else { + if (bpitbe.getPoolSettings().power < 15) { + bpitbe.getPoolSettings().power = MathHelper.clamp(bpitbe.getPoolSettings().power + 1, 1, 15); + } + else { + bpitbe.getPoolSettings().power = 1; + } + if (!world.isClient()) { + miner.sendMessage(Text.translatable("enchantment.minecraft.power").append(": " + bpitbe.getPoolSettings().power), true); } - miner.sendMessage(Text.literal(bpitbe.getSelectionMode().asString() + ": " + object), true); } } return false; @@ -39,14 +55,19 @@ public boolean canMine(BlockState state, World world, BlockPos pos, PlayerEntity public ActionResult useOnBlock(ItemUsageContext context) { if (context.getWorld().getBlockEntity(context.getBlockPos()) instanceof BallPoolRegistrationTableBlockEntity bpitbe) { assert context.getPlayer() != null; - if (!context.getPlayer().isSneaking() && !context.getWorld().getBlockState(context.getBlockPos()).get(BallPoolRegistrationTableBlock.LOCK_SCAN)) { + if (!context.getWorld().getBlockState(context.getBlockPos()).get(BallPoolRegistrationTableBlock.LOCK_SCAN)) { + Consumer deleter = blockPos -> { + if (context.getWorld().getBlockState(blockPos).isOf(ExtravaganzaBlocks.BALL_POOL_PROTECTION)) { + context.getWorld().removeBlock(blockPos, false); + } + }; switch (bpitbe.getSelectionMode()) { - case POSITIVE_X -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(1, 0, 0)); - case NEGATIVE_X -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(-1, 0, 0)); - case POSITIVE_Y -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(0, 1, 0)); - case NEGATIVE_Y -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(0, -1, 0)); - case POSITIVE_Z -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(0, 0, 1)); - case NEGATIVE_Z -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(0, 0, -1)); + case POSITIVE_X -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(1, 0, 0), deleter); + case NEGATIVE_X -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(-1, 0, 0), deleter); + case POSITIVE_Y -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(0, 1, 0), deleter); + case NEGATIVE_Y -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(0, -1, 0), deleter); + case POSITIVE_Z -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(0, 0, 1), deleter); + case NEGATIVE_Z -> bpitbe.setScannedCurrent(bpitbe.getScannedCurrent().add(0, 0, -1), deleter); case SOURCE -> bpitbe.switchSource(); } if (!context.getWorld().isClient()) { @@ -61,22 +82,7 @@ public ActionResult useOnBlock(ItemUsageContext context) { } return ActionResult.SUCCESS; } - if (!context.getPlayer().isSneaking() && !context.getWorld().getBlockState(context.getBlockPos()).get(BallPoolRegistrationTableBlock.LOCK_SETTINGS)) { - if (bpitbe.getPoolSettings().power < 15) { - bpitbe.getPoolSettings().power = MathHelper.clamp(bpitbe.getPoolSettings().power + 1, 1, 15); - } - else { - bpitbe.getPoolSettings().power = 1; - } - if (!context.getWorld().isClient()) { - context.getPlayer().sendMessage(Text.translatable("enchantment.minecraft.power").append(": " + bpitbe.getPoolSettings().power), true); - } - return ActionResult.SUCCESS; - } - return ActionResult.FAIL; - } - else { - return super.useOnBlock(context); } + return super.useOnBlock(context); } } diff --git a/src/main/java/com/mmodding/extravaganza/mixin/ClientPlayerInteractionManagerMixin.java b/src/main/java/com/mmodding/extravaganza/mixin/ClientPlayerInteractionManagerMixin.java index 7472bdc3..99d4b7ba 100644 --- a/src/main/java/com/mmodding/extravaganza/mixin/ClientPlayerInteractionManagerMixin.java +++ b/src/main/java/com/mmodding/extravaganza/mixin/ClientPlayerInteractionManagerMixin.java @@ -2,7 +2,6 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.mmodding.extravaganza.block.TrashCanBlock; -import com.mmodding.extravaganza.init.ExtravaganzaBlocks; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.network.ClientPlayerInteractionManager; import net.minecraft.util.Hand; @@ -15,6 +14,6 @@ public class ClientPlayerInteractionManagerMixin { @ModifyExpressionValue(method = "interactBlockInternal", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;shouldCancelInteraction()Z")) private boolean allowTrashCan(boolean original, ClientPlayerEntity player, Hand hand, BlockHitResult hitResult) { - return original && !(player.getWorld().getBlockState(hitResult.getBlockPos()).getBlock() instanceof TrashCanBlock) && !player.getWorld().getBlockState(hitResult.getBlockPos()).isOf(ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE); + return original && !(player.getWorld().getBlockState(hitResult.getBlockPos()).getBlock() instanceof TrashCanBlock); } } diff --git a/src/main/java/com/mmodding/extravaganza/mixin/ServerPlayerInteractionManagerMixin.java b/src/main/java/com/mmodding/extravaganza/mixin/ServerPlayerInteractionManagerMixin.java index 3d7a12f7..370868d8 100644 --- a/src/main/java/com/mmodding/extravaganza/mixin/ServerPlayerInteractionManagerMixin.java +++ b/src/main/java/com/mmodding/extravaganza/mixin/ServerPlayerInteractionManagerMixin.java @@ -2,7 +2,6 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.mmodding.extravaganza.block.TrashCanBlock; -import com.mmodding.extravaganza.init.ExtravaganzaBlocks; import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerInteractionManager; @@ -17,6 +16,6 @@ public class ServerPlayerInteractionManagerMixin { @ModifyExpressionValue(method = "interactBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;shouldCancelInteraction()Z")) private boolean allowTrashCan(boolean original, ServerPlayerEntity player, World world, ItemStack stack, Hand hand, BlockHitResult hitResult) { - return original && !(world.getBlockState(hitResult.getBlockPos()).getBlock() instanceof TrashCanBlock) && !player.getWorld().getBlockState(hitResult.getBlockPos()).isOf(ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE); + return original && !(world.getBlockState(hitResult.getBlockPos()).getBlock() instanceof TrashCanBlock); } } diff --git a/src/main/resources/assets/extravaganza/models/block/attached_garland_down.json b/src/main/resources/assets/extravaganza/models/block/attached_garland_down.json new file mode 100644 index 00000000..a44cf893 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/attached_garland_down.json @@ -0,0 +1,48 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland", + "3": "extravaganza:block/hevea_brasiliensis_log" + }, + "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"} + } + }, + { + "from": [6, 0, 6], + "to": [10, 4, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 2, 8]}, + "faces": { + "north": {"uv": [4, 4, 12, 12], "texture": "#3"}, + "east": {"uv": [4, 4, 12, 12], "texture": "#3"}, + "south": {"uv": [4, 4, 12, 12], "texture": "#3"}, + "west": {"uv": [4, 4, 12, 12], "texture": "#3"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#3"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#3"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/attached_garland_east.json b/src/main/resources/assets/extravaganza/models/block/attached_garland_east.json new file mode 100644 index 00000000..9357d4e2 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/attached_garland_east.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland", + "2": "extravaganza:block/hevea_brasiliensis_log", + "particle": "extravaganza:block/hevea_brasiliensis_log" + }, + "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"} + } + }, + { + "from": [12, 6, 6], + "to": [16, 10, 10], + "rotation": {"angle": 0, "axis": "z", "origin": [14, 8, 8]}, + "faces": { + "north": {"uv": [4, 4, 12, 12], "rotation": 270, "texture": "#2"}, + "east": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"}, + "south": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"}, + "west": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"}, + "up": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"}, + "down": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/attached_garland_north.json b/src/main/resources/assets/extravaganza/models/block/attached_garland_north.json new file mode 100644 index 00000000..8c6e746e --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/attached_garland_north.json @@ -0,0 +1,48 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland", + "3": "extravaganza:block/hevea_brasiliensis_log" + }, + "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"} + } + }, + { + "from": [6, 6, 0], + "to": [10, 10, 4], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 2]}, + "faces": { + "north": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#3"}, + "east": {"uv": [4, 4, 12, 12], "rotation": 270, "texture": "#3"}, + "south": {"uv": [4, 4, 12, 12], "texture": "#3"}, + "west": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#3"}, + "up": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#3"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#3"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/attached_garland_south.json b/src/main/resources/assets/extravaganza/models/block/attached_garland_south.json new file mode 100644 index 00000000..33cefced --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/attached_garland_south.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland", + "2": "extravaganza:block/hevea_brasiliensis_log", + "particle": "extravaganza:block/hevea_brasiliensis_log" + }, + "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"} + } + }, + { + "from": [6, 6, 12], + "to": [10, 10, 16], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 14]}, + "faces": { + "north": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#2"}, + "east": {"uv": [4, 4, 12, 12], "rotation": 270, "texture": "#2"}, + "south": {"uv": [4, 4, 12, 12], "texture": "#2"}, + "west": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"}, + "up": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#2"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#2"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/attached_garland_up.json b/src/main/resources/assets/extravaganza/models/block/attached_garland_up.json new file mode 100644 index 00000000..ccd6a518 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/attached_garland_up.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland", + "2": "extravaganza:block/hevea_brasiliensis_log", + "particle": "extravaganza:block/hevea_brasiliensis_log" + }, + "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"} + } + }, + { + "from": [6, 12, 6], + "to": [10, 16, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [4, 4, 12, 12], "texture": "#2"}, + "east": {"uv": [4, 4, 12, 12], "texture": "#2"}, + "south": {"uv": [4, 4, 12, 12], "texture": "#2"}, + "west": {"uv": [4, 4, 12, 12], "texture": "#2"}, + "up": {"uv": [4, 4, 12, 12], "texture": "#2"}, + "down": {"uv": [4, 4, 12, 12], "texture": "#2"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/attached_garland_west.json b/src/main/resources/assets/extravaganza/models/block/attached_garland_west.json new file mode 100644 index 00000000..756b63d6 --- /dev/null +++ b/src/main/resources/assets/extravaganza/models/block/attached_garland_west.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "extravaganza:block/garland", + "2": "extravaganza:block/hevea_brasiliensis_log", + "particle": "extravaganza:block/hevea_brasiliensis_log" + }, + "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"} + } + }, + { + "from": [0, 6, 6], + "to": [4, 10, 10], + "rotation": {"angle": 0, "axis": "z", "origin": [2, 8, 8]}, + "faces": { + "north": {"uv": [4, 4, 12, 12], "rotation": 270, "texture": "#2"}, + "east": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"}, + "south": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"}, + "west": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"}, + "up": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"}, + "down": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#2"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/models/block/ball_distributor_up.json b/src/main/resources/assets/extravaganza/models/block/ball_distributor_up.json index 4640ace6..787a2276 100644 --- a/src/main/resources/assets/extravaganza/models/block/ball_distributor_up.json +++ b/src/main/resources/assets/extravaganza/models/block/ball_distributor_up.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "texture_size": [48, 48], + "texture_size": [64, 64], "textures": { "main": "extravaganza:block/ball_distributor_up", "balls": "extravaganza:block/ball_pool_content", @@ -12,12 +12,12 @@ "to": [5, 4.25, 5], "rotation": {"angle": 0, "axis": "y", "origin": [1, 0.25, 1]}, "faces": { - "north": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "east": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "south": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "west": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "up": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "down": {"uv": [8, 8, 12, 12], "texture": "#balls"} + "north": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "east": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "south": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "west": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "up": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "down": {"uv": [6, 6, 9, 9], "texture": "#balls"} } }, { @@ -25,12 +25,12 @@ "to": [6, 4.25, 10], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0.25, 6]}, "faces": { - "north": {"uv": [12, 8, 16, 12], "texture": "#balls"}, - "east": {"uv": [12, 8, 16, 12], "texture": "#balls"}, - "south": {"uv": [12, 8, 16, 12], "texture": "#balls"}, - "west": {"uv": [12, 8, 16, 12], "texture": "#balls"}, - "up": {"uv": [12, 8, 16, 12], "texture": "#balls"}, - "down": {"uv": [12, 8, 16, 12], "texture": "#balls"} + "north": {"uv": [9, 6, 12, 9], "texture": "#balls"}, + "east": {"uv": [9, 6, 12, 9], "texture": "#balls"}, + "south": {"uv": [9, 6, 12, 9], "texture": "#balls"}, + "west": {"uv": [9, 6, 12, 9], "texture": "#balls"}, + "up": {"uv": [9, 6, 12, 9], "texture": "#balls"}, + "down": {"uv": [9, 6, 12, 9], "texture": "#balls"} } }, { @@ -38,12 +38,12 @@ "to": [11, 4.25, 10], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0.25, 6]}, "faces": { - "north": {"uv": [0, 12, 4, 16], "texture": "#balls"}, - "east": {"uv": [0, 12, 4, 16], "texture": "#balls"}, - "south": {"uv": [0, 12, 4, 16], "texture": "#balls"}, - "west": {"uv": [0, 12, 4, 16], "texture": "#balls"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#balls"}, - "down": {"uv": [0, 12, 4, 16], "texture": "#balls"} + "north": {"uv": [0, 9, 3, 12], "texture": "#balls"}, + "east": {"uv": [0, 9, 3, 12], "texture": "#balls"}, + "south": {"uv": [0, 9, 3, 12], "texture": "#balls"}, + "west": {"uv": [0, 9, 3, 12], "texture": "#balls"}, + "up": {"uv": [0, 9, 3, 12], "texture": "#balls"}, + "down": {"uv": [0, 9, 3, 12], "texture": "#balls"} } }, { @@ -51,12 +51,12 @@ "to": [10, 4.25, 5], "rotation": {"angle": 0, "axis": "y", "origin": [6, 0.25, 1]}, "faces": { - "north": {"uv": [4, 12, 8, 16], "texture": "#balls"}, - "east": {"uv": [4, 12, 8, 16], "texture": "#balls"}, - "south": {"uv": [4, 12, 8, 16], "texture": "#balls"}, - "west": {"uv": [4, 12, 8, 16], "texture": "#balls"}, - "up": {"uv": [4, 12, 8, 16], "texture": "#balls"}, - "down": {"uv": [4, 12, 8, 16], "texture": "#balls"} + "north": {"uv": [3, 9, 6, 12], "texture": "#balls"}, + "east": {"uv": [3, 9, 6, 12], "texture": "#balls"}, + "south": {"uv": [3, 9, 6, 12], "texture": "#balls"}, + "west": {"uv": [3, 9, 6, 12], "texture": "#balls"}, + "up": {"uv": [3, 9, 6, 12], "texture": "#balls"}, + "down": {"uv": [3, 9, 6, 12], "texture": "#balls"} } }, { @@ -64,12 +64,12 @@ "to": [15, 4.25, 4.25], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0.25, 0.25]}, "faces": { - "north": {"uv": [8, 12, 12, 16], "texture": "#balls"}, - "east": {"uv": [8, 12, 12, 16], "texture": "#balls"}, - "south": {"uv": [8, 12, 12, 16], "texture": "#balls"}, - "west": {"uv": [8, 12, 12, 16], "texture": "#balls"}, - "up": {"uv": [8, 12, 12, 16], "texture": "#balls"}, - "down": {"uv": [8, 12, 12, 16], "texture": "#balls"} + "north": {"uv": [6, 9, 9, 12], "texture": "#balls"}, + "east": {"uv": [6, 9, 9, 12], "texture": "#balls"}, + "south": {"uv": [6, 9, 9, 12], "texture": "#balls"}, + "west": {"uv": [6, 9, 9, 12], "texture": "#balls"}, + "up": {"uv": [6, 9, 9, 12], "texture": "#balls"}, + "down": {"uv": [6, 9, 9, 12], "texture": "#balls"} } }, { @@ -77,12 +77,12 @@ "to": [5, 4.25, 15], "rotation": {"angle": 0, "axis": "y", "origin": [1, 0.25, 11]}, "faces": { - "north": {"uv": [0, 8, 4, 12], "texture": "#balls"}, - "east": {"uv": [0, 8, 4, 12], "texture": "#balls"}, - "south": {"uv": [0, 8, 4, 12], "texture": "#balls"}, - "west": {"uv": [0, 8, 4, 12], "texture": "#balls"}, - "up": {"uv": [0, 8, 4, 12], "texture": "#balls"}, - "down": {"uv": [0, 8, 4, 12], "texture": "#balls"} + "north": {"uv": [0, 6, 3, 9], "texture": "#balls"}, + "east": {"uv": [0, 6, 3, 9], "texture": "#balls"}, + "south": {"uv": [0, 6, 3, 9], "texture": "#balls"}, + "west": {"uv": [0, 6, 3, 9], "texture": "#balls"}, + "up": {"uv": [0, 6, 3, 9], "texture": "#balls"}, + "down": {"uv": [0, 6, 3, 9], "texture": "#balls"} } }, { @@ -90,12 +90,12 @@ "to": [5.5, 12.25, 14.5], "rotation": {"angle": 0, "axis": "y", "origin": [1.5, 8.25, 10.5]}, "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#balls"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#balls"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#balls"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#balls"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#balls"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#balls"} + "north": {"uv": [0, 0, 3, 3], "texture": "#balls"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#balls"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#balls"}, + "west": {"uv": [0, 0, 3, 3], "texture": "#balls"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#balls"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#balls"} } }, { @@ -103,12 +103,12 @@ "to": [11, 4.25, 15.75], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0.25, 11.75]}, "faces": { - "north": {"uv": [4, 0, 8, 4], "texture": "#balls"}, - "east": {"uv": [4, 0, 8, 4], "texture": "#balls"}, - "south": {"uv": [4, 0, 8, 4], "texture": "#balls"}, - "west": {"uv": [4, 0, 8, 4], "texture": "#balls"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#balls"}, - "down": {"uv": [4, 0, 8, 4], "texture": "#balls"} + "north": {"uv": [3, 0, 6, 3], "texture": "#balls"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#balls"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#balls"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#balls"}, + "up": {"uv": [3, 0, 6, 3], "texture": "#balls"}, + "down": {"uv": [3, 0, 6, 3], "texture": "#balls"} } }, { @@ -116,12 +116,12 @@ "to": [15.75, 4.25, 9], "rotation": {"angle": 0, "axis": "y", "origin": [11.75, 0.25, 5]}, "faces": { - "north": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "east": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "south": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "west": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "up": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "down": {"uv": [8, 8, 12, 12], "texture": "#balls"} + "north": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "east": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "south": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "west": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "up": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "down": {"uv": [6, 6, 9, 9], "texture": "#balls"} } }, { @@ -129,12 +129,12 @@ "to": [13.75, 8.25, 9], "rotation": {"angle": 0, "axis": "y", "origin": [9.75, 4.25, 5]}, "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#balls"}, - "east": {"uv": [12, 12, 16, 16], "texture": "#balls"}, - "south": {"uv": [12, 12, 16, 16], "texture": "#balls"}, - "west": {"uv": [12, 12, 16, 16], "texture": "#balls"}, - "up": {"uv": [12, 12, 16, 16], "texture": "#balls"}, - "down": {"uv": [12, 12, 16, 16], "texture": "#balls"} + "north": {"uv": [9, 9, 12, 12], "texture": "#balls"}, + "east": {"uv": [9, 9, 12, 12], "texture": "#balls"}, + "south": {"uv": [9, 9, 12, 12], "texture": "#balls"}, + "west": {"uv": [9, 9, 12, 12], "texture": "#balls"}, + "up": {"uv": [9, 9, 12, 12], "texture": "#balls"}, + "down": {"uv": [9, 9, 12, 12], "texture": "#balls"} } }, { @@ -142,12 +142,12 @@ "to": [12.75, 8.25, 4.25], "rotation": {"angle": 0, "axis": "y", "origin": [8.75, 4.25, 0.25]}, "faces": { - "north": {"uv": [12, 8, 16, 12], "texture": "#balls"}, - "east": {"uv": [12, 8, 16, 12], "texture": "#balls"}, - "south": {"uv": [12, 8, 16, 12], "texture": "#balls"}, - "west": {"uv": [12, 8, 16, 12], "texture": "#balls"}, - "up": {"uv": [12, 8, 16, 12], "texture": "#balls"}, - "down": {"uv": [12, 8, 16, 12], "texture": "#balls"} + "north": {"uv": [9, 6, 12, 9], "texture": "#balls"}, + "east": {"uv": [9, 6, 12, 9], "texture": "#balls"}, + "south": {"uv": [9, 6, 12, 9], "texture": "#balls"}, + "west": {"uv": [9, 6, 12, 9], "texture": "#balls"}, + "up": {"uv": [9, 6, 12, 9], "texture": "#balls"}, + "down": {"uv": [9, 6, 12, 9], "texture": "#balls"} } }, { @@ -155,12 +155,12 @@ "to": [9.75, 8.25, 14], "rotation": {"angle": 0, "axis": "y", "origin": [5.75, 4.25, 10]}, "faces": { - "north": {"uv": [4, 12, 8, 16], "texture": "#balls"}, - "east": {"uv": [4, 12, 8, 16], "texture": "#balls"}, - "south": {"uv": [4, 12, 8, 16], "texture": "#balls"}, - "west": {"uv": [4, 12, 8, 16], "texture": "#balls"}, - "up": {"uv": [4, 12, 8, 16], "texture": "#balls"}, - "down": {"uv": [4, 12, 8, 16], "texture": "#balls"} + "north": {"uv": [3, 9, 6, 12], "texture": "#balls"}, + "east": {"uv": [3, 9, 6, 12], "texture": "#balls"}, + "south": {"uv": [3, 9, 6, 12], "texture": "#balls"}, + "west": {"uv": [3, 9, 6, 12], "texture": "#balls"}, + "up": {"uv": [3, 9, 6, 12], "texture": "#balls"}, + "down": {"uv": [3, 9, 6, 12], "texture": "#balls"} } }, { @@ -168,12 +168,12 @@ "to": [4.75, 8.25, 11], "rotation": {"angle": 0, "axis": "y", "origin": [0.75, 4.25, 7]}, "faces": { - "north": {"uv": [4, 8, 8, 12], "texture": "#balls"}, - "east": {"uv": [4, 8, 8, 12], "texture": "#balls"}, - "south": {"uv": [4, 8, 8, 12], "texture": "#balls"}, - "west": {"uv": [4, 8, 8, 12], "texture": "#balls"}, - "up": {"uv": [4, 8, 8, 12], "texture": "#balls"}, - "down": {"uv": [4, 8, 8, 12], "texture": "#balls"} + "north": {"uv": [3, 6, 6, 9], "texture": "#balls"}, + "east": {"uv": [3, 6, 6, 9], "texture": "#balls"}, + "south": {"uv": [3, 6, 6, 9], "texture": "#balls"}, + "west": {"uv": [3, 6, 6, 9], "texture": "#balls"}, + "up": {"uv": [3, 6, 6, 9], "texture": "#balls"}, + "down": {"uv": [3, 6, 6, 9], "texture": "#balls"} } }, { @@ -181,12 +181,12 @@ "to": [7.75, 8.25, 6], "rotation": {"angle": 0, "axis": "y", "origin": [3.75, 4.25, 2]}, "faces": { - "north": {"uv": [8, 0, 12, 4], "texture": "#balls"}, - "east": {"uv": [8, 0, 12, 4], "texture": "#balls"}, - "south": {"uv": [8, 0, 12, 4], "texture": "#balls"}, - "west": {"uv": [8, 0, 12, 4], "texture": "#balls"}, - "up": {"uv": [8, 0, 12, 4], "texture": "#balls"}, - "down": {"uv": [8, 0, 12, 4], "texture": "#balls"} + "north": {"uv": [6, 0, 9, 3], "texture": "#balls"}, + "east": {"uv": [6, 0, 9, 3], "texture": "#balls"}, + "south": {"uv": [6, 0, 9, 3], "texture": "#balls"}, + "west": {"uv": [6, 0, 9, 3], "texture": "#balls"}, + "up": {"uv": [6, 0, 9, 3], "texture": "#balls"}, + "down": {"uv": [6, 0, 9, 3], "texture": "#balls"} } }, { @@ -194,12 +194,12 @@ "to": [14.75, 8.25, 14], "rotation": {"angle": 0, "axis": "y", "origin": [10.75, 4.25, 10]}, "faces": { - "north": {"uv": [4, 4, 8, 8], "texture": "#balls"}, - "east": {"uv": [4, 4, 8, 8], "texture": "#balls"}, - "south": {"uv": [4, 4, 8, 8], "texture": "#balls"}, - "west": {"uv": [4, 4, 8, 8], "texture": "#balls"}, - "up": {"uv": [4, 4, 8, 8], "texture": "#balls"}, - "down": {"uv": [4, 4, 8, 8], "texture": "#balls"} + "north": {"uv": [3, 3, 6, 6], "texture": "#balls"}, + "east": {"uv": [3, 3, 6, 6], "texture": "#balls"}, + "south": {"uv": [3, 3, 6, 6], "texture": "#balls"}, + "west": {"uv": [3, 3, 6, 6], "texture": "#balls"}, + "up": {"uv": [3, 3, 6, 6], "texture": "#balls"}, + "down": {"uv": [3, 3, 6, 6], "texture": "#balls"} } }, { @@ -207,12 +207,12 @@ "to": [15.5, 4.25, 15], "rotation": {"angle": 0, "axis": "y", "origin": [11.5, 0.25, 11]}, "faces": { - "north": {"uv": [4, 8, 8, 12], "texture": "#balls"}, - "east": {"uv": [4, 8, 8, 12], "texture": "#balls"}, - "south": {"uv": [4, 8, 8, 12], "texture": "#balls"}, - "west": {"uv": [4, 8, 8, 12], "texture": "#balls"}, - "up": {"uv": [4, 8, 8, 12], "texture": "#balls"}, - "down": {"uv": [4, 8, 8, 12], "texture": "#balls"} + "north": {"uv": [3, 6, 6, 9], "texture": "#balls"}, + "east": {"uv": [3, 6, 6, 9], "texture": "#balls"}, + "south": {"uv": [3, 6, 6, 9], "texture": "#balls"}, + "west": {"uv": [3, 6, 6, 9], "texture": "#balls"}, + "up": {"uv": [3, 6, 6, 9], "texture": "#balls"}, + "down": {"uv": [3, 6, 6, 9], "texture": "#balls"} } }, { @@ -220,12 +220,12 @@ "to": [15, 12.25, 14.75], "rotation": {"angle": 0, "axis": "y", "origin": [8.375, 10.25, 7.375]}, "faces": { - "north": {"uv": [8, 4, 12, 8], "texture": "#balls"}, - "east": {"uv": [8, 4, 12, 8], "texture": "#balls"}, - "south": {"uv": [8, 4, 12, 8], "texture": "#balls"}, - "west": {"uv": [8, 4, 12, 8], "texture": "#balls"}, - "up": {"uv": [8, 4, 12, 8], "texture": "#balls"}, - "down": {"uv": [8, 4, 12, 8], "texture": "#balls"} + "north": {"uv": [6, 3, 9, 6], "texture": "#balls"}, + "east": {"uv": [6, 3, 9, 6], "texture": "#balls"}, + "south": {"uv": [6, 3, 9, 6], "texture": "#balls"}, + "west": {"uv": [6, 3, 9, 6], "texture": "#balls"}, + "up": {"uv": [6, 3, 9, 6], "texture": "#balls"}, + "down": {"uv": [6, 3, 9, 6], "texture": "#balls"} } }, { @@ -233,12 +233,12 @@ "to": [15.75, 12.25, 9.75], "rotation": {"angle": 0, "axis": "y", "origin": [8.375, 10.25, 8.375]}, "faces": { - "north": {"uv": [0, 4, 4, 8], "texture": "#balls"}, - "east": {"uv": [0, 4, 4, 8], "texture": "#balls"}, - "south": {"uv": [0, 4, 4, 8], "texture": "#balls"}, - "west": {"uv": [0, 4, 4, 8], "texture": "#balls"}, - "up": {"uv": [0, 4, 4, 8], "texture": "#balls"}, - "down": {"uv": [0, 4, 4, 8], "texture": "#balls"} + "north": {"uv": [0, 3, 3, 6], "texture": "#balls"}, + "east": {"uv": [0, 3, 3, 6], "texture": "#balls"}, + "south": {"uv": [0, 3, 3, 6], "texture": "#balls"}, + "west": {"uv": [0, 3, 3, 6], "texture": "#balls"}, + "up": {"uv": [0, 3, 3, 6], "texture": "#balls"}, + "down": {"uv": [0, 3, 3, 6], "texture": "#balls"} } }, { @@ -246,12 +246,12 @@ "to": [14, 12.25, 5.25], "rotation": {"angle": 0, "axis": "y", "origin": [7.375, 10.25, 8.375]}, "faces": { - "north": {"uv": [4, 0, 8, 4], "texture": "#balls"}, - "east": {"uv": [4, 0, 8, 4], "texture": "#balls"}, - "south": {"uv": [4, 0, 8, 4], "texture": "#balls"}, - "west": {"uv": [4, 0, 8, 4], "texture": "#balls"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#balls"}, - "down": {"uv": [4, 0, 8, 4], "texture": "#balls"} + "north": {"uv": [3, 0, 6, 3], "texture": "#balls"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#balls"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#balls"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#balls"}, + "up": {"uv": [3, 0, 6, 3], "texture": "#balls"}, + "down": {"uv": [3, 0, 6, 3], "texture": "#balls"} } }, { @@ -259,12 +259,12 @@ "to": [10, 12.25, 9.75], "rotation": {"angle": 0, "axis": "y", "origin": [8.375, 10.25, 8.375]}, "faces": { - "north": {"uv": [12, 0, 16, 4], "texture": "#balls"}, - "east": {"uv": [12, 0, 16, 4], "texture": "#balls"}, - "south": {"uv": [12, 0, 16, 4], "texture": "#balls"}, - "west": {"uv": [12, 0, 16, 4], "texture": "#balls"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#balls"}, - "down": {"uv": [12, 0, 16, 4], "texture": "#balls"} + "north": {"uv": [9, 0, 12, 3], "texture": "#balls"}, + "east": {"uv": [9, 0, 12, 3], "texture": "#balls"}, + "south": {"uv": [9, 0, 12, 3], "texture": "#balls"}, + "west": {"uv": [9, 0, 12, 3], "texture": "#balls"}, + "up": {"uv": [9, 0, 12, 3], "texture": "#balls"}, + "down": {"uv": [9, 0, 12, 3], "texture": "#balls"} } }, { @@ -272,12 +272,12 @@ "to": [10, 12.25, 14.25], "rotation": {"angle": 0, "axis": "y", "origin": [8.375, 10.25, 7.875]}, "faces": { - "north": {"uv": [12, 4, 16, 8], "texture": "#balls"}, - "east": {"uv": [12, 4, 16, 8], "texture": "#balls"}, - "south": {"uv": [12, 4, 16, 8], "texture": "#balls"}, - "west": {"uv": [12, 4, 16, 8], "texture": "#balls"}, - "up": {"uv": [12, 4, 16, 8], "texture": "#balls"}, - "down": {"uv": [12, 4, 16, 8], "texture": "#balls"} + "north": {"uv": [9, 3, 12, 6], "texture": "#balls"}, + "east": {"uv": [9, 3, 12, 6], "texture": "#balls"}, + "south": {"uv": [9, 3, 12, 6], "texture": "#balls"}, + "west": {"uv": [9, 3, 12, 6], "texture": "#balls"}, + "up": {"uv": [9, 3, 12, 6], "texture": "#balls"}, + "down": {"uv": [9, 3, 12, 6], "texture": "#balls"} } }, { @@ -285,12 +285,12 @@ "to": [4.25, 8.25, 15.75], "rotation": {"angle": 0, "axis": "y", "origin": [7.625, 6.25, 8.375]}, "faces": { - "north": {"uv": [0, 12, 4, 16], "texture": "#balls"}, - "east": {"uv": [0, 12, 4, 16], "texture": "#balls"}, - "south": {"uv": [0, 12, 4, 16], "texture": "#balls"}, - "west": {"uv": [0, 12, 4, 16], "texture": "#balls"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#balls"}, - "down": {"uv": [0, 12, 4, 16], "texture": "#balls"} + "north": {"uv": [0, 9, 3, 12], "texture": "#balls"}, + "east": {"uv": [0, 9, 3, 12], "texture": "#balls"}, + "south": {"uv": [0, 9, 3, 12], "texture": "#balls"}, + "west": {"uv": [0, 9, 3, 12], "texture": "#balls"}, + "up": {"uv": [0, 9, 3, 12], "texture": "#balls"}, + "down": {"uv": [0, 9, 3, 12], "texture": "#balls"} } }, { @@ -298,12 +298,12 @@ "to": [4.75, 12.25, 9.75], "rotation": {"angle": 0, "axis": "y", "origin": [8.125, 10.25, 8.375]}, "faces": { - "north": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "east": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "south": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "west": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "up": {"uv": [8, 8, 12, 12], "texture": "#balls"}, - "down": {"uv": [8, 8, 12, 12], "texture": "#balls"} + "north": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "east": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "south": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "west": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "up": {"uv": [6, 6, 9, 9], "texture": "#balls"}, + "down": {"uv": [6, 6, 9, 9], "texture": "#balls"} } }, { @@ -311,24 +311,24 @@ "to": [9, 12.25, 5], "rotation": {"angle": 0, "axis": "y", "origin": [8.375, 10.25, 8.375]}, "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#balls"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#balls"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#balls"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#balls"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#balls"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#balls"} + "north": {"uv": [0, 0, 3, 3], "texture": "#balls"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#balls"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#balls"}, + "west": {"uv": [0, 0, 3, 3], "texture": "#balls"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#balls"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#balls"} } }, { "from": [0, 0, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 5.33333, 5.33333], "texture": "#main"}, - "east": {"uv": [0, 5.33333, 5.33333, 10.66667], "texture": "#main"}, - "south": {"uv": [5.33333, 0, 10.66667, 5.33333], "texture": "#main"}, - "west": {"uv": [5.33333, 5.33333, 10.66667, 10.66667], "texture": "#main"}, - "up": {"uv": [5.33333, 16, 0, 10.66667], "texture": "#main"}, - "down": {"uv": [16, 0, 10.66667, 5.33333], "texture": "#main"} + "north": {"uv": [0, 0, 4, 4], "texture": "#main"}, + "east": {"uv": [0, 4, 4, 8], "texture": "#main"}, + "south": {"uv": [4, 0, 8, 4], "texture": "#main"}, + "west": {"uv": [4, 4, 8, 8], "texture": "#main"}, + "up": {"uv": [4, 12, 0, 8], "texture": "#main"}, + "down": {"uv": [12, 0, 8, 4], "texture": "#main"} } } ] diff --git a/src/main/resources/assets/extravaganza/models/block/ball_pool_content.json b/src/main/resources/assets/extravaganza/models/block/ball_pool_content.json index f71b92e8..fb166139 100644 --- a/src/main/resources/assets/extravaganza/models/block/ball_pool_content.json +++ b/src/main/resources/assets/extravaganza/models/block/ball_pool_content.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "texture_size": [24, 24], + "texture_size": [32, 32], "textures": { "main": "extravaganza:block/ball_pool_content", "particle": "extravaganza:block/ball_pool_content" @@ -11,12 +11,12 @@ "to": [14, 8, 14], "rotation": {"angle": 0, "axis": "y", "origin": [10, 4, 10]}, "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#main"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#main"} + "north": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#main"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "west": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#main"} } }, { @@ -24,12 +24,12 @@ "to": [5, 4, 5], "rotation": {"angle": 0, "axis": "y", "origin": [1, 0, 1]}, "faces": { - "north": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "east": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "south": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "west": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "down": {"uv": [4, 0, 8, 4], "texture": "#main"} + "north": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "up": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "down": {"uv": [3, 0, 6, 3], "texture": "#main"} } }, { @@ -37,12 +37,12 @@ "to": [10, 7, 5], "rotation": {"angle": 0, "axis": "y", "origin": [6, 3, 1]}, "faces": { - "north": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "east": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "south": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "west": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "up": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "down": {"uv": [8, 0, 12, 4], "texture": "#main"} + "north": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "east": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "south": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "west": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "up": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "down": {"uv": [6, 0, 9, 3], "texture": "#main"} } }, { @@ -50,12 +50,12 @@ "to": [6, 4, 10], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 6]}, "faces": { - "north": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "east": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "south": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "west": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "down": {"uv": [12, 0, 16, 4], "texture": "#main"} + "north": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "east": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "south": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "west": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "up": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "down": {"uv": [9, 0, 12, 3], "texture": "#main"} } }, { @@ -63,12 +63,12 @@ "to": [6, 4, 15], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, "faces": { - "north": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "east": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "south": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "west": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "up": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "down": {"uv": [0, 4, 4, 8], "texture": "#main"} + "north": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "east": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "south": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "west": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "up": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "down": {"uv": [0, 3, 3, 6], "texture": "#main"} } }, { @@ -76,12 +76,12 @@ "to": [12, 4, 6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 2]}, "faces": { - "north": {"uv": [4, 4, 8, 8], "texture": "#main"}, - "east": {"uv": [4, 4, 8, 8], "texture": "#main"}, - "south": {"uv": [4, 4, 8, 8], "texture": "#main"}, - "west": {"uv": [4, 4, 8, 8], "texture": "#main"}, - "up": {"uv": [4, 4, 8, 8], "texture": "#main"}, - "down": {"uv": [4, 4, 8, 8], "texture": "#main"} + "north": {"uv": [3, 3, 6, 6], "texture": "#main"}, + "east": {"uv": [3, 3, 6, 6], "texture": "#main"}, + "south": {"uv": [3, 3, 6, 6], "texture": "#main"}, + "west": {"uv": [3, 3, 6, 6], "texture": "#main"}, + "up": {"uv": [3, 3, 6, 6], "texture": "#main"}, + "down": {"uv": [3, 3, 6, 6], "texture": "#main"} } }, { @@ -89,12 +89,12 @@ "to": [11, 4, 15], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 11]}, "faces": { - "north": {"uv": [8, 4, 12, 8], "texture": "#main"}, - "east": {"uv": [8, 4, 12, 8], "texture": "#main"}, - "south": {"uv": [8, 4, 12, 8], "texture": "#main"}, - "west": {"uv": [8, 4, 12, 8], "texture": "#main"}, - "up": {"uv": [8, 4, 12, 8], "texture": "#main"}, - "down": {"uv": [8, 4, 12, 8], "texture": "#main"} + "north": {"uv": [6, 3, 9, 6], "texture": "#main"}, + "east": {"uv": [6, 3, 9, 6], "texture": "#main"}, + "south": {"uv": [6, 3, 9, 6], "texture": "#main"}, + "west": {"uv": [6, 3, 9, 6], "texture": "#main"}, + "up": {"uv": [6, 3, 9, 6], "texture": "#main"}, + "down": {"uv": [6, 3, 9, 6], "texture": "#main"} } }, { @@ -102,12 +102,12 @@ "to": [11, 4, 10], "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 6]}, "faces": { - "north": {"uv": [12, 4, 16, 8], "texture": "#main"}, - "east": {"uv": [12, 4, 16, 8], "texture": "#main"}, - "south": {"uv": [12, 4, 16, 8], "texture": "#main"}, - "west": {"uv": [12, 4, 16, 8], "texture": "#main"}, - "up": {"uv": [12, 4, 16, 8], "texture": "#main"}, - "down": {"uv": [12, 4, 16, 8], "texture": "#main"} + "north": {"uv": [9, 3, 12, 6], "texture": "#main"}, + "east": {"uv": [9, 3, 12, 6], "texture": "#main"}, + "south": {"uv": [9, 3, 12, 6], "texture": "#main"}, + "west": {"uv": [9, 3, 12, 6], "texture": "#main"}, + "up": {"uv": [9, 3, 12, 6], "texture": "#main"}, + "down": {"uv": [9, 3, 12, 6], "texture": "#main"} } }, { @@ -115,12 +115,12 @@ "to": [5, 8, 9], "rotation": {"angle": 0, "axis": "y", "origin": [1, 4, 5]}, "faces": { - "north": {"uv": [0, 8, 4, 12], "texture": "#main"}, - "east": {"uv": [0, 8, 4, 12], "texture": "#main"}, - "south": {"uv": [0, 8, 4, 12], "texture": "#main"}, - "west": {"uv": [0, 8, 4, 12], "texture": "#main"}, - "up": {"uv": [0, 8, 4, 12], "texture": "#main"}, - "down": {"uv": [0, 8, 4, 12], "texture": "#main"} + "north": {"uv": [0, 6, 3, 9], "texture": "#main"}, + "east": {"uv": [0, 6, 3, 9], "texture": "#main"}, + "south": {"uv": [0, 6, 3, 9], "texture": "#main"}, + "west": {"uv": [0, 6, 3, 9], "texture": "#main"}, + "up": {"uv": [0, 6, 3, 9], "texture": "#main"}, + "down": {"uv": [0, 6, 3, 9], "texture": "#main"} } }, { @@ -128,12 +128,12 @@ "to": [5, 8, 15], "rotation": {"angle": 0, "axis": "y", "origin": [1, 4, 11]}, "faces": { - "north": {"uv": [4, 8, 8, 12], "texture": "#main"}, - "east": {"uv": [4, 8, 8, 12], "texture": "#main"}, - "south": {"uv": [4, 8, 8, 12], "texture": "#main"}, - "west": {"uv": [4, 8, 8, 12], "texture": "#main"}, - "up": {"uv": [4, 8, 8, 12], "texture": "#main"}, - "down": {"uv": [4, 8, 8, 12], "texture": "#main"} + "north": {"uv": [3, 6, 6, 9], "texture": "#main"}, + "east": {"uv": [3, 6, 6, 9], "texture": "#main"}, + "south": {"uv": [3, 6, 6, 9], "texture": "#main"}, + "west": {"uv": [3, 6, 6, 9], "texture": "#main"}, + "up": {"uv": [3, 6, 6, 9], "texture": "#main"}, + "down": {"uv": [3, 6, 6, 9], "texture": "#main"} } }, { @@ -141,12 +141,12 @@ "to": [10, 8, 11], "rotation": {"angle": 0, "axis": "y", "origin": [6, 4, 7]}, "faces": { - "north": {"uv": [8, 8, 12, 12], "texture": "#main"}, - "east": {"uv": [8, 8, 12, 12], "texture": "#main"}, - "south": {"uv": [8, 8, 12, 12], "texture": "#main"}, - "west": {"uv": [8, 8, 12, 12], "texture": "#main"}, - "up": {"uv": [8, 8, 12, 12], "texture": "#main"}, - "down": {"uv": [8, 8, 12, 12], "texture": "#main"} + "north": {"uv": [6, 6, 9, 9], "texture": "#main"}, + "east": {"uv": [6, 6, 9, 9], "texture": "#main"}, + "south": {"uv": [6, 6, 9, 9], "texture": "#main"}, + "west": {"uv": [6, 6, 9, 9], "texture": "#main"}, + "up": {"uv": [6, 6, 9, 9], "texture": "#main"}, + "down": {"uv": [6, 6, 9, 9], "texture": "#main"} } }, { @@ -154,12 +154,12 @@ "to": [16, 8, 9], "rotation": {"angle": 0, "axis": "y", "origin": [12, 4, 5]}, "faces": { - "north": {"uv": [12, 8, 16, 12], "texture": "#main"}, - "east": {"uv": [12, 8, 16, 12], "texture": "#main"}, - "south": {"uv": [12, 8, 16, 12], "texture": "#main"}, - "west": {"uv": [12, 8, 16, 12], "texture": "#main"}, - "up": {"uv": [12, 8, 16, 12], "texture": "#main"}, - "down": {"uv": [12, 8, 16, 12], "texture": "#main"} + "north": {"uv": [9, 6, 12, 9], "texture": "#main"}, + "east": {"uv": [9, 6, 12, 9], "texture": "#main"}, + "south": {"uv": [9, 6, 12, 9], "texture": "#main"}, + "west": {"uv": [9, 6, 12, 9], "texture": "#main"}, + "up": {"uv": [9, 6, 12, 9], "texture": "#main"}, + "down": {"uv": [9, 6, 12, 9], "texture": "#main"} } }, { @@ -167,12 +167,12 @@ "to": [14, 8, 4], "rotation": {"angle": 0, "axis": "y", "origin": [10, 4, 0]}, "faces": { - "north": {"uv": [0, 12, 4, 16], "texture": "#main"}, - "east": {"uv": [0, 12, 4, 16], "texture": "#main"}, - "south": {"uv": [0, 12, 4, 16], "texture": "#main"}, - "west": {"uv": [0, 12, 4, 16], "texture": "#main"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#main"}, - "down": {"uv": [0, 12, 4, 16], "texture": "#main"} + "north": {"uv": [0, 9, 3, 12], "texture": "#main"}, + "east": {"uv": [0, 9, 3, 12], "texture": "#main"}, + "south": {"uv": [0, 9, 3, 12], "texture": "#main"}, + "west": {"uv": [0, 9, 3, 12], "texture": "#main"}, + "up": {"uv": [0, 9, 3, 12], "texture": "#main"}, + "down": {"uv": [0, 9, 3, 12], "texture": "#main"} } }, { @@ -180,12 +180,12 @@ "to": [5, 8, 4], "rotation": {"angle": 0, "axis": "y", "origin": [1, 4, 0]}, "faces": { - "north": {"uv": [4, 12, 8, 16], "texture": "#main"}, - "east": {"uv": [4, 12, 8, 16], "texture": "#main"}, - "south": {"uv": [4, 12, 8, 16], "texture": "#main"}, - "west": {"uv": [4, 12, 8, 16], "texture": "#main"}, - "up": {"uv": [4, 12, 8, 16], "texture": "#main"}, - "down": {"uv": [4, 12, 8, 16], "texture": "#main"} + "north": {"uv": [3, 9, 6, 12], "texture": "#main"}, + "east": {"uv": [3, 9, 6, 12], "texture": "#main"}, + "south": {"uv": [3, 9, 6, 12], "texture": "#main"}, + "west": {"uv": [3, 9, 6, 12], "texture": "#main"}, + "up": {"uv": [3, 9, 6, 12], "texture": "#main"}, + "down": {"uv": [3, 9, 6, 12], "texture": "#main"} } }, { @@ -193,12 +193,12 @@ "to": [9, 8, 16], "rotation": {"angle": 0, "axis": "y", "origin": [5, 4, 12]}, "faces": { - "north": {"uv": [8, 12, 12, 16], "texture": "#main"}, - "east": {"uv": [8, 12, 12, 16], "texture": "#main"}, - "south": {"uv": [8, 12, 12, 16], "texture": "#main"}, - "west": {"uv": [8, 12, 12, 16], "texture": "#main"}, - "up": {"uv": [8, 12, 12, 16], "texture": "#main"}, - "down": {"uv": [8, 12, 12, 16], "texture": "#main"} + "north": {"uv": [6, 9, 9, 12], "texture": "#main"}, + "east": {"uv": [6, 9, 9, 12], "texture": "#main"}, + "south": {"uv": [6, 9, 9, 12], "texture": "#main"}, + "west": {"uv": [6, 9, 9, 12], "texture": "#main"}, + "up": {"uv": [6, 9, 9, 12], "texture": "#main"}, + "down": {"uv": [6, 9, 9, 12], "texture": "#main"} } }, { @@ -206,12 +206,12 @@ "to": [4, 12, 14], "rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 10]}, "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#main"}, - "east": {"uv": [12, 12, 16, 16], "texture": "#main"}, - "south": {"uv": [12, 12, 16, 16], "texture": "#main"}, - "west": {"uv": [12, 12, 16, 16], "texture": "#main"}, - "up": {"uv": [12, 12, 16, 16], "texture": "#main"}, - "down": {"uv": [12, 12, 16, 16], "texture": "#main"} + "north": {"uv": [9, 9, 12, 12], "texture": "#main"}, + "east": {"uv": [9, 9, 12, 12], "texture": "#main"}, + "south": {"uv": [9, 9, 12, 12], "texture": "#main"}, + "west": {"uv": [9, 9, 12, 12], "texture": "#main"}, + "up": {"uv": [9, 9, 12, 12], "texture": "#main"}, + "down": {"uv": [9, 9, 12, 12], "texture": "#main"} } }, { @@ -219,12 +219,12 @@ "to": [5, 12, 10], "rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 6]}, "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#main"} + "north": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "west": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#main"} } }, { @@ -232,12 +232,12 @@ "to": [8, 16, 9], "rotation": {"angle": 0, "axis": "y", "origin": [4, 12, 5]}, "faces": { - "north": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "east": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "south": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "west": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "down": {"uv": [4, 0, 8, 4], "texture": "#main"} + "north": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "up": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "down": {"uv": [3, 0, 6, 3], "texture": "#main"} } }, { @@ -245,12 +245,12 @@ "to": [15, 16, 6], "rotation": {"angle": 0, "axis": "y", "origin": [11, 12, 2]}, "faces": { - "north": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "east": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "south": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "west": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "up": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "down": {"uv": [8, 0, 12, 4], "texture": "#main"} + "north": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "east": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "south": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "west": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "up": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "down": {"uv": [6, 0, 9, 3], "texture": "#main"} } }, { @@ -258,12 +258,12 @@ "to": [16, 16, 10], "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 6]}, "faces": { - "north": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "east": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "south": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "west": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "down": {"uv": [12, 0, 16, 4], "texture": "#main"} + "north": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "east": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "south": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "west": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "up": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "down": {"uv": [9, 0, 12, 3], "texture": "#main"} } }, { @@ -271,12 +271,12 @@ "to": [12, 16, 11], "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 7]}, "faces": { - "north": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "east": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "south": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "west": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "up": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "down": {"uv": [0, 4, 4, 8], "texture": "#main"} + "north": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "east": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "south": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "west": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "up": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "down": {"uv": [0, 3, 3, 6], "texture": "#main"} } }, { @@ -284,12 +284,12 @@ "to": [7, 16, 15], "rotation": {"angle": 0, "axis": "y", "origin": [3, 12, 11]}, "faces": { - "north": {"uv": [4, 4, 8, 8], "texture": "#main"}, - "east": {"uv": [4, 4, 8, 8], "texture": "#main"}, - "south": {"uv": [4, 4, 8, 8], "texture": "#main"}, - "west": {"uv": [4, 4, 8, 8], "texture": "#main"}, - "up": {"uv": [4, 4, 8, 8], "texture": "#main"}, - "down": {"uv": [4, 4, 8, 8], "texture": "#main"} + "north": {"uv": [3, 3, 6, 6], "texture": "#main"}, + "east": {"uv": [3, 3, 6, 6], "texture": "#main"}, + "south": {"uv": [3, 3, 6, 6], "texture": "#main"}, + "west": {"uv": [3, 3, 6, 6], "texture": "#main"}, + "up": {"uv": [3, 3, 6, 6], "texture": "#main"}, + "down": {"uv": [3, 3, 6, 6], "texture": "#main"} } }, { @@ -297,12 +297,12 @@ "to": [11, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [7, 12, 12]}, "faces": { - "north": {"uv": [8, 4, 12, 8], "texture": "#main"}, - "east": {"uv": [8, 4, 12, 8], "texture": "#main"}, - "south": {"uv": [8, 4, 12, 8], "texture": "#main"}, - "west": {"uv": [8, 4, 12, 8], "texture": "#main"}, - "up": {"uv": [8, 4, 12, 8], "texture": "#main"}, - "down": {"uv": [8, 4, 12, 8], "texture": "#main"} + "north": {"uv": [6, 3, 9, 6], "texture": "#main"}, + "east": {"uv": [6, 3, 9, 6], "texture": "#main"}, + "south": {"uv": [6, 3, 9, 6], "texture": "#main"}, + "west": {"uv": [6, 3, 9, 6], "texture": "#main"}, + "up": {"uv": [6, 3, 9, 6], "texture": "#main"}, + "down": {"uv": [6, 3, 9, 6], "texture": "#main"} } }, { @@ -310,12 +310,12 @@ "to": [11, 16, 5], "rotation": {"angle": 0, "axis": "y", "origin": [7, 12, 1]}, "faces": { - "north": {"uv": [12, 4, 16, 8], "texture": "#main"}, - "east": {"uv": [12, 4, 16, 8], "texture": "#main"}, - "south": {"uv": [12, 4, 16, 8], "texture": "#main"}, - "west": {"uv": [12, 4, 16, 8], "texture": "#main"}, - "up": {"uv": [12, 4, 16, 8], "texture": "#main"}, - "down": {"uv": [12, 4, 16, 8], "texture": "#main"} + "north": {"uv": [9, 3, 12, 6], "texture": "#main"}, + "east": {"uv": [9, 3, 12, 6], "texture": "#main"}, + "south": {"uv": [9, 3, 12, 6], "texture": "#main"}, + "west": {"uv": [9, 3, 12, 6], "texture": "#main"}, + "up": {"uv": [9, 3, 12, 6], "texture": "#main"}, + "down": {"uv": [9, 3, 12, 6], "texture": "#main"} } }, { @@ -323,12 +323,12 @@ "to": [6, 16, 4], "rotation": {"angle": 0, "axis": "y", "origin": [2, 12, 0]}, "faces": { - "north": {"uv": [0, 8, 4, 12], "texture": "#main"}, - "east": {"uv": [0, 8, 4, 12], "texture": "#main"}, - "south": {"uv": [0, 8, 4, 12], "texture": "#main"}, - "west": {"uv": [0, 8, 4, 12], "texture": "#main"}, - "up": {"uv": [0, 8, 4, 12], "texture": "#main"}, - "down": {"uv": [0, 8, 4, 12], "texture": "#main"} + "north": {"uv": [0, 6, 3, 9], "texture": "#main"}, + "east": {"uv": [0, 6, 3, 9], "texture": "#main"}, + "south": {"uv": [0, 6, 3, 9], "texture": "#main"}, + "west": {"uv": [0, 6, 3, 9], "texture": "#main"}, + "up": {"uv": [0, 6, 3, 9], "texture": "#main"}, + "down": {"uv": [0, 6, 3, 9], "texture": "#main"} } }, { @@ -336,12 +336,12 @@ "to": [4, 16, 11], "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 7]}, "faces": { - "north": {"uv": [4, 8, 8, 12], "texture": "#main"}, - "east": {"uv": [4, 8, 8, 12], "texture": "#main"}, - "south": {"uv": [4, 8, 8, 12], "texture": "#main"}, - "west": {"uv": [4, 8, 8, 12], "texture": "#main"}, - "up": {"uv": [4, 8, 8, 12], "texture": "#main"}, - "down": {"uv": [4, 8, 8, 12], "texture": "#main"} + "north": {"uv": [3, 6, 6, 9], "texture": "#main"}, + "east": {"uv": [3, 6, 6, 9], "texture": "#main"}, + "south": {"uv": [3, 6, 6, 9], "texture": "#main"}, + "west": {"uv": [3, 6, 6, 9], "texture": "#main"}, + "up": {"uv": [3, 6, 6, 9], "texture": "#main"}, + "down": {"uv": [3, 6, 6, 9], "texture": "#main"} } }, { @@ -349,12 +349,12 @@ "to": [15, 16, 15], "rotation": {"angle": 0, "axis": "y", "origin": [11, 12, 11]}, "faces": { - "north": {"uv": [8, 8, 12, 12], "texture": "#main"}, - "east": {"uv": [8, 8, 12, 12], "texture": "#main"}, - "south": {"uv": [8, 8, 12, 12], "texture": "#main"}, - "west": {"uv": [8, 8, 12, 12], "texture": "#main"}, - "up": {"uv": [8, 8, 12, 12], "texture": "#main"}, - "down": {"uv": [8, 8, 12, 12], "texture": "#main"} + "north": {"uv": [6, 6, 9, 9], "texture": "#main"}, + "east": {"uv": [6, 6, 9, 9], "texture": "#main"}, + "south": {"uv": [6, 6, 9, 9], "texture": "#main"}, + "west": {"uv": [6, 6, 9, 9], "texture": "#main"}, + "up": {"uv": [6, 6, 9, 9], "texture": "#main"}, + "down": {"uv": [6, 6, 9, 9], "texture": "#main"} } }, { @@ -362,12 +362,12 @@ "to": [16, 12, 15], "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 11]}, "faces": { - "north": {"uv": [12, 8, 16, 12], "texture": "#main"}, - "east": {"uv": [12, 8, 16, 12], "texture": "#main"}, - "south": {"uv": [12, 8, 16, 12], "texture": "#main"}, - "west": {"uv": [12, 8, 16, 12], "texture": "#main"}, - "up": {"uv": [12, 8, 16, 12], "texture": "#main"}, - "down": {"uv": [12, 8, 16, 12], "texture": "#main"} + "north": {"uv": [9, 6, 12, 9], "texture": "#main"}, + "east": {"uv": [9, 6, 12, 9], "texture": "#main"}, + "south": {"uv": [9, 6, 12, 9], "texture": "#main"}, + "west": {"uv": [9, 6, 12, 9], "texture": "#main"}, + "up": {"uv": [9, 6, 12, 9], "texture": "#main"}, + "down": {"uv": [9, 6, 12, 9], "texture": "#main"} } }, { @@ -375,12 +375,12 @@ "to": [16, 12, 5], "rotation": {"angle": 0, "axis": "y", "origin": [12, 8, 1]}, "faces": { - "north": {"uv": [0, 12, 4, 16], "texture": "#main"}, - "east": {"uv": [0, 12, 4, 16], "texture": "#main"}, - "south": {"uv": [0, 12, 4, 16], "texture": "#main"}, - "west": {"uv": [0, 12, 4, 16], "texture": "#main"}, - "up": {"uv": [0, 12, 4, 16], "texture": "#main"}, - "down": {"uv": [0, 12, 4, 16], "texture": "#main"} + "north": {"uv": [0, 9, 3, 12], "texture": "#main"}, + "east": {"uv": [0, 9, 3, 12], "texture": "#main"}, + "south": {"uv": [0, 9, 3, 12], "texture": "#main"}, + "west": {"uv": [0, 9, 3, 12], "texture": "#main"}, + "up": {"uv": [0, 9, 3, 12], "texture": "#main"}, + "down": {"uv": [0, 9, 3, 12], "texture": "#main"} } }, { @@ -388,12 +388,12 @@ "to": [15, 12, 11], "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 7]}, "faces": { - "north": {"uv": [4, 12, 8, 16], "texture": "#main"}, - "east": {"uv": [4, 12, 8, 16], "texture": "#main"}, - "south": {"uv": [4, 12, 8, 16], "texture": "#main"}, - "west": {"uv": [4, 12, 8, 16], "texture": "#main"}, - "up": {"uv": [4, 12, 8, 16], "texture": "#main"}, - "down": {"uv": [4, 12, 8, 16], "texture": "#main"} + "north": {"uv": [3, 9, 6, 12], "texture": "#main"}, + "east": {"uv": [3, 9, 6, 12], "texture": "#main"}, + "south": {"uv": [3, 9, 6, 12], "texture": "#main"}, + "west": {"uv": [3, 9, 6, 12], "texture": "#main"}, + "up": {"uv": [3, 9, 6, 12], "texture": "#main"}, + "down": {"uv": [3, 9, 6, 12], "texture": "#main"} } }, { @@ -401,12 +401,12 @@ "to": [11, 12, 9], "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 5]}, "faces": { - "north": {"uv": [8, 12, 12, 16], "texture": "#main"}, - "east": {"uv": [8, 12, 12, 16], "texture": "#main"}, - "south": {"uv": [8, 12, 12, 16], "texture": "#main"}, - "west": {"uv": [8, 12, 12, 16], "texture": "#main"}, - "up": {"uv": [8, 12, 12, 16], "texture": "#main"}, - "down": {"uv": [8, 12, 12, 16], "texture": "#main"} + "north": {"uv": [6, 9, 9, 12], "texture": "#main"}, + "east": {"uv": [6, 9, 9, 12], "texture": "#main"}, + "south": {"uv": [6, 9, 9, 12], "texture": "#main"}, + "west": {"uv": [6, 9, 9, 12], "texture": "#main"}, + "up": {"uv": [6, 9, 9, 12], "texture": "#main"}, + "down": {"uv": [6, 9, 9, 12], "texture": "#main"} } }, { @@ -414,12 +414,12 @@ "to": [5, 12, 5], "rotation": {"angle": 0, "axis": "y", "origin": [1, 8, 1]}, "faces": { - "north": {"uv": [12, 12, 16, 16], "texture": "#main"}, - "east": {"uv": [12, 12, 16, 16], "texture": "#main"}, - "south": {"uv": [12, 12, 16, 16], "texture": "#main"}, - "west": {"uv": [12, 12, 16, 16], "texture": "#main"}, - "up": {"uv": [12, 12, 16, 16], "texture": "#main"}, - "down": {"uv": [12, 12, 16, 16], "texture": "#main"} + "north": {"uv": [9, 9, 12, 12], "texture": "#main"}, + "east": {"uv": [9, 9, 12, 12], "texture": "#main"}, + "south": {"uv": [9, 9, 12, 12], "texture": "#main"}, + "west": {"uv": [9, 9, 12, 12], "texture": "#main"}, + "up": {"uv": [9, 9, 12, 12], "texture": "#main"}, + "down": {"uv": [9, 9, 12, 12], "texture": "#main"} } }, { @@ -427,12 +427,12 @@ "to": [11, 12, 4], "rotation": {"angle": 0, "axis": "y", "origin": [7, 8, 0]}, "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#main"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#main"} + "north": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "east": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "west": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#main"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#main"} } }, { @@ -440,12 +440,12 @@ "to": [10, 12, 15], "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 11]}, "faces": { - "north": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "east": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "south": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "west": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "up": {"uv": [4, 0, 8, 4], "texture": "#main"}, - "down": {"uv": [4, 0, 8, 4], "texture": "#main"} + "north": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "east": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "south": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "west": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "up": {"uv": [3, 0, 6, 3], "texture": "#main"}, + "down": {"uv": [3, 0, 6, 3], "texture": "#main"} } }, { @@ -453,12 +453,12 @@ "to": [16, 4, 11], "rotation": {"angle": 0, "axis": "y", "origin": [12, 0, 7]}, "faces": { - "north": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "east": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "south": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "west": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "up": {"uv": [8, 0, 12, 4], "texture": "#main"}, - "down": {"uv": [8, 0, 12, 4], "texture": "#main"} + "north": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "east": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "south": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "west": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "up": {"uv": [6, 0, 9, 3], "texture": "#main"}, + "down": {"uv": [6, 0, 9, 3], "texture": "#main"} } }, { @@ -466,12 +466,12 @@ "to": [16, 4, 5], "rotation": {"angle": 0, "axis": "y", "origin": [12, 0, 1]}, "faces": { - "north": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "east": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "south": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "west": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "up": {"uv": [12, 0, 16, 4], "texture": "#main"}, - "down": {"uv": [12, 0, 16, 4], "texture": "#main"} + "north": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "east": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "south": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "west": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "up": {"uv": [9, 0, 12, 3], "texture": "#main"}, + "down": {"uv": [9, 0, 12, 3], "texture": "#main"} } }, { @@ -479,12 +479,12 @@ "to": [15, 4, 16], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 12]}, "faces": { - "north": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "east": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "south": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "west": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "up": {"uv": [0, 4, 4, 8], "texture": "#main"}, - "down": {"uv": [0, 4, 4, 8], "texture": "#main"} + "north": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "east": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "south": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "west": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "up": {"uv": [0, 3, 3, 6], "texture": "#main"}, + "down": {"uv": [0, 3, 3, 6], "texture": "#main"} } } ] diff --git a/src/main/resources/assets/extravaganza/textures/block/ball_distributor_up.png b/src/main/resources/assets/extravaganza/textures/block/ball_distributor_up.png index 04c4d180..3961408d 100644 Binary files a/src/main/resources/assets/extravaganza/textures/block/ball_distributor_up.png and b/src/main/resources/assets/extravaganza/textures/block/ball_distributor_up.png differ diff --git a/src/main/resources/assets/extravaganza/textures/block/ball_pool_content.png b/src/main/resources/assets/extravaganza/textures/block/ball_pool_content.png index 00dbebf6..ec6dc0e4 100644 Binary files a/src/main/resources/assets/extravaganza/textures/block/ball_pool_content.png and b/src/main/resources/assets/extravaganza/textures/block/ball_pool_content.png differ