From be30c2c099c898bd27687108b51cfed3eee62c3f Mon Sep 17 00:00:00 2001 From: FirstMegaGame4 <84094287+FirstMegaGame4@users.noreply.github.com> Date: Fri, 28 Jun 2024 01:03:50 +0200 Subject: [PATCH] 17 Trash Can Death Messages Bump Version --- build.gradle | 27 +++++- gradle.properties | 9 +- .../171a5fea2de5104463020a45cb40c2789069fea5 | 2 +- .../31557ff09de80da41e255b48ee144b5150ca7a3f | 8 +- .../4bb21c42f2bb08194954862c483686b61a2126b8 | 6 ++ ... 584c1a43949a9c899dc112415674d20efb051ed8} | 3 +- .../90eeb0d915a79c389c7026cb5e3cb8d595013f56 | 2 +- .../97a4721ed155c6fdfa3ad558e447c8340a205f56 | 96 +++++++++---------- .../d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 | 82 ++++++++-------- .../ea38d437bba961a39355c1fcb8fe7bfeb267e512 | 4 +- .../assets/extravaganza/lang/en_us.json | 17 ++++ .../data/extravaganza/damage_type/trash.json | 5 + .../always_most_significant_fall.json | 5 + .../tags/damage_type/bypasses_armor.json | 5 + .../damage_type/bypasses_invulnerability.json | 5 + .../tags/damage_type/bypasses_resistance.json | 5 + .../tags/damage_type/no_knockback.json | 5 + .../mmodding/extravaganza/Extravaganza.java | 2 + .../ExtravaganzaDataGenerator.java | 72 +++++++++++--- .../extravaganza/block/TrashCanBlock.java | 12 ++- .../init/ExtravaganzaDamageTypes.java | 25 +++++ .../extravaganza/mixin/DamageSourceMixin.java | 56 +++++++++++ src/main/resources/extravaganza.mixins.json | 1 + 23 files changed, 334 insertions(+), 120 deletions(-) create mode 100644 src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 rename src/main/generated/.cache/{998472689041e178bce30ce8683c5024eec036d4 => 584c1a43949a9c899dc112415674d20efb051ed8} (56%) create mode 100644 src/main/generated/data/extravaganza/damage_type/trash.json create mode 100644 src/main/generated/data/minecraft/tags/damage_type/always_most_significant_fall.json create mode 100644 src/main/generated/data/minecraft/tags/damage_type/bypasses_armor.json create mode 100644 src/main/generated/data/minecraft/tags/damage_type/bypasses_invulnerability.json create mode 100644 src/main/generated/data/minecraft/tags/damage_type/bypasses_resistance.json create mode 100644 src/main/generated/data/minecraft/tags/damage_type/no_knockback.json create mode 100644 src/main/java/com/mmodding/extravaganza/init/ExtravaganzaDamageTypes.java create mode 100644 src/main/java/com/mmodding/extravaganza/mixin/DamageSourceMixin.java diff --git a/build.gradle b/build.gradle index 79d31c93..86075d93 100644 --- a/build.gradle +++ b/build.gradle @@ -14,11 +14,17 @@ base { } repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. + exclusiveContent { + forRepository { + maven { + name "Modrinth" + url "https://api.modrinth.com/maven" + } + } + filter { + includeGroup "maven.modrinth" + } + } } fabricApi { @@ -61,6 +67,12 @@ mmodding { it.fabricLoaderVersion = ">=" + project.loader_version it.fabricApiVersion = "*" } + withSuggestions { + it.addDependency("ouch", ">=" + project.ouch_version) + } + withBreakages { + it.addDependency("ouch", "<" + project.ouch_version) + } } } @@ -72,6 +84,11 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + // Ouch! + if (project.ouch_integration) { + modCompileOnlyApi "maven.modrinth:ouch:${project.ouch_version}" + } } processResources { diff --git a/gradle.properties b/gradle.properties index b95e29bd..52d84881 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,9 +9,14 @@ yarn_mappings=1.21+build.1 loader_version=0.15.11 # Mod Properties -mod_version=0.1.3-beta +mod_version=0.1.4-beta maven_group=com.mmodding.extravaganza archives_base_name=extravaganza # Dependencies -fabric_version=0.100.1+1.21 \ No newline at end of file +fabric_version=0.100.1+1.21 + +# Integrations +ouch_integration=true +ouch_version=1.1.0+1.21 +polymer_version=0.9.2+1.21 \ No newline at end of file diff --git a/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 b/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 index ee7768b3..02ddacae 100644 --- a/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 +++ b/src/main/generated/.cache/171a5fea2de5104463020a45cb40c2789069fea5 @@ -1,4 +1,4 @@ -// 1.21 2024-06-24T20:23:24.0302347 Extravaganza!/Tags for minecraft:block +// 1.21 2024-06-28T01:02:39.970263 Extravaganza!/Tags for minecraft:block dbff392afc55efca744c56e3454d0e5de2012e20 data\minecraft\tags\block\fences.json 95046486087e22ae6d1b1f59624db082c3d0408e data\minecraft\tags\block\walls.json 55786c9bbcdceb69fa2bf2b3be010a0cac171f71 data\minecraft\tags\block\mineable\pickaxe.json diff --git a/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f b/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f index 381ddd84..ac5e2f93 100644 --- a/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f +++ b/src/main/generated/.cache/31557ff09de80da41e255b48ee144b5150ca7a3f @@ -1,4 +1,4 @@ -// 1.21 2024-06-24T20:23:24.0322361 Extravaganza!/Block Loot Tables +// 1.21 2024-06-28T01:02:39.9747859 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 @@ -571,8 +571,8 @@ ad8ab6e44a2b8d2be006eacaa32cafce5b8c1466 data\extravaganza\loot_table\blocks\lim d75e81df0bb53b19c9287b6666611c9cd692b8a4 data\extravaganza\loot_table\blocks\yellow_windowed_festive_rubber_stairs.json 09e340203e918bea26fe2abaa9bec5b389b7a995 data\extravaganza\loot_table\blocks\nymph_stained_glass.json 81e4c2040748ba14b69c60854a236ea949c01c2a data\extravaganza\loot_table\blocks\orange_sharped_festive_rubber_stairs.json -81f3303437376d39a077751935d9d45118a59018 data\extravaganza\loot_table\blocks\orange_barred_festive_rubber_slab.json c0cfa90392aa874b96e391af99d66c62022dff3a data\extravaganza\loot_table\blocks\blue_split_festive_rubber.json +81f3303437376d39a077751935d9d45118a59018 data\extravaganza\loot_table\blocks\orange_barred_festive_rubber_slab.json 1ebb6d157c5b0328d6a41e679755e18762a2de34 data\extravaganza\loot_table\blocks\orange_windowed_festive_rubber.json 2d16be2f8b124bc6c2cd303811995592b0506732 data\extravaganza\loot_table\blocks\gray_split_festive_rubber_wall.json 8a6232b828322268d7ac69d20b19753dea9f8c42 data\extravaganza\loot_table\blocks\brown_barred_festive_rubber.json @@ -1184,8 +1184,8 @@ ef20322af6291926acfe3a32b988a1427ab2ec21 data\extravaganza\loot_table\blocks\ora 1a869eb3961c501e2b92843b7ea99e340f9c2ba2 data\extravaganza\loot_table\blocks\blue_scratched_festive_rubber_slab.json 8ef0328f1e7da4b3e40610bd43653c326dd25c14 data\extravaganza\loot_table\blocks\light_blue_wooded_festive_rubber_stairs.json 690a72e685ef8d0082159ceecbe65a2eb17d6ce3 data\extravaganza\loot_table\blocks\gray_scratched_festive_rubber_slab.json -366c298a14e94b63a6d8b2d5f0af47ba4d049925 data\extravaganza\loot_table\blocks\tear_wooded_festive_rubber_slab.json e93567a3ef956bfdc465a7d55fdaa6642cbad08c data\extravaganza\loot_table\blocks\tear_wooded_festive_rubber.json +366c298a14e94b63a6d8b2d5f0af47ba4d049925 data\extravaganza\loot_table\blocks\tear_wooded_festive_rubber_slab.json c1f17aefae9f37a5f049db8e19138aaaa523a0cd data\extravaganza\loot_table\blocks\nymph_festive_rubber_grate_slab.json d3725d068eadf9fd44554541f84c571cfa314efd data\extravaganza\loot_table\blocks\brown_festive_rubber_grate_slab.json 5575e129f3abc70b5657472df10afd26994e8925 data\extravaganza\loot_table\blocks\tear_curved_festive_rubber_stairs.json @@ -1484,8 +1484,8 @@ c6c0d7a71d64329a777bb9ac1f643cb0cce187e3 data\extravaganza\loot_table\blocks\yel a61bbd6ee24a28130867ad003fe64118e9d6b0a0 data\extravaganza\loot_table\blocks\light_gray_bent_festive_rubber_stairs.json 2ad91033a4f0eac3312a34b430dba1dbdb9b0ca9 data\extravaganza\loot_table\blocks\nymph_tiled_festive_rubber_wall.json 97d7e3dfc488a8e9b33dcf736eac7fba51962b70 data\extravaganza\loot_table\blocks\light_blue_scratched_festive_rubber_wall.json -70f21cb7ae2c8d8760065b2280f0fa7071401550 data\extravaganza\loot_table\blocks\lime_windowed_festive_rubber_wall.json 525a19d23f12b281e059087f652a873ad6acb86a data\extravaganza\loot_table\blocks\green_festive_rubber.json +70f21cb7ae2c8d8760065b2280f0fa7071401550 data\extravaganza\loot_table\blocks\lime_windowed_festive_rubber_wall.json efb0f544fb7363ea63465d2f11b5c7754817c9c7 data\extravaganza\loot_table\blocks\light_gray_padded_festive_rubber.json c25741d77171254f155630e9c72cca1de11a4954 data\extravaganza\loot_table\blocks\green_festive_rubber_ladder.json da050284e42abc90ed1791f809246fb168150f80 data\extravaganza\loot_table\blocks\purple_tiled_festive_rubber_slab.json diff --git a/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 b/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 new file mode 100644 index 00000000..ae439152 --- /dev/null +++ b/src/main/generated/.cache/4bb21c42f2bb08194954862c483686b61a2126b8 @@ -0,0 +1,6 @@ +// 1.21 2024-06-28T01:02:39.9853399 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 +39f9f1e2b4c18274a69f8bd4854abf0411fd28e0 data\minecraft\tags\damage_type\bypasses_invulnerability.json +39f9f1e2b4c18274a69f8bd4854abf0411fd28e0 data\minecraft\tags\damage_type\bypasses_resistance.json diff --git a/src/main/generated/.cache/998472689041e178bce30ce8683c5024eec036d4 b/src/main/generated/.cache/584c1a43949a9c899dc112415674d20efb051ed8 similarity index 56% rename from src/main/generated/.cache/998472689041e178bce30ce8683c5024eec036d4 rename to src/main/generated/.cache/584c1a43949a9c899dc112415674d20efb051ed8 index 6c9dc185..f0fa7ebd 100644 --- a/src/main/generated/.cache/998472689041e178bce30ce8683c5024eec036d4 +++ b/src/main/generated/.cache/584c1a43949a9c899dc112415674d20efb051ed8 @@ -1,3 +1,4 @@ -// 1.21 2024-06-24T20:23:24.0552352 Extravaganza!/Extravaganza World Generation +// 1.21 2024-06-28T01:02:40.0059701 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 62829c4a..38e304d8 100644 --- a/src/main/generated/.cache/90eeb0d915a79c389c7026cb5e3cb8d595013f56 +++ b/src/main/generated/.cache/90eeb0d915a79c389c7026cb5e3cb8d595013f56 @@ -1,2 +1,2 @@ -// 1.21 2024-06-24T20:23:24.0552352 Extravaganza!/Tags for minecraft:item +// 1.21 2024-06-28T01:02:40.0049696 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 0a80faec..17253aa0 100644 --- a/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 +++ b/src/main/generated/.cache/97a4721ed155c6fdfa3ad558e447c8340a205f56 @@ -1,4 +1,4 @@ -// 1.21 2024-06-24T20:23:23.9817201 Extravaganza!/Model Definitions +// 1.21 2024-06-28T01:02:39.8349502 Extravaganza!/Model Definitions 09069aeb77e14004aeda8fa0146eb6ccff536f60 assets\extravaganza\models\block\brown_split_festive_rubber_wall_post.json d1ed7f65065fc79cfeedfa82dca34a19eedecb03 assets\extravaganza\blockstates\light_gray_festive_rubber_grate_wall.json 875af43ba13f0c507f90a04acd0ffc1d8260b000 assets\extravaganza\models\block\plant_padded_festive_rubber_slab_top.json @@ -44,8 +44,8 @@ a34fbb90f2458e62fcae5dbb39e2eabd8b97fe55 assets\extravaganza\models\block\green_ eb059a62a5d3cc879df2240a920158057f37a418 assets\extravaganza\blockstates\magenta_festive_rubber.json 5e5c0a6271fa944b908a487d46d69b1593cdd52d assets\extravaganza\models\block\white_screwed_festive_rubber_wall_side_tall.json e82fe213be68e74c261c19ede1a2d120871de79c assets\extravaganza\models\block\purple_festive_rubber_grate_slab.json -70c8f51e0e46de002f0eabfe910a2f4a4a7cea19 assets\extravaganza\blockstates\plant_perforated_festive_rubber_wall.json 060d3cdd7a45b0e81e6d5cb4c2f4a59245c4cd84 assets\extravaganza\blockstates\black_festive_rubber_grate_slab.json +70c8f51e0e46de002f0eabfe910a2f4a4a7cea19 assets\extravaganza\blockstates\plant_perforated_festive_rubber_wall.json 5953c2f793400d3a69a14f1b7932fee5be87e0d0 assets\extravaganza\models\item\blue_screwed_festive_rubber_slab.json a66071bc1fccd7648ea51979ab02fed54319525a assets\extravaganza\blockstates\green_trash_can.json b93f8eaf44883bc60b1c7b314e048612c012eb4d assets\extravaganza\models\item\cyan_bent_festive_rubber_stairs.json @@ -261,8 +261,8 @@ f17ba933e01b1f8253a1f34e1a1b4274bc2aedef assets\extravaganza\models\block\light_ 73002ccaac046ce36639b35bf1bd8b0336c247aa assets\extravaganza\models\block\cyan_split_festive_rubber_wall_side.json 0fa4a38bb83af5b4546a7ebba9b3692496b8bd64 assets\extravaganza\models\item\plant_dotted_festive_rubber_wall.json 6651a82080b4c26786afa06a66ec33c82892734a assets\extravaganza\models\block\brown_striped_festive_rubber_slab_top.json -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 +356,8 @@ f269adf80a50571c8da22587ee788ac786454613 assets\extravaganza\models\block\cyan_s 3443eb81474cd0379a00a13c6984431c8a7e9475 assets\extravaganza\models\item\brown_striped_festive_rubber.json 28b91e440edb39090a4d5e6569deb88b99391c13 assets\extravaganza\models\block\plant_curved_festive_rubber_wall_post.json 825f877183bdba94d1808b4aa3f1d94f3ffc20c8 assets\extravaganza\models\item\tear_padded_festive_rubber_stairs.json -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 @@ -391,8 +391,8 @@ bd3cc51cb090966b8482cebd3aa0ae9d8f1de6e2 assets\extravaganza\models\item\red_til c5edc0310659bec79fdfbe6a43f174523944c7c7 assets\extravaganza\models\block\lime_curved_festive_rubber_stairs_inner.json 2dcb8f9eb2e6235deb313a039915cf1372c62c85 assets\extravaganza\models\block\tomato_scratched_festive_rubber_wall_side_tall.json 30993462334890b5b9a42f34916a9ce0ecf3fa50 assets\extravaganza\models\block\nymph_split_festive_rubber_wall_inventory.json -fb07e98d22a05479b92876f342b9e92208f66962 assets\extravaganza\blockstates\brown_striped_festive_rubber_slab.json 500554fff2aaed1b22b744f30527b92b21b0bd91 assets\extravaganza\blockstates\red_slipped_festive_rubber_stairs.json +fb07e98d22a05479b92876f342b9e92208f66962 assets\extravaganza\blockstates\brown_striped_festive_rubber_slab.json 353d179b4e2b9125f595726b27ddc262cd2a721d assets\extravaganza\models\block\black_wooded_festive_rubber_wall_side_tall.json 757de408b3e4351e94149a4b8b2f23e91eb354f3 assets\extravaganza\models\block\red_curved_festive_rubber_wall_side_tall.json 16e362c2271bd78f628b4f71955f65c83e293b43 assets\extravaganza\models\block\plant_sharped_festive_rubber_wall_inventory.json @@ -471,8 +471,8 @@ cbc63125c1a9d82ced96a6aab0249f5fb6f2e5f7 assets\extravaganza\blockstates\plant_w 10fa925c71f2a541ee8d4c31f6cd6d375d6aae9c assets\extravaganza\blockstates\gray_festive_rubber_grate.json 0d962f5d9e2b6161e658e9f7e48f2e76b4ffdc58 assets\extravaganza\models\item\purple_dotted_festive_rubber_slab.json 1852d3cdf2355ff23e642ba40883e9643ec28179 assets\extravaganza\blockstates\red_sharped_festive_rubber.json -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 @@ -553,8 +553,8 @@ d34a364e1e4730dfe984e2e5a6eae5a8de31f72d assets\extravaganza\models\block\tomato 3a5dc1f9e94706278a4bf98d89388e36755ff7cb assets\extravaganza\models\block\red_wooded_festive_rubber_stairs_inner.json 38147dfcc82416ed1fe894b19463a44ebe6c69cd assets\extravaganza\models\item\pink_striped_festive_rubber_wall.json e6f060bd98657d0132db32fcff834f57000b6f34 assets\extravaganza\models\item\gray_striped_festive_rubber_stairs.json -f9e39e7d03e6f90168f2ee6e91e169060b9b3113 assets\extravaganza\models\block\blue_dotted_festive_rubber.json a4317b9b5e2db3c606ab0d4b1cc7b187a42f8740 assets\extravaganza\models\block\white_curved_festive_rubber_wall_inventory.json +f9e39e7d03e6f90168f2ee6e91e169060b9b3113 assets\extravaganza\models\block\blue_dotted_festive_rubber.json 744eaeacb8ae33f04eb85c6a261a7301d41e84a2 assets\extravaganza\blockstates\light_blue_dotted_festive_rubber_slab.json a04d2950bba89423a6bcf42025542c73c3ed3c33 assets\extravaganza\models\block\tear_screwed_festive_rubber_wall_side_tall.json 97a1aa664ae1fe9cb79b6667408e8d308f69d5d5 assets\extravaganza\models\block\blue_tiled_festive_rubber_slab_top.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 -83101b44880ac6067e93c47fd4ed483edcff1beb assets\extravaganza\blockstates\green_split_festive_rubber_wall.json 3bfe60f8f17cc01d7222b930ec7a65a523e84c1e assets\extravaganza\blockstates\black_padded_festive_rubber_stairs.json +83101b44880ac6067e93c47fd4ed483edcff1beb assets\extravaganza\blockstates\green_split_festive_rubber_wall.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 @@ -828,13 +828,13 @@ a079279328aea7641eb0b3959eb58a02ae17c4d0 assets\extravaganza\blockstates\purple_ fef86f1c1e4d0c32292c76b7b1b503499ae12bca assets\extravaganza\blockstates\plant_screwed_festive_rubber_wall.json 50072a7dfdd30143662755fa0ce9958682d4216c assets\extravaganza\blockstates\nymph_wooded_festive_rubber.json ffd574e461d5e36a699cd0567edf63407c8d5683 assets\extravaganza\models\block\light_blue_striped_festive_rubber_wall_post.json -a39a3688505dd9057420b5b4825a8833bde1e8e9 assets\extravaganza\models\block\brown_festive_rubber_grate.json bb153d14d8ef0bceab99535210ad812d5c15d243 assets\extravaganza\models\block\gray_scratched_festive_rubber_slab.json +a39a3688505dd9057420b5b4825a8833bde1e8e9 assets\extravaganza\models\block\brown_festive_rubber_grate.json c424297837e98b2cd46261eb6ee7d52375cccd1d assets\extravaganza\blockstates\lime_festive_rubber.json a82d502e412efd7b1c151a457c25c99df2f2bea8 assets\extravaganza\models\block\brown_windowed_festive_rubber_stairs_outer.json add9d6fcf0738cbdf22f760a180673b487b01ff8 assets\extravaganza\models\block\orange_split_festive_rubber_stairs_outer.json -6ff1de352930a2ef364a3deb3d688da24d87fe91 assets\extravaganza\blockstates\red_striped_festive_rubber_wall.json fe444370cd4e2b9982e06cb7958baf627cc039cb assets\extravaganza\blockstates\plant_dotted_festive_rubber.json +6ff1de352930a2ef364a3deb3d688da24d87fe91 assets\extravaganza\blockstates\red_striped_festive_rubber_wall.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 @@ -1046,8 +1046,8 @@ af690f579c74a457cb195421accc422b19acc412 assets\extravaganza\models\block\cyan_s db34bef5cac260f0e05cb74e842de3c45111c300 assets\extravaganza\models\block\orange_scratched_festive_rubber_stairs.json 380e3f57985edee33d6a731e380b808be98a8868 assets\extravaganza\models\block\light_blue_barred_festive_rubber_stairs_inner.json 0669f76bb3fba6821c5f434db6f84f83b965313a assets\extravaganza\models\block\blue_screwed_festive_rubber_wall_post.json -770f5a7a5c39749504091bffbc5e92ab7aebf655 assets\extravaganza\models\block\pink_windowed_festive_rubber_stairs.json 0f40ebcdf863e75d480bcdb75573df2a31437101 assets\extravaganza\models\block\plant_perforated_festive_rubber.json +770f5a7a5c39749504091bffbc5e92ab7aebf655 assets\extravaganza\models\block\pink_windowed_festive_rubber_stairs.json 05cf2fe2a85dd923f37be4b903deeb34db7d284a assets\extravaganza\models\block\pink_screwed_festive_rubber_slab_top.json 9af389387ffa833ede377394f82ddd4ef3cf245e assets\extravaganza\models\item\nymph_dotted_festive_rubber_wall.json 6dc49f14a1dfadf80426c8059ab0abf1e45743ac assets\extravaganza\models\block\red_scratched_festive_rubber_wall_inventory.json @@ -1100,8 +1100,8 @@ d3c2a10094356828fc5ddf6e20c5043f9c54f041 assets\extravaganza\models\block\brown_ 087450cd211cedc6695be10f6a391c534c71e62c assets\extravaganza\models\item\pink_slipped_festive_rubber_wall.json 5fd58258a7e5dace73d5926201555247dfa2a868 assets\extravaganza\models\item\light_blue_windowed_festive_rubber.json 4cc0ff233750a4e2c8723e90003951f54983a21f assets\extravaganza\blockstates\green_wooded_festive_rubber_stairs.json -7f4997eed6e3ceeafdb920a11f87f4f301c8e52b assets\extravaganza\blockstates\brown_split_festive_rubber_slab.json 1ccacf040c334baa078c8c113990f246927cd70b assets\extravaganza\blockstates\white_dotted_festive_rubber_wall.json +7f4997eed6e3ceeafdb920a11f87f4f301c8e52b assets\extravaganza\blockstates\brown_split_festive_rubber_slab.json 127f0512459f2c72004d0fbccfd205660d104a9d assets\extravaganza\blockstates\light_blue_bent_festive_rubber_wall.json 7d02caff0eb290267ffe9523ebaf9279a0309c5c assets\extravaganza\blockstates\purple_sharped_festive_rubber_stairs.json 311c66ea1155d307ec0f05afd1d18bc893b8242f assets\extravaganza\blockstates\blue_wooded_festive_rubber_slab.json @@ -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 -88e21555ee909ff8ab2da844865f7bbb9a80da63 assets\extravaganza\blockstates\gray_screwed_festive_rubber_slab.json bcad5862b0c07b93a50d82043c1634bec113bf51 assets\extravaganza\blockstates\purple_poured_festive_rubber.json +88e21555ee909ff8ab2da844865f7bbb9a80da63 assets\extravaganza\blockstates\gray_screwed_festive_rubber_slab.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 @@ -2208,8 +2208,8 @@ aa7aefb21eb758c56cce77c4fbe81e30b564761f assets\extravaganza\models\block\nymph_ 1176d6d7a7e54e48890e10a72f575dcbb708eafa assets\extravaganza\models\block\nymph_festive_rubber_grate_wall_inventory.json 18bc68525aa2ca3b1999e17cd4fd2cc09c2fc584 assets\extravaganza\models\block\orange_windowed_festive_rubber_stairs_outer.json 1a985b7e0759041b3d97c9e182515ba829480f18 assets\extravaganza\models\block\magenta_curved_festive_rubber_wall_post.json -de4eaac8b91aaa3b0f85f82c203e6a75a04aaf3c assets\extravaganza\models\block\red_perforated_festive_rubber_wall_post.json ebafba346bfec8006675980ef56b13f27a13d044 assets\extravaganza\blockstates\yellow_sharped_festive_rubber_stairs.json +de4eaac8b91aaa3b0f85f82c203e6a75a04aaf3c assets\extravaganza\models\block\red_perforated_festive_rubber_wall_post.json 7b8f8138659659ec396aa32b8d9d40832677ee2d assets\extravaganza\models\block\green_scratched_festive_rubber_stairs_inner.json 3192b417e424773e2af2980eccde861d7030fb96 assets\extravaganza\models\block\white_poured_festive_rubber.json 23addd886cf634ae1c285cea893e3043b0d7861f assets\extravaganza\blockstates\pink_sharped_festive_rubber_stairs.json @@ -2407,8 +2407,8 @@ d528ddb4c1dff42f74d4062662614ac4a0529502 assets\extravaganza\blockstates\orange_ 460ab92709a045b76d51afec096ec0204cc8bac7 assets\extravaganza\models\block\yellow_dotted_festive_rubber_wall_post.json 6b951dc88f59095760def21f15fb4e0ea9175cb8 assets\extravaganza\models\block\yellow_padded_festive_rubber_stairs.json 5d474d1676e228fc5810e3a09ed250d7f5e498e8 assets\extravaganza\blockstates\purple_windowed_festive_rubber_slab.json -ccee97f5cfb0c1b94b5d84da39192509b17bb9e8 assets\extravaganza\blockstates\plant_tiled_festive_rubber_slab.json 2ac8b1db228a6f018ddcb39ec4f1a8442c56b3b1 assets\extravaganza\blockstates\nymph_festive_rubber_grate.json +ccee97f5cfb0c1b94b5d84da39192509b17bb9e8 assets\extravaganza\blockstates\plant_tiled_festive_rubber_slab.json 2e20989a83a2a7af7ea119ddc102817449f10030 assets\extravaganza\models\block\orange_padded_festive_rubber_slab.json 8612e66d8993f30b4eeda47048743b789fcf3ea0 assets\extravaganza\models\block\black_split_festive_rubber_slab.json 92104a482a85bf96884e9a177f4c9551ea7ebed3 assets\extravaganza\models\item\blue_festive_rubber_grate_wall.json @@ -2435,8 +2435,8 @@ b6e1d01f793acc9e19f62104c2ce9f53990f47fd assets\extravaganza\models\item\light_b 5cda1d989bb1895274e22c77c3f19ab38336920c assets\extravaganza\models\block\gray_dotted_festive_rubber_wall_post.json 090b582248e89eb7b41951cedd7d41bef3359b7e assets\extravaganza\models\item\light_gray_scratched_festive_rubber_slab.json 186929b27ec846f8e65098703974ec5311ce3852 assets\extravaganza\models\item\red_dotted_festive_rubber_stairs.json -8498eb76d443f63555598b8fedf3848f4a95e0c1 assets\extravaganza\blockstates\orange_festive_rubber_slab.json 4fda12152f30e0bc2715f33d35b93cdd170b2cfb assets\extravaganza\blockstates\orange_barred_festive_rubber_stairs.json +8498eb76d443f63555598b8fedf3848f4a95e0c1 assets\extravaganza\blockstates\orange_festive_rubber_slab.json 60bdb01c0ca8211150e2dade53c73cb7c64bf52b assets\extravaganza\models\block\brown_wooded_festive_rubber_slab_top.json 15e832a39b29c77a3a0bacdbc9dd47060d62de69 assets\extravaganza\models\item\empty_popcorn.json 454de238ddba0c11d501a65d81909f42491906b6 assets\extravaganza\models\block\white_wooded_festive_rubber_stairs.json @@ -2618,8 +2618,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 -abd700ddab88ac138c70e254ce62091e54ac6663 assets\extravaganza\blockstates\white_tiled_festive_rubber_stairs.json 8637594d73576284d3bff6a5a4cb23e6fab4df63 assets\extravaganza\blockstates\brown_festive_rubber_grate_slab.json +abd700ddab88ac138c70e254ce62091e54ac6663 assets\extravaganza\blockstates\white_tiled_festive_rubber_stairs.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 @@ -2845,8 +2845,8 @@ fa97ff0ce5e8ed713c1f11a100e3eb429f955868 assets\extravaganza\blockstates\cyan_fe 674b29ed07ce7be285724c56f8575c1bf49da284 assets\extravaganza\models\item\brown_windowed_festive_rubber_slab.json 731e8641c8d858683d8fbc3065becd03567a2a99 assets\extravaganza\models\block\white_scratched_festive_rubber_slab.json 0bdb64d422299d50ef682d0270efe1f0a0a1e864 assets\extravaganza\models\block\light_blue_festive_rubber_grate_wall_side.json -d16e51bc5f4f5a3457a3a327f0b454496d0e7380 assets\extravaganza\blockstates\green_festive_rubber_stairs.json c51cfc50d9dd4a6face3773984c66894ee6596ab assets\extravaganza\blockstates\plant_wooded_festive_rubber_wall.json +d16e51bc5f4f5a3457a3a327f0b454496d0e7380 assets\extravaganza\blockstates\green_festive_rubber_stairs.json c25f987d37c15795f2db73c93217ea458913e589 assets\extravaganza\models\block\blue_wooded_festive_rubber_wall_side.json 63fd2b39bf0094f932b1347d39694e8aefc10109 assets\extravaganza\models\item\orange_wooded_festive_rubber_slab.json 196ec68c0b8bb7883bb947f19d7369086fe622fd assets\extravaganza\models\block\light_blue_slipped_festive_rubber.json @@ -3070,8 +3070,8 @@ ac8c7d3ca1097cdc944b714cd62d026c8d21a151 assets\extravaganza\models\block\gray_p 29d8e6361ff2122f857474f6ed94cf00cd1136c6 assets\extravaganza\models\block\light_blue_striped_festive_rubber_stairs_inner.json 21f2c79c187627ec40482da7c792d0ab7d6e52f1 assets\extravaganza\models\block\white_barred_festive_rubber_slab_top.json ee62261bb42902250036c96bcd67551620867ef3 assets\extravaganza\blockstates\magenta_perforated_festive_rubber_slab.json -87c720f955e2c751b58c3a1d103250f9f9e4a081 assets\extravaganza\blockstates\light_gray_split_festive_rubber_wall.json ea34b509673581781e10a666ea40fd83dbe5aa11 assets\extravaganza\blockstates\magenta_screwed_festive_rubber.json +87c720f955e2c751b58c3a1d103250f9f9e4a081 assets\extravaganza\blockstates\light_gray_split_festive_rubber_wall.json fe1504e0136dee8bc137d84eb6d8493a9a297381 assets\extravaganza\models\block\tomato_striped_festive_rubber.json 2b5868f4e378ea58263b7cc8b29448f8f0e31f85 assets\extravaganza\blockstates\orange_trash_can.json 51a63b19618583bd74216ead25c31a535ce9cc07 assets\extravaganza\models\block\cyan_screwed_festive_rubber_wall_post.json @@ -3108,8 +3108,8 @@ cf1f65aa578c19704783cb9c259c13b5276c6e10 assets\extravaganza\models\block\white_ 66e265a3eca2c16857927b169a06f4e7121f8e06 assets\extravaganza\models\item\gray_striped_festive_rubber.json 526e5c69e46bb7718a164e00b83277a1c450225c assets\extravaganza\models\block\tear_festive_rubber_slab_top.json b67eb9cc2e5058599f86b740b3e5e556deac286c assets\extravaganza\models\block\green_tiled_festive_rubber.json -fbe9a123d71a2a5d8fdc9c4c5341ab9066681dfe assets\extravaganza\blockstates\blue_sharped_festive_rubber_stairs.json d255d6c84dca411a73c37c15a569ffee23b284d9 assets\extravaganza\blockstates\black_bent_festive_rubber_stairs.json +fbe9a123d71a2a5d8fdc9c4c5341ab9066681dfe assets\extravaganza\blockstates\blue_sharped_festive_rubber_stairs.json 70161055fe76a7939704941321cc59fbfad40bb0 assets\extravaganza\models\item\yellow_slipped_festive_rubber.json 92a96cb39c4f84ec2d822ea17fca2ddf81343868 assets\extravaganza\models\block\orange_slipped_festive_rubber_wall_post.json d7612159db2b78b1ebdf571c764713fcd05eb30f assets\extravaganza\models\item\blue_barred_festive_rubber_wall.json @@ -3207,8 +3207,8 @@ d385d20dea2ca29d50144705d373e2753550fc0f assets\extravaganza\models\block\light_ 57a8a24b57d000d2f1d6d70dd1f63fe508702960 assets\extravaganza\models\item\purple_scratched_festive_rubber_wall.json 95879d1233f0d5b36a99e7004784874554867dce assets\extravaganza\models\block\brown_wooded_festive_rubber_stairs_inner.json b3db280093b02a33f64c3bc6f34fa767011900e5 assets\extravaganza\models\block\purple_curved_festive_rubber_wall_inventory.json -a3c97ddf1eb33b1134b7040ec390c0cdb742c77e assets\extravaganza\blockstates\gray_bent_festive_rubber_slab.json cacbe4e968d124332bb90930fbe230f1761e8a59 assets\extravaganza\blockstates\tomato_scratched_festive_rubber_wall.json +a3c97ddf1eb33b1134b7040ec390c0cdb742c77e assets\extravaganza\blockstates\gray_bent_festive_rubber_slab.json 8a73e36463cb43714454e2219b35fdea51b40e25 assets\extravaganza\models\block\magenta_tiled_festive_rubber_wall_side.json 00d6bc833cea0cbf6da1e51724b97b2f8866ad6e assets\extravaganza\models\item\light_blue_poured_festive_rubber_wall.json 027ec7a83861b9cf9e0387cf2bcc198e5bb1b1f8 assets\extravaganza\models\item\plant_padded_festive_rubber_stairs.json @@ -3258,8 +3258,8 @@ d2d4d876ff85bba8fafacff45d54e26c4bd118e8 assets\extravaganza\models\block\orange 632ccd53fbfcc052dc191faf34e3817af10c5da1 assets\extravaganza\blockstates\green_split_festive_rubber_stairs.json ee1c368b81f2dd35733b1f7ab1e1aaedb04dce8f assets\extravaganza\blockstates\black_split_festive_rubber_wall.json 0858db5b79a48d6cc9d1477e9073b0f7d43f6bd6 assets\extravaganza\models\block\pink_scratched_festive_rubber_stairs_outer.json -99e8810f34dc3cf47d5ac8d5aaf21e2fabbc9325 assets\extravaganza\blockstates\pink_scratched_festive_rubber.json 1541c0c7a1bb81c8ac1f971e179da33204bd507f assets\extravaganza\blockstates\orange_split_festive_rubber_slab.json +99e8810f34dc3cf47d5ac8d5aaf21e2fabbc9325 assets\extravaganza\blockstates\pink_scratched_festive_rubber.json 76608642e7e6debfa56eeae7270f2fb097e6f998 assets\extravaganza\models\item\light_gray_padded_festive_rubber_stairs.json 03985073c51fdf57023fa392fa21ac48485282b7 assets\extravaganza\models\item\tear_curved_festive_rubber.json 9b135643c1e4fd75fba22c61a5159d9ab11ae3c4 assets\extravaganza\models\item\tomato_wooded_festive_rubber.json @@ -3287,8 +3287,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 -725db354bf4528d04c1db1e0c059bd192a2a6a7a assets\extravaganza\blockstates\brown_striped_festive_rubber.json 1fbfd1d77ba88fc10c002d12efe69f3f93a3933f assets\extravaganza\blockstates\red_tiled_festive_rubber_wall.json +725db354bf4528d04c1db1e0c059bd192a2a6a7a assets\extravaganza\blockstates\brown_striped_festive_rubber.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 @@ -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 -13a6dbae53732881354265a7496989f4771e6ad5 assets\extravaganza\blockstates\pink_sharped_festive_rubber_wall.json da5948a11865afc1c0e25b8fc727e1ac83eb5ec6 assets\extravaganza\blockstates\light_blue_perforated_festive_rubber_wall.json +13a6dbae53732881354265a7496989f4771e6ad5 assets\extravaganza\blockstates\pink_sharped_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 @@ -3654,8 +3654,8 @@ ee1e8a4789c132be077b31aa40596e307737e021 assets\extravaganza\models\block\yellow 7082e9d6d97219d185951d8eeaf5d5793c6bdcde assets\extravaganza\models\item\white_curved_festive_rubber_slab.json 72ae80df82eb2626eee753f641ae62c7491edd88 assets\extravaganza\models\item\lime_scratched_festive_rubber_slab.json b26aafc7acf3742aa0edfa8b4859671e966f6c3a assets\extravaganza\blockstates\plant_festive_rubber_ladder.json -51883be12dff92d485d6b8abed7b6abce9d55120 assets\extravaganza\models\block\magenta_padded_festive_rubber_slab_top.json 58a53987cdd2d6cde2ea5d28ea568a48d1877ecf assets\extravaganza\blockstates\orange_festive_rubber.json +51883be12dff92d485d6b8abed7b6abce9d55120 assets\extravaganza\models\block\magenta_padded_festive_rubber_slab_top.json 9819a141387836626840a57394352f21430b4029 assets\extravaganza\models\item\tomato_festive_rubber.json bc53ae50c2ef5f4c739b7cc687f530f5998af674 assets\extravaganza\models\block\pink_curved_festive_rubber_slab.json 031b8c3d84926d85b810de172f0dcf5742abcbe1 assets\extravaganza\models\block\tear_festive_rubber_wall_side.json @@ -3718,16 +3718,16 @@ 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 -d6c33b7b8ee4eb99dc7e84e881998e4e46361d5e assets\extravaganza\blockstates\blue_slipped_festive_rubber.json -7e42a766f37fdaf442b0abcb1d7e47c88a4d334d assets\extravaganza\blockstates\pink_windowed_festive_rubber_stairs.json 758ff06e3ca47043d926b01e81be8ff48f653a5f assets\extravaganza\blockstates\cyan_bent_festive_rubber_stairs.json +7e42a766f37fdaf442b0abcb1d7e47c88a4d334d assets\extravaganza\blockstates\pink_windowed_festive_rubber_stairs.json +d6c33b7b8ee4eb99dc7e84e881998e4e46361d5e assets\extravaganza\blockstates\blue_slipped_festive_rubber.json cd95ce073953ce4a91dc628722f6a3746abce0d2 assets\extravaganza\models\block\nymph_screwed_festive_rubber.json 57da538a9eada0fecb9268fd1492036a4cbef5cd assets\extravaganza\models\block\light_blue_trash_can.json 767a066f7242f967b2a277d1a2286a0c375085ae assets\extravaganza\models\block\black_dotted_festive_rubber_wall_side_tall.json 42dde90e4dfde78c99d6e4ceb9dda37674108d2c assets\extravaganza\blockstates\cyan_slipped_festive_rubber_wall.json e84e5894426315abeeb1529771856166bdbefa1f assets\extravaganza\blockstates\white_bent_festive_rubber_slab.json -e9f096a318e346166fba1f7a0ee64a78e0e8cf4c assets\extravaganza\models\block\tomato_curved_festive_rubber_slab.json c630c948d2ad3d86919f75aea7548382ace15180 assets\extravaganza\blockstates\light_gray_striped_festive_rubber_stairs.json +e9f096a318e346166fba1f7a0ee64a78e0e8cf4c assets\extravaganza\models\block\tomato_curved_festive_rubber_slab.json e850e3a676839071f5dc001ed021270483e9eeea assets\extravaganza\blockstates\gray_bent_festive_rubber.json a2b9d7e942be1bc1e642dbb4632e7f8f7e0cce9c assets\extravaganza\models\block\brown_screwed_festive_rubber_slab_top.json 6144fcb36a4e6454f75682ec6d5045be8f783266 assets\extravaganza\models\item\light_blue_bent_festive_rubber_stairs.json @@ -3862,8 +3862,8 @@ e845f5e64594d1e8b11dfc130f0880251d3f7e14 assets\extravaganza\models\block\lime_s 8d5ea5db36622d9982563728bdc0960c81f9f7d3 assets\extravaganza\models\item\pink_scratched_festive_rubber.json 159118354723558ddd52ecd05822c97ba1d784e3 assets\extravaganza\models\item\blue_scratched_festive_rubber_wall.json 923c14a1da89c6f534212bd6a1699c7b2beef76d assets\extravaganza\models\block\purple_bent_festive_rubber_wall_post.json -08bc2ce656c5a12b46700fd1b189babf1f4bf8ef assets\extravaganza\models\block\yellow_curved_festive_rubber_stairs_inner.json 8c4194917b1970e7ab2df7182824cf058eb25c1f assets\extravaganza\models\block\light_blue_wooded_festive_rubber_stairs_outer.json +08bc2ce656c5a12b46700fd1b189babf1f4bf8ef assets\extravaganza\models\block\yellow_curved_festive_rubber_stairs_inner.json 7524665d1a78d1609e1640fba4753c23a89ee4ca assets\extravaganza\blockstates\tomato_festive_rubber_grate_stairs.json 27a45f917ffe09f1f068ef2caf27118403d3a9c8 assets\extravaganza\blockstates\light_blue_scratched_festive_rubber_slab.json e8b05e1802922e84358c590904f0aafc06728246 assets\extravaganza\models\block\blue_slipped_festive_rubber_wall_post.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 @@ -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 -463d4a2e2fb57f77e0b433ea5f4cf45dc6b55d13 assets\extravaganza\blockstates\light_gray_tiled_festive_rubber_wall.json 32213ec5f5a2bdfe5048ef9bd78f53c962a6b394 assets\extravaganza\blockstates\purple_striped_festive_rubber.json +463d4a2e2fb57f77e0b433ea5f4cf45dc6b55d13 assets\extravaganza\blockstates\light_gray_tiled_festive_rubber_wall.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 @@ -4433,8 +4433,8 @@ eeea0b3ffccd57388963a9b8a1809ab6a0762872 assets\extravaganza\models\block\lime_w 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 -a5a6658c2e8c29582db7c991830f26f6c06d29ce assets\extravaganza\blockstates\yellow_bent_festive_rubber_stairs.json 9b8722fca97d5df5ba00c7e0edf2952c294f4cc4 assets\extravaganza\blockstates\yellow_dotted_festive_rubber_stairs.json +a5a6658c2e8c29582db7c991830f26f6c06d29ce assets\extravaganza\blockstates\yellow_bent_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 @@ -4882,8 +4882,8 @@ f05ef4708fc23cce9ce6d796ed209b2b4e735c0e assets\extravaganza\models\block\cyan_s d3324e35c8afa42cbd9826f1014684ddda27957a assets\extravaganza\models\block\brown_tiled_festive_rubber_stairs_outer.json 25244e5f2b30987be294f46b01861e7b7ce816c5 assets\extravaganza\blockstates\orange_slipped_festive_rubber.json 8a1a698d3acc569a78893ffa21d8bfdda8e3091b assets\extravaganza\models\block\tear_festive_rubber_wall_inventory.json -1c75b66ceae5d06e0e419a08931ccf2d4968273b assets\extravaganza\blockstates\gray_screwed_festive_rubber_wall.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 af4636f4c5685709b220b71862c72a316538f393 assets\extravaganza\models\block\nymph_scratched_festive_rubber_stairs_outer.json 940eae3f54492cfe4bf83343e976b135643976f3 assets\extravaganza\models\block\purple_striped_festive_rubber_wall_side.json @@ -4936,16 +4936,16 @@ c3d6931d0d66b4b679fd963274ba9efcb5460342 assets\extravaganza\models\block\yellow f5c85c3b90b14f3da272e73833b1bc343c548a37 assets\extravaganza\models\block\magenta_dotted_festive_rubber_slab.json 35862fd304f31fb45c12c92680e3c5e37c919618 assets\extravaganza\models\item\white_windowed_festive_rubber_slab.json 8c03682ca405730d4c8a6e41bf2852fb88357582 assets\extravaganza\models\block\purple_windowed_festive_rubber_stairs_inner.json -f2746c9fa0030092b90bc132f35664cc7aa1a578 assets\extravaganza\blockstates\light_gray_wooded_festive_rubber.json e11587cb0e50d5e88f2cac9205d94390aed1058f assets\extravaganza\blockstates\white_scratched_festive_rubber.json +f2746c9fa0030092b90bc132f35664cc7aa1a578 assets\extravaganza\blockstates\light_gray_wooded_festive_rubber.json 79c9294178e6aa78ba6b776273e0bd3cbb570614 assets\extravaganza\blockstates\red_curved_festive_rubber_wall.json e693a948c44cac9a4499e1a80dba88554bda296a assets\extravaganza\models\block\cyan_barred_festive_rubber_slab_top.json dd729768dbbbea7e41b5c51a1cb3e150382dd091 assets\extravaganza\models\block\orange_festive_rubber_grate_stairs_outer.json 432ed9d47879e43d72aab3327c4dd251c5c8cccc assets\extravaganza\models\item\pink_festive_rubber.json fd7bc75ca0fb5e6432e1a824ac7ad96002741544 assets\extravaganza\models\block\magenta_scratched_festive_rubber_stairs_inner.json 461e1bfdf9ca7e7de936977f3ac319857b970252 assets\extravaganza\models\item\magenta_festive_rubber.json -7bdbca8520cefa5eb43e8b3ff9f1be47abf5fbe4 assets\extravaganza\blockstates\light_blue_sharped_festive_rubber_stairs.json fd6934600ce72651a571f4bce6ab9541d6a5d67f assets\extravaganza\models\item\tomato_screwed_festive_rubber.json +7bdbca8520cefa5eb43e8b3ff9f1be47abf5fbe4 assets\extravaganza\blockstates\light_blue_sharped_festive_rubber_stairs.json 31e1000dcac8e864718708362f55d5c918cf54fd assets\extravaganza\models\item\plant_perforated_festive_rubber_wall.json 7b6f18f0c1ed0c1ff66d1684f6943e715d9c338f assets\extravaganza\models\block\blue_perforated_festive_rubber_wall_post.json 742660455c107116d11dea050d78b7d10c3d1fbd assets\extravaganza\blockstates\light_gray_perforated_festive_rubber.json @@ -5162,8 +5162,8 @@ a75a40aa8252885b6419a9ab3abf050ebb3ca04a assets\extravaganza\blockstates\brown_t 06968a757ecf86b72e77b2035b9f60178d7c9459 assets\extravaganza\models\block\nymph_padded_festive_rubber_wall_side_tall.json 527e4bf730fed798ba636d938bbb3884969c6f8a assets\extravaganza\models\block\light_gray_trash_can_lid_open.json 7539c79026e09d54eb4ace2ae7ad555dcd7cde34 assets\extravaganza\models\item\blue_slipped_festive_rubber.json -aa3c5e3268d62bb0bf0b4c54fec637030b0c3653 assets\extravaganza\blockstates\nymph_dotted_festive_rubber.json f39dbe0c75565313344f87890c3964e6eeca6828 assets\extravaganza\blockstates\red_festive_rubber_grate_slab.json +aa3c5e3268d62bb0bf0b4c54fec637030b0c3653 assets\extravaganza\blockstates\nymph_dotted_festive_rubber.json 84f7ebbe92b521648ca004b65f7a98d628982a5b assets\extravaganza\models\block\tear_slipped_festive_rubber_stairs_outer.json e170ea025f3dd35f249cc4cbfa4540d6aeb69fcc assets\extravaganza\models\block\gray_split_festive_rubber_slab.json 108eea473a30e76966b36ae95244357239bd33cb assets\extravaganza\models\item\white_slipped_festive_rubber_slab.json @@ -5327,8 +5327,8 @@ f45a74fea45086bee21c03f7031f5b1005c2b112 assets\extravaganza\models\block\light_ 2f6f8cfe03779ab39d35d3fe0112076820515b1d assets\extravaganza\blockstates\tomato_dotted_festive_rubber_wall.json c005641f894b1858480bab0292cfb2898b54b38a assets\extravaganza\blockstates\nymph_screwed_festive_rubber_wall.json f091ac42705f8298522053360f0e9d9e2f28531e assets\extravaganza\models\block\lime_scratched_festive_rubber_slab_top.json -8ac7e0fd9b0f3666981e4d2b902c9fdc8ab5a575 assets\extravaganza\blockstates\pink_festive_rubber_grate.json 34b69d11d4a08839848e969dc4da19e684a27c51 assets\extravaganza\blockstates\magenta_festive_rubber_grate_wall.json +8ac7e0fd9b0f3666981e4d2b902c9fdc8ab5a575 assets\extravaganza\blockstates\pink_festive_rubber_grate.json 40bd9a5f12fe6cabe4b46e244f2171b884adbef9 assets\extravaganza\blockstates\green_windowed_festive_rubber_slab.json f002545d9c4093b1f59b34c4cca810ece9464816 assets\extravaganza\models\block\blue_curved_festive_rubber_stairs_outer.json 997aa90a8e4171c4b75702eefc335aace034df2c assets\extravaganza\models\block\lime_bent_festive_rubber_wall_post.json @@ -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 -1faf603463216b28e27894c0f80e7bab0318b8e0 assets\extravaganza\blockstates\brown_sharped_festive_rubber_stairs.json a14b5736d51f3264912f9ee94a603e585e112e0d assets\extravaganza\blockstates\hevea_brasiliensis_log.json +1faf603463216b28e27894c0f80e7bab0318b8e0 assets\extravaganza\blockstates\brown_sharped_festive_rubber_stairs.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 @@ -5541,16 +5541,16 @@ a7830f71ffa2b210ba9f9ceb142864402f04deb1 assets\extravaganza\models\block\magent aeba3361cf5c7c36b5699da458dff2c9884650e6 assets\extravaganza\models\block\pink_striped_festive_rubber_slab_top.json aeb7d4241821f0b6798d5606ee58ef23dca039f1 assets\extravaganza\models\item\plant_padded_festive_rubber_wall.json 88693d24f768698ad3d614944d4f334932a6df3e assets\extravaganza\models\block\plant_striped_festive_rubber_slab.json -8389169546fb7f483fc9889ef1a97c3b09b9fede assets\extravaganza\models\block\blue_dotted_festive_rubber_stairs_outer.json 7b89eb10808b5b4f32b9a2c97cd75e90c9c51cef assets\extravaganza\models\block\magenta_screwed_festive_rubber_wall_post.json +8389169546fb7f483fc9889ef1a97c3b09b9fede assets\extravaganza\models\block\blue_dotted_festive_rubber_stairs_outer.json 199f59d73a6f57cc4689c4a6e66cbd648452d176 assets\extravaganza\models\block\purple_padded_festive_rubber_slab_top.json fae78713b8485a79f8ff6438337a228a7192a918 assets\extravaganza\models\block\yellow_scratched_festive_rubber_stairs_inner.json 7bdaafa9d882dfd9c4ab9a0be3b2b0689f2d969d assets\extravaganza\models\block\blue_wooded_festive_rubber.json d22c04acb15aa91e6f6a94fbef2cec4ed02a54af assets\extravaganza\blockstates\white_tiled_festive_rubber.json 3ba757ff420251336cac4c91411b5e1599537fac assets\extravaganza\models\block\nymph_bent_festive_rubber_stairs_inner.json 007a44f312d0cb38df3dc156ca6ddbe4413f9ef7 assets\extravaganza\models\block\brown_tiled_festive_rubber_wall_post.json -35f147f990b1f0220788a34b444236f2d403c23a assets\extravaganza\models\block\plant_poured_festive_rubber.json c0eb14011283c63cbecfb3bc43dff737767c1655 assets\extravaganza\models\block\nymph_poured_festive_rubber_wall_inventory.json +35f147f990b1f0220788a34b444236f2d403c23a assets\extravaganza\models\block\plant_poured_festive_rubber.json 32a52c692eb53372adf7f4d6a293909800b22d0d assets\extravaganza\models\item\nymph_windowed_festive_rubber_stairs.json 63898b78b2128078d649915319693639b9f24d3a assets\extravaganza\models\block\lime_trash_can.json 6e7a1e8831ae71ce0eea846e6e84febe57bc560b assets\extravaganza\models\item\plant_striped_festive_rubber_stairs.json @@ -5613,14 +5613,14 @@ e12cf4e74ce056109768081210d3f0f0031bc454 assets\extravaganza\models\block\green_ 64791f3820e948eb9484465a0a35f92480b98fed assets\extravaganza\blockstates\brown_windowed_festive_rubber_slab.json 0b23a24364293e950c688ed5723615e6a4213de7 assets\extravaganza\models\block\white_screwed_festive_rubber.json b66c835f2ca681ec2d3f089145fc9bc8bd0bbb3c assets\extravaganza\models\block\purple_striped_festive_rubber_wall_side_tall.json -ee9cf571957d195658c50daf63446426f533958b assets\extravaganza\blockstates\tear_bent_festive_rubber_slab.json 62ca56e5aeff9798d250332366c4c7fa39ded700 assets\extravaganza\blockstates\red_festive_rubber_stairs.json +ee9cf571957d195658c50daf63446426f533958b assets\extravaganza\blockstates\tear_bent_festive_rubber_slab.json e1492a267563d5c235f6ff8908765ac9289e3fbc assets\extravaganza\models\block\nymph_scratched_festive_rubber.json 316c8e83c219ca7d1176e2dd0fc7ba0b11bb3648 assets\extravaganza\models\block\lime_striped_festive_rubber_slab.json 3b5712f08810cc01887258c403b171e59b51daca assets\extravaganza\models\item\light_blue_padded_festive_rubber_slab.json ac2263221639d61cd8c53d7d6d92dbdfba0ba768 assets\extravaganza\models\block\plant_split_festive_rubber_slab_top.json -056dff8ca95dfef01bec6c76899f65ab7afe6b17 assets\extravaganza\models\item\green_festive_rubber_wall.json 2910875650941d23854f361c054ab45d0dc20c78 assets\extravaganza\blockstates\brown_festive_rubber_grate.json +056dff8ca95dfef01bec6c76899f65ab7afe6b17 assets\extravaganza\models\item\green_festive_rubber_wall.json 12bb0b3abd0656b42c26d5888eb64529f14c6812 assets\extravaganza\models\item\blue_split_festive_rubber_slab.json 492a2d495321d4eaa2ddc8e8fe9868ea6c714b5d assets\extravaganza\models\item\tear_festive_rubber_grate_wall.json a125bfc4ce4aac7c648010eb0a4fbd8395348c46 assets\extravaganza\blockstates\black_perforated_festive_rubber_wall.json @@ -5835,8 +5835,8 @@ e9e0f345e397e581373399265266585f453f6359 assets\extravaganza\models\item\cyan_pa d439837e6cc006c9cd07ec6dec3b660a76ec36ab assets\extravaganza\blockstates\magenta_striped_festive_rubber_slab.json 874e111cc54e6e1ea4ecc528e471a2ee29868805 assets\extravaganza\models\block\blue_festive_rubber_wall_post.json ec2fdbfd80f41fefe015d628158049336e5b941e assets\extravaganza\models\block\pink_tiled_festive_rubber_wall_inventory.json -da6fb29bd901bd8602978ae2c446d0e1eceaeac0 assets\extravaganza\blockstates\orange_scratched_festive_rubber_slab.json 6db72434aeb3371f616a98855c73ccded111ecee assets\extravaganza\blockstates\light_blue_padded_festive_rubber_slab.json +da6fb29bd901bd8602978ae2c446d0e1eceaeac0 assets\extravaganza\blockstates\orange_scratched_festive_rubber_slab.json 1354ca9c2196317ab0b0e12937566c43a5b863da assets\extravaganza\models\block\blue_tiled_festive_rubber.json 57a86ee4e7f9722648299897f976b439de11fb63 assets\extravaganza\models\item\magenta_perforated_festive_rubber.json 9435c65c1cf13614498708fa960cd19910f4a8c1 assets\extravaganza\models\block\light_gray_slipped_festive_rubber_slab_top.json @@ -5873,8 +5873,8 @@ becf28611cfaa075a7a50785c3e56f527675cf3f assets\extravaganza\blockstates\brown_s c5952752e780c1846f2b83cc8f94e3ebdddb8990 assets\extravaganza\models\block\light_gray_sharped_festive_rubber_wall_side.json 3274a501e16d7b000e73611df8708937f3088c95 assets\extravaganza\models\block\gray_poured_festive_rubber_stairs_inner.json 00fce8dec6c49adceb53f4952a6f25e012d3144c assets\extravaganza\models\block\lime_curved_festive_rubber_wall_side_tall.json -064089b76f2cd592dd07d6f2820e5c861ed93e82 assets\extravaganza\blockstates\plant_padded_festive_rubber.json 78be7af9643198271f68733d0bc5cf2daa9725b9 assets\extravaganza\blockstates\nymph_dotted_festive_rubber_stairs.json +064089b76f2cd592dd07d6f2820e5c861ed93e82 assets\extravaganza\blockstates\plant_padded_festive_rubber.json 5d00a5b6abd19adb57483d45ef703262b3ba959c assets\extravaganza\models\block\blue_poured_festive_rubber_stairs_outer.json 5a31705ccfb30b40b79e80d423b1f7666b6b230d assets\extravaganza\models\block\orange_scratched_festive_rubber_stairs_inner.json c1bb646764fbb26e1422b299f983f0b3c1f2ea8d assets\extravaganza\models\item\magenta_dotted_festive_rubber_slab.json @@ -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 @@ -6296,8 +6296,8 @@ c14acadf742aa8eaba394f643ce4a14302643826 assets\extravaganza\models\block\tomato 00da8edb56271fc236d89e86a6393af7bd2f5810 assets\extravaganza\models\item\orange_windowed_festive_rubber_wall.json 3541ac917e77499c9233732a6fa78d133df7e293 assets\extravaganza\models\block\light_gray_windowed_festive_rubber.json 24d444b8fb49ef45b0297334cd1b6f36e8a9d016 assets\extravaganza\models\block\plant_curved_festive_rubber_wall_side.json -514b68f8fd0edd77bebc104f2ab9d4f4f631716e assets\extravaganza\blockstates\brown_barred_festive_rubber_wall.json 64f8ee7fa7b1ae025481ab8081696f8b4fa7270a assets\extravaganza\blockstates\yellow_split_festive_rubber_stairs.json +514b68f8fd0edd77bebc104f2ab9d4f4f631716e assets\extravaganza\blockstates\brown_barred_festive_rubber_wall.json 4a93121455dda8bd0672b6faacdff89eb54c9e8d assets\extravaganza\models\block\black_tiled_festive_rubber_slab.json 3b61d7236ae3902ebb11aa1b1cd7253165df49af assets\extravaganza\blockstates\tomato_bent_festive_rubber_wall.json 3fa9c2aa04e7c708787f89a7e73dcb477c1603c6 assets\extravaganza\models\block\black_padded_festive_rubber_slab_top.json @@ -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 diff --git a/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 b/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 index a1f8a46c..8ae5703b 100644 --- a/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 +++ b/src/main/generated/.cache/d37a63a7993c504d0eaad0ecdd7aacdf9f76c455 @@ -1,4 +1,4 @@ -// 1.21 2024-06-24T20:23:24.0402345 Extravaganza!/Recipes +// 1.21 2024-06-28T01:02:39.9863435 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 @@ -9,8 +9,8 @@ fb30eea0d999149de6fb958951d450f08481e470 data\extravaganza\advancement\recipes\b ef385dc2abe5a3b49ebeb60c76e7bfc876e3ab28 data\extravaganza\recipe\tomato_barred_festive_rubber_wall.json ae7a4dc5b00c6fd0e021218f783368fa75c3f182 data\extravaganza\recipe\green_padded_festive_rubber.json 8b5f6e081197c42efab9266216f408a2ccdf2ddc data\extravaganza\recipe\gray_festive_rubber_grate.json -6ae166c923b974c43f068505f4f6a55da4cab59b data\extravaganza\recipe\white_sharped_festive_rubber_wall.json 0d4cc6e27facfdcc33822e04e19db2d7e7be22d3 data\extravaganza\advancement\recipes\building_blocks\white_perforated_festive_rubber_slab.json +6ae166c923b974c43f068505f4f6a55da4cab59b data\extravaganza\recipe\white_sharped_festive_rubber_wall.json 9b9ca023b92323c54a4ebcf597e94066531a2d15 data\extravaganza\advancement\recipes\building_blocks\tear_slipped_festive_rubber.json 8d9686ae007d2cc6ff9abbaae5afcff9bf643700 data\extravaganza\recipe\tomato_slipped_festive_rubber_slab.json 0f2927a6a98e85fd4ce18806362cdc77c183aac0 data\extravaganza\advancement\recipes\building_blocks\magenta_sharped_festive_rubber.json @@ -135,8 +135,8 @@ ddb5e33d91317f0a4f723f1ef703781285317e57 data\extravaganza\advancement\recipes\b bffbe01ab9131e0a1f96f2002cd95bfc2f49dd22 data\extravaganza\advancement\recipes\building_blocks\nymph_festive_rubber_wall.json 381f0b39b4795f12807388f3061ee1e9c904ef64 data\extravaganza\recipe\orange_tiled_festive_rubber_stairs.json c7f1293d0c2498e787a976425900d4bf1e464286 data\extravaganza\recipe\red_festive_rubber_grate_stairs.json -0c59a0872e5b310ddfa4601832a4688ba3cbb1a7 data\extravaganza\recipe\yellow_poured_festive_rubber_slab.json 345fc39eabbe8ab0365b9994616ffb568e52841b data\extravaganza\recipe\yellow_perforated_festive_rubber.json +0c59a0872e5b310ddfa4601832a4688ba3cbb1a7 data\extravaganza\recipe\yellow_poured_festive_rubber_slab.json d7e19e75431cb5bebc9837176e58b2b03f0bd395 data\extravaganza\recipe\plant_perforated_festive_rubber_slab.json 7fc14561782c65644a9701d8d25c05706bb254b6 data\extravaganza\recipe\tomato_bent_festive_rubber_stairs.json e3a43577466581a174f2fdc52bddbb0ed1d60f2f data\extravaganza\recipe\pink_curved_festive_rubber_slab.json @@ -208,8 +208,8 @@ eca59fb1099d1c912ef6040049c1023e3fe3f756 data\extravaganza\recipe\yellow_windowe 87554f21168450a530aa45e452826aeea51b53de data\extravaganza\recipe\light_blue_wooded_festive_rubber.json 87a3192545a23d8f6b01cb2b13527e90e5e1a939 data\extravaganza\advancement\recipes\building_blocks\brown_barred_festive_rubber_stairs.json 3a7d0e2ad55ba568c9a2f3b8fe604b8b5e430e0f data\extravaganza\recipe\yellow_festive_rubber_grate_wall.json -200cf581021b76d39ecc6e12ceac1e9dcf09ac3d data\extravaganza\recipe\blue_perforated_festive_rubber_stairs.json fbb6e22720728d62e4d60cb244f7f49288c7b792 data\extravaganza\recipe\lime_wooded_festive_rubber_stairs.json +200cf581021b76d39ecc6e12ceac1e9dcf09ac3d data\extravaganza\recipe\blue_perforated_festive_rubber_stairs.json 1ebed3b882f5e85a3f3259f3b52de6db5129dcf9 data\extravaganza\recipe\green_tiled_festive_rubber_slab.json 1af58ec071e3d47946dadcb1fc7276cc891601f0 data\extravaganza\advancement\recipes\building_blocks\nymph_windowed_festive_rubber_wall.json 8c859c1ae4ab1777ad7a00da7c88af4f5a3d8fa8 data\extravaganza\advancement\recipes\building_blocks\white_bent_festive_rubber.json @@ -361,8 +361,8 @@ e96ffb7752b2196801503a3d32b79f6d83f232d1 data\extravaganza\advancement\recipes\b e152faf573f48bfbee098e26d10cc5190479e950 data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber_slab.json a3bbd4c520bb47cd74067b0f8b5dc0edc0cc9002 data\extravaganza\advancement\recipes\building_blocks\orange_striped_festive_rubber.json b1c8e80a0cef956bdf905b92ec1e6ef421bd500a data\extravaganza\recipe\brown_striped_festive_rubber_stairs.json -132c16b23dd6f2fe9e397b499f7f375b82b8b562 data\extravaganza\recipe\orange_slipped_festive_rubber_stairs.json b8565aefa174dadae9f7347bcf2444a4fb6ce198 data\extravaganza\advancement\recipes\building_blocks\orange_dotted_festive_rubber_stairs.json +132c16b23dd6f2fe9e397b499f7f375b82b8b562 data\extravaganza\recipe\orange_slipped_festive_rubber_stairs.json 0b68bab7be053b1672714580e36c681a646e5e7f data\extravaganza\advancement\recipes\building_blocks\blue_sharped_festive_rubber_wall.json 3ed72494ca5d00a66470be192b443bbf9504844c data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_wall.json 66e37c48915e820077503679f744c0b1f00589e0 data\extravaganza\recipe\pink_screwed_festive_rubber_stairs.json @@ -523,8 +523,8 @@ ae3863215cf66206a5c789569f065c051feca8b2 data\extravaganza\advancement\recipes\b 664bdc0f04c58b65eb618fa3b76aac0b0c7ffb43 data\extravaganza\recipe\orange_split_festive_rubber_wall.json 067e1bb257279bfc9204787463d50432900bf4f0 data\extravaganza\recipe\light_blue_slipped_festive_rubber_stairs.json f93bad502f8e74185d07126b174041e0e3327981 data\extravaganza\advancement\recipes\building_blocks\yellow_sharped_festive_rubber_wall.json -e808e5ed5954afbd2067ae1934d4ef3d3423cef8 data\extravaganza\advancement\recipes\building_blocks\blue_perforated_festive_rubber_slab.json 26edbcd03de079b717f8e4d486a0a9eccf744708 data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_slab.json +e808e5ed5954afbd2067ae1934d4ef3d3423cef8 data\extravaganza\advancement\recipes\building_blocks\blue_perforated_festive_rubber_slab.json 72b7d647141f515bdb4d9f1a524a11b24d61e2f1 data\extravaganza\advancement\recipes\building_blocks\lime_split_festive_rubber_wall.json 4cda7e419abc57df9e7eca4ecdf31bd4ca19d498 data\extravaganza\recipe\light_gray_festive_rubber.json 26eac7f72c95757df9d8295212f2284240fcd911 data\extravaganza\advancement\recipes\building_blocks\purple_curved_festive_rubber_slab.json @@ -664,8 +664,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 -e89144975d813c81f02bd40f2e12899ce616b5b7 data\extravaganza\recipe\green_curved_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 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 +682,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 @@ -692,8 +692,8 @@ ae2dee884ccf6f082b2439946b5633eeb2ce981e data\extravaganza\advancement\recipes\b a006ba0595d0f7c7df55451112573d64ff04c676 data\extravaganza\advancement\recipes\building_blocks\purple_dotted_festive_rubber.json 1f08849383c872244d32698cafec5deba8bbfc63 data\extravaganza\advancement\recipes\building_blocks\pink_festive_rubber_grate_wall.json 16c1f9b1c713bf7f03c62e8ebf8ce31853ff4053 data\extravaganza\recipe\light_blue_curved_festive_rubber_slab.json -8c9947bb77a86460d6580518c66fa1b51bf6c961 data\extravaganza\advancement\recipes\building_blocks\red_festive_rubber_stairs.json 557d313f2b80989baba40faac061c77b32928968 data\extravaganza\recipe\red_slipped_festive_rubber_stairs.json +8c9947bb77a86460d6580518c66fa1b51bf6c961 data\extravaganza\advancement\recipes\building_blocks\red_festive_rubber_stairs.json 69419a1a5693ec66a8fa0e469682da39b2ebcb58 data\extravaganza\recipe\brown_striped_festive_rubber_slab.json c1008fb066f0a2421c75cfcb1c45f88db91271f4 data\extravaganza\recipe\magenta_windowed_festive_rubber_slab.json 9bb8c3a92b4012adc4f98cb4a32920f432b051cb data\extravaganza\recipe\yellow_perforated_festive_rubber_stairs.json @@ -751,8 +751,8 @@ cbd374e2da79feebdee460e084d3297a38d4beee data\extravaganza\advancement\recipes\b 660b7f97719bad15918dcd25b1c1ba7bbe6c7a4e data\extravaganza\recipe\light_blue_curved_festive_rubber.json 9813298b24f6e97044c8295c7fc671737682879a data\extravaganza\recipe\purple_scratched_festive_rubber_wall.json 829cfb3a1e11452e32c55b6a98a6b91629cbce50 data\extravaganza\advancement\recipes\building_blocks\pink_striped_festive_rubber.json -efa09e771aba332aa6ac014008d41bdbb5359805 data\extravaganza\recipe\light_gray_sharped_festive_rubber_stairs.json ba331531dd86ded846d21895e780b6f6f1c72307 data\extravaganza\recipe\light_gray_perforated_festive_rubber_wall.json +efa09e771aba332aa6ac014008d41bdbb5359805 data\extravaganza\recipe\light_gray_sharped_festive_rubber_stairs.json 0f7b118048e940cbb9d0383952ff1f2b062701d4 data\extravaganza\advancement\recipes\building_blocks\black_wooded_festive_rubber_stairs.json 96fa32265018e3d62d49a775b4de966b04b745cd data\extravaganza\recipe\light_blue_screwed_festive_rubber_slab.json 19b947da36c5a938b31976385127550a55e8270d data\extravaganza\recipe\plant_poured_festive_rubber_stairs.json @@ -771,8 +771,8 @@ d37ba310c86ff8bd8cea8e29638d3f8a978cb4ff data\extravaganza\recipe\cyan_padded_fe fa30833aa297d6924d59c5835af78add913ec12c data\extravaganza\advancement\recipes\building_blocks\magenta_curved_festive_rubber_stairs.json 29a59c95d8030c752701a2d4789f42e57d6f94bc data\extravaganza\recipe\pink_bent_festive_rubber_wall.json 881a5c6e939dbb8070f3e689db3554ddf81ffdd4 data\extravaganza\advancement\recipes\building_blocks\blue_trash_can.json -a6ae9fa6d999f2ee051471832be5b5c02e6329c8 data\extravaganza\advancement\recipes\building_blocks\black_dotted_festive_rubber_slab.json 55f97d6d7e225a91f29123f6e7db17d52c30a50f data\extravaganza\recipe\black_windowed_festive_rubber_slab.json +a6ae9fa6d999f2ee051471832be5b5c02e6329c8 data\extravaganza\advancement\recipes\building_blocks\black_dotted_festive_rubber_slab.json b54a9ad782e6c587428d4bf11cc90751c45740fc data\extravaganza\advancement\recipes\building_blocks\light_gray_curved_festive_rubber_wall.json 4936351634522260a292babc0bb0b3606842895a data\extravaganza\advancement\recipes\building_blocks\tomato_bent_festive_rubber.json e8869126955c0dea5122bb01c92ee729a5109ce8 data\extravaganza\advancement\recipes\building_blocks\light_gray_poured_festive_rubber.json @@ -844,8 +844,8 @@ e67b427cfa23a74740b6e8a0490bdbd8f12c898c data\extravaganza\recipe\green_festive_ 900b9d6647b7d03c95b84cae88e2f4c6e6770599 data\extravaganza\advancement\recipes\building_blocks\yellow_scratched_festive_rubber_slab.json 151dc4b2031971bb4013effc77319138e6ebf228 data\extravaganza\advancement\recipes\building_blocks\red_tiled_festive_rubber.json 3a57880471d56596abe6c12aac675bfb20a77d0c data\extravaganza\recipe\cyan_trash_can.json -e96614c4852d4fac91aeb1e5fdc3c673859b768e data\extravaganza\advancement\recipes\redstone\hevea_brasiliensis_fence_gate.json 802315a5a727682c15ff640b7aeb0237b64332c3 data\extravaganza\recipe\black_wooded_festive_rubber.json +e96614c4852d4fac91aeb1e5fdc3c673859b768e data\extravaganza\advancement\recipes\redstone\hevea_brasiliensis_fence_gate.json 60f3ed093942a3d50d2d46199069ef500681ef88 data\extravaganza\recipe\light_gray_barred_festive_rubber_slab.json a827db198461a9f438ceb2ec4e286572adaf7af8 data\extravaganza\recipe\green_slipped_festive_rubber.json 226db0ad9ac246aa8d069f23ca3f426cb15c4b3b data\extravaganza\advancement\recipes\building_blocks\light_gray_barred_festive_rubber_slab.json @@ -1033,8 +1033,8 @@ ceccd9cac8b8a904ab3bb1108ddf1f966108b657 data\extravaganza\advancement\recipes\b cddcf3b6f6d88c64a060c75b90903fcd5a029273 data\extravaganza\advancement\recipes\building_blocks\gray_dotted_festive_rubber_slab.json eb48f35e7c4b5b60930d7c3b98c5f7bad8341769 data\extravaganza\advancement\recipes\building_blocks\yellow_sharped_festive_rubber.json fdecf8df18c0c072a17cdd30669fde8e1f73d021 data\extravaganza\recipe\black_bent_festive_rubber_wall.json -6e05e00d2a2829d38fb00b95f6657f998c4c4fc6 data\extravaganza\recipe\nymph_festive_rubber_slab.json 314bfa9361dbe71bd8e88c48228379a054c8f4bf data\extravaganza\recipe\nymph_slipped_festive_rubber.json +6e05e00d2a2829d38fb00b95f6657f998c4c4fc6 data\extravaganza\recipe\nymph_festive_rubber_slab.json 4e3d9f1e70908ff5cd15c302bb09224dabb094dc data\extravaganza\recipe\blue_scratched_festive_rubber_wall.json 3f82c0d0a66a099b7d6cc3baab0f4538db95c973 data\extravaganza\advancement\recipes\building_blocks\red_sharped_festive_rubber_stairs.json 936b80db3da1ad88a38099365499c89359519831 data\extravaganza\recipe\brown_scratched_festive_rubber_wall.json @@ -1068,15 +1068,15 @@ c36b0ebdc7798ab4566af4d7c84df07355c295f6 data\extravaganza\recipe\light_blue_cur a3643a3ce94b4e8283484e9535e055bff4adfb7d data\extravaganza\advancement\recipes\building_blocks\red_barred_festive_rubber.json 6df09dc03fc8a226add8f168908e7d8c964dd415 data\extravaganza\advancement\recipes\building_blocks\light_blue_curved_festive_rubber_slab.json d7b34d9ead19a855657f25a88893d476ea7c3929 data\extravaganza\recipe\red_striped_festive_rubber.json -348d32b1f532db1c4ad30468403d08ee2454170b data\extravaganza\recipe\tear_poured_festive_rubber_wall.json e875cd0f021ccdbc2cee46b1684ba762a3541f0e data\extravaganza\advancement\recipes\building_blocks\tear_dotted_festive_rubber_stairs.json +348d32b1f532db1c4ad30468403d08ee2454170b data\extravaganza\recipe\tear_poured_festive_rubber_wall.json 9d1132eb10845818dfc42bd979aaf2b8070c44a7 data\extravaganza\recipe\cyan_dotted_festive_rubber_stairs.json 86266a4f34f900de2f0787a9968aa17c7fafbe7f data\extravaganza\advancement\recipes\building_blocks\pink_striped_festive_rubber_stairs.json d6a51427ec78bdbd300c440da64f53f2681ac773 data\extravaganza\advancement\recipes\building_blocks\tear_striped_festive_rubber_wall.json 79bcae0f26508327ef9f1291eec92b5c42d073da data\extravaganza\advancement\recipes\building_blocks\tomato_split_festive_rubber.json f02b959450bda8adfc52e816dbdf25cf741b7018 data\extravaganza\recipe\light_blue_poured_festive_rubber_slab.json -7b336aed2c73c996dcb53a241178a99866e40324 data\extravaganza\advancement\recipes\building_blocks\cyan_wooded_festive_rubber_stairs.json 51ed46bc43f41a94ec8405ce5e84ce4719afbfa2 data\extravaganza\advancement\recipes\building_blocks\cyan_perforated_festive_rubber_wall.json +7b336aed2c73c996dcb53a241178a99866e40324 data\extravaganza\advancement\recipes\building_blocks\cyan_wooded_festive_rubber_stairs.json fe7487b4a464878190a07aea1cd33175a17ff5f4 data\extravaganza\advancement\recipes\building_blocks\cyan_perforated_festive_rubber.json 363c2cf493cbd447cd9fb3b1a0d47ba12317236d data\extravaganza\advancement\recipes\building_blocks\black_windowed_festive_rubber_slab.json 8b31f527daf0df09de24b97101a9ff5ac186c5eb data\extravaganza\recipe\red_trash_can.json @@ -1162,8 +1162,8 @@ fef3ae9ba2668e6c46f27e77cab2e3b26ec2619d data\extravaganza\advancement\recipes\b 81fc12c8876c2c7000d6be2654d661ded8f75982 data\extravaganza\advancement\recipes\building_blocks\red_screwed_festive_rubber_slab.json 1a265bd156b86adb52f0b58b57eb7244c84cab37 data\extravaganza\recipe\cyan_festive_rubber.json 158fa0b550cd928c9f1d115d1b36be9eca22899a data\extravaganza\advancement\recipes\building_blocks\nymph_windowed_festive_rubber_slab.json -913f39242d0ffb83cad606e709b634346cb52f46 data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber_stairs.json 59025247d978c9cd4b3f127b0bd716c99f1ec099 data\extravaganza\advancement\recipes\building_blocks\magenta_bent_festive_rubber_stairs.json +913f39242d0ffb83cad606e709b634346cb52f46 data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber_stairs.json a45d3507498f95e156ce933bef5720f4457229b7 data\extravaganza\recipe\nymph_poured_festive_rubber_wall.json 6f52f2e5e0f61af1d2308ef19606b1d26068e444 data\extravaganza\recipe\white_split_festive_rubber_wall.json a1786e35343bb6aac4243455a6015daaa4fb0a79 data\extravaganza\advancement\recipes\building_blocks\yellow_split_festive_rubber_wall.json @@ -1186,9 +1186,9 @@ dfb8cd66111179802aeac0741390bdf8994522a6 data\extravaganza\recipe\pink_festive_r 29bcfbefe3e47853353c98e29984e041aecaa153 data\extravaganza\recipe\magenta_dotted_festive_rubber_slab.json 4ef7612e63dd2d7a3759ac26c86306c78ad73308 data\extravaganza\advancement\recipes\building_blocks\cyan_striped_festive_rubber_wall.json 2c4d2247f2f22e95461be4cb47ebac0aad58be0a data\extravaganza\recipe\green_screwed_festive_rubber.json -f38393579e6f1d0e6bd72f68d74a5c005c020e5a data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber_grate_stairs.json 8fb40a984024875a533308808c4fd960a5cb35e8 data\extravaganza\recipe\light_gray_striped_festive_rubber_slab.json 2ec1f1a4629dfc3b1ae56e966c859bcf402a9975 data\extravaganza\advancement\recipes\building_blocks\cyan_padded_festive_rubber_wall.json +f38393579e6f1d0e6bd72f68d74a5c005c020e5a data\extravaganza\advancement\recipes\building_blocks\magenta_festive_rubber_grate_stairs.json 8d549528ca90faf5d69f65d6816bec3c51da02ec data\extravaganza\advancement\recipes\building_blocks\nymph_sharped_festive_rubber_stairs.json 8a2d791abcd2f5a4bc4adf6f8dd41485ec28a1fd data\extravaganza\recipe\purple_slipped_festive_rubber_wall.json 6bff9a33b8b75de3987d37190b88ff89021ccb0a data\extravaganza\advancement\recipes\building_blocks\gray_striped_festive_rubber_slab.json @@ -1204,8 +1204,8 @@ da75748654904bf00fea3ee47cd509bb6f10ea5c data\extravaganza\advancement\recipes\b 62392a818dd1064f2eeec1cf3e833534339ab4f7 data\extravaganza\advancement\recipes\building_blocks\red_striped_festive_rubber_slab.json c1e470124a1b5d13603aafcd44a9961f182798b6 data\extravaganza\advancement\recipes\building_blocks\tomato_split_festive_rubber_slab.json 3a2c148785255804a5c54f83fd68e1ba4a8ff518 data\extravaganza\recipe\light_blue_barred_festive_rubber_stairs.json -cce343273dd76164a2f2ec71dd19c75d65f47d3c data\extravaganza\advancement\recipes\building_blocks\magenta_split_festive_rubber.json e20213688a18d7d6cff41727a9540cfa0769e742 data\extravaganza\recipe\magenta_curved_festive_rubber_wall.json +cce343273dd76164a2f2ec71dd19c75d65f47d3c data\extravaganza\advancement\recipes\building_blocks\magenta_split_festive_rubber.json 96e08e905e66f2a4d473a8db6d02eb93ceb404d9 data\extravaganza\advancement\recipes\building_blocks\light_gray_screwed_festive_rubber_wall.json 2e6c9aee1062a38b127fe6c8fb28f142a3bbdec5 data\extravaganza\advancement\recipes\building_blocks\plant_scratched_festive_rubber_stairs.json 1da7cc9a48f5888b7858c7f341488c04ab3e2a15 data\extravaganza\advancement\recipes\building_blocks\pink_scratched_festive_rubber_wall.json @@ -1332,12 +1332,12 @@ abc6f5fa238595c45083b01035841e6f3c4ca664 data\extravaganza\recipe\yellow_split_f 89e2dbff09c7c46b071ec3606b90a4905ae705e7 data\extravaganza\advancement\recipes\building_blocks\brown_scratched_festive_rubber_wall.json aeb9aa7ccb2aea9c9a8907b942f3cb56aacc90f3 data\extravaganza\recipe\cyan_split_festive_rubber_stairs.json b6a49be8089524e771c51d05c0570cc3d18677b2 data\extravaganza\advancement\recipes\building_blocks\tomato_perforated_festive_rubber_stairs.json -81191527f7be79de4d0760d32369808ebc93ceb8 data\extravaganza\recipe\light_gray_perforated_festive_rubber_stairs.json d46d1b716dc9ea72d5b2d9d9f7eb4d7d1fc0027e data\extravaganza\advancement\recipes\building_blocks\light_gray_bent_festive_rubber_slab.json +81191527f7be79de4d0760d32369808ebc93ceb8 data\extravaganza\recipe\light_gray_perforated_festive_rubber_stairs.json f9297e83800a7c29defb7882eda1fe35b6e986c4 data\extravaganza\recipe\lime_perforated_festive_rubber_stairs.json 835ac7783c65e7fde862c8fe7726908f9eb29875 data\extravaganza\advancement\recipes\building_blocks\black_festive_rubber_wall.json -e1a52d2ca28e548830617df53e674ae2f813ef59 data\extravaganza\recipe\nymph_perforated_festive_rubber_wall.json 225e2de9682850f74327a65fe5cf2d79cd249fbe data\extravaganza\advancement\recipes\building_blocks\nymph_wooded_festive_rubber_stairs.json +e1a52d2ca28e548830617df53e674ae2f813ef59 data\extravaganza\recipe\nymph_perforated_festive_rubber_wall.json b204793691c84825c18acd3639e5c81abe2c8786 data\extravaganza\advancement\recipes\food\hot_dog_with_mayonnaise.json 106e4befa087610c91b4bd6a99053d95b3a38a44 data\extravaganza\recipe\white_slipped_festive_rubber.json 73aa0db6f49c310c55c5c15964809229db248cb9 data\extravaganza\recipe\orange_scratched_festive_rubber_stairs.json @@ -1346,8 +1346,8 @@ eadd9b71546dc8acc8927cead68b0e1cb81dfe5e data\extravaganza\recipe\nymph_slipped_ e7b54503e8e9b0cc463c0a907dbfdeddab20b2ea data\extravaganza\advancement\recipes\building_blocks\blue_tiled_festive_rubber.json df5f52340da5fd3dd12dce528191a8b882b41a48 data\extravaganza\recipe\gray_festive_rubber_grate_stairs.json 92efc6d085d8c5f8b6fe5f9735fb7b5187d3c1c2 data\extravaganza\advancement\recipes\building_blocks\yellow_striped_festive_rubber_stairs.json -8b7e9a873e65aeed7b6058f2685fca442ad1b7e9 data\extravaganza\advancement\recipes\building_blocks\white_split_festive_rubber_slab.json 963eb11226909b97a462a68ad204e11644d21695 data\extravaganza\recipe\white_wooded_festive_rubber_wall.json +8b7e9a873e65aeed7b6058f2685fca442ad1b7e9 data\extravaganza\advancement\recipes\building_blocks\white_split_festive_rubber_slab.json 99fc8b5442e478fd0661282cabc2e59ad1f775ac data\extravaganza\advancement\recipes\building_blocks\red_screwed_festive_rubber.json 3b1364703cd98c7f1b0d0e82b2a6a7b40411d497 data\extravaganza\advancement\recipes\building_blocks\gray_festive_rubber_ladder.json 570bf25b2ea75a68b460f464f3700d541ba48a33 data\extravaganza\advancement\recipes\building_blocks\black_barred_festive_rubber_slab.json @@ -1381,8 +1381,8 @@ e2cf53b4cdde94acaf0c52fe31cf563f581295b8 data\extravaganza\recipe\red_candy_cane e5aa137d13410548a42ab801e158e312cecefc7d data\extravaganza\advancement\recipes\building_blocks\tear_perforated_festive_rubber_slab.json 2d6b4ccae6df71415bf46a241f5ef24e58cb6ad6 data\extravaganza\advancement\recipes\building_blocks\orange_windowed_festive_rubber.json 7378b87d5b3f5e8c265e005ca288fe124bdc7a70 data\extravaganza\recipe\purple_wooded_festive_rubber_wall.json -771ffdd199a8e5b94f15a47c243bb800fffbc1d4 data\extravaganza\recipe\plant_wooded_festive_rubber.json fe41a422100ff6d399043539b23b28fa3b7c2ce3 data\extravaganza\advancement\recipes\building_blocks\plant_bent_festive_rubber.json +771ffdd199a8e5b94f15a47c243bb800fffbc1d4 data\extravaganza\recipe\plant_wooded_festive_rubber.json f446556cfe48b17a6f16040c1aea8f9bef355209 data\extravaganza\advancement\recipes\building_blocks\magenta_dotted_festive_rubber_wall.json ae7debe86f335529a823cb2a292db4c07d007cec data\extravaganza\recipe\tomato_barred_festive_rubber_slab.json 31672f4fdee1088df505e1dde3972576a0094875 data\extravaganza\recipe\pink_festive_rubber.json @@ -1472,8 +1472,8 @@ ddd31fc2370befaa2ddfc4b757f98ff2640b5b5d data\extravaganza\advancement\recipes\b 9dabe9a48d75ece708f23bcb44ea6a06cd620d73 data\extravaganza\advancement\recipes\building_blocks\green_trash_can.json ec44fd001bc321727b3562b864a9b90c32d159af data\extravaganza\recipe\light_gray_striped_festive_rubber_wall.json b4f2a2d5b9452fa7696b7eff3ced7322014f457a data\extravaganza\advancement\recipes\building_blocks\purple_split_festive_rubber_stairs.json -5b6570af748802a96fc94ea5ca28f3c2f8ee8417 data\extravaganza\advancement\recipes\building_blocks\lime_striped_festive_rubber.json 030f22297aa84e55cd43327c76a95f57faa26ae6 data\extravaganza\advancement\recipes\building_blocks\blue_festive_rubber_grate_wall.json +5b6570af748802a96fc94ea5ca28f3c2f8ee8417 data\extravaganza\advancement\recipes\building_blocks\lime_striped_festive_rubber.json 1e43f68c8da17f0cb2e339d8bca251037471c60a data\extravaganza\advancement\recipes\building_blocks\yellow_curved_festive_rubber_wall.json 02ce5e73eabbb617108e89e6a834e7a3533a0f26 data\extravaganza\recipe\orange_dotted_festive_rubber_wall.json 12a71ec3ec597f3023949be5573c6f6da90740b3 data\extravaganza\advancement\recipes\building_blocks\purple_slipped_festive_rubber_stairs.json @@ -1512,8 +1512,8 @@ e77f1464a8b81c1b8a38799113362a201d2e9317 data\extravaganza\advancement\recipes\b 83a5d43f8e51babbf5c986fb7c56e0cdd199af94 data\extravaganza\recipe\blue_festive_rubber_ladder.json 8eb1be52d712fb381dd1a7100ff3d5b4dbda34c3 data\extravaganza\recipe\blue_windowed_festive_rubber_slab.json dde9c9f2f8e37fd4c818bd29bdbe0c3f00720168 data\extravaganza\advancement\recipes\building_blocks\yellow_perforated_festive_rubber_stairs.json -21521f4eb0157c8b0d8b5b2fa64fddff24daf54f data\extravaganza\advancement\recipes\building_blocks\light_blue_festive_rubber_grate.json acac2e78fb699f7faa3edd79fbeb88273479ef05 data\extravaganza\advancement\recipes\building_blocks\light_blue_festive_rubber_slab.json +21521f4eb0157c8b0d8b5b2fa64fddff24daf54f data\extravaganza\advancement\recipes\building_blocks\light_blue_festive_rubber_grate.json 6ec7cd56c6aae627c3812e855a15fe63e3339d7d data\extravaganza\recipe\purple_striped_festive_rubber.json d1dca474ae8d4348fc6b41f145627c79762820c4 data\extravaganza\advancement\recipes\building_blocks\nymph_barred_festive_rubber_slab.json 17db1bb6466d21314e8f8a9a009bf0ebf4fec1ad data\extravaganza\advancement\recipes\building_blocks\white_poured_festive_rubber_slab.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 -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 +8147307ddbb1de9b5d27d409c81adf42e08c27d5 data\extravaganza\advancement\recipes\building_blocks\cyan_tiled_festive_rubber_stairs.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 @@ -1581,8 +1581,8 @@ d98053e7804af44c9b4f201a1784f01820b26e19 data\extravaganza\advancement\recipes\b 5a99b7b8028aadb436130d9e758b572cb8c4816f data\extravaganza\advancement\recipes\building_blocks\purple_scratched_festive_rubber_stairs.json 88ab54b801b99987762420ab457eb997e5bb2aa7 data\extravaganza\recipe\light_blue_split_festive_rubber_slab.json 0c97058995f3fcb677256f00e859f6dcc367d671 data\extravaganza\advancement\recipes\building_blocks\brown_sharped_festive_rubber_slab.json -c374de19ff94b967edb47eb362c8a727a1bb687e data\extravaganza\recipe\nymph_striped_festive_rubber_slab.json d205169db3e1aec420eef38640fff67d93731a1d data\extravaganza\advancement\recipes\building_blocks\nymph_bent_festive_rubber_stairs.json +c374de19ff94b967edb47eb362c8a727a1bb687e data\extravaganza\recipe\nymph_striped_festive_rubber_slab.json 5b2f6b4ded636d6f8e39e051f7120d3a0e8ab3e0 data\extravaganza\recipe\plant_barred_festive_rubber_stairs.json 56f925944ed14e35450c4749c251ba06998a426a data\extravaganza\advancement\recipes\building_blocks\orange_bent_festive_rubber_wall.json b3ff4a612274be4d274b2e5cdee7493fdb6e2d4a data\extravaganza\advancement\recipes\building_blocks\pink_festive_rubber_grate.json @@ -1762,8 +1762,8 @@ c3d679c91ff2e35f3ae52d225af59dc8567290e8 data\extravaganza\recipe\red_split_fest 6d62dcb320f140a50e9d03de28966c4e82edd8f6 data\extravaganza\advancement\recipes\building_blocks\nymph_padded_festive_rubber_stairs.json e24b9a2bd1c452aaf74c9f25800f1d2a087e9640 data\extravaganza\advancement\recipes\building_blocks\green_festive_rubber_slab.json 975fc3f7b1fe4a23738eac45adfc8625eff67037 data\extravaganza\advancement\recipes\building_blocks\white_festive_rubber_grate_wall.json -8038aabbc2a87ea1c54cedb20cb800228ce8474a data\extravaganza\advancement\recipes\building_blocks\tomato_striped_festive_rubber.json dd82e28bfd814934490c1bfab2f9b73c5b54985d data\extravaganza\recipe\tomato_bent_festive_rubber_slab.json +8038aabbc2a87ea1c54cedb20cb800228ce8474a data\extravaganza\advancement\recipes\building_blocks\tomato_striped_festive_rubber.json aa59f13fb595ddc0b06130aced5f6f30d5b2c75e data\extravaganza\recipe\tear_padded_festive_rubber.json edea7e209fcfd15d52b0b6f08f7159d373931a2b data\extravaganza\recipe\light_gray_tiled_festive_rubber.json 791a76ce90777a3820df9731e62e552af10439b9 data\extravaganza\recipe\tomato_trash_can.json @@ -1779,8 +1779,8 @@ b969a3fc83b5578b1d64aa5f4bbbeb726b769906 data\extravaganza\recipe\brown_festive_ 0cc758d9ec8af55aa0f66fb14f4a0ae3c2734a81 data\extravaganza\advancement\recipes\building_blocks\tear_dotted_festive_rubber.json cf0e2fbe7aa9c1dcb1b0a4afa1a8dd74b840e54c data\extravaganza\advancement\recipes\building_blocks\light_gray_perforated_festive_rubber_stairs.json c7656c101fac71a7dbc6896ac6ed0df0540e8a85 data\extravaganza\advancement\recipes\building_blocks\white_split_festive_rubber.json -aaad1144ba769c09a0e16a128cc14d00580fcd55 data\extravaganza\recipe\brown_bent_festive_rubber_slab.json 69eb8fe4a56d872269268c683626b8aafb659263 data\extravaganza\recipe\magenta_slipped_festive_rubber_slab.json +aaad1144ba769c09a0e16a128cc14d00580fcd55 data\extravaganza\recipe\brown_bent_festive_rubber_slab.json a0040d88633c0d193df6cafc470755169dc171db data\extravaganza\advancement\recipes\building_blocks\plant_perforated_festive_rubber_stairs.json d3f598833aa9e23e8d7fc6d464a7280e0f11a32b data\extravaganza\recipe\plant_festive_rubber_grate_stairs.json 086ed47be173f12e28cad07bbded688b2d411638 data\extravaganza\advancement\recipes\building_blocks\purple_barred_festive_rubber_wall.json @@ -1828,9 +1828,9 @@ b10eca20168c4227ba774a0d27bbf8d3ba0504f4 data\extravaganza\advancement\recipes\b 5441156ce6c66fa403ba722ed05eead2c117d446 data\extravaganza\advancement\recipes\building_blocks\lime_striped_festive_rubber_wall.json c3b4fafe5d8b1401b38121c0fe5100a26fec9c45 data\extravaganza\advancement\recipes\building_blocks\black_festive_rubber.json 3853d410b2efbaad07a3fd391bb1d7044776c9a7 data\extravaganza\recipe\orange_festive_rubber_grate_slab.json -4efc724299b44c6c897b926ad94794811b2a3012 data\extravaganza\advancement\recipes\building_blocks\cyan_barred_festive_rubber_stairs.json d9d52352726f64b90e2625f5a5d07643d0435b7d data\extravaganza\advancement\recipes\building_blocks\brown_screwed_festive_rubber.json c75581d6b1daecc5029b02cb900b7eedad06a5d6 data\extravaganza\recipe\black_curved_festive_rubber_stairs.json +4efc724299b44c6c897b926ad94794811b2a3012 data\extravaganza\advancement\recipes\building_blocks\cyan_barred_festive_rubber_stairs.json 7a0e77a93af2c38c1889e5cff566705f9106e71e data\extravaganza\recipe\cyan_poured_festive_rubber_slab.json c03b10ae7d7d2837a3cd11fc96c5f3918d4fe9a7 data\extravaganza\advancement\recipes\building_blocks\light_blue_screwed_festive_rubber.json 95ae4f0beb3504cc28658c19285b21eae6009373 data\extravaganza\advancement\recipes\building_blocks\red_perforated_festive_rubber_slab.json @@ -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 -286999a123728e7b620c65f23e2375660dfd1e73 data\extravaganza\recipe\cyan_bent_festive_rubber_wall.json 695172e4cb87627bcd12880e107feb96f42c8ac8 data\extravaganza\recipe\magenta_tiled_festive_rubber_slab.json +286999a123728e7b620c65f23e2375660dfd1e73 data\extravaganza\recipe\cyan_bent_festive_rubber_wall.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 @@ -1908,8 +1908,8 @@ e92672fcbb3f12520163937b7a998a5a05762199 data\extravaganza\advancement\recipes\b b3886bd3b5424fd7d6a128a689d3539fefd42cdc data\extravaganza\advancement\recipes\building_blocks\lime_scratched_festive_rubber_stairs.json 4c353bb56e38573dfdbe279110a3b896345a5775 data\extravaganza\recipe\plant_wooded_festive_rubber_stairs.json ed05ca435f61e1f727d47b7bf999ad04f4711f3a data\extravaganza\advancement\recipes\building_blocks\light_gray_windowed_festive_rubber.json -351ff2f276df8e1e4f1d4e1a1e948b0a04dccb9b data\extravaganza\advancement\recipes\building_blocks\green_festive_rubber_grate_slab.json 24d60c4f9830c50acb0109bd8392ef02b94eb697 data\extravaganza\recipe\hevea_brasiliensis_trapdoor.json +351ff2f276df8e1e4f1d4e1a1e948b0a04dccb9b data\extravaganza\advancement\recipes\building_blocks\green_festive_rubber_grate_slab.json 5c1c0eff9a6d0be8e47f05760c13b8af26dba714 data\extravaganza\recipe\orange_sharped_festive_rubber_slab.json 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 @@ -1979,8 +1979,8 @@ e6c22841865a6a4eff7d02e82898e36f2e54fc12 data\extravaganza\advancement\recipes\b 360591bf25ff729af99cce26a812c224d12e73c3 data\extravaganza\recipe\light_gray_windowed_festive_rubber.json 185d4af7ecef386f637aba439f1c9c6b3c65a606 data\extravaganza\advancement\recipes\building_blocks\plant_striped_festive_rubber.json a335bfb8d6e287c85f064a4d4f3e8559265e965c data\extravaganza\recipe\lime_poured_festive_rubber.json -608f6d0495e2d9273014bf4ece3e404288694450 data\extravaganza\recipe\brown_barred_festive_rubber.json b2ecdfed1920f7255af3835fdf2ee3b4c7610606 data\extravaganza\advancement\recipes\building_blocks\brown_festive_rubber_grate_stairs.json +608f6d0495e2d9273014bf4ece3e404288694450 data\extravaganza\recipe\brown_barred_festive_rubber.json 47bd4bbbe6630eec6e841e986f3acf950df96251 data\extravaganza\advancement\recipes\building_blocks\purple_wooded_festive_rubber.json f277be64828911b6b7c915eb20e896218ad9210a data\extravaganza\recipe\pink_perforated_festive_rubber_slab.json 26b416966aecb207d0371d9365aa16241d0a488d data\extravaganza\recipe\plant_padded_festive_rubber_stairs.json @@ -2002,8 +2002,8 @@ cb3fa7604626eee029b129ab54616bb17d0c4795 data\extravaganza\advancement\recipes\b 10156adaf6f7288d452d014fa85c066ca5b385b2 data\extravaganza\advancement\recipes\building_blocks\plant_slipped_festive_rubber.json 0f964193564f8a28dc55ac967ce75e74fe0a9ed6 data\extravaganza\recipe\purple_striped_festive_rubber_slab.json ea880818a86ecb1aa20e7564e435ce52796e0ceb data\extravaganza\recipe\blue_poured_festive_rubber_stairs.json -4ec4b1edb96ca4838b87361d976558ce93b726f9 data\extravaganza\advancement\recipes\building_blocks\tear_festive_rubber_grate.json 05ee9a2136461a0d4173a2b74e7eea6514b5a9c7 data\extravaganza\advancement\recipes\building_blocks\tear_barred_festive_rubber.json +4ec4b1edb96ca4838b87361d976558ce93b726f9 data\extravaganza\advancement\recipes\building_blocks\tear_festive_rubber_grate.json bca16c6c3e6cb7856d5f18779ef9dd00ba40f08d data\extravaganza\recipe\magenta_tiled_festive_rubber_wall.json dee592ca4ea6114495eee4785852c4445ab7ec2a data\extravaganza\advancement\recipes\building_blocks\lime_dotted_festive_rubber_wall.json c1c3f99911c628c49a63aaaeeb5abbeebaedc8f0 data\extravaganza\advancement\recipes\redstone\hevea_brasiliensis_pressure_plate.json @@ -2033,8 +2033,8 @@ e5216a187046d7de4db8ffcc49ff1a91a2c8045d data\extravaganza\recipe\purple_bent_fe 05347fd2820aba9cfa3e052f175b7e0cbcdcbf56 data\extravaganza\advancement\recipes\building_blocks\black_scratched_festive_rubber_slab.json 5cfb67cdba26d1fe4d9579db6aef51fb8bb2697e data\extravaganza\recipe\green_trash_can.json 492369d1ad155666f4d64a2f7a75c58176e18dfb data\extravaganza\advancement\recipes\building_blocks\gray_wooded_festive_rubber_stairs.json -001ddb7760ee1646658efe15125b3dadb60cbf06 data\extravaganza\advancement\recipes\building_blocks\orange_poured_festive_rubber.json fee983a4083fb1dc28a0e5a3f9e98ef57dfb4874 data\extravaganza\advancement\recipes\building_blocks\orange_dotted_festive_rubber.json +001ddb7760ee1646658efe15125b3dadb60cbf06 data\extravaganza\advancement\recipes\building_blocks\orange_poured_festive_rubber.json 34e1fc8716dc36669a7486b78ff374f7e9b0ab92 data\extravaganza\recipe\yellow_barred_festive_rubber_slab.json aedc1ddae0f4a49685beb49e11144977804b2434 data\extravaganza\advancement\recipes\building_blocks\nymph_barred_festive_rubber_wall.json 2bc50153e55f0434bc7ede1f033f9b1d3dc52136 data\extravaganza\recipe\plant_curved_festive_rubber_slab.json @@ -2191,8 +2191,8 @@ 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 @@ -2216,8 +2216,8 @@ f7591e571d6e1a47bdaa94a2e62913270b468fc7 data\extravaganza\advancement\recipes\b 6b93ec462b685b19dfe174ccfbd764d53ea1d932 data\extravaganza\advancement\recipes\building_blocks\magenta_perforated_festive_rubber.json 2d27fd9e5b23eee4fca3576b43e155ae55ec5552 data\extravaganza\recipe\green_curved_festive_rubber.json 5bf4132e60dee4e16c39ba167e3618c84e68a97c data\extravaganza\advancement\recipes\building_blocks\plant_wooded_festive_rubber_stairs.json -cf6da016acf8d69cdaf296f1a66c56fbd1b8a39b data\extravaganza\recipe\cyan_perforated_festive_rubber_stairs.json 10cf94b6423047728e8601b8a562a18c4b9b644a data\extravaganza\recipe\gray_festive_rubber_grate_wall.json +cf6da016acf8d69cdaf296f1a66c56fbd1b8a39b data\extravaganza\recipe\cyan_perforated_festive_rubber_stairs.json bd2e4393c47b28a8b8218e719d7c282e9ede79d8 data\extravaganza\recipe\purple_scratched_festive_rubber.json 9254774aec4cbeacd0e6e33f91c6f687521c28e0 data\extravaganza\advancement\recipes\building_blocks\magenta_striped_festive_rubber_wall.json d7d7d225ba905d660925adf566be8978b557195b data\extravaganza\advancement\recipes\decorations\hevea_brasiliensis_fence.json @@ -2542,8 +2542,8 @@ d4dfea080fa70b91feb6a6f87eed37c250b7295c data\extravaganza\recipe\brown_wooded_f 0b95c61d1cb8afa0f8467e4264e49edf3a00b963 data\extravaganza\recipe\blue_poured_festive_rubber_wall.json 0e277fe861481b4e8d890886733296f1785f3120 data\extravaganza\advancement\recipes\building_blocks\tomato_bent_festive_rubber_wall.json 0bfdd2688fe9cb4a8fca725eda0e039f018be85d data\extravaganza\recipe\magenta_poured_festive_rubber_slab.json -760dd9f10388461fdfae82a251f9f004b5d0ae4c data\extravaganza\advancement\recipes\building_blocks\blue_slipped_festive_rubber_wall.json feb0015a3fc54c09c3b27340ee0582fd873062b2 data\extravaganza\recipe\blue_curved_festive_rubber.json +760dd9f10388461fdfae82a251f9f004b5d0ae4c data\extravaganza\advancement\recipes\building_blocks\blue_slipped_festive_rubber_wall.json d7797e6764fef62a969f15b2c18cfe08eb0e9532 data\extravaganza\advancement\recipes\redstone\hevea_brasiliensis_door.json fdac67bcc5fe3bc8e2eda77b1c8cc244331fa1ee data\extravaganza\advancement\recipes\building_blocks\cyan_bent_festive_rubber.json 12842d0d1be3bbe339736704e15a15803151fa50 data\extravaganza\advancement\recipes\building_blocks\plant_split_festive_rubber.json @@ -2676,8 +2676,8 @@ f536e706606fa93f2d1def2854bdcf2b7ae4c065 data\extravaganza\advancement\recipes\b dd017b7a54d24aa65648d2b26e327ce757350281 data\extravaganza\advancement\recipes\building_blocks\light_blue_scratched_festive_rubber_wall.json 1e8f096533d2476fcbbc6a01512b9a3ad90cf345 data\extravaganza\advancement\recipes\building_blocks\yellow_scratched_festive_rubber_stairs.json e62469b707bd93722c488c5a10bc0f1d1df8f1e6 data\extravaganza\recipe\gray_barred_festive_rubber.json -43586e8dfda0e3d76620626bd1864ae32206d8f5 data\extravaganza\recipe\green_windowed_festive_rubber_stairs.json 791a10d44f0c0dc18fee59ed65a1cf113b6f49ea data\extravaganza\recipe\magenta_poured_festive_rubber.json +43586e8dfda0e3d76620626bd1864ae32206d8f5 data\extravaganza\recipe\green_windowed_festive_rubber_stairs.json e9de8040663d7de41b2d9e4f17842bf2013b6398 data\extravaganza\advancement\recipes\building_blocks\stripped_hevea_brasiliensis_wood.json 72d671fc9fc04c0bdebe47d9bb7f2a630157a102 data\extravaganza\advancement\recipes\building_blocks\magenta_scratched_festive_rubber_stairs.json 0ca238eec876ffeb3d4a8d7d0f2890335fcd1942 data\extravaganza\recipe\pink_wooded_festive_rubber.json @@ -2818,8 +2818,8 @@ bb5421363a4bf914688a47ecc9b5f887a7472cea data\extravaganza\advancement\recipes\b 5b26e92f4cd02e3f76345b8742249cd2bd7c73f5 data\extravaganza\recipe\white_slipped_festive_rubber_wall.json 3979536c0f0fef55018d2801020e42eb47cfce6c data\extravaganza\recipe\yellow_tiled_festive_rubber_wall.json 1b98de179c1da2d45abaa95b1f10dc08a42e2f4b data\extravaganza\advancement\recipes\building_blocks\lime_perforated_festive_rubber.json -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 @@ -2841,8 +2841,8 @@ a38b4f02f9b6a38c87dcdc915ec7fafdc805e9e7 data\extravaganza\recipe\light_gray_dot 7bb4c7a1db771cf7bc3d52f0d43f25034b7fe037 data\extravaganza\advancement\recipes\building_blocks\yellow_poured_festive_rubber.json 4a8c1028cf03a41384e5567a0840ada9f25317c5 data\extravaganza\recipe\light_blue_festive_rubber_grate_wall.json a90129da71225ef60c69cfc3ac3fc8b45afeaa5b data\extravaganza\advancement\recipes\building_blocks\orange_padded_festive_rubber_slab.json -484db206f20454397f875e6f28a77e290c789e40 data\extravaganza\recipe\purple_poured_festive_rubber_slab.json ba74d995c7532622e3df8e04afcadeba2a84308a data\extravaganza\advancement\recipes\building_blocks\purple_split_festive_rubber.json +484db206f20454397f875e6f28a77e290c789e40 data\extravaganza\recipe\purple_poured_festive_rubber_slab.json c97e18b2ccc5e67f424d054b7b10ea32cd8054ab data\extravaganza\advancement\recipes\building_blocks\orange_wooded_festive_rubber_slab.json 7fb8049f59adf1313e5a586b9d985faa635a3f4f data\extravaganza\recipe\creeper_balloon.json 517a5629cd63cb5bf50bd0ae184e7f2a056a63ee data\extravaganza\advancement\recipes\building_blocks\lime_sharped_festive_rubber_wall.json @@ -2993,8 +2993,8 @@ f022fd867ee1c6f26f1a9ed98ce62e7cdbc962ac data\extravaganza\recipe\magenta_perfor 0a1aab919b24b60f21d4834bc3d8de72bb54a039 data\extravaganza\advancement\recipes\building_blocks\pink_split_festive_rubber_wall.json 44d6f85f5887af95e2a20c8c17438558a329d44f data\extravaganza\advancement\recipes\building_blocks\gray_poured_festive_rubber.json 06aeb8dc621b4c15ff346c8a36197f3bf8ed9034 data\extravaganza\recipe\brown_tiled_festive_rubber_stairs.json -d8b1c0bc7c5142cc22e718bf023ffe19d7217dec data\extravaganza\recipe\black_poured_festive_rubber_stairs.json 459b75890fcab492466ae5072fdb00154549a961 data\extravaganza\advancement\recipes\building_blocks\black_festive_rubber_grate.json +d8b1c0bc7c5142cc22e718bf023ffe19d7217dec data\extravaganza\recipe\black_poured_festive_rubber_stairs.json 45d8b9fe0ea944ab60516aa4b676dcb88b44d5a1 data\extravaganza\advancement\recipes\building_blocks\light_blue_tiled_festive_rubber_slab.json 848888af17e5bac2908e4a054dfdad5bea3bd592 data\extravaganza\advancement\recipes\building_blocks\light_blue_perforated_festive_rubber_stairs.json a96535299ad0b635596e9840ebb639a9c03a2029 data\extravaganza\advancement\recipes\building_blocks\nymph_tiled_festive_rubber.json diff --git a/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 b/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 index e109146d..2b555f66 100644 --- a/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 +++ b/src/main/generated/.cache/ea38d437bba961a39355c1fcb8fe7bfeb267e512 @@ -1,2 +1,2 @@ -// 1.21 2024-06-24T20:23:24.0312342 Extravaganza!/Language (en_us) -4b1f9aeb8b26e6f65900525948e6dcfe66703728 assets\extravaganza\lang\en_us.json +// 1.21 2024-06-28T01:02:39.9737868 Extravaganza!/Language (en_us) +cbccb91f33768fcb7db25fa4b5817ea6bf2012a6 assets\extravaganza\lang\en_us.json diff --git a/src/main/generated/assets/extravaganza/lang/en_us.json b/src/main/generated/assets/extravaganza/lang/en_us.json index 20b0057b..91237c0b 100644 --- a/src/main/generated/assets/extravaganza/lang/en_us.json +++ b/src/main/generated/assets/extravaganza/lang/en_us.json @@ -1504,6 +1504,23 @@ "block.extravaganza.yellow_wooded_festive_rubber_slab": "Yellow Wooded Festive Rubber Slab", "block.extravaganza.yellow_wooded_festive_rubber_stairs": "Yellow Wooded Festive Rubber Stairs", "block.extravaganza.yellow_wooded_festive_rubber_wall": "Yellow Wooded Festive Rubber Wall", + "death.trash.0": "%1$s slipped and fell into the garbage. No funeral.", + "death.trash.1": "%1$s was stuffed into a trash can", + "death.trash.10": "%1$s was not recycled", + "death.trash.11": "%1$s suffocated in the garbage", + "death.trash.12": "%1$s will feed the raccoons well tonight", + "death.trash.13": "%1$s became a vessel for maggots", + "death.trash.14": "Garbage God obliterated %1$s", + "death.trash.2": "%1$s became rubbish", + "death.trash.3": "%1$s fell into waste bin", + "death.trash.4": "%1$s went to waste", + "death.trash.5": "%1$s was canned", + "death.trash.6": "%1$s was disposed of", + "death.trash.7": "%1$s was discarded", + "death.trash.8": "%1$s went dumpster diving", + "death.trash.9": "%1$s invoked the cans' wrath", + "death.trash.player.0": "%1$s was shoved into a trash can by %2$s", + "death.trash.player.1": "%2$s took out the trash (%1$s)", "item.extravaganza.bat": "Bat", "item.extravaganza.black_festive_ball": "Black Festive Ball", "item.extravaganza.blue_festive_ball": "Blue Festive Ball", diff --git a/src/main/generated/data/extravaganza/damage_type/trash.json b/src/main/generated/data/extravaganza/damage_type/trash.json new file mode 100644 index 00000000..70cae781 --- /dev/null +++ b/src/main/generated/data/extravaganza/damage_type/trash.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0.0, + "message_id": "trash", + "scaling": "when_caused_by_living_non_player" +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/damage_type/always_most_significant_fall.json b/src/main/generated/data/minecraft/tags/damage_type/always_most_significant_fall.json new file mode 100644 index 00000000..0a1dbcc0 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/damage_type/always_most_significant_fall.json @@ -0,0 +1,5 @@ +{ + "values": [ + "extravaganza:trash" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/damage_type/bypasses_armor.json b/src/main/generated/data/minecraft/tags/damage_type/bypasses_armor.json new file mode 100644 index 00000000..0a1dbcc0 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/damage_type/bypasses_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "extravaganza:trash" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/damage_type/bypasses_invulnerability.json b/src/main/generated/data/minecraft/tags/damage_type/bypasses_invulnerability.json new file mode 100644 index 00000000..0a1dbcc0 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/damage_type/bypasses_invulnerability.json @@ -0,0 +1,5 @@ +{ + "values": [ + "extravaganza:trash" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/damage_type/bypasses_resistance.json b/src/main/generated/data/minecraft/tags/damage_type/bypasses_resistance.json new file mode 100644 index 00000000..0a1dbcc0 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/damage_type/bypasses_resistance.json @@ -0,0 +1,5 @@ +{ + "values": [ + "extravaganza:trash" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/damage_type/no_knockback.json b/src/main/generated/data/minecraft/tags/damage_type/no_knockback.json new file mode 100644 index 00000000..0a1dbcc0 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/damage_type/no_knockback.json @@ -0,0 +1,5 @@ +{ + "values": [ + "extravaganza:trash" + ] +} \ No newline at end of file diff --git a/src/main/java/com/mmodding/extravaganza/Extravaganza.java b/src/main/java/com/mmodding/extravaganza/Extravaganza.java index 4e32ad06..fac969a7 100644 --- a/src/main/java/com/mmodding/extravaganza/Extravaganza.java +++ b/src/main/java/com/mmodding/extravaganza/Extravaganza.java @@ -5,6 +5,7 @@ import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.loot.v2.LootTableEvents; +import net.fabricmc.loader.api.FabricLoader; import net.minecraft.loot.LootPool; import net.minecraft.loot.LootTables; import net.minecraft.loot.entry.ItemEntry; @@ -59,6 +60,7 @@ public void onInitialize() { } })) ); + if (FabricLoader.getInstance().isModLoaded("ouch")) ExtravaganzaDamageTypes.ouch(); } public static Logger getLogger() { diff --git a/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java b/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java index 1d911a57..ca335a94 100644 --- a/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java +++ b/src/main/java/com/mmodding/extravaganza/ExtravaganzaDataGenerator.java @@ -4,6 +4,7 @@ import com.mmodding.extravaganza.block.HeveaBrasiliensisLog; import com.mmodding.extravaganza.block.TrashCanBlock; import com.mmodding.extravaganza.init.ExtravaganzaBlocks; +import com.mmodding.extravaganza.init.ExtravaganzaDamageTypes; import com.mmodding.extravaganza.init.ExtravaganzaItems; import com.mmodding.extravaganza.init.ExtravaganzaWorldGeneration; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; @@ -16,6 +17,7 @@ import net.minecraft.data.family.BlockFamilies; import net.minecraft.data.family.BlockFamily; import net.minecraft.data.server.recipe.*; +import net.minecraft.entity.damage.DamageType; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.Items; @@ -23,6 +25,7 @@ import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.*; import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.DamageTypeTags; import net.minecraft.registry.tag.TagKey; import net.minecraft.resource.featuretoggle.FeatureFlags; import net.minecraft.resource.featuretoggle.FeatureSet; @@ -85,11 +88,13 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { pack.addProvider(ExtravaganzaBlockLootTableGenerator::new); pack.addProvider(ExtravaganzaBlockTagProvider::new); pack.addProvider(ExtravaganzaItemTagProvider::new); - pack.addProvider(ExtravaganzaWorldgenProvider::new); + pack.addProvider(ExtravaganzaDamageTypeTagProvider::new); + pack.addProvider(ExtravaganzaDynamicRegistryProvider::new); } @Override public void buildRegistry(RegistryBuilder registryBuilder) { + ExtravaganzaDamageTypes.data(registryBuilder); ExtravaganzaWorldGeneration.data(registryBuilder); } @@ -100,16 +105,33 @@ private ExtravaganzaLanguageProvider(FabricDataOutput dataOutput, CompletableFut } @Override - public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, TranslationBuilder translationBuilder) { - translationBuilder.add("itemGroup.extravaganza.main", "Extravaganza!"); - translationBuilder.add("message.extravaganza.trash_can.right_click", "The player can open the trash by right-clicking."); - translationBuilder.add("message.extravaganza.trash_can.quick_throw", "The player can throw items to trash (one by one) by sneaking + right-clicking whenever the trash is open or not."); - translationBuilder.add("message.extravaganza.trash_can.opening_trash", "The player can throw entities to trash by putting them on top of the opened trash."); - translationBuilder.add("message.extravaganza.trash_can.throw_whole_stack", "If the player wants to throw an entire stack, he needs to open the trash and then throw the whole stack."); - translationBuilder.add("painting.extravaganza.reflect.author", "Aeramisu"); - translationBuilder.add("painting.extravaganza.reflect.title", "Reflect"); - translationBuilder.add("tag.item.extravaganza.festive_balls", "Festive Balls"); - Extravaganza.executeKeyForRegistry(Registries.ITEM, key -> translationBuilder.add(Registries.ITEM.get(key), this.makeItReadable(key))); + public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, TranslationBuilder translations) { + translations.add("death.trash.0", "%1$s slipped and fell into the garbage. No funeral."); + translations.add("death.trash.1", "%1$s was stuffed into a trash can"); + translations.add("death.trash.2", "%1$s became rubbish"); + translations.add("death.trash.3", "%1$s fell into waste bin"); + translations.add("death.trash.4", "%1$s went to waste"); + translations.add("death.trash.5", "%1$s was canned"); + translations.add("death.trash.6", "%1$s was disposed of"); + translations.add("death.trash.7", "%1$s was discarded"); + translations.add("death.trash.8", "%1$s went dumpster diving"); + translations.add("death.trash.9", "%1$s invoked the cans' wrath"); + translations.add("death.trash.10", "%1$s was not recycled"); + translations.add("death.trash.11", "%1$s suffocated in the garbage"); + translations.add("death.trash.12", "%1$s will feed the raccoons well tonight"); + translations.add("death.trash.13", "%1$s became a vessel for maggots"); + translations.add("death.trash.14", "Garbage God obliterated %1$s"); + translations.add("death.trash.player.0", "%1$s was shoved into a trash can by %2$s"); + translations.add("death.trash.player.1", "%2$s took out the trash (%1$s)"); + translations.add("itemGroup.extravaganza.main", "Extravaganza!"); + translations.add("message.extravaganza.trash_can.right_click", "The player can open the trash by right-clicking."); + translations.add("message.extravaganza.trash_can.quick_throw", "The player can throw items to trash (one by one) by sneaking + right-clicking whenever the trash is open or not."); + translations.add("message.extravaganza.trash_can.opening_trash", "The player can throw entities to trash by putting them on top of the opened trash."); + translations.add("message.extravaganza.trash_can.throw_whole_stack", "If the player wants to throw an entire stack, he needs to open the trash and then throw the whole stack."); + translations.add("painting.extravaganza.reflect.author", "Aeramisu"); + translations.add("painting.extravaganza.reflect.title", "Reflect"); + translations.add("tag.item.extravaganza.festive_balls", "Festive Balls"); + Extravaganza.executeKeyForRegistry(Registries.ITEM, key -> translations.add(Registries.ITEM.get(key), this.makeItReadable(key))); } private String makeItReadable(RegistryKey key) { @@ -762,21 +784,43 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { } } - public static class ExtravaganzaWorldgenProvider extends FabricDynamicRegistryProvider { + public static class ExtravaganzaDamageTypeTagProvider extends FabricTagProvider { - public ExtravaganzaWorldgenProvider(FabricDataOutput output, CompletableFuture registriesFuture) { + public ExtravaganzaDamageTypeTagProvider(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, RegistryKeys.DAMAGE_TYPE, registriesFuture); + } + + @Override + protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { + this.getOrCreateTagBuilder(DamageTypeTags.BYPASSES_ARMOR) + .add(ExtravaganzaDamageTypes.TRASH); + this.getOrCreateTagBuilder(DamageTypeTags.BYPASSES_INVULNERABILITY) + .add(ExtravaganzaDamageTypes.TRASH); + this.getOrCreateTagBuilder(DamageTypeTags.BYPASSES_RESISTANCE) + .add(ExtravaganzaDamageTypes.TRASH); + this.getOrCreateTagBuilder(DamageTypeTags.ALWAYS_MOST_SIGNIFICANT_FALL) + .add(ExtravaganzaDamageTypes.TRASH); + this.getOrCreateTagBuilder(DamageTypeTags.NO_KNOCKBACK) + .add(ExtravaganzaDamageTypes.TRASH); + } + } + + public static class ExtravaganzaDynamicRegistryProvider extends FabricDynamicRegistryProvider { + + public ExtravaganzaDynamicRegistryProvider(FabricDataOutput output, CompletableFuture registriesFuture) { super(output, registriesFuture); } @Override protected void configure(RegistryWrapper.WrapperLookup registries, Entries entries) { entries.addAll(registries.getWrapperOrThrow(RegistryKeys.CONFIGURED_FEATURE)); + entries.addAll(registries.getWrapperOrThrow(RegistryKeys.DAMAGE_TYPE)); entries.addAll(registries.getWrapperOrThrow(RegistryKeys.PLACED_FEATURE)); } @Override public String getName() { - return "Extravaganza World Generation"; + return "Extravaganza DynamicRegistries Generation"; } } } diff --git a/src/main/java/com/mmodding/extravaganza/block/TrashCanBlock.java b/src/main/java/com/mmodding/extravaganza/block/TrashCanBlock.java index 7f00cf3e..237332f7 100644 --- a/src/main/java/com/mmodding/extravaganza/block/TrashCanBlock.java +++ b/src/main/java/com/mmodding/extravaganza/block/TrashCanBlock.java @@ -1,11 +1,14 @@ package com.mmodding.extravaganza.block; +import com.mmodding.extravaganza.init.ExtravaganzaDamageTypes; import com.mmodding.extravaganza.init.ExtravaganzaGameRules; import com.mojang.serialization.MapCodec; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; @@ -65,7 +68,14 @@ else if (!player.getStackInHand(hand).isEmpty() && player.isSneaking()) { @Override public void onSteppedOn(World world, BlockPos pos, BlockState state, Entity entity) { if (world.getBlockState(pos).get(TrashCanBlock.OPEN) && (!(entity instanceof PlayerEntity) || world.getGameRules().getBoolean(ExtravaganzaGameRules.PLAYERS_INTO_TRASH))) { - entity.damage(world.getDamageSources().outOfWorld(), 1000000.0f); + DamageSource source; + if (entity instanceof LivingEntity livingEntity && livingEntity.getPrimeAdversary() != null) { + source = world.getDamageSources().create(ExtravaganzaDamageTypes.TRASH, livingEntity.getPrimeAdversary()); + } + else { + source = world.getDamageSources().create(ExtravaganzaDamageTypes.TRASH); + } + entity.damage(source, 1000000.0f); } } diff --git a/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaDamageTypes.java b/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaDamageTypes.java new file mode 100644 index 00000000..a902142d --- /dev/null +++ b/src/main/java/com/mmodding/extravaganza/init/ExtravaganzaDamageTypes.java @@ -0,0 +1,25 @@ +package com.mmodding.extravaganza.init; + +import com.mmodding.extravaganza.Extravaganza; +import eu.pb4.ouch.api.PresetCreationEvents; +import net.minecraft.entity.damage.DamageType; +import net.minecraft.registry.RegistryBuilder; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; + +public class ExtravaganzaDamageTypes { + + public static final RegistryKey TRASH = RegistryKey.of(RegistryKeys.DAMAGE_TYPE, Extravaganza.createId("trash")); + + public static void data(RegistryBuilder registries) { + registries.addRegistry( + RegistryKeys.DAMAGE_TYPE, + damageTypes -> damageTypes.register(ExtravaganzaDamageTypes.TRASH, new DamageType("trash", 0.0f)) + ); + } + + @SuppressWarnings("unchecked") + public static void ouch() { + PresetCreationEvents.APPEND.register((builder, preset) -> builder.addDamage("<#ff0000>-${value}\uD83D\uDDD1", ExtravaganzaDamageTypes.TRASH)); + } +} diff --git a/src/main/java/com/mmodding/extravaganza/mixin/DamageSourceMixin.java b/src/main/java/com/mmodding/extravaganza/mixin/DamageSourceMixin.java new file mode 100644 index 00000000..d63a0e8b --- /dev/null +++ b/src/main/java/com/mmodding/extravaganza/mixin/DamageSourceMixin.java @@ -0,0 +1,56 @@ +package com.mmodding.extravaganza.mixin; + +import com.mmodding.extravaganza.init.ExtravaganzaDamageTypes; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.damage.DamageType; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.text.Text; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.random.Random; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.*; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Debug(export = true) +@Mixin(DamageSource.class) +public class DamageSourceMixin { + + @Unique + private int variant = -1; + + @Unique + private boolean self; + + @Shadow + @Final + @Nullable + private Entity source; + + @Inject(method = "(Lnet/minecraft/registry/entry/RegistryEntry;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Vec3d;)V", at = @At("TAIL")) + private void setupVariant(RegistryEntry type, Entity source, Entity attacker, Vec3d position, CallbackInfo ci) { + if (type.getKey().isPresent()) { + if (type.getKey().orElseThrow() == ExtravaganzaDamageTypes.TRASH) { + this.variant = Random.create().nextInt((source == null || attacker == null) ? 15 : 2); + this.self = source == null || attacker == null; + } + } + } + + @Inject(method = "getDeathMessage", at = @At("HEAD"), cancellable = true) + private void injectVariant(LivingEntity killed, CallbackInfoReturnable cir) { + if (this.variant != -1) { + if (this.self) { + cir.setReturnValue(Text.translatable("death.trash." + this.variant, killed.getDisplayName())); + } + else { + assert this.source != null; + cir.setReturnValue(Text.translatable("death.trash.player." + this.variant, killed.getDisplayName(), this.source.getDisplayName())); + } + } + } +} diff --git a/src/main/resources/extravaganza.mixins.json b/src/main/resources/extravaganza.mixins.json index 3a2f46ff..7e130404 100644 --- a/src/main/resources/extravaganza.mixins.json +++ b/src/main/resources/extravaganza.mixins.json @@ -3,6 +3,7 @@ "package": "com.mmodding.extravaganza.mixin", "compatibilityLevel": "JAVA_21", "mixins": [ + "DamageSourceMixin", "EntityMixin", "ServerPlayerInteractionManagerMixin", "TallPlantBlockAccessor"