diff --git a/README.md b/README.md index cd4cfad4..ed86a72d 100644 --- a/README.md +++ b/README.md @@ -98,8 +98,8 @@ in order to make you feel like if you were not controlling your movements anymor can access the Ball Pool by right-clicking to the Registration Table, to get teleported at the center of the Ball Pool. If players wants to get out of the Ball Pool, they can simply execute the `/before-entering-poll` command. -![Ball Pool Registration Table Craft](https://github.com/MModding/extravaganza/blob/main/external/ball_pool_registration_table_craft.png?raw=true) -![Ball Pool Content Craft](https://github.com/MModding/extravaganza/blob/main/external/ball_pool_content_craft.gif?raw=true) +![Ball Pool Registration Table Craft](https://github.com/MModding/extravaganza/blob/main/external/ball_pit_registration_table_craft.png?raw=true) +![Ball Pool Content Craft](https://github.com/MModding/extravaganza/blob/main/external/ball_pit_content_craft.gif?raw=true) ### Building Blocks diff --git a/external/ball_pool_content_craft.gif b/external/ball_pit_content_craft.gif similarity index 100% rename from external/ball_pool_content_craft.gif rename to external/ball_pit_content_craft.gif diff --git a/external/ball_pool_registration_table_craft.png b/external/ball_pit_registration_table_craft.png similarity index 100% rename from external/ball_pool_registration_table_craft.png rename to external/ball_pit_registration_table_craft.png diff --git a/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 b/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 index 5b15e6ea..105fa735 100644 --- a/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 +++ b/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 @@ -1,10 +1,10 @@ -// 1.21 2024-07-01T03:10:22.4788059 Extravaganza!/Tags for minecraft:block +// 1.21 2024-07-31T00:08:58.0235667 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 a8b6770510cf194d8c33705d68e554cc38552304 data\minecraft\tags\block\leaves.json -3c8bbaaabaf9b2266c841e34a9d46efe3a45e4e7 data\minecraft\tags\block\mineable\axe.json -de7ad400e07f2e733f61c3cf89cae477444836e1 data\minecraft\tags\block\needs_stone_tool.json +e35ac935d3c22f3ac71f623769b56109430b4914 data\minecraft\tags\block\mineable\axe.json c58fa380156a46ee40acafab7082a5d157ddaa7f data\minecraft\tags\block\planks.json +53fee3a1722e42635c21085e045c7a4d288ae411 data\minecraft\tags\block\needs_stone_tool.json 869b050fc75552bca4dae428fbfd91837c77b108 data\minecraft\tags\block\logs_that_burn.json 98082c57579d5e185c79df23954ae0b3b22b8266 data\minecraft\tags\block\climbable.json diff --git a/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f b/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f index 429ab4f1..956fe9d8 100644 --- a/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f +++ b/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f @@ -1,4 +1,4 @@ -// 1.21 2024-07-01T03:10:22.4808046 Extravaganza!/Block Loot Tables +// 1.21 2024-07-31T00:08:58.0265155 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 @@ -63,6 +63,7 @@ eb75514aff039cc9150639c8376647c5c561e3d4 data\extravaganza\loot_table\blocks\lig cd3a108821b05c9c2200f26dcd0b14bef6b9b120 data\extravaganza\loot_table\blocks\magenta_barred_festive_rubber_slab.json 0719a7530d0f622d406bd3e23c3e7ea7b3a0f555 data\extravaganza\loot_table\blocks\blue_poured_festive_rubber_stairs.json 965cd6bf48a2ec042e193ea32a4acd865de7f734 data\extravaganza\loot_table\blocks\white_tiled_festive_rubber_wall.json +da763898fb62d70aeb1308e0a99b2701af4d90bb data\extravaganza\loot_table\blocks\ball_pit_registration_table.json 92a1d7b62b5153fdc18262e191fa91bc9412d38d data\extravaganza\loot_table\blocks\cyan_dotted_festive_rubber_stairs.json 483570d526c4b9f9f203535d64b7d13513a2c7d2 data\extravaganza\loot_table\blocks\lime_poured_festive_rubber_slab.json 8f77ea845d3ca8a1c6116ae6a08e8350b2842792 data\extravaganza\loot_table\blocks\brown_dotted_festive_rubber_slab.json @@ -254,7 +255,6 @@ ae7f8a3627307f43a5165876cbd07d4f1e5b413b data\extravaganza\loot_table\blocks\tom b77030a21a0ce1b1d50e2cba078019c5b91684f9 data\extravaganza\loot_table\blocks\tomato_perforated_festive_rubber_wall.json 355ded4e524e7b1a33cad9a2a7548f385782f63c data\extravaganza\loot_table\blocks\pink_split_festive_rubber_wall.json 9577385f757f7566c85c4dccec6c22ed9cbd06da data\extravaganza\loot_table\blocks\orange_perforated_festive_rubber_stairs.json -94c4776da16c154a5a9efeab679e9dfd37f88d24 data\extravaganza\loot_table\blocks\ball_pool_registration_table.json 42565f0b484b142203bd4c34edc5d33c4b752986 data\extravaganza\loot_table\blocks\light_blue_festive_rubber.json d6cbc637371d9e8a5a369d25d84bee25057ff2e9 data\extravaganza\loot_table\blocks\light_gray_festive_rubber_grate_slab.json ec9ec91129e1b8e472b4ffd79ec4375ae8e77b6b data\extravaganza\loot_table\blocks\gray_curved_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 -fa35c25650931cbcf08a8906965de30c1bdc3ffb data\extravaganza\loot_table\blocks\cyan_tiled_festive_rubber_wall.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 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 @@ -652,7 +652,6 @@ f81ba954eca54717c729e9fc151c5008745b380c data\extravaganza\loot_table\blocks\red fcc34df08d60fc1c8cc5b441ef337e7e35afecfb data\extravaganza\loot_table\blocks\green_festive_rubber_grate_wall.json 780fb106b2b619c075b02c9d06996713d951f376 data\extravaganza\loot_table\blocks\brown_wooded_festive_rubber_wall.json 8323119c2d241501433da9f55f533818495afa13 data\extravaganza\loot_table\blocks\black_windowed_festive_rubber.json -95fed33b39b7865caae022e8c9b0e00987c55a0e data\extravaganza\loot_table\blocks\ball_pool_content.json 2a6071287ccd28871d715419c1d15cdbd1a47eda data\extravaganza\loot_table\blocks\tear_tiled_festive_rubber_wall.json ee53b3fff4fd94d34cc566e8a208ecb27db4891f data\extravaganza\loot_table\blocks\cyan_wooded_festive_rubber.json fe9029bc56e36c721ed5b6297fa20a5a4f8884de data\extravaganza\loot_table\blocks\brown_striped_festive_rubber_slab.json @@ -1197,6 +1196,7 @@ d4b17e215edc21ce0efcd8307e522108b567f550 data\extravaganza\loot_table\blocks\pin d6a0460eaae32fddb32a9f97a10791fdd8b5a324 data\extravaganza\loot_table\blocks\tomato_curved_festive_rubber_wall.json 23f3c27c96b0132968f3e32d69d1604241f78cc9 data\extravaganza\loot_table\blocks\tomato_festive_rubber_ladder.json defaa4310a2e6114dea194c868f3f6ad54336944 data\extravaganza\loot_table\blocks\stripped_hevea_brasiliensis_wood.json +e758d09bb2ed9a6ce0800bd2284fcdf29e7a89e7 data\extravaganza\loot_table\blocks\ball_pit_content.json 532760344d4e89add5f32ff1c5e78cc2f4f62a71 data\extravaganza\loot_table\blocks\magenta_festive_rubber_slab.json a67235f32bb68304edd012822406ae5b4a9d057a data\extravaganza\loot_table\blocks\light_blue_perforated_festive_rubber_stairs.json e01da094295063bebe916be030f3bfafaaae4c71 data\extravaganza\loot_table\blocks\tear_striped_festive_rubber.json diff --git a/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 b/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 index 2151f430..3da11569 100644 --- a/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 +++ b/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 @@ -1,4 +1,4 @@ -// 1.21 2024-07-01T03:10:22.4873209 Extravaganza!/Tags for minecraft:damage_type +// 1.21 2024-07-31T00:08:58.0345785 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 b465ebd9..ddef9b84 100644 --- a/src/main/generated/.cache/584c1a43949a9c899dc112415674d20efb051ed8 +++ b/src/main/generated/.cache/584c1a43949a9c899dc112415674d20efb051ed8 @@ -1,4 +1,4 @@ -// 1.21 2024-07-01T03:10:22.4998323 Extravaganza!/Extravaganza DynamicRegistries Generation +// 1.21 2024-07-31T00:08:58.0553764 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 c65f87e9..dbdaf2fd 100644 --- a/src/main/generated/.cache/90eeb0d915a79c389c7026cb5e3cb8d595013f56 +++ b/src/main/generated/.cache/90eeb0d915a79c389c7026cb5e3cb8d595013f56 @@ -1,2 +1,2 @@ -// 1.21 2024-07-01T03:10:22.4988321 Extravaganza!/Tags for minecraft:item +// 1.21 2024-07-31T00:08:58.0543829 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 2fcf6901..444d3e20 100644 --- a/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 +++ b/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 @@ -1,4 +1,4 @@ -// 1.21 2024-07-01T03:10:22.4355561 Extravaganza!/Model Definitions +// 1.21 2024-07-31T00:08:57.911884 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 @@ -201,8 +201,9 @@ b1aef5916cee460b889ee6c18032843fbee48831 assets\extravaganza\models\block\blue_p ed30dc22066d271b75688a2fb44a3688c011d5fc assets\extravaganza\models\block\stripped_hevea_brasiliensis_log.json f889e6553aadf1d17ae23d9fd46febf4ed4b72e2 assets\extravaganza\models\item\nymph_windowed_festive_rubber_wall.json a55e26429b1cb080af94237574a329b2ef97bd0a assets\extravaganza\models\block\lime_scratched_festive_rubber.json -6a203a7a0de076c3d0ca08c6f2df54a91dd94d07 assets\extravaganza\models\item\magenta_wooded_festive_rubber.json 84041a26e2915ccdb4420e561f0eaa65124df0b3 assets\extravaganza\models\block\light_gray_screwed_festive_rubber_wall_post.json +6a203a7a0de076c3d0ca08c6f2df54a91dd94d07 assets\extravaganza\models\item\magenta_wooded_festive_rubber.json +e6905aec7e91c89c2907bf90de9bf5a9e185e6b6 assets\extravaganza\models\item\ball_pit_registration_table.json 8bdd6d225ad14642f9d91395d7f45a940ed13363 assets\extravaganza\models\item\cyan_wooded_festive_rubber.json 83c7aedc5d0395b2378e9435734bc1ed85d6a3e8 assets\extravaganza\blockstates\tomato_barred_festive_rubber.json a9aff8632c4ed01be8bd2c1ba80dac9755e91049 assets\extravaganza\models\block\orange_padded_festive_rubber_wall_side.json @@ -261,8 +262,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 -f090e9858fc4be8adcb1fcce20aea867c0d53398 assets\extravaganza\blockstates\light_gray_screwed_festive_rubber_wall.json 6aa79e5e3132c875996faddddf234370ca35f293 assets\extravaganza\blockstates\lime_curved_festive_rubber_wall.json +f090e9858fc4be8adcb1fcce20aea867c0d53398 assets\extravaganza\blockstates\light_gray_screwed_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 +357,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 -fadd5a6c3815e1f8e4cea2b62b6a2abb8d27cb67 assets\extravaganza\models\block\light_gray_barred_festive_rubber_wall_side_tall.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 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 +377,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 @@ -396,8 +397,8 @@ fb07e98d22a05479b92876f342b9e92208f66962 assets\extravaganza\blockstates\brown_s 353d179b4e2b9125f595726b27ddc262cd2a721d assets\extravaganza\models\block\black_wooded_festive_rubber_wall_side_tall.json 757de408b3e4351e94149a4b8b2f23e91eb354f3 assets\extravaganza\models\block\red_curved_festive_rubber_wall_side_tall.json 16e362c2271bd78f628b4f71955f65c83e293b43 assets\extravaganza\models\block\plant_sharped_festive_rubber_wall_inventory.json -4c026736850261e82adcb163602320faee2a7f99 assets\extravaganza\blockstates\nymph_screwed_festive_rubber.json 967acd6654260c6f86f63f4d3e37af73b8cdc38a assets\extravaganza\blockstates\tomato_curved_festive_rubber_stairs.json +4c026736850261e82adcb163602320faee2a7f99 assets\extravaganza\blockstates\nymph_screwed_festive_rubber.json ef6f358f1e7364f14a2dc5108a6b3fc38266e61d assets\extravaganza\models\block\tear_windowed_festive_rubber_wall_post.json 1581000e483f43c2d2e7fce1c4723d8200693be9 assets\extravaganza\models\item\tomato_tiled_festive_rubber.json 15c8d4ce5d420ba2ac02cf5a04fa675832ca481d assets\extravaganza\models\block\black_tiled_festive_rubber_stairs.json @@ -471,8 +472,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 -311af2b6977847b4b33316ae0a58e0db768f7e90 assets\extravaganza\blockstates\light_blue_poured_festive_rubber_stairs.json 74794f41207db64f577e455e53e01402c53986b8 assets\extravaganza\blockstates\magenta_sharped_festive_rubber_wall.json +311af2b6977847b4b33316ae0a58e0db768f7e90 assets\extravaganza\blockstates\light_blue_poured_festive_rubber_stairs.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 @@ -681,7 +682,6 @@ b4663b3e2e0a4690b55778ab7c2d7cf6665e868b assets\extravaganza\models\block\gray_s 0495e98cc024babc6a0f6c36e34f8940f610ed6d assets\extravaganza\models\block\cyan_wooded_festive_rubber.json 59c697c77c59a88d99dc831f28e71974ed91cf22 assets\extravaganza\blockstates\yellow_slipped_festive_rubber_stairs.json 0efbb525f6968a68bf98eb148fca50bc253854d5 assets\extravaganza\models\item\light_blue_festive_rubber_grate_wall.json -a3ed341a577831695fa5bc6c2dbaa3c266705002 assets\extravaganza\models\item\ball_pool_content.json a40b9c3bba3c9a525e9b6e7a16b391457105874b assets\extravaganza\models\item\lime_wooded_festive_rubber_stairs.json a74de512b8f44e0fbb39b67b80d8ed49e128cc06 assets\extravaganza\models\block\light_blue_dotted_festive_rubber_slab.json 843e3ca763f4079817d0e0c618c53c9d23c07165 assets\extravaganza\models\item\purple_festive_rubber_grate.json @@ -767,8 +767,8 @@ f0ae36faa74138273efe7bb25b7f6fc5a6965e89 assets\extravaganza\models\block\nymph_ a11daaaaac6b67301e9dc097d1b0dfdee2a196c3 assets\extravaganza\models\item\lime_barred_festive_rubber.json 11ca60e958cba09768da69e38b112aafac25ef75 assets\extravaganza\models\block\nymph_windowed_festive_rubber_stairs_inner.json b6619926a6b4402eb761049d7eded1090627a504 assets\extravaganza\models\block\white_screwed_festive_rubber_slab_top.json -3bfe60f8f17cc01d7222b930ec7a65a523e84c1e assets\extravaganza\blockstates\black_padded_festive_rubber_stairs.json 83101b44880ac6067e93c47fd4ed483edcff1beb assets\extravaganza\blockstates\green_split_festive_rubber_wall.json +3bfe60f8f17cc01d7222b930ec7a65a523e84c1e assets\extravaganza\blockstates\black_padded_festive_rubber_stairs.json 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 @@ -833,8 +833,8 @@ bb153d14d8ef0bceab99535210ad812d5c15d243 assets\extravaganza\models\block\gray_s 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 -fe444370cd4e2b9982e06cb7958baf627cc039cb assets\extravaganza\blockstates\plant_dotted_festive_rubber.json 6ff1de352930a2ef364a3deb3d688da24d87fe91 assets\extravaganza\blockstates\red_striped_festive_rubber_wall.json +fe444370cd4e2b9982e06cb7958baf627cc039cb assets\extravaganza\blockstates\plant_dotted_festive_rubber.json 6f69ef2d19890611987b6231da3a0832ff6ea5e4 assets\extravaganza\models\block\nymph_dotted_festive_rubber.json bcda89de5da08a5f17429f1111efabbd8bb09b5a assets\extravaganza\models\item\yellow_scratched_festive_rubber_slab.json 24ec4c64fa97dc502fb5dc1535a5aa2fe87094c1 assets\extravaganza\blockstates\blue_tiled_festive_rubber.json @@ -1099,13 +1099,13 @@ d886d17623a6d48b49430a6fa9aa60ea1d540918 assets\extravaganza\models\block\cyan_s d3c2a10094356828fc5ddf6e20c5043f9c54f041 assets\extravaganza\models\block\brown_striped_festive_rubber_slab.json 087450cd211cedc6695be10f6a391c534c71e62c assets\extravaganza\models\item\pink_slipped_festive_rubber_wall.json 5fd58258a7e5dace73d5926201555247dfa2a868 assets\extravaganza\models\item\light_blue_windowed_festive_rubber.json -4cc0ff233750a4e2c8723e90003951f54983a21f assets\extravaganza\blockstates\green_wooded_festive_rubber_stairs.json -1ccacf040c334baa078c8c113990f246927cd70b assets\extravaganza\blockstates\white_dotted_festive_rubber_wall.json 7f4997eed6e3ceeafdb920a11f87f4f301c8e52b assets\extravaganza\blockstates\brown_split_festive_rubber_slab.json +1ccacf040c334baa078c8c113990f246927cd70b assets\extravaganza\blockstates\white_dotted_festive_rubber_wall.json +4cc0ff233750a4e2c8723e90003951f54983a21f assets\extravaganza\blockstates\green_wooded_festive_rubber_stairs.json 127f0512459f2c72004d0fbccfd205660d104a9d assets\extravaganza\blockstates\light_blue_bent_festive_rubber_wall.json 7d02caff0eb290267ffe9523ebaf9279a0309c5c assets\extravaganza\blockstates\purple_sharped_festive_rubber_stairs.json -09f39073650af508330afb1ee404ee63c75a9ad1 assets\extravaganza\blockstates\magenta_tiled_festive_rubber_slab.json 311c66ea1155d307ec0f05afd1d18bc893b8242f assets\extravaganza\blockstates\blue_wooded_festive_rubber_slab.json +09f39073650af508330afb1ee404ee63c75a9ad1 assets\extravaganza\blockstates\magenta_tiled_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 @@ -1198,8 +1198,8 @@ ec853f24d6dbad57b124b813cb6ead6ffce015d0 assets\extravaganza\models\block\black_ 3bd5dc5bfa12656e797d69e85fd08d192cd2c321 assets\extravaganza\models\block\nymph_tiled_festive_rubber_wall_side_tall.json 51ca6861430758540a642528963a63233ad4f850 assets\extravaganza\models\block\red_perforated_festive_rubber_wall_inventory.json d68f7e21620502b56636936b39a0d2e33fab1bb0 assets\extravaganza\models\block\black_padded_festive_rubber_stairs.json -ece4f3a33e5833ad08e6e094543643eb84114379 assets\extravaganza\blockstates\blue_tiled_festive_rubber_stairs.json d2101b88cc49c40662ed5afb33200ea608cf77d1 assets\extravaganza\blockstates\white_curved_festive_rubber_wall.json +ece4f3a33e5833ad08e6e094543643eb84114379 assets\extravaganza\blockstates\blue_tiled_festive_rubber_stairs.json 88d7f7bef83a4b2ee771ed1b3ad3857e3b2bcb84 assets\extravaganza\models\block\lime_dotted_festive_rubber_wall_side_tall.json 3a0fbea6c22c7a0bc1fb0285b551dce1c0193a03 assets\extravaganza\models\item\blue_striped_festive_rubber.json fa6765294661c7aa458f142c3a2155cfaf08cc92 assets\extravaganza\models\block\tomato_padded_festive_rubber_slab.json @@ -1339,8 +1339,8 @@ f0544d1b406b581561bb5338c4273f1f5a2b53fb assets\extravaganza\models\block\purple 0b0f673741149ec3cdc1d59db8ea9522a2e01a05 assets\extravaganza\blockstates\pink_festive_rubber.json 2b77bdd52c182fc277c2189ba1db464a8e58b599 assets\extravaganza\models\item\lime_bent_festive_rubber_wall.json f20a2b10d5b8e46a0cb94848f2d66bb90736da2b assets\extravaganza\models\block\gray_tiled_festive_rubber_wall_post.json -bcad5862b0c07b93a50d82043c1634bec113bf51 assets\extravaganza\blockstates\purple_poured_festive_rubber.json 88e21555ee909ff8ab2da844865f7bbb9a80da63 assets\extravaganza\blockstates\gray_screwed_festive_rubber_slab.json +bcad5862b0c07b93a50d82043c1634bec113bf51 assets\extravaganza\blockstates\purple_poured_festive_rubber.json 9cc11835e39e4e0d1cc674c092c9f252db7bd03d assets\extravaganza\blockstates\red_padded_festive_rubber_stairs.json d80340a93c287c31063d882885f027b917584fd2 assets\extravaganza\blockstates\cyan_bent_festive_rubber_wall.json 63980af56192aa6441aeecbb078cf0c9d8c91e84 assets\extravaganza\models\item\black_windowed_festive_rubber_stairs.json @@ -1967,8 +1967,8 @@ fe0c533524fae36b9f0748c262c2176e04ed60af assets\extravaganza\models\block\tear_f 17e04d6ca2254a92ee7bb0f190761006a3ee2c79 assets\extravaganza\models\item\pink_sharped_festive_rubber.json b1ec2e17abedd532ad60239946fa165763858a00 assets\extravaganza\models\block\plant_poured_festive_rubber_stairs_inner.json c2808e7e5f8645978ba8941f59d92ad01978bcee assets\extravaganza\blockstates\light_blue_dotted_festive_rubber.json -5c691a4a68a1d9573faf701a05d3fcbcb6e42f5a assets\extravaganza\models\block\magenta_padded_festive_rubber_wall_side.json 7abe7a767da3cb3f671118c8efeee30f3cc5d13c assets\extravaganza\blockstates\plant_festive_rubber_slab.json +5c691a4a68a1d9573faf701a05d3fcbcb6e42f5a assets\extravaganza\models\block\magenta_padded_festive_rubber_wall_side.json 9d25ea1e70e5f0cfedb0bf42b7efe2461f46e328 assets\extravaganza\models\block\cyan_dotted_festive_rubber_slab.json afd9f74129ab5ae78cb0636882ad6a0d4b5b7b36 assets\extravaganza\models\item\red_dotted_festive_rubber.json d65adc1eadd8169e0397f4d96bef1ad74d77f891 assets\extravaganza\blockstates\yellow_windowed_festive_rubber_stairs.json @@ -2088,6 +2088,7 @@ ba2401dff7276738b55378dfe06ada0c9587ba0b assets\extravaganza\models\block\yellow cd3502eabb5bf42194f781705e23ba67a053a7c5 assets\extravaganza\blockstates\plant_curved_festive_rubber.json 38a835553e45a1581ab05e51b8aeaf6c91d3db52 assets\extravaganza\models\item\gray_dotted_festive_rubber_stairs.json 27bded1f5b930af462fc17ef388ea4a1e3abbf0f assets\extravaganza\models\block\green_wooded_festive_rubber_stairs_inner.json +8ef1820d97e7416be050d39721ff58486575a477 assets\extravaganza\blockstates\ball_pit_registration_table.json 1d089ddaf5d1b23a1d5d3eb7bbc6dc6c983d3a24 assets\extravaganza\models\block\green_padded_festive_rubber.json 003e23b56af3f06291121e8f7ebd63ca550a9f77 assets\extravaganza\models\block\tear_festive_rubber_grate_stairs_outer.json 5173e9cb4905323ac84d36a406f78ae3b9e7e103 assets\extravaganza\blockstates\gray_padded_festive_rubber_stairs.json @@ -2262,8 +2263,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 -1b8744484fd0741ef62c008820a39125ec285e21 assets\extravaganza\blockstates\magenta_barred_festive_rubber_wall.json 54b669abfe85a622d4a3faa062632fb4973a4dd5 assets\extravaganza\blockstates\blue_scratched_festive_rubber_wall.json +1b8744484fd0741ef62c008820a39125ec285e21 assets\extravaganza\blockstates\magenta_barred_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 @@ -2291,7 +2292,6 @@ ab5585d63dab788aee14192516ab27bf6c0330af assets\extravaganza\models\block\yellow 4f6974977e98c7b8ae4fe203f82b716b481a45fe assets\extravaganza\models\item\green_sharped_festive_rubber.json 3bd192208de4a50c2fa7766d3c9bf08833af0387 assets\extravaganza\models\block\nymph_split_festive_rubber_stairs.json cbf89558e8618b48ae452e2e92ba8a3e11e0e469 assets\extravaganza\models\block\blue_slipped_festive_rubber_stairs_inner.json -9262ee430bca1e7ca5708a0620697e22e0b22fef assets\extravaganza\models\item\ball_pool_registration_table.json 6f633c2fe02351056e5158c8ced15f1dd7c8d482 assets\extravaganza\models\block\nymph_slipped_festive_rubber_stairs.json 7628eec1c22a58bbe8b57c7e430ce563e7836d30 assets\extravaganza\models\block\white_wooded_festive_rubber_stairs_outer.json 23d22b3a94e49d4e9f07bdaf168978b86f0cadac assets\extravaganza\models\item\yellow_festive_rubber.json @@ -2609,6 +2609,7 @@ e9bed7d76d8f25307dc92c76f317217cdabb490f assets\extravaganza\models\item\plant_p a80d68e34f82bc13ab888f2920d14079cf523982 assets\extravaganza\models\block\hevea_brasiliensis_log.json 90c71777c505c9053b0897570c4227202ea522d6 assets\extravaganza\models\block\cyan_festive_rubber_grate.json 21ea261505c8dde441bba56c5c837672bfb6ee09 assets\extravaganza\models\item\tomato_padded_festive_rubber.json +6c0daaf38a1b8a8839fbc14f0cfdd3736551ade5 assets\extravaganza\models\item\ball_pit_content.json c419301eecba4807c1ae2a88f0bd02d45d9cb725 assets\extravaganza\models\item\tomato_windowed_festive_rubber_slab.json b1f67b7f7999ef045013a0d2a8bf37bd9fe58eeb assets\extravaganza\blockstates\gray_split_festive_rubber_slab.json 671a4150a0bd4ae3ac9b32328c9b5051883e0c61 assets\extravaganza\models\block\light_blue_bent_festive_rubber_stairs.json @@ -2618,8 +2619,8 @@ ea405a9d73bca23935ce71652027b3ee7aa5c986 assets\extravaganza\blockstates\tear_sp 6f9dd8729ca0b3858ff2c944968fe2f2b9d357c8 assets\extravaganza\models\block\brown_bent_festive_rubber_wall_side.json 04782b9014b253c93995d7c83604af35b5137ae6 assets\extravaganza\blockstates\gray_wooded_festive_rubber_stairs.json adab1e0eb04f9542e76e28f5994e30e7a482fd2c assets\extravaganza\blockstates\tear_curved_festive_rubber.json -8637594d73576284d3bff6a5a4cb23e6fab4df63 assets\extravaganza\blockstates\brown_festive_rubber_grate_slab.json abd700ddab88ac138c70e254ce62091e54ac6663 assets\extravaganza\blockstates\white_tiled_festive_rubber_stairs.json +8637594d73576284d3bff6a5a4cb23e6fab4df63 assets\extravaganza\blockstates\brown_festive_rubber_grate_slab.json 5cbc131d405b85107de8f3f92b8aaab1028f73dd assets\extravaganza\blockstates\gray_windowed_festive_rubber_stairs.json 417b7cc3218e0d6ff148b07dd89a4911d53349c8 assets\extravaganza\models\block\yellow_dotted_festive_rubber_wall_side_tall.json f41869e07369ee8171457f0c01a9983416b07eb4 assets\extravaganza\models\block\purple_bent_festive_rubber_wall_inventory.json @@ -3287,8 +3288,8 @@ f1e798ba858316cfaf0425776ad72f9925a9aba0 assets\extravaganza\models\block\gray_t ee52c3059094025b3cb168e0f109ef8a550ff152 assets\extravaganza\blockstates\gray_festive_rubber_slab.json 0e5aa32f43773848e9cf8bd74cb6369834d26cef assets\extravaganza\models\block\magenta_curved_festive_rubber_stairs.json 855f41c6bcfa5a18d2017aefe4ff63f9aef4f4c2 assets\extravaganza\models\block\orange_slipped_festive_rubber.json -1fbfd1d77ba88fc10c002d12efe69f3f93a3933f assets\extravaganza\blockstates\red_tiled_festive_rubber_wall.json 725db354bf4528d04c1db1e0c059bd192a2a6a7a assets\extravaganza\blockstates\brown_striped_festive_rubber.json +1fbfd1d77ba88fc10c002d12efe69f3f93a3933f assets\extravaganza\blockstates\red_tiled_festive_rubber_wall.json 290be19846453926ff0c53689655f61c00561a3d assets\extravaganza\models\block\magenta_sharped_festive_rubber_stairs_inner.json bdd86604a44d2bacaf290d88a2f423382e3306fb assets\extravaganza\models\item\gray_split_festive_rubber_stairs.json 4a2695bbdc7391d4dc074fbb94ffa491677fcc80 assets\extravaganza\models\block\cyan_bent_festive_rubber_slab_top.json @@ -3372,7 +3373,6 @@ a88ddfaccdc29281cd0e47559417bf1ac52fdbca assets\extravaganza\blockstates\red_per 7e6ac2ea27fa435e00c04c78729f9eb0fea276be assets\extravaganza\models\item\pink_festive_rubber_stairs.json 038de3bb8487baaad72333b5369976bb96d0c1b0 assets\extravaganza\models\block\tear_padded_festive_rubber_wall_inventory.json bd5647f5da83ce2d9ca44cb2be752b5d8dc67467 assets\extravaganza\blockstates\lime_trash_can.json -5b72ef4dec1e24024e5a724ef6e6513fe9f3f27e assets\extravaganza\blockstates\ball_pool_registration_table.json 030d2b24a5b9a6744f96760f99023332e7c73ff5 assets\extravaganza\blockstates\lime_scratched_festive_rubber_stairs.json a213db11ca66113743bdd93a8cefd1417a9c7c4d assets\extravaganza\models\block\pink_padded_festive_rubber_wall_inventory.json ad4cea2114c6f73db8d0cfcbace1ae83d63ca1ec assets\extravaganza\models\block\green_striped_festive_rubber_slab_top.json @@ -3401,8 +3401,8 @@ d70d5eb1ac0760ff65def88de9812f0279f63f1b assets\extravaganza\models\item\blue_sc b4860e71b6ab8302998b68c350871987afaf6b0a assets\extravaganza\models\block\tomato_festive_rubber_grate_wall_side.json fa5e9f83d338bc59aa1db275bf5713dbf66be611 assets\extravaganza\models\block\green_tiled_festive_rubber_stairs_inner.json f5a1b4eea05fc5c27ac3a2e234d43a921b390d0b assets\extravaganza\models\item\brown_bent_festive_rubber_stairs.json -da5948a11865afc1c0e25b8fc727e1ac83eb5ec6 assets\extravaganza\blockstates\light_blue_perforated_festive_rubber_wall.json 13a6dbae53732881354265a7496989f4771e6ad5 assets\extravaganza\blockstates\pink_sharped_festive_rubber_wall.json +da5948a11865afc1c0e25b8fc727e1ac83eb5ec6 assets\extravaganza\blockstates\light_blue_perforated_festive_rubber_wall.json c8bf2198877072348df8f338bf4dd60b5941290f assets\extravaganza\models\item\cyan_barred_festive_rubber_slab.json f52cb45a3d98c753f88fa24fb64ee15c21743b9c assets\extravaganza\blockstates\black_striped_festive_rubber_wall.json 2a8db8e4e728f3b6b030f5c054bb6fa8dfd3d179 assets\extravaganza\blockstates\brown_padded_festive_rubber_slab.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 -2419b287e01aea374467cfb0cbe5eafeb31d8d23 assets\extravaganza\blockstates\yellow_screwed_festive_rubber_wall.json 76c9b98ebecd6afcd35a09501f66d4103cd1b9ce assets\extravaganza\blockstates\tear_striped_festive_rubber.json +2419b287e01aea374467cfb0cbe5eafeb31d8d23 assets\extravaganza\blockstates\yellow_screwed_festive_rubber_wall.json 23923430609d7c9edf121fcb95acb7e623c2296a assets\extravaganza\models\block\blue_bent_festive_rubber_stairs.json 4771569b55d1a91ec46937562f5a69ab643584f0 assets\extravaganza\models\block\brown_striped_festive_rubber_stairs.json 29b2d8d76eb1d05181672134f4a5a6e2ae162b01 assets\extravaganza\models\block\plant_scratched_festive_rubber_wall_inventory.json @@ -3718,9 +3718,9 @@ f9e642777606643379ea1566f9df055a3a203a16 assets\extravaganza\models\block\cyan_f b129b594fb56c6ceb1a93cebb91e4f3d612e1338 assets\extravaganza\models\item\magenta_curved_festive_rubber.json 8b2ed5e7de7f20defd94fba9415e7dd5f9df9626 assets\extravaganza\blockstates\nymph_windowed_festive_rubber.json e95246c3b8818a65d483b5d6e19f56a7c8e0b01f assets\extravaganza\models\block\lime_poured_festive_rubber_wall_side_tall.json +7e42a766f37fdaf442b0abcb1d7e47c88a4d334d assets\extravaganza\blockstates\pink_windowed_festive_rubber_stairs.json 758ff06e3ca47043d926b01e81be8ff48f653a5f assets\extravaganza\blockstates\cyan_bent_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 @@ -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 -dba4de97b18daa02f99b16201f36ce196057eb05 assets\extravaganza\blockstates\purple_trash_can.json 2db7a374eb502eae8b01e8c537d921ae2216a561 assets\extravaganza\blockstates\yellow_festive_rubber_grate_stairs.json +dba4de97b18daa02f99b16201f36ce196057eb05 assets\extravaganza\blockstates\purple_trash_can.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 @@ -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 -1e36c53e97b02ea39889e35423469281c9208c74 assets\extravaganza\blockstates\red_windowed_festive_rubber_wall.json 3da4b23e7111214d06b5c66a42863751656ab278 assets\extravaganza\blockstates\light_gray_screwed_festive_rubber_stairs.json +1e36c53e97b02ea39889e35423469281c9208c74 assets\extravaganza\blockstates\red_windowed_festive_rubber_wall.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 @@ -4306,8 +4306,8 @@ e2feedd9f4537c62f09f0cf5e7a498962c2b973f assets\extravaganza\blockstates\black_s a544de918bfcd47b3ae5f0014d923409e2092ded assets\extravaganza\models\block\lime_poured_festive_rubber_stairs_inner.json d64717e42e0f9cf9cf0a0b75fa31781ce839b583 assets\extravaganza\models\item\blue_dotted_festive_rubber_slab.json 66f6ebe381f3ae4b516b6453ed85dc21629fbeac assets\extravaganza\models\block\nymph_striped_festive_rubber_wall_post.json -e2b414f321d8f78e95bda0b61a8e3bd597c53126 assets\extravaganza\blockstates\lime_screwed_festive_rubber.json d0a43e0cb141385aae0ed737778f88c918cea0b6 assets\extravaganza\blockstates\gray_perforated_festive_rubber_stairs.json +e2b414f321d8f78e95bda0b61a8e3bd597c53126 assets\extravaganza\blockstates\lime_screwed_festive_rubber.json b837f8dc7f0f31a24bd83c24d482fe597d6574af assets\extravaganza\models\block\purple_wooded_festive_rubber.json 72f174e8f107c4cf79c6086692b9346421ddcfe7 assets\extravaganza\blockstates\magenta_tiled_festive_rubber_wall.json ad0783abb87d630f2da0b6624fe0f24b0dc63703 assets\extravaganza\models\block\yellow_poured_festive_rubber_stairs.json @@ -4322,8 +4322,8 @@ ef600df32d0de16914cda186d45e4d2f2ac47db9 assets\extravaganza\models\item\purple_ f0513dcf7af4f23b012f3bfb04d5eba731ab5c6f assets\extravaganza\models\block\gray_curved_festive_rubber_stairs_outer.json 39e9719c9eb09044eae76098cc9bc34ed9a5eb06 assets\extravaganza\blockstates\orange_padded_festive_rubber.json cf2df3b6c528f978ade8d3d4df8d79fc71c27a01 assets\extravaganza\models\item\brown_curved_festive_rubber_slab.json -32213ec5f5a2bdfe5048ef9bd78f53c962a6b394 assets\extravaganza\blockstates\purple_striped_festive_rubber.json 463d4a2e2fb57f77e0b433ea5f4cf45dc6b55d13 assets\extravaganza\blockstates\light_gray_tiled_festive_rubber_wall.json +32213ec5f5a2bdfe5048ef9bd78f53c962a6b394 assets\extravaganza\blockstates\purple_striped_festive_rubber.json 6f7f49c887c353353a1b9f1c4d917779493b7f08 assets\extravaganza\models\item\black_festive_rubber_grate_stairs.json 05f7602230c9ec6006bfdfde466e51f5deb6065c assets\extravaganza\models\item\magenta_bent_festive_rubber.json 6bb0b4e9ceb4abc19a6f09c903a82949e09c6e5c assets\extravaganza\models\block\gray_slipped_festive_rubber.json @@ -4350,8 +4350,8 @@ d4c7fca275003df35f40102c153360c561553614 assets\extravaganza\models\block\yellow a3307a77ceb98825bf7b1ba9889517fab423b6cb assets\extravaganza\models\block\lime_windowed_festive_rubber_stairs_inner.json e29c819363e26f906fcaac40b67b8a7b29a778ca assets\extravaganza\models\block\tear_windowed_festive_rubber_wall_inventory.json 1fb8696be73cce564a22802dc964124e152cb5bf assets\extravaganza\blockstates\tomato_perforated_festive_rubber.json -20c12ae5202b96cbcd35581245bbfdd81967fd4d assets\extravaganza\models\block\yellow_screwed_festive_rubber_stairs_outer.json 215b8a0dc4f9707333f7e224af9f20b1cad6a127 assets\extravaganza\models\item\yellow_scratched_festive_rubber_wall.json +20c12ae5202b96cbcd35581245bbfdd81967fd4d assets\extravaganza\models\block\yellow_screwed_festive_rubber_stairs_outer.json 1da7d5b61170dea7bc9df97605300e42500ada37 assets\extravaganza\models\block\green_curved_festive_rubber_stairs.json 800d2f7fe872ad395c316b15549441c3345d436e assets\extravaganza\blockstates\purple_barred_festive_rubber_slab.json 4de8536bf05dd05a27f74222b248f39660150d68 assets\extravaganza\models\item\yellow_sharped_festive_rubber_stairs.json @@ -4425,16 +4425,16 @@ dd2cc99bc4a79cddcadc751f9716e75233a937ef assets\extravaganza\models\block\cyan_t 2e810dd3f1322b73f4a5a42e5f9a30559f5a6aeb assets\extravaganza\models\item\brown_festive_rubber_grate_slab.json 2bbd7c8d3dd7346bc7a5149bca998a7f8094c15d assets\extravaganza\models\item\nymph_wooded_festive_rubber_slab.json e78c70819d30c2efe4f99be6c7c313e4ea5ae80f assets\extravaganza\models\item\green_screwed_festive_rubber_wall.json -76d6bbe2b0688043091575b7c4d609ec3b9480eb assets\extravaganza\blockstates\lime_striped_festive_rubber_stairs.json 24c2ee510e80c9c2064d11bbd028aa84a237a502 assets\extravaganza\blockstates\brown_perforated_festive_rubber.json +76d6bbe2b0688043091575b7c4d609ec3b9480eb assets\extravaganza\blockstates\lime_striped_festive_rubber_stairs.json 1ee050d7dea8d524b5304913836e1620a627cf64 assets\extravaganza\models\block\blue_sharped_festive_rubber_slab_top.json 21ff2343ce5839db598e734a6219a3f2d958d3ff assets\extravaganza\models\item\nymph_wooded_festive_rubber.json eeea0b3ffccd57388963a9b8a1809ab6a0762872 assets\extravaganza\models\block\lime_wooded_festive_rubber_wall_inventory.json 3ded3d508033b69e5b673856b05f2b2309a27599 assets\extravaganza\blockstates\lime_slipped_festive_rubber.json 0e7b00e10e9dc936995646389201874ecdca744d assets\extravaganza\models\item\light_gray_festive_rubber_grate_wall.json 41e18ce0bd568b23a0c50715cf850ded834c13e7 assets\extravaganza\models\block\tear_wooded_festive_rubber_slab_top.json -9b8722fca97d5df5ba00c7e0edf2952c294f4cc4 assets\extravaganza\blockstates\yellow_dotted_festive_rubber_stairs.json a5a6658c2e8c29582db7c991830f26f6c06d29ce assets\extravaganza\blockstates\yellow_bent_festive_rubber_stairs.json +9b8722fca97d5df5ba00c7e0edf2952c294f4cc4 assets\extravaganza\blockstates\yellow_dotted_festive_rubber_stairs.json 1c239cbb0f9353d50132095f707b6e2409b4317f assets\extravaganza\models\block\orange_screwed_festive_rubber_wall_post.json e760371527fde6c0b45e499f140f9ce1bb47059f assets\extravaganza\models\block\tomato_sharped_festive_rubber_slab_top.json c6f0ca37eb5ad70bd3b3c96256991ac06647f508 assets\extravaganza\models\block\light_gray_perforated_festive_rubber_wall_side_tall.json @@ -4668,8 +4668,8 @@ 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 -9ffe6df29976a74a96335bb063ec8208cfdee506 assets\extravaganza\blockstates\orange_festive_rubber_grate.json 2be29468270c0893027a50aaea649b3d25fd5da6 assets\extravaganza\blockstates\orange_dotted_festive_rubber_stairs.json +9ffe6df29976a74a96335bb063ec8208cfdee506 assets\extravaganza\blockstates\orange_festive_rubber_grate.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 @@ -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 -596c9c387d1207133aa995b68a2b529ca661ffc3 assets\extravaganza\blockstates\cyan_scratched_festive_rubber_wall.json 632aece41cf09ea257c25708ff905a55e62b25ee assets\extravaganza\blockstates\white_festive_rubber_slab.json +596c9c387d1207133aa995b68a2b529ca661ffc3 assets\extravaganza\blockstates\cyan_scratched_festive_rubber_wall.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 @@ -4882,9 +4882,9 @@ f05ef4708fc23cce9ce6d796ed209b2b4e735c0e assets\extravaganza\models\block\cyan_s d3324e35c8afa42cbd9826f1014684ddda27957a assets\extravaganza\models\block\brown_tiled_festive_rubber_stairs_outer.json 25244e5f2b30987be294f46b01861e7b7ce816c5 assets\extravaganza\blockstates\orange_slipped_festive_rubber.json 8a1a698d3acc569a78893ffa21d8bfdda8e3091b assets\extravaganza\models\block\tear_festive_rubber_wall_inventory.json -0e068142317a0662496cf594cc99007e7d38ff1c assets\extravaganza\blockstates\orange_slipped_festive_rubber_stairs.json 1c75b66ceae5d06e0e419a08931ccf2d4968273b assets\extravaganza\blockstates\gray_screwed_festive_rubber_wall.json c7953d222febfcceb8335863a2051e29d65f0395 assets\extravaganza\blockstates\black_dotted_festive_rubber.json +0e068142317a0662496cf594cc99007e7d38ff1c assets\extravaganza\blockstates\orange_slipped_festive_rubber_stairs.json af4636f4c5685709b220b71862c72a316538f393 assets\extravaganza\models\block\nymph_scratched_festive_rubber_stairs_outer.json 940eae3f54492cfe4bf83343e976b135643976f3 assets\extravaganza\models\block\purple_striped_festive_rubber_wall_side.json bf1046776567a32759cd2b5a7faa3904a915f98f assets\extravaganza\blockstates\gray_perforated_festive_rubber_slab.json @@ -5188,8 +5188,8 @@ e09946b8f840aa3d027582745637a5efd9458e0b assets\extravaganza\models\block\red_tr 0c72cf290e8d02cd94a916754e5f2570bce6c5cb assets\extravaganza\blockstates\light_gray_perforated_festive_rubber_wall.json cefac4aa9370214f8ff8d1e2c45ad11d7bb56dbf assets\extravaganza\models\block\tear_scratched_festive_rubber_wall_post.json 6e0f2528093273f0a7eb35a7ac33dfd3282cf216 assets\extravaganza\models\item\green_curved_festive_rubber_slab.json -cfff5395bd57a14d0d687cb122e8f683bed964ed assets\extravaganza\blockstates\green_windowed_festive_rubber_wall.json 3893495e18b2d6a88609fa51d75ef12ebdf3f492 assets\extravaganza\blockstates\tomato_barred_festive_rubber_wall.json +cfff5395bd57a14d0d687cb122e8f683bed964ed assets\extravaganza\blockstates\green_windowed_festive_rubber_wall.json 19ac6270d6391dd51070276b28b71e1e1b669a5e assets\extravaganza\models\item\lime_padded_festive_rubber_stairs.json 8eaff8633c98ac6c3e2e86c6b5482b3df4f7d301 assets\extravaganza\blockstates\red_wooded_festive_rubber_wall.json 4cbc5b50e7e253516fee2937916eaaf7aa549cbf assets\extravaganza\models\item\light_blue_windowed_festive_rubber_slab.json @@ -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 -a1cef0bc6de522f56460ec9fb7ce9aac2d0d812b assets\extravaganza\blockstates\lime_perforated_festive_rubber_slab.json d591284d9eba42e36afea0a848bae988151e26ac assets\extravaganza\blockstates\black_dotted_festive_rubber_slab.json +a1cef0bc6de522f56460ec9fb7ce9aac2d0d812b assets\extravaganza\blockstates\lime_perforated_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 @@ -5262,8 +5262,8 @@ bc32adf5e4bc33b438c0ab7a256159f3784fb15c assets\extravaganza\models\block\purple 3166152ddab08534d06021cbedcdc0507a593d2a assets\extravaganza\models\item\purple_striped_festive_rubber.json 270c3685eebd855163c3f42acd520ec5d9d74a48 assets\extravaganza\blockstates\nymph_dotted_festive_rubber_slab.json 49fab71b9f1e9b6f9fe65e905882b0a2d72ef968 assets\extravaganza\models\item\orange_split_festive_rubber_wall.json -b8121bc74e9706549fd29bd1fcb0e62b3f1b7602 assets\extravaganza\blockstates\magenta_split_festive_rubber_stairs.json 8b402110c1fd96c1d622b7dcbd72fd41683aec9b assets\extravaganza\blockstates\orange_split_festive_rubber_stairs.json +b8121bc74e9706549fd29bd1fcb0e62b3f1b7602 assets\extravaganza\blockstates\magenta_split_festive_rubber_stairs.json 0c0584506dcb890225d4e7423510b04c561cbd9f assets\extravaganza\models\item\gray_screwed_festive_rubber.json e3906d1029df47e948b11848d3f66f9938cf7c5d assets\extravaganza\models\block\lime_striped_festive_rubber_stairs_inner.json aa2d675035c73bfd443d4317311208d41f94cc3a assets\extravaganza\models\block\yellow_wooded_festive_rubber_wall_post.json @@ -5362,8 +5362,8 @@ cc7fc3a2e9f1b25a244eca15db1e35ccd27ba031 assets\extravaganza\models\block\purple cb1159642ff2eb8a69133943e6d1708caac43155 assets\extravaganza\models\item\lime_barred_festive_rubber_stairs.json 80c5ff4c68a7c5d8dcea49bdcc0f506ad17a31f0 assets\extravaganza\models\block\light_blue_dotted_festive_rubber_stairs_outer.json 1aa40fd613376f1957590393bb842b6dabab2c34 assets\extravaganza\models\item\plant_tiled_festive_rubber_wall.json -a14b5736d51f3264912f9ee94a603e585e112e0d assets\extravaganza\blockstates\hevea_brasiliensis_log.json 1faf603463216b28e27894c0f80e7bab0318b8e0 assets\extravaganza\blockstates\brown_sharped_festive_rubber_stairs.json +a14b5736d51f3264912f9ee94a603e585e112e0d assets\extravaganza\blockstates\hevea_brasiliensis_log.json 9980ad517c488e92d434376798852bb4bd2c7040 assets\extravaganza\models\block\purple_tiled_festive_rubber_wall_side.json 8b39f86d1d8b8342348b63976660a48a4e003cf6 assets\extravaganza\models\block\tomato_sharped_festive_rubber_wall_side.json 9ba9cd8d5b6dd24300083136e5fab854ad83ba58 assets\extravaganza\models\block\green_split_festive_rubber.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 -635c9999e5b55e360da467d3cf02f4ad32e36613 assets\extravaganza\blockstates\tomato_curved_festive_rubber_slab.json eb7524778abf35ff8ffc21012ccdfc96edbf151c assets\extravaganza\blockstates\orange_windowed_festive_rubber_slab.json +635c9999e5b55e360da467d3cf02f4ad32e36613 assets\extravaganza\blockstates\tomato_curved_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 @@ -6361,8 +6361,8 @@ c56b5123dc82e4635e5d01fa34a3b195407b14f5 assets\extravaganza\models\item\blue_po 3d7482cfd6e31ea1eadb562ff0f90728ff75f0ec assets\extravaganza\models\item\nymph_barred_festive_rubber_slab.json 1af12b3cc4e7c7f1ce7ce3eb28fc84ee6c007877 assets\extravaganza\models\block\purple_poured_festive_rubber_slab.json 35e7b944aede334b5732ee5c95d7a50431e90f97 assets\extravaganza\models\block\nymph_tiled_festive_rubber.json -1b74a61789d9d4fd89763e38a55a4a0022a5b162 assets\extravaganza\blockstates\blue_poured_festive_rubber.json d06bc54db4095e3b172bc2ac80d30ffbfcc6002a assets\extravaganza\blockstates\lime_festive_rubber_slab.json +1b74a61789d9d4fd89763e38a55a4a0022a5b162 assets\extravaganza\blockstates\blue_poured_festive_rubber.json eae6d454f0320eba378c0ddfb0529094822c6ea5 assets\extravaganza\blockstates\brown_sharped_festive_rubber_slab.json 54c24f580e87bf112fa478301e8720893e16b62c assets\extravaganza\models\item\pink_slipped_festive_rubber_stairs.json b9a9428d57a3eeacd540341d633f699ded553be4 assets\extravaganza\models\block\red_split_festive_rubber_wall_inventory.json @@ -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 -8c648087de8c8a517b33a8c3a9ac5562f7d83579 assets\extravaganza\models\block\yellow_poured_festive_rubber_wall_post.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 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 -96725bfedb240fbc1f131094ac7d096460874b9b assets\extravaganza\blockstates\purple_bent_festive_rubber_wall.json ee70e21220322abd7351d994e8859c45e756afa0 assets\extravaganza\blockstates\red_dotted_festive_rubber_stairs.json +96725bfedb240fbc1f131094ac7d096460874b9b assets\extravaganza\blockstates\purple_bent_festive_rubber_wall.json b0732643e28d65b80bbba1f16f069f8ff514232d assets\extravaganza\models\block\black_scratched_festive_rubber_slab.json 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 -7f3f229199f3ed14466def7f521c576ddc0cee14 assets\extravaganza\blockstates\magenta_scratched_festive_rubber.json 5a2898efe6aa48836099f59bc73b8ea8d002e2cb assets\extravaganza\blockstates\blue_dotted_festive_rubber_stairs.json +7f3f229199f3ed14466def7f521c576ddc0cee14 assets\extravaganza\blockstates\magenta_scratched_festive_rubber.json 2a0ad5035834ee85a984e0437b148a8dfa544704 assets\extravaganza\models\block\white_poured_festive_rubber_stairs_inner.json 43a9a1ed976e464dcd5d1f338a30fe8d7219779b assets\extravaganza\models\block\green_striped_festive_rubber_stairs_inner.json f784b89dd16513467c306e8fafbe6ffe0406b5f6 assets\extravaganza\models\item\tear_dotted_festive_rubber_wall.json diff --git a/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 b/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 index 6a502770..e82d208a 100644 --- a/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 +++ b/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 @@ -1,4 +1,4 @@ -// 1.21 2024-07-01T03:10:22.4883201 Extravaganza!/Recipes +// 1.21 2024-07-31T00:08:58.0355791 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 @@ -43,6 +43,7 @@ e3eb75b50e77b00f715bd51877f6aa051c3a0af7 data\extravaganza\recipe\gray_curved_fe 2196817d9cae0e9ed3f59269cf2a67a0b3cb7769 data\extravaganza\advancement\recipes\building_blocks\blue_curved_festive_rubber.json 0076b9f163ab8ffad0bfe56bae8f264a00a030b3 data\extravaganza\advancement\recipes\building_blocks\magenta_barred_festive_rubber_stairs.json 253d9b068a4815cdf58e43127016c56d7fe0814e data\extravaganza\advancement\recipes\building_blocks\yellow_barred_festive_rubber_stairs.json +6475db5a05e4f9ed17344c00ea3957a3a2000169 data\extravaganza\recipe\ball_pit_registration_table.json dd32b701b324482ea59ee106ad9550810192afad data\extravaganza\recipe\cyan_slipped_festive_rubber.json 6c4dfe17f17737a375fa4a2d4ce75dd5bc40e8ea data\extravaganza\recipe\plant_bent_festive_rubber_stairs.json 698dab3fdbe82f72c6552d878bbb6c15484c5bd5 data\extravaganza\recipe\yellow_poured_festive_rubber_wall.json @@ -260,8 +261,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 -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 +4888e7a21cc903859fc1653fa8b159b781887c20 data\extravaganza\advancement\recipes\building_blocks\magenta_padded_festive_rubber_wall.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 +326,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 -e1af5d0e60825e05b53c514408fd4ac1f32e179f data\extravaganza\recipe\brown_tiled_festive_rubber_wall.json 97e266f37df5833d1192511f82537adcec004269 data\extravaganza\recipe\black_curved_festive_rubber_slab.json +e1af5d0e60825e05b53c514408fd4ac1f32e179f data\extravaganza\recipe\brown_tiled_festive_rubber_wall.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 @@ -453,8 +454,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 -a633186f820b444d4ee989b524c602e7ad9659fd data\extravaganza\recipe\nymph_tiled_festive_rubber_stairs.json 856d55bfbc55f8e65104cc80107bd12a87e8378e data\extravaganza\advancement\recipes\building_blocks\nymph_screwed_festive_rubber_stairs.json +a633186f820b444d4ee989b524c602e7ad9659fd data\extravaganza\recipe\nymph_tiled_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 @@ -664,8 +665,8 @@ e049efd0d5f2814be3e3c5b55b3c034b7cb392c6 data\extravaganza\advancement\recipes\b bfc3198a9876dbb0b7bfeab9bd0ba7c4275fbe81 data\extravaganza\advancement\recipes\building_blocks\blue_wooded_festive_rubber_stairs.json b093af3e1210bb70e423d1a2906d97d08fe78308 data\extravaganza\advancement\recipes\building_blocks\white_windowed_festive_rubber_stairs.json 6933a372c0d590fd39b85918e1aad5c692b087d2 data\extravaganza\advancement\recipes\building_blocks\plant_windowed_festive_rubber_slab.json -a87213d89d42f436733c307306b8ea971167db99 data\extravaganza\advancement\recipes\building_blocks\green_tiled_festive_rubber_slab.json e89144975d813c81f02bd40f2e12899ce616b5b7 data\extravaganza\recipe\green_curved_festive_rubber_slab.json +a87213d89d42f436733c307306b8ea971167db99 data\extravaganza\advancement\recipes\building_blocks\green_tiled_festive_rubber_slab.json dd705c607c67c450ff05f2ee7fdbdaa3df492255 data\extravaganza\recipe\lime_barred_festive_rubber.json 54a1de96bc5733584e26f8bccb62f3aa1c3afd98 data\extravaganza\recipe\cyan_windowed_festive_rubber.json 89a8770ab17883816995bb2c5979ab8cb0ba50f1 data\extravaganza\recipe\light_blue_festive_rubber_grate_stairs.json @@ -682,8 +683,8 @@ a942ac2d9a7964ac6b8269e3ba8ff95f0402c7e0 data\extravaganza\advancement\recipes\b 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 -aae1887425ed593cf91d3375b8053eea251d6d60 data\extravaganza\advancement\recipes\building_blocks\magenta_tiled_festive_rubber_wall.json 87767bd42f3fdb4db666489a2caa4bbcf9a69db5 data\extravaganza\recipe\black_poured_festive_rubber_slab.json +aae1887425ed593cf91d3375b8053eea251d6d60 data\extravaganza\advancement\recipes\building_blocks\magenta_tiled_festive_rubber_wall.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 @@ -866,7 +867,6 @@ a4757d63e439ff8c733709ef3454ff081acee2ed data\extravaganza\advancement\recipes\b ccd0e519765283c11b3d4eb898a1b9d4ff23d932 data\extravaganza\advancement\recipes\building_blocks\blue_screwed_festive_rubber.json b86ee66c6aafd6f9cf7953e50231653df0cdf46a data\extravaganza\advancement\recipes\building_blocks\orange_sharped_festive_rubber_stairs.json 8a48bd74368674849c73e254384281fa1715dc62 data\extravaganza\recipe\yellow_dotted_festive_rubber_stairs.json -141c581303221fef848d002336c647ea8e38dc88 data\extravaganza\advancement\recipes\misc\ball_pool_registration_table.json 9718ed5415b0bbb6e8df096e118176d5a1762513 data\extravaganza\advancement\recipes\building_blocks\light_blue_trash_can.json ffd276f60c759143f34703083571162b97d9f861 data\extravaganza\recipe\plant_screwed_festive_rubber_stairs.json 9032104e703ae8bab910d3918e8813c707b4a86e data\extravaganza\recipe\tear_wooded_festive_rubber.json @@ -1543,8 +1543,8 @@ fe3f44bd33789351d203b3974ceabe2d57d77115 data\extravaganza\advancement\recipes\b ccb55f2b34487583f14dcde50c8781c9c8d37d93 data\extravaganza\recipe\pink_barred_festive_rubber_slab.json cdb7fa91a1c19f8d0a0b5bbfc29c797f25992bd5 data\extravaganza\recipe\lime_festive_rubber.json 099a16e9a2e2276c2662632c67267929dfa8ee7b data\extravaganza\recipe\yellow_barred_festive_rubber_stairs.json -0cb9b8156e6ed020027e22039e958b2520437aee data\extravaganza\advancement\recipes\building_blocks\cyan_split_festive_rubber_wall.json 8147307ddbb1de9b5d27d409c81adf42e08c27d5 data\extravaganza\advancement\recipes\building_blocks\cyan_tiled_festive_rubber_stairs.json +0cb9b8156e6ed020027e22039e958b2520437aee data\extravaganza\advancement\recipes\building_blocks\cyan_split_festive_rubber_wall.json 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 @@ -1865,8 +1865,8 @@ f67230677c2f49f7b3bda66da5c1b8a96be94ab1 data\extravaganza\recipe\cyan_barred_fe 2fa7320503d1aa3f88b2b2d23498dd3d0c4f0738 data\extravaganza\advancement\recipes\building_blocks\orange_padded_festive_rubber.json 604384531d3c96ed8a15bbe35bc1a8ffe8e81ae1 data\extravaganza\advancement\recipes\building_blocks\purple_curved_festive_rubber_stairs.json 256597bba7966acba746ab18353bb50fac97d9d4 data\extravaganza\recipe\green_bent_festive_rubber_stairs.json -695172e4cb87627bcd12880e107feb96f42c8ac8 data\extravaganza\recipe\magenta_tiled_festive_rubber_slab.json 286999a123728e7b620c65f23e2375660dfd1e73 data\extravaganza\recipe\cyan_bent_festive_rubber_wall.json +695172e4cb87627bcd12880e107feb96f42c8ac8 data\extravaganza\recipe\magenta_tiled_festive_rubber_slab.json cc933a4cdab36a714d1c2ee08aced6174e71ecdb data\extravaganza\recipe\blue_wooded_festive_rubber_wall.json 80ee36d5bb44e2aa4f27cb86747142a46e02f5a2 data\extravaganza\recipe\magenta_barred_festive_rubber_wall.json 8737723be93be78b83505328e6fbc0416620ff70 data\extravaganza\advancement\recipes\building_blocks\gray_bent_festive_rubber_stairs.json @@ -1914,6 +1914,7 @@ ed05ca435f61e1f727d47b7bf999ad04f4711f3a data\extravaganza\advancement\recipes\b 3e3abfd4404983fd540fed38c76a5883dcd526c2 data\extravaganza\advancement\recipes\building_blocks\pink_slipped_festive_rubber_wall.json 04666866a9b41a080d6905684f3f0924db47f96e data\extravaganza\advancement\recipes\building_blocks\purple_windowed_festive_rubber_stairs.json 8f85044a8bb24f122795d5125457e494312a46ec data\extravaganza\recipe\magenta_curved_festive_rubber.json +9a9de239f897cccebf0c03a52d24c10b94ad60c9 data\extravaganza\recipe\ball_pit_content.json dee10b0324cf5c610ca78034898afede71eab12b data\extravaganza\advancement\recipes\building_blocks\plant_festive_rubber_slab.json a4a12546e9e0e027276479760811ca5250b19b36 data\extravaganza\advancement\recipes\building_blocks\magenta_scratched_festive_rubber_wall.json 69a60f0b4565489dff0b4246210f23c68a3c031f data\extravaganza\recipe\plant_bent_festive_rubber.json @@ -2191,13 +2192,12 @@ 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 -a907cc83697c57d199304b730c54028c91e7f298 data\extravaganza\advancement\recipes\building_blocks\brown_padded_festive_rubber_wall.json 21b52fe84082d2f0ea464bd2b98f2602a5ad6aed data\extravaganza\recipe\magenta_wooded_festive_rubber_stairs.json +a907cc83697c57d199304b730c54028c91e7f298 data\extravaganza\advancement\recipes\building_blocks\brown_padded_festive_rubber_wall.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 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 @@ -2430,7 +2430,6 @@ f7adedb113680d1d3210162e3b705dea86e3618b data\extravaganza\advancement\recipes\b 210507e434831fed0935dfc36da3abfad1461139 data\extravaganza\advancement\recipes\building_blocks\blue_bent_festive_rubber_slab.json 87f7874821b8045bce396a4e01530d052a63fce5 data\extravaganza\advancement\recipes\building_blocks\black_tiled_festive_rubber_wall.json 05451c44ba41eb6086847f7a50a42cfdf45e4050 data\extravaganza\advancement\recipes\building_blocks\black_windowed_festive_rubber.json -d22b6e1433f82d99a3731208e19d5feeff14a74b data\extravaganza\recipe\ball_pool_content.json 6236f8ef94b1f4b500a5390d01cc64a68a4e7355 data\extravaganza\recipe\brown_festive_rubber_grate.json 4544130fc71d7cdb644bdd1d83bd475371ec4e7a data\extravaganza\recipe\gray_sharped_festive_rubber_wall.json a00be94c06dfd5948aeded9bd1110a7ef598a62a data\extravaganza\advancement\recipes\building_blocks\green_barred_festive_rubber_slab.json @@ -2501,7 +2500,6 @@ a65535283c96096cbd9215ec7f1bfdfd682735e4 data\extravaganza\recipe\cyan_split_fes f406aeccd93d15ceca401272ca51b12fc10a4ba2 data\extravaganza\recipe\black_padded_festive_rubber_slab.json de759d1c97223a8d4b8942bfee21078820d5eb6a data\extravaganza\advancement\recipes\building_blocks\pink_poured_festive_rubber_slab.json acbf5a32568948b0bc64d7456a2db62f489953ec data\extravaganza\advancement\recipes\building_blocks\yellow_sharped_festive_rubber_stairs.json -6c0c5d41c74b6efb96e88c5e062ffe9e64f06f87 data\extravaganza\advancement\recipes\misc\ball_pool_content.json 3185f2db8db5735b96634d253815e532c6398835 data\extravaganza\advancement\recipes\building_blocks\gray_festive_rubber_grate_stairs.json 04a881d1cfab5efc03c20d8a32f2be3c7b2c7b5f data\extravaganza\advancement\recipes\building_blocks\black_festive_rubber_grate_stairs.json d77d66175ee1d2143a99158bc2ddbe5161ecc949 data\extravaganza\recipe\lime_split_festive_rubber_stairs.json @@ -2530,6 +2528,7 @@ eee564431355e24182a893c06a740404d34fbc7f data\extravaganza\advancement\recipes\b 3222ee04cec7bc27237fcca31539ec5d22e77e18 data\extravaganza\advancement\recipes\building_blocks\black_perforated_festive_rubber.json 707cb56118ba408d1714f6f83e6fad7d424eb2e3 data\extravaganza\advancement\recipes\building_blocks\light_blue_padded_festive_rubber_stairs.json 2ec1025e54abc8611169a3bb3d41e18fb6d72111 data\extravaganza\advancement\recipes\building_blocks\brown_dotted_festive_rubber_stairs.json +6a30d5b4f84d05a56101f0af0ca4cc5521821612 data\extravaganza\advancement\recipes\misc\ball_pit_content.json ed66fde055254fcf80f1199ba2b2111dd58da551 data\extravaganza\advancement\recipes\building_blocks\brown_perforated_festive_rubber_stairs.json 6677165c9e2adc705471d44ae6e00142da15ed53 data\extravaganza\recipe\white_scratched_festive_rubber_slab.json 14e91e9d41568e4136ec1bbc242faf0db07ad752 data\extravaganza\recipe\nymph_padded_festive_rubber_slab.json @@ -2710,14 +2709,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 +031e9263a6119d884e7baee3cfe00f61516f5406 data\extravaganza\advancement\recipes\building_blocks\light_gray_scratched_festive_rubber_stairs.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 -2de793ea3b9ff29289fed783a5900efe353f7bb6 data\extravaganza\advancement\recipes\building_blocks\yellow_tiled_festive_rubber.json b3f05067297c1b6ca88c72d8ff7555e2b4d30ad7 data\extravaganza\recipe\yellow_screwed_festive_rubber_wall.json +2de793ea3b9ff29289fed783a5900efe353f7bb6 data\extravaganza\advancement\recipes\building_blocks\yellow_tiled_festive_rubber.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 @@ -2818,8 +2817,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 -216dcee4b6e545b16437b9bae3116cfa1bb703a5 data\extravaganza\recipe\red_tiled_festive_rubber_slab.json 2b7858a2359159b331e500e287710c72f7adcce2 data\extravaganza\advancement\recipes\building_blocks\red_slipped_festive_rubber_slab.json +216dcee4b6e545b16437b9bae3116cfa1bb703a5 data\extravaganza\recipe\red_tiled_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 @@ -2827,6 +2826,7 @@ fab26e475a64ce6a69aa79c52d0fe3fbaedc894f data\extravaganza\recipe\light_gray_fes 485f01a59f38042e963b17e0f6e527db60eb89fc data\extravaganza\advancement\recipes\building_blocks\orange_striped_festive_rubber_stairs.json 7191861587e10a0d3fbea72ff9d152ba75f91a72 data\extravaganza\advancement\recipes\building_blocks\purple_festive_rubber_wall.json 8c2bcf59acdefd6045a413190c38f2cb7a34777a data\extravaganza\recipe\nymph_scratched_festive_rubber_slab.json +c77dfbf255deaa03d54afa1fade4d99c8d26c676 data\extravaganza\advancement\recipes\misc\ball_pit_registration_table.json a85338756dc3178f162ee03a9831e1b3ce5f9e0f data\extravaganza\recipe\green_screwed_festive_rubber_stairs.json 97e125220cb4b861869240c49fd81c2342964a90 data\extravaganza\advancement\recipes\building_blocks\tear_wooded_festive_rubber_slab.json 79388c49f7a4f720d29b4330da850fa605b37efe data\extravaganza\recipe\purple_windowed_festive_rubber_wall.json diff --git a/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 b/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 index 8f6cbc91..41be0199 100644 --- a/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 +++ b/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 @@ -1,2 +1,2 @@ -// 1.21 2024-07-01T03:10:22.4798061 Extravaganza!/Language (en_us) -cbccb91f33768fcb7db25fa4b5817ea6bf2012a6 assets\extravaganza\lang\en_us.json +// 1.21 2024-07-31T00:08:58.0255118 Extravaganza!/Language (en_us) +20e22105d050ea2ed1ca6322c53f76c93ede914f assets\extravaganza\lang\en_us.json diff --git a/src/main/generated/assets/extravaganza/blockstates/ball_pit_registration_table.json b/src/main/generated/assets/extravaganza/blockstates/ball_pit_registration_table.json new file mode 100644 index 00000000..5e7dcc70 --- /dev/null +++ b/src/main/generated/assets/extravaganza/blockstates/ball_pit_registration_table.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "extravaganza:block/ball_pit_registration_table", + "y": 90 + }, + "facing=north": { + "model": "extravaganza:block/ball_pit_registration_table" + }, + "facing=south": { + "model": "extravaganza:block/ball_pit_registration_table", + "y": 180 + }, + "facing=west": { + "model": "extravaganza:block/ball_pit_registration_table", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/extravaganza/blockstates/ball_pool_registration_table.json b/src/main/generated/assets/extravaganza/blockstates/ball_pool_registration_table.json deleted file mode 100644 index 607c38c0..00000000 --- a/src/main/generated/assets/extravaganza/blockstates/ball_pool_registration_table.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=east": { - "model": "extravaganza:block/ball_pool_registration_table", - "y": 90 - }, - "facing=north": { - "model": "extravaganza:block/ball_pool_registration_table" - }, - "facing=south": { - "model": "extravaganza:block/ball_pool_registration_table", - "y": 180 - }, - "facing=west": { - "model": "extravaganza:block/ball_pool_registration_table", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/extravaganza/lang/en_us.json b/src/main/generated/assets/extravaganza/lang/en_us.json index 91237c0b..257c563d 100644 --- a/src/main/generated/assets/extravaganza/lang/en_us.json +++ b/src/main/generated/assets/extravaganza/lang/en_us.json @@ -1,7 +1,7 @@ { "block.extravaganza.ball_distributor": "Ball Distributor", - "block.extravaganza.ball_pool_content": "Ball Pool Content", - "block.extravaganza.ball_pool_registration_table": "Ball Pool Registration Table", + "block.extravaganza.ball_pit_content": "Ball Pit Content", + "block.extravaganza.ball_pit_registration_table": "Ball Pit Registration Table", "block.extravaganza.black_barred_festive_rubber": "Black Barred Festive Rubber", "block.extravaganza.black_barred_festive_rubber_slab": "Black Barred Festive Rubber Slab", "block.extravaganza.black_barred_festive_rubber_stairs": "Black Barred Festive Rubber Stairs", diff --git a/src/main/generated/assets/extravaganza/models/item/ball_pool_content.json b/src/main/generated/assets/extravaganza/models/item/ball_pit_content.json similarity index 54% rename from src/main/generated/assets/extravaganza/models/item/ball_pool_content.json rename to src/main/generated/assets/extravaganza/models/item/ball_pit_content.json index 6f1a48a9..01878ab8 100644 --- a/src/main/generated/assets/extravaganza/models/item/ball_pool_content.json +++ b/src/main/generated/assets/extravaganza/models/item/ball_pit_content.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "extravaganza:item/ball_pool_content" + "layer0": "extravaganza:item/ball_pit_content" } } \ No newline at end of file diff --git a/src/main/generated/assets/extravaganza/models/item/ball_pit_registration_table.json b/src/main/generated/assets/extravaganza/models/item/ball_pit_registration_table.json new file mode 100644 index 00000000..4d504bf1 --- /dev/null +++ b/src/main/generated/assets/extravaganza/models/item/ball_pit_registration_table.json @@ -0,0 +1,3 @@ +{ + "parent": "extravaganza:block/ball_pit_registration_table" +} \ No newline at end of file diff --git a/src/main/generated/assets/extravaganza/models/item/ball_pool_registration_table.json b/src/main/generated/assets/extravaganza/models/item/ball_pool_registration_table.json deleted file mode 100644 index 4da99e85..00000000 --- a/src/main/generated/assets/extravaganza/models/item/ball_pool_registration_table.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "extravaganza:block/ball_pool_registration_table" -} \ No newline at end of file diff --git a/src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pool_content.json b/src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pit_content.json similarity index 66% rename from src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pool_content.json rename to src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pit_content.json index 6dd2070f..9dc2f886 100644 --- a/src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pool_content.json +++ b/src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pit_content.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_ball_pool_content": { + "has_ball_pit_content": { "conditions": { "items": [ { - "items": "extravaganza:ball_pool_content" + "items": "extravaganza:ball_pit_content" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "extravaganza:ball_pool_content" + "recipe": "extravaganza:ball_pit_content" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_ball_pool_content" + "has_ball_pit_content" ] ], "rewards": { "recipes": [ - "extravaganza:ball_pool_content" + "extravaganza:ball_pit_content" ] } } \ No newline at end of file diff --git a/src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pool_registration_table.json b/src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pit_registration_table.json similarity index 61% rename from src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pool_registration_table.json rename to src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pit_registration_table.json index f62b4733..bcd1966b 100644 --- a/src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pool_registration_table.json +++ b/src/main/generated/data/extravaganza/advancement/recipes/misc/ball_pit_registration_table.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_ball_pool_registration_table": { + "has_ball_pit_registration_table": { "conditions": { "items": [ { - "items": "extravaganza:ball_pool_registration_table" + "items": "extravaganza:ball_pit_registration_table" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "extravaganza:ball_pool_registration_table" + "recipe": "extravaganza:ball_pit_registration_table" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_ball_pool_registration_table" + "has_ball_pit_registration_table" ] ], "rewards": { "recipes": [ - "extravaganza:ball_pool_registration_table" + "extravaganza:ball_pit_registration_table" ] } } \ No newline at end of file diff --git a/src/main/generated/data/extravaganza/loot_table/blocks/ball_pool_content.json b/src/main/generated/data/extravaganza/loot_table/blocks/ball_pit_content.json similarity index 85% rename from src/main/generated/data/extravaganza/loot_table/blocks/ball_pool_content.json rename to src/main/generated/data/extravaganza/loot_table/blocks/ball_pit_content.json index c090cfd5..bd879064 100644 --- a/src/main/generated/data/extravaganza/loot_table/blocks/ball_pool_content.json +++ b/src/main/generated/data/extravaganza/loot_table/blocks/ball_pit_content.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "extravaganza:ball_pool_content" + "name": "extravaganza:ball_pit_content" } ], "rolls": 1.0 diff --git a/src/main/generated/data/extravaganza/loot_table/blocks/ball_pool_registration_table.json b/src/main/generated/data/extravaganza/loot_table/blocks/ball_pit_registration_table.json similarity index 82% rename from src/main/generated/data/extravaganza/loot_table/blocks/ball_pool_registration_table.json rename to src/main/generated/data/extravaganza/loot_table/blocks/ball_pit_registration_table.json index 2bcf8429..b43ea8b0 100644 --- a/src/main/generated/data/extravaganza/loot_table/blocks/ball_pool_registration_table.json +++ b/src/main/generated/data/extravaganza/loot_table/blocks/ball_pit_registration_table.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "extravaganza:ball_pool_registration_table" + "name": "extravaganza:ball_pit_registration_table" } ], "rolls": 1.0 diff --git a/src/main/generated/data/extravaganza/recipe/ball_pool_content.json b/src/main/generated/data/extravaganza/recipe/ball_pit_content.json similarity index 84% rename from src/main/generated/data/extravaganza/recipe/ball_pool_content.json rename to src/main/generated/data/extravaganza/recipe/ball_pit_content.json index 3efc4a3e..80350967 100644 --- a/src/main/generated/data/extravaganza/recipe/ball_pool_content.json +++ b/src/main/generated/data/extravaganza/recipe/ball_pit_content.json @@ -13,6 +13,6 @@ ], "result": { "count": 16, - "id": "extravaganza:ball_pool_content" + "id": "extravaganza:ball_pit_content" } } \ No newline at end of file diff --git a/src/main/generated/data/extravaganza/recipe/ball_pool_registration_table.json b/src/main/generated/data/extravaganza/recipe/ball_pit_registration_table.json similarity index 87% rename from src/main/generated/data/extravaganza/recipe/ball_pool_registration_table.json rename to src/main/generated/data/extravaganza/recipe/ball_pit_registration_table.json index 96c37df3..95199779 100644 --- a/src/main/generated/data/extravaganza/recipe/ball_pool_registration_table.json +++ b/src/main/generated/data/extravaganza/recipe/ball_pit_registration_table.json @@ -22,6 +22,6 @@ ], "result": { "count": 1, - "id": "extravaganza:ball_pool_registration_table" + "id": "extravaganza:ball_pit_registration_table" } } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/mineable/axe.json b/src/main/generated/data/minecraft/tags/block/mineable/axe.json index b948db47..4ed50154 100644 --- a/src/main/generated/data/minecraft/tags/block/mineable/axe.json +++ b/src/main/generated/data/minecraft/tags/block/mineable/axe.json @@ -15,6 +15,6 @@ "extravaganza:hevea_brasiliensis_button", "extravaganza:hevea_brasiliensis_leaves", "extravaganza:hevea_brasiliensis_sapling", - "extravaganza:ball_pool_registration_table" + "extravaganza:ball_pit_registration_table" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json b/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json index 191174ab..05b7850b 100644 --- a/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json +++ b/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json @@ -15,7 +15,7 @@ "extravaganza:hevea_brasiliensis_button", "extravaganza:hevea_brasiliensis_leaves", "extravaganza:hevea_brasiliensis_sapling", - "extravaganza:ball_pool_registration_table", + "extravaganza:ball_pit_registration_table", "extravaganza:ball_distributor", "extravaganza:popcorn_machine", "extravaganza:black_trash_can", diff --git a/src/main/java/com/mmodding/extravaganza/Extravaganza.java b/src/main/java/com/mmodding/extravaganza/Extravaganza.java index fac969a7..43211cfe 100644 --- a/src/main/java/com/mmodding/extravaganza/Extravaganza.java +++ b/src/main/java/com/mmodding/extravaganza/Extravaganza.java @@ -47,12 +47,12 @@ public void onInitialize() { } }); CommandRegistrationCallback.EVENT.register( - (dispatcher, registries, environment) -> dispatcher.register(CommandManager.literal("before-entering-poll").executes(context -> { - if (context.getSource().getPlayer() != null && context.getSource().getPlayer().hasAttached(ExtravaganzaDataAttachments.BEFORE_ENTERING_POOL)) { - Vec3d position = context.getSource().getPlayer().getAttached(ExtravaganzaDataAttachments.BEFORE_ENTERING_POOL); + (dispatcher, registries, environment) -> dispatcher.register(CommandManager.literal("leave-ball-pit").executes(context -> { + if (context.getSource().getPlayer() != null && context.getSource().getPlayer().hasAttached(ExtravaganzaDataAttachments.BEFORE_BALL_PIT)) { + Vec3d position = context.getSource().getPlayer().getAttached(ExtravaganzaDataAttachments.BEFORE_BALL_PIT); assert position != null; context.getSource().getPlayer().teleport(position.getX(), position.getY(), position.getZ(), false); - context.getSource().getPlayer().removeAttached(ExtravaganzaDataAttachments.BEFORE_ENTERING_POOL); + context.getSource().getPlayer().removeAttached(ExtravaganzaDataAttachments.BEFORE_BALL_PIT); return 1; } else { diff --git a/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java b/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java index 05b8a19f..773db2eb 100644 --- a/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java +++ b/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java @@ -157,16 +157,16 @@ public static class ExtravaganzaModelProvider extends FabricModelProvider { block instanceof TransparentBlock || block instanceof TrashCanBlock || block instanceof LadderBlock || - block.equals(ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE) || - block.equals(ExtravaganzaBlocks.BALL_POOL_CONTENT) || - block.equals(ExtravaganzaBlocks.BALL_POOL_PROTECTION) || + block.equals(ExtravaganzaBlocks.BALL_PIT_REGISTRATION_TABLE) || + block.equals(ExtravaganzaBlocks.BALL_PIT_CONTENT) || + block.equals(ExtravaganzaBlocks.BALL_PIT_PROTECTION) || block.equals(ExtravaganzaBlocks.BALL_DISTRIBUTOR) || block.equals(ExtravaganzaBlocks.POPCORN_MACHINE) || block.equals(ExtravaganzaBlocks.GARLAND) || block.equals(ExtravaganzaBlocks.PINATA); private final static Set WITH_GENERATED_ITEM = Set.of( - ExtravaganzaBlocks.BALL_POOL_CONTENT, + ExtravaganzaBlocks.BALL_PIT_CONTENT, ExtravaganzaBlocks.BALL_DISTRIBUTOR, ExtravaganzaBlocks.GARLAND, ExtravaganzaBlocks.PINATA, @@ -310,9 +310,9 @@ else if (block instanceof LadderBlock) { else if (block.equals(ExtravaganzaBlocks.GARLAND)) { this.generateGarlandModel(blockStateModelGenerator); } - else if (block.equals(ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE) || block.equals(ExtravaganzaBlocks.POPCORN_MACHINE)) { + else if (block.equals(ExtravaganzaBlocks.BALL_PIT_REGISTRATION_TABLE) || block.equals(ExtravaganzaBlocks.POPCORN_MACHINE)) { blockStateModelGenerator.registerNorthDefaultHorizontalRotation(block); - if (block.equals(ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE)) { + if (block.equals(ExtravaganzaBlocks.BALL_PIT_REGISTRATION_TABLE)) { blockStateModelGenerator.registerParentedItemModel(block, ModelIds.getBlockModelId(block)); } } @@ -718,8 +718,8 @@ public void generate(RecipeExporter exporter) { .pattern("RRR") .pattern("SRS") .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE.asItem()) - .criterion(ExtravaganzaRecipeProvider.hasItem(ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE.asItem()), ExtravaganzaRecipeProvider.conditionsFromItem(ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE.asItem())) + ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, ExtravaganzaBlocks.BALL_PIT_REGISTRATION_TABLE.asItem()) + .criterion(ExtravaganzaRecipeProvider.hasItem(ExtravaganzaBlocks.BALL_PIT_REGISTRATION_TABLE.asItem()), ExtravaganzaRecipeProvider.conditionsFromItem(ExtravaganzaBlocks.BALL_PIT_REGISTRATION_TABLE.asItem())) .input('P', Items.PAPER) .input('I', Items.INK_SAC) .input('F', Items.FLOWER_POT) @@ -728,8 +728,8 @@ public void generate(RecipeExporter exporter) { .pattern("HHH") .pattern("H H") .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, ExtravaganzaBlocks.BALL_POOL_CONTENT.asItem(), 16) - .criterion(ExtravaganzaRecipeProvider.hasItem(ExtravaganzaBlocks.BALL_POOL_CONTENT.asItem()), ExtravaganzaRecipeProvider.conditionsFromItem(ExtravaganzaBlocks.BALL_POOL_CONTENT.asItem())) + ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, ExtravaganzaBlocks.BALL_PIT_CONTENT.asItem(), 16) + .criterion(ExtravaganzaRecipeProvider.hasItem(ExtravaganzaBlocks.BALL_PIT_CONTENT.asItem()), ExtravaganzaRecipeProvider.conditionsFromItem(ExtravaganzaBlocks.BALL_PIT_CONTENT.asItem())) .input('B', TagKey.of(RegistryKeys.ITEM, Extravaganza.createId("festive_balls"))) .pattern("BBB") .pattern("BBB") diff --git a/src/main/java/com/mmodding/extravaganza/block/BallPoolContentBlock.java b/src/main/java/com/mmodding/extravaganza/block/BallPitContentBlock.java similarity index 65% rename from src/main/java/com/mmodding/extravaganza/block/BallPoolContentBlock.java rename to src/main/java/com/mmodding/extravaganza/block/BallPitContentBlock.java index 846ca82e..6eba25fa 100644 --- a/src/main/java/com/mmodding/extravaganza/block/BallPoolContentBlock.java +++ b/src/main/java/com/mmodding/extravaganza/block/BallPitContentBlock.java @@ -6,17 +6,17 @@ import net.minecraft.state.property.IntProperty; import net.minecraft.state.property.Properties; -public class BallPoolContentBlock extends Block { +public class BallPitContentBlock extends Block { public static final IntProperty POWER = Properties.POWER; - public BallPoolContentBlock(Settings settings) { + public BallPitContentBlock(Settings settings) { super(settings); - this.setDefaultState(this.getDefaultState().with(BallPoolContentBlock.POWER, 3)); + this.setDefaultState(this.getDefaultState().with(BallPitContentBlock.POWER, 3)); } @Override protected void appendProperties(StateManager.Builder builder) { - builder.add(BallPoolContentBlock.POWER); + builder.add(BallPitContentBlock.POWER); } } diff --git a/src/main/java/com/mmodding/extravaganza/block/BallPoolProtectionBlock.java b/src/main/java/com/mmodding/extravaganza/block/BallPitProtectionBlock.java similarity index 92% rename from src/main/java/com/mmodding/extravaganza/block/BallPoolProtectionBlock.java rename to src/main/java/com/mmodding/extravaganza/block/BallPitProtectionBlock.java index 80dd39c8..dd5cb3aa 100644 --- a/src/main/java/com/mmodding/extravaganza/block/BallPoolProtectionBlock.java +++ b/src/main/java/com/mmodding/extravaganza/block/BallPitProtectionBlock.java @@ -10,9 +10,9 @@ import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -public class BallPoolProtectionBlock extends Block { +public class BallPitProtectionBlock extends Block { - public BallPoolProtectionBlock(Settings settings) { + public BallPitProtectionBlock(Settings settings) { super(settings); } diff --git a/src/main/java/com/mmodding/extravaganza/block/BallPoolRegistrationTableBlock.java b/src/main/java/com/mmodding/extravaganza/block/BallPitRegistrationTableBlock.java similarity index 70% rename from src/main/java/com/mmodding/extravaganza/block/BallPoolRegistrationTableBlock.java rename to src/main/java/com/mmodding/extravaganza/block/BallPitRegistrationTableBlock.java index cd93a740..1ff9c738 100644 --- a/src/main/java/com/mmodding/extravaganza/block/BallPoolRegistrationTableBlock.java +++ b/src/main/java/com/mmodding/extravaganza/block/BallPitRegistrationTableBlock.java @@ -1,6 +1,6 @@ package com.mmodding.extravaganza.block; -import com.mmodding.extravaganza.block.entity.BallPoolRegistrationTableBlockEntity; +import com.mmodding.extravaganza.block.entity.BallPitRegistrationTableBlockEntity; import com.mmodding.extravaganza.init.ExtravaganzaBlockEntities; import com.mmodding.extravaganza.init.ExtravaganzaBlocks; import com.mmodding.extravaganza.init.ExtravaganzaDataAttachments; @@ -33,29 +33,29 @@ import org.jetbrains.annotations.Nullable; // This block will manage the full Ball Pool, including changing the power of the velocity in example. -public class BallPoolRegistrationTableBlock extends BlockWithEntity { +public class BallPitRegistrationTableBlock extends BlockWithEntity { - public static final MapCodec CODEC = BallPoolRegistrationTableBlock.createCodec(BallPoolRegistrationTableBlock::new); + public static final MapCodec CODEC = BallPitRegistrationTableBlock.createCodec(BallPitRegistrationTableBlock::new); public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING; public static final BooleanProperty LOCK_SCAN = BooleanProperty.of("lock_scan"); public static final BooleanProperty LOCK_SETTINGS = BooleanProperty.of("lock_settings"); - public BallPoolRegistrationTableBlock(Settings settings) { + public BallPitRegistrationTableBlock(Settings settings) { super(settings); - this.setDefaultState(this.getDefaultState().with(BallPoolRegistrationTableBlock.FACING, Direction.NORTH).with(BallPoolRegistrationTableBlock.LOCK_SCAN, false).with(BallPoolRegistrationTableBlock.LOCK_SETTINGS, false)); + this.setDefaultState(this.getDefaultState().with(BallPitRegistrationTableBlock.FACING, Direction.NORTH).with(BallPitRegistrationTableBlock.LOCK_SCAN, false).with(BallPitRegistrationTableBlock.LOCK_SETTINGS, false)); } @Override protected MapCodec getCodec() { - return BallPoolRegistrationTableBlock.CODEC; + return BallPitRegistrationTableBlock.CODEC; } @Nullable @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { - return new BallPoolRegistrationTableBlockEntity(pos, state); + return new BallPitRegistrationTableBlockEntity(pos, state); } @Override @@ -65,9 +65,9 @@ protected BlockRenderType getRenderType(BlockState state) { @Override protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { - if (world.getBlockEntity(pos) instanceof BallPoolRegistrationTableBlockEntity bpitbe) { + if (world.getBlockEntity(pos) instanceof BallPitRegistrationTableBlockEntity bpitbe) { if (player instanceof ServerPlayerEntity serverPlayer) { - serverPlayer.setAttached(ExtravaganzaDataAttachments.BEFORE_ENTERING_POOL, serverPlayer.getPos()); + serverPlayer.setAttached(ExtravaganzaDataAttachments.BEFORE_BALL_PIT, serverPlayer.getPos()); } Vec3d center = bpitbe.getRelativeFullScanned(pos).getCenter(); player.teleport(center.getX(), center.getY(), center.getZ(), false); @@ -87,12 +87,12 @@ 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) { - if (!player.isSneaking() && !world.getBlockState(pos).get(BallPoolRegistrationTableBlock.LOCK_SCAN)) { + if (world.getBlockEntity(pos) instanceof BallPitRegistrationTableBlockEntity bpitbe) { + if (!player.isSneaking() && !world.getBlockState(pos).get(BallPitRegistrationTableBlock.LOCK_SCAN)) { bpitbe.switchSelectionMode(); if (!world.isClient()) { Object object; - if (bpitbe.getSelectionMode().equals(BallPoolRegistrationTableBlockEntity.SelectionMode.SOURCE)) { + if (bpitbe.getSelectionMode().equals(BallPitRegistrationTableBlockEntity.SelectionMode.SOURCE)) { object = bpitbe.isSource(); } else { object = bpitbe.getScannedCurrent(); @@ -100,7 +100,7 @@ protected void onBlockBreakStart(BlockState state, World world, BlockPos pos, Pl player.sendMessage(Text.literal(bpitbe.getSelectionMode().asString() + ": " + object), true); } } - else if (!world.getBlockState(pos).get(BallPoolRegistrationTableBlock.LOCK_SETTINGS)) { + else if (!world.getBlockState(pos).get(BallPitRegistrationTableBlock.LOCK_SETTINGS)) { if (bpitbe.getPoolSettings().power < 15) { bpitbe.getPoolSettings().power = MathHelper.clamp(bpitbe.getPoolSettings().power + 1, 1, 15); } @@ -116,9 +116,9 @@ else if (!world.getBlockState(pos).get(BallPoolRegistrationTableBlock.LOCK_SETTI @Override public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) { - if (world.getBlockEntity(pos) instanceof BallPoolRegistrationTableBlockEntity bpitbe) { + if (world.getBlockEntity(pos) instanceof BallPitRegistrationTableBlockEntity bpitbe) { BlockPos.iterate(bpitbe.getRelativeScannedStart(pos), bpitbe.getRelativeScannedEnd(pos)).forEach(blockPos -> { - if (world.getBlockState(blockPos).isOf(ExtravaganzaBlocks.BALL_POOL_PROTECTION)) { + if (world.getBlockState(blockPos).isOf(ExtravaganzaBlocks.BALL_PIT_PROTECTION)) { world.removeBlock(blockPos, false); } }); @@ -128,28 +128,28 @@ public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEnt @Override public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return BallPoolRegistrationTableBlock.validateTicker(type, ExtravaganzaBlockEntities.BALL_POOl_REGISTRATION_TABLE, BallPoolRegistrationTableBlockEntity::tick); + return BallPitRegistrationTableBlock.validateTicker(type, ExtravaganzaBlockEntities.BALL_PIT_REGISTRATION_TABLE, BallPitRegistrationTableBlockEntity::tick); } @Override protected BlockState rotate(BlockState state, BlockRotation rotation) { - return state.with(BallPoolRegistrationTableBlock.FACING, rotation.rotate(state.get(BallPoolRegistrationTableBlock.FACING))); + return state.with(BallPitRegistrationTableBlock.FACING, rotation.rotate(state.get(BallPitRegistrationTableBlock.FACING))); } @Override protected BlockState mirror(BlockState state, BlockMirror mirror) { - return state.rotate(mirror.getRotation(state.get(BallPoolRegistrationTableBlock.FACING))); + return state.rotate(mirror.getRotation(state.get(BallPitRegistrationTableBlock.FACING))); } @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - return this.getDefaultState().with(BallPoolRegistrationTableBlock.FACING, ctx.getHorizontalPlayerFacing().getOpposite()); + return this.getDefaultState().with(BallPitRegistrationTableBlock.FACING, ctx.getHorizontalPlayerFacing().getOpposite()); } @Override protected void appendProperties(StateManager.Builder builder) { - builder.add(BallPoolRegistrationTableBlock.FACING); - builder.add(BallPoolRegistrationTableBlock.LOCK_SCAN); - builder.add(BallPoolRegistrationTableBlock.LOCK_SETTINGS); + builder.add(BallPitRegistrationTableBlock.FACING); + builder.add(BallPitRegistrationTableBlock.LOCK_SCAN); + builder.add(BallPitRegistrationTableBlock.LOCK_SETTINGS); } } diff --git a/src/main/java/com/mmodding/extravaganza/block/entity/BallPoolRegistrationTableBlockEntity.java b/src/main/java/com/mmodding/extravaganza/block/entity/BallPitRegistrationTableBlockEntity.java similarity index 90% rename from src/main/java/com/mmodding/extravaganza/block/entity/BallPoolRegistrationTableBlockEntity.java rename to src/main/java/com/mmodding/extravaganza/block/entity/BallPitRegistrationTableBlockEntity.java index b42d34eb..79fb8709 100644 --- a/src/main/java/com/mmodding/extravaganza/block/entity/BallPoolRegistrationTableBlockEntity.java +++ b/src/main/java/com/mmodding/extravaganza/block/entity/BallPitRegistrationTableBlockEntity.java @@ -1,6 +1,6 @@ package com.mmodding.extravaganza.block.entity; -import com.mmodding.extravaganza.block.BallPoolContentBlock; +import com.mmodding.extravaganza.block.BallPitContentBlock; import com.mmodding.extravaganza.init.ExtravaganzaBlockEntities; import com.mmodding.extravaganza.init.ExtravaganzaBlocks; import net.minecraft.block.BlockState; @@ -19,7 +19,7 @@ import java.util.function.Consumer; -public class BallPoolRegistrationTableBlockEntity extends BlockEntity { +public class BallPitRegistrationTableBlockEntity extends BlockEntity { private final PoolSettings poolSettings = new PoolSettings(); @@ -30,8 +30,8 @@ public class BallPoolRegistrationTableBlockEntity extends BlockEntity { private boolean source = true; - public BallPoolRegistrationTableBlockEntity(BlockPos pos, BlockState state) { - super(ExtravaganzaBlockEntities.BALL_POOl_REGISTRATION_TABLE, pos, state); + public BallPitRegistrationTableBlockEntity(BlockPos pos, BlockState state) { + super(ExtravaganzaBlockEntities.BALL_PIT_REGISTRATION_TABLE, pos, state); } @Override @@ -77,14 +77,14 @@ public NbtCompound toInitialChunkDataNbt(RegistryWrapper.WrapperLookup registryL return this.createComponentlessNbt(registryLookup); } - public static void tick(World world, BlockPos pos, BlockState state, BallPoolRegistrationTableBlockEntity bpitbe) { + public static void tick(World world, BlockPos pos, BlockState state, BallPitRegistrationTableBlockEntity bpitbe) { for (BlockPos current : BlockPos.iterate(bpitbe.getRelativeScannedStart(pos), bpitbe.getRelativeScannedEnd(pos))) { if (world.getBlockState(current).isAir()) { - world.setBlockState(current, ExtravaganzaBlocks.BALL_POOL_PROTECTION.getDefaultState()); + world.setBlockState(current, ExtravaganzaBlocks.BALL_PIT_PROTECTION.getDefaultState()); } - else if (world.getBlockState(current).isOf(ExtravaganzaBlocks.BALL_POOL_CONTENT)) { - if (world.getBlockState(current).get(BallPoolContentBlock.POWER) != bpitbe.getPoolSettings().power) { - world.setBlockState(current, world.getBlockState(current).with(BallPoolContentBlock.POWER, bpitbe.getPoolSettings().power)); + else if (world.getBlockState(current).isOf(ExtravaganzaBlocks.BALL_PIT_CONTENT)) { + if (world.getBlockState(current).get(BallPitContentBlock.POWER) != bpitbe.getPoolSettings().power) { + world.setBlockState(current, world.getBlockState(current).with(BallPitContentBlock.POWER, bpitbe.getPoolSettings().power)); } } } diff --git a/src/main/java/com/mmodding/extravaganza/client/block/entity/renderer/BallPoolRegistrationTableBlockEntityRenderer.java b/src/main/java/com/mmodding/extravaganza/client/block/entity/renderer/BallPitRegistrationTableBlockEntityRenderer.java similarity index 56% rename from src/main/java/com/mmodding/extravaganza/client/block/entity/renderer/BallPoolRegistrationTableBlockEntityRenderer.java rename to src/main/java/com/mmodding/extravaganza/client/block/entity/renderer/BallPitRegistrationTableBlockEntityRenderer.java index e4f9353a..63e3e5ef 100644 --- a/src/main/java/com/mmodding/extravaganza/client/block/entity/renderer/BallPoolRegistrationTableBlockEntityRenderer.java +++ b/src/main/java/com/mmodding/extravaganza/client/block/entity/renderer/BallPitRegistrationTableBlockEntityRenderer.java @@ -1,23 +1,23 @@ package com.mmodding.extravaganza.client.block.entity.renderer; -import com.mmodding.extravaganza.block.entity.BallPoolRegistrationTableBlockEntity; +import com.mmodding.extravaganza.block.entity.BallPitRegistrationTableBlockEntity; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.util.math.MatrixStack; -public class BallPoolRegistrationTableBlockEntityRenderer implements BlockEntityRenderer { +public class BallPitRegistrationTableBlockEntityRenderer implements BlockEntityRenderer { @Override - public void render(BallPoolRegistrationTableBlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertices, int light, int overlay) { + public void render(BallPitRegistrationTableBlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertices, int light, int overlay) { matrices.push(); WorldRenderer.drawBox(matrices, vertices.getBuffer(RenderLayer.getLines()), entity.getFullScanned(), 0.9f, 0.9f, 0.9f, 1.0f); matrices.pop(); } @Override - public boolean rendersOutsideBoundingBox(BallPoolRegistrationTableBlockEntity blockEntity) { + public boolean rendersOutsideBoundingBox(BallPitRegistrationTableBlockEntity blockEntity) { return true; } diff --git a/src/main/java/com/mmodding/extravaganza/client/init/ExtravaganzaRenderers.java b/src/main/java/com/mmodding/extravaganza/client/init/ExtravaganzaRenderers.java index c9b66d5a..47de1c98 100644 --- a/src/main/java/com/mmodding/extravaganza/client/init/ExtravaganzaRenderers.java +++ b/src/main/java/com/mmodding/extravaganza/client/init/ExtravaganzaRenderers.java @@ -1,6 +1,6 @@ package com.mmodding.extravaganza.client.init; -import com.mmodding.extravaganza.client.block.entity.renderer.BallPoolRegistrationTableBlockEntityRenderer; +import com.mmodding.extravaganza.client.block.entity.renderer.BallPitRegistrationTableBlockEntityRenderer; import com.mmodding.extravaganza.client.entity.renderer.FestiveBallEntityRenderer; import com.mmodding.extravaganza.client.entity.renderer.HeliumBalloonEntityRenderer; import com.mmodding.extravaganza.client.entity.renderer.MerryGoRoundEntityRenderer; @@ -15,6 +15,6 @@ public static void register() { EntityRendererRegistry.register(ExtravaganzaEntities.FESTIVE_BALL, FestiveBallEntityRenderer::new); EntityRendererRegistry.register(ExtravaganzaEntities.HELIUM_BALLOON, HeliumBalloonEntityRenderer::new); EntityRendererRegistry.register(ExtravaganzaEntities.MERRY_GO_ROUND, MerryGoRoundEntityRenderer::new); - BlockEntityRendererFactories.register(ExtravaganzaBlockEntities.BALL_POOl_REGISTRATION_TABLE, ctx -> new BallPoolRegistrationTableBlockEntityRenderer()); + BlockEntityRendererFactories.register(ExtravaganzaBlockEntities.BALL_PIT_REGISTRATION_TABLE, ctx -> new BallPitRegistrationTableBlockEntityRenderer()); } } diff --git a/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlockEntities.java b/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlockEntities.java index 82a8f3ab..57b46774 100644 --- a/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlockEntities.java +++ b/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlockEntities.java @@ -1,7 +1,7 @@ package com.mmodding.extravaganza.init; import com.mmodding.extravaganza.Extravaganza; -import com.mmodding.extravaganza.block.entity.BallPoolRegistrationTableBlockEntity; +import com.mmodding.extravaganza.block.entity.BallPitRegistrationTableBlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; @@ -10,13 +10,13 @@ public class ExtravaganzaBlockEntities { - public static final BlockEntityType BALL_POOl_REGISTRATION_TABLE = new BlockEntityType<>( - BallPoolRegistrationTableBlockEntity::new, - Set.of(ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE), + public static final BlockEntityType BALL_PIT_REGISTRATION_TABLE = new BlockEntityType<>( + BallPitRegistrationTableBlockEntity::new, + Set.of(ExtravaganzaBlocks.BALL_PIT_REGISTRATION_TABLE), null ); public static void register() { - Registry.register(Registries.BLOCK_ENTITY_TYPE, Extravaganza.createId("ball_pool_registration_table"), ExtravaganzaBlockEntities.BALL_POOl_REGISTRATION_TABLE); + Registry.register(Registries.BLOCK_ENTITY_TYPE, Extravaganza.createId("ball_pit_registration_table"), ExtravaganzaBlockEntities.BALL_PIT_REGISTRATION_TABLE); } } diff --git a/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlocks.java b/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlocks.java index 23a3af71..1ac34fcd 100644 --- a/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlocks.java +++ b/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaBlocks.java @@ -47,9 +47,9 @@ protected List getDroppedStacks(BlockState state, LootContextParamete public static final Block HEVEA_BRASILIENSIS_SAPLING = new SaplingBlock(new SaplingGenerator("hevea_brasiliensis", Optional.empty(), Optional.of(ExtravaganzaWorldGeneration.HEVEA_BRASILIENSIS), Optional.empty()), AbstractBlock.Settings.create().noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.AZALEA_LEAVES)); - public static final Block BALL_POOL_REGISTRATION_TABLE = new BallPoolRegistrationTableBlock(AbstractBlock.Settings.create().nonOpaque().strength(2.0f).sounds(BlockSoundGroup.WOOD)); - public static final Block BALL_POOL_CONTENT = new BallPoolContentBlock(AbstractBlock.Settings.create().noCollision().sounds(BlockSoundGroup.SLIME)); - public static final Block BALL_POOL_PROTECTION = new BallPoolProtectionBlock(AbstractBlock.Settings.create().noCollision().allowsSpawning(Blocks::never).solidBlock(Blocks::never).suffocates(Blocks::never).blockVision(Blocks::always).replaceable()); + public static final Block BALL_PIT_REGISTRATION_TABLE = new BallPitRegistrationTableBlock(AbstractBlock.Settings.create().nonOpaque().strength(2.0f).sounds(BlockSoundGroup.WOOD)); + public static final Block BALL_PIT_CONTENT = new BallPitContentBlock(AbstractBlock.Settings.create().noCollision().sounds(BlockSoundGroup.SLIME)); + public static final Block BALL_PIT_PROTECTION = new BallPitProtectionBlock(AbstractBlock.Settings.create().noCollision().allowsSpawning(Blocks::never).solidBlock(Blocks::never).suffocates(Blocks::never).blockVision(Blocks::always).replaceable()); public static final Block BALL_DISTRIBUTOR = new BallDistributorBlock(AbstractBlock.Settings.create().requiresTool().strength(2.5f, 3.0f).nonOpaque().sounds(BlockSoundGroup.LANTERN)); @@ -80,9 +80,9 @@ public static void register() { ExtravaganzaBlocks.registerBlockWithItem("hevea_brasiliensis_button", ExtravaganzaBlocks.HEVEA_BRASILIENSIS_BUTTON); ExtravaganzaBlocks.registerBlockWithItem("hevea_brasiliensis_leaves", ExtravaganzaBlocks.HEVEA_BRASILIENSIS_LEAVES); ExtravaganzaBlocks.registerBlockWithItem("hevea_brasiliensis_sapling", ExtravaganzaBlocks.HEVEA_BRASILIENSIS_SAPLING); - ExtravaganzaBlocks.registerBlockWithItem("ball_pool_registration_table", ExtravaganzaBlocks.BALL_POOL_REGISTRATION_TABLE); - ExtravaganzaBlocks.registerBlockWithItem("ball_pool_content", ExtravaganzaBlocks.BALL_POOL_CONTENT); - Registry.register(Registries.BLOCK, "ball_pool_protection", ExtravaganzaBlocks.BALL_POOL_PROTECTION); + ExtravaganzaBlocks.registerBlockWithItem("ball_pit_registration_table", ExtravaganzaBlocks.BALL_PIT_REGISTRATION_TABLE); + ExtravaganzaBlocks.registerBlockWithItem("ball_pit_content", ExtravaganzaBlocks.BALL_PIT_CONTENT); + Registry.register(Registries.BLOCK, "ball_pit_protection", ExtravaganzaBlocks.BALL_PIT_PROTECTION); ExtravaganzaBlocks.registerBlockWithItem("ball_distributor", ExtravaganzaBlocks.BALL_DISTRIBUTOR); ExtravaganzaBlocks.registerBlockWithItem("popcorn_machine", ExtravaganzaBlocks.POPCORN_MACHINE); ExtravaganzaBlocks.registerBlockWithItem("garland", ExtravaganzaBlocks.GARLAND); diff --git a/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaDataAttachments.java b/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaDataAttachments.java index 78c97508..fc23599a 100644 --- a/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaDataAttachments.java +++ b/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaDataAttachments.java @@ -7,7 +7,7 @@ public class ExtravaganzaDataAttachments { - public static final AttachmentType BEFORE_ENTERING_POOL = AttachmentRegistry.createPersistent(Extravaganza.createId("before_entering_pool"), Vec3d.CODEC); + public static final AttachmentType BEFORE_BALL_PIT = AttachmentRegistry.createPersistent(Extravaganza.createId("before_ball_pit"), Vec3d.CODEC); public static void register() {} } diff --git a/src/main/java/com/mmodding/extravaganza/item/WrenchAganzaItem.java b/src/main/java/com/mmodding/extravaganza/item/WrenchAganzaItem.java index ceb18c41..645d0e34 100644 --- a/src/main/java/com/mmodding/extravaganza/item/WrenchAganzaItem.java +++ b/src/main/java/com/mmodding/extravaganza/item/WrenchAganzaItem.java @@ -1,7 +1,7 @@ package com.mmodding.extravaganza.item; -import com.mmodding.extravaganza.block.BallPoolRegistrationTableBlock; -import com.mmodding.extravaganza.block.entity.BallPoolRegistrationTableBlockEntity; +import com.mmodding.extravaganza.block.BallPitRegistrationTableBlock; +import com.mmodding.extravaganza.block.entity.BallPitRegistrationTableBlockEntity; import com.mmodding.extravaganza.init.ExtravaganzaBlocks; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -23,12 +23,12 @@ public WrenchAganzaItem(Settings settings) { @Override public boolean canMine(BlockState state, World world, BlockPos pos, PlayerEntity miner) { - if (world.getBlockEntity(pos) instanceof BallPoolRegistrationTableBlockEntity bpitbe) { - if (!miner.isSneaking() && !world.getBlockState(pos).get(BallPoolRegistrationTableBlock.LOCK_SCAN)) { + if (world.getBlockEntity(pos) instanceof BallPitRegistrationTableBlockEntity bpitbe) { + if (!miner.isSneaking() && !world.getBlockState(pos).get(BallPitRegistrationTableBlock.LOCK_SCAN)) { bpitbe.switchSelectionMode(); if (!world.isClient()) { Object object; - if (bpitbe.getSelectionMode().equals(BallPoolRegistrationTableBlockEntity.SelectionMode.SOURCE)) { + if (bpitbe.getSelectionMode().equals(BallPitRegistrationTableBlockEntity.SelectionMode.SOURCE)) { object = bpitbe.isSource(); } else { object = bpitbe.getScannedCurrent(); @@ -36,7 +36,7 @@ public boolean canMine(BlockState state, World world, BlockPos pos, PlayerEntity miner.sendMessage(Text.literal(bpitbe.getSelectionMode().asString() + ": " + object), true); } } - else if (!world.getBlockState(pos).get(BallPoolRegistrationTableBlock.LOCK_SETTINGS)) { + else if (!world.getBlockState(pos).get(BallPitRegistrationTableBlock.LOCK_SETTINGS)) { if (bpitbe.getPoolSettings().power < 15) { bpitbe.getPoolSettings().power = MathHelper.clamp(bpitbe.getPoolSettings().power + 1, 1, 15); } @@ -53,11 +53,11 @@ else if (!world.getBlockState(pos).get(BallPoolRegistrationTableBlock.LOCK_SETTI @Override public ActionResult useOnBlock(ItemUsageContext context) { - if (context.getWorld().getBlockEntity(context.getBlockPos()) instanceof BallPoolRegistrationTableBlockEntity bpitbe) { + if (context.getWorld().getBlockEntity(context.getBlockPos()) instanceof BallPitRegistrationTableBlockEntity bpitbe) { assert context.getPlayer() != null; - if (!context.getWorld().getBlockState(context.getBlockPos()).get(BallPoolRegistrationTableBlock.LOCK_SCAN)) { + if (!context.getWorld().getBlockState(context.getBlockPos()).get(BallPitRegistrationTableBlock.LOCK_SCAN)) { Consumer deleter = blockPos -> { - if (context.getWorld().getBlockState(blockPos).isOf(ExtravaganzaBlocks.BALL_POOL_PROTECTION)) { + if (context.getWorld().getBlockState(blockPos).isOf(ExtravaganzaBlocks.BALL_PIT_PROTECTION)) { context.getWorld().removeBlock(blockPos, false); } }; @@ -72,7 +72,7 @@ public ActionResult useOnBlock(ItemUsageContext context) { } if (!context.getWorld().isClient()) { Object object; - if (bpitbe.getSelectionMode().equals(BallPoolRegistrationTableBlockEntity.SelectionMode.SOURCE)) { + if (bpitbe.getSelectionMode().equals(BallPitRegistrationTableBlockEntity.SelectionMode.SOURCE)) { object = bpitbe.isSource(); } else { diff --git a/src/main/java/com/mmodding/extravaganza/mixin/EntityMixin.java b/src/main/java/com/mmodding/extravaganza/mixin/EntityMixin.java index 6644d873..e159d257 100644 --- a/src/main/java/com/mmodding/extravaganza/mixin/EntityMixin.java +++ b/src/main/java/com/mmodding/extravaganza/mixin/EntityMixin.java @@ -2,7 +2,7 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import com.mmodding.extravaganza.block.BallPoolContentBlock; +import com.mmodding.extravaganza.block.BallPitContentBlock; import com.mmodding.extravaganza.init.ExtravaganzaBlocks; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -38,12 +38,12 @@ public abstract class EntityMixin { private void applyBallPoolContentLogic(CallbackInfo ci) { BlockState underState = this.getWorld().getBlockState(this.getBlockPos().down()); BlockState currentState = this.getWorld().getBlockState(this.getBlockPos()); - if (!underState.isOf(ExtravaganzaBlocks.BALL_POOL_CONTENT) && currentState.isOf(ExtravaganzaBlocks.BALL_POOL_CONTENT)) { + if (!underState.isOf(ExtravaganzaBlocks.BALL_PIT_CONTENT) && currentState.isOf(ExtravaganzaBlocks.BALL_PIT_CONTENT)) { if (!this.bypassesLandingEffects()) { this.addVelocity( - this.getRandom().nextDouble() * (this.getRandom().nextBoolean() ? -1 : 1) / 10 * currentState.get(BallPoolContentBlock.POWER), - this.getRandom().nextDouble() / 10 * currentState.get(BallPoolContentBlock.POWER), - this.getRandom().nextDouble() * (this.getRandom().nextBoolean() ? -1 : 1) / 10 * currentState.get(BallPoolContentBlock.POWER) + this.getRandom().nextDouble() * (this.getRandom().nextBoolean() ? -1 : 1) / 10 * currentState.get(BallPitContentBlock.POWER), + this.getRandom().nextDouble() / 10 * currentState.get(BallPitContentBlock.POWER), + this.getRandom().nextDouble() * (this.getRandom().nextBoolean() ? -1 : 1) / 10 * currentState.get(BallPitContentBlock.POWER) ); } } @@ -51,7 +51,7 @@ private void applyBallPoolContentLogic(CallbackInfo ci) { @WrapOperation(method = "fall", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onLandedUpon(Lnet/minecraft/world/World;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;F)V")) private void removeHandleFallDamageIfBallPollContent(Block instance, World world, BlockState state, BlockPos landedPosition, Entity entity, float fallDistance, Operation original) { - if (!this.getWorld().getBlockState(this.getBlockPos()).isOf(ExtravaganzaBlocks.BALL_POOL_CONTENT)) { + if (!this.getWorld().getBlockState(this.getBlockPos()).isOf(ExtravaganzaBlocks.BALL_PIT_CONTENT)) { original.call(instance, world, state, landedPosition, entity, fallDistance); } } diff --git a/src/main/resources/assets/extravaganza/blockstates/ball_pit_content.json b/src/main/resources/assets/extravaganza/blockstates/ball_pit_content.json new file mode 100644 index 00000000..ba4460ff --- /dev/null +++ b/src/main/resources/assets/extravaganza/blockstates/ball_pit_content.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "extravaganza:block/ball_pit_content" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/extravaganza/blockstates/ball_pool_protection.json b/src/main/resources/assets/extravaganza/blockstates/ball_pit_protection.json similarity index 100% rename from src/main/resources/assets/extravaganza/blockstates/ball_pool_protection.json rename to src/main/resources/assets/extravaganza/blockstates/ball_pit_protection.json diff --git a/src/main/resources/assets/extravaganza/blockstates/ball_pool_content.json b/src/main/resources/assets/extravaganza/blockstates/ball_pool_content.json deleted file mode 100644 index f805fea0..00000000 --- a/src/main/resources/assets/extravaganza/blockstates/ball_pool_content.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "extravaganza:block/ball_pool_content" - } - } -} \ 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 787a2276..41b36df2 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 @@ -3,7 +3,7 @@ "texture_size": [64, 64], "textures": { "main": "extravaganza:block/ball_distributor_up", - "balls": "extravaganza:block/ball_pool_content", + "balls": "extravaganza:block/ball_pit_content", "particle": "extravaganza:block/ball_distributor_up" }, "elements": [ diff --git a/src/main/resources/assets/extravaganza/models/block/ball_pool_content.json b/src/main/resources/assets/extravaganza/models/block/ball_pit_content.json similarity index 99% rename from src/main/resources/assets/extravaganza/models/block/ball_pool_content.json rename to src/main/resources/assets/extravaganza/models/block/ball_pit_content.json index fb166139..75de5a9d 100644 --- a/src/main/resources/assets/extravaganza/models/block/ball_pool_content.json +++ b/src/main/resources/assets/extravaganza/models/block/ball_pit_content.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "main": "extravaganza:block/ball_pool_content", - "particle": "extravaganza:block/ball_pool_content" + "main": "extravaganza:block/ball_pit_content", + "particle": "extravaganza:block/ball_pit_content" }, "elements": [ { diff --git a/src/main/resources/assets/extravaganza/models/block/ball_pool_registration_table.json b/src/main/resources/assets/extravaganza/models/block/ball_pit_registration_table.json similarity index 97% rename from src/main/resources/assets/extravaganza/models/block/ball_pool_registration_table.json rename to src/main/resources/assets/extravaganza/models/block/ball_pit_registration_table.json index 7ca30f78..7aca9c64 100644 --- a/src/main/resources/assets/extravaganza/models/block/ball_pool_registration_table.json +++ b/src/main/resources/assets/extravaganza/models/block/ball_pit_registration_table.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "main": "extravaganza:block/ball_pool_registration_table", - "particle": "extravaganza:block/ball_pool_registration_table" + "main": "extravaganza:block/ball_pit_registration_table", + "particle": "extravaganza:block/ball_pit_registration_table" }, "elements": [ { diff --git a/src/main/resources/assets/extravaganza/textures/block/ball_pool_content.png b/src/main/resources/assets/extravaganza/textures/block/ball_pit_content.png similarity index 100% rename from src/main/resources/assets/extravaganza/textures/block/ball_pool_content.png rename to src/main/resources/assets/extravaganza/textures/block/ball_pit_content.png diff --git a/src/main/resources/assets/extravaganza/textures/block/ball_pool_registration_table.png b/src/main/resources/assets/extravaganza/textures/block/ball_pit_registration_table.png similarity index 100% rename from src/main/resources/assets/extravaganza/textures/block/ball_pool_registration_table.png rename to src/main/resources/assets/extravaganza/textures/block/ball_pit_registration_table.png diff --git a/src/main/resources/assets/extravaganza/textures/item/ball_pool_content.png b/src/main/resources/assets/extravaganza/textures/item/ball_pit_content.png similarity index 100% rename from src/main/resources/assets/extravaganza/textures/item/ball_pool_content.png rename to src/main/resources/assets/extravaganza/textures/item/ball_pit_content.png