Greatly simplify cauldron contents

No longer needs quite so many interfaces. Instead of an extension pattern, it uses a contains pattern
KnightMiner · Aug 30, 2020 · 27217ad · 27217ad
1 parent 4d97ff6
commit 27217ad
Show file tree

Hide file tree

Showing 67 changed files with 746 additions and 1,020 deletions.
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -344,13 +344,13 @@ ff5fde84a7450ccb06afdc5bd0f304b35a588767 data/inspirations/recipes/recipes/cauld
 0e5e751d7bcb35d50307d72a6eba56ee132f2a88 data/inspirations/recipes/recipes/cauldron/bed/pink.json
 028811ba5fb23e7858d9fb95f5ed598389020431 data/inspirations/recipes/recipes/cauldron/bed/purple.json
 885d69f7737ba3ba8522f82dfc7c739b22659db1 data/inspirations/recipes/recipes/cauldron/bed/red.json
-118d098f311ea540b2f6d4eab4608d4ee52dc2a5 data/inspirations/recipes/recipes/cauldron/bed/undye.json
+bf7624bd0b13278ab60b60dc92adae54eca88b8d data/inspirations/recipes/recipes/cauldron/bed/undye.json
 89b881547d2c94cdd27981cae5da50685fd31a1c data/inspirations/recipes/recipes/cauldron/bed/white.json
 d50dc899aed6e6694f029a00d53db65ff615659b data/inspirations/recipes/recipes/cauldron/bed/yellow.json
 fe04e5bbb4df454952a6157b73be9fa5704bebb7 data/inspirations/recipes/recipes/cauldron/beetroot_soup/empty_bowl.json
 93a92eda0d8f38ec22a0b0eb5028c4b6057462d3 data/inspirations/recipes/recipes/cauldron/beetroot_soup/fill_bowl.json
-be2746b59e3ca2429e995dcccb0cedee9b342c97 data/inspirations/recipes/recipes/cauldron/beetroot_soup/stew_large.json
-822a07bece6524bf5c8634b8dbda8ec0468b2674 data/inspirations/recipes/recipes/cauldron/beetroot_soup/stew_small.json
+942cd6b327c7210c0151c07426f03504e546a160 data/inspirations/recipes/recipes/cauldron/beetroot_soup/stew_large.json
+8f9e790c6897e438f4ff04ef9aecd03543fae2bb data/inspirations/recipes/recipes/cauldron/beetroot_soup/stew_small.json
 ebdd67116d86ac764cb4a96bd6557aaeeb02abf7 data/inspirations/recipes/recipes/cauldron/carpet/black.json
 04de7b6a4cb5ad8a8dc488a6f1f8f17ff82ad3a7 data/inspirations/recipes/recipes/cauldron/carpet/blue.json
 8a2a5b8f40786170e04b617a789ae590525665fa data/inspirations/recipes/recipes/cauldron/carpet/brown.json
@@ -365,7 +365,7 @@ befe8bf90532875d4a39208053750c3fd7f1b1a6 data/inspirations/recipes/recipes/cauld
 ea91e7213978be241f269036996de0b32027a4e8 data/inspirations/recipes/recipes/cauldron/carpet/pink.json
 f722f6ceccb597cc27c12ab2ab4aa2d2bce9db36 data/inspirations/recipes/recipes/cauldron/carpet/purple.json
 fe2e2c16caa769480e2d4573b8f11ab014181150 data/inspirations/recipes/recipes/cauldron/carpet/red.json
-51a482222f83be4a2376b1f23beff71cabe83542 data/inspirations/recipes/recipes/cauldron/carpet/undye.json
+a8e7a8439ac65ae9a3876c7cea3482a2aec7141c data/inspirations/recipes/recipes/cauldron/carpet/undye.json
 95dcb74a75afeaf78dd0f52450d804b2cdff2788 data/inspirations/recipes/recipes/cauldron/carpet/white.json
 b9465b154cd0ff9e1049f1e91301845ff0365ce7 data/inspirations/recipes/recipes/cauldron/carpet/yellow.json
 0470b03da3e918e67ece2e1e84fa16497d6ec2dd data/inspirations/recipes/recipes/cauldron/carpeted_trapdoor/black.json
@@ -382,34 +382,34 @@ b5884bb930640dd834d09b2b6b7aa77300f9c82b data/inspirations/recipes/recipes/cauld
 7624d77593a563edb7b3eed074971bc668163128 data/inspirations/recipes/recipes/cauldron/carpeted_trapdoor/pink.json
 b5da52edeef70d69d9c1301142c1740752617164 data/inspirations/recipes/recipes/cauldron/carpeted_trapdoor/purple.json
 f59ee5ba86c76518f9b19ca169cf63bbae294656 data/inspirations/recipes/recipes/cauldron/carpeted_trapdoor/red.json
-79738e90bd75482e6a759b3051eedad159be0963 data/inspirations/recipes/recipes/cauldron/carpeted_trapdoor/undye.json
+a182da117b9c3e9ca2aba8eeda7b6fe3bd71866b data/inspirations/recipes/recipes/cauldron/carpeted_trapdoor/undye.json
 d5031ffbd2e8d55ffeebae5321ca28e4602965f7 data/inspirations/recipes/recipes/cauldron/carpeted_trapdoor/white.json
 c06892adc3f05763d07e32392359f3d432d07bb6 data/inspirations/recipes/recipes/cauldron/carpeted_trapdoor/yellow.json
-132c99663e26b7150ff1444f32e275493c0a5e19 data/inspirations/recipes/recipes/cauldron/concrete/black.json
-0875af1056d3155b6476bf0ff3f75192cf69dee8 data/inspirations/recipes/recipes/cauldron/concrete/blue.json
-dcc5d8515a823187c828e4677e67a8ab9a3385a6 data/inspirations/recipes/recipes/cauldron/concrete/brown.json
-c8e0dcc9135997bedcc0fdfe5bd6f51796c9dfcc data/inspirations/recipes/recipes/cauldron/concrete/cyan.json
-e7234db22c24b2d500146e2d5d090ef1cd3d24f8 data/inspirations/recipes/recipes/cauldron/concrete/gray.json
-aeac89b70f584280e5dc0a5dcdd2fd463bcf8145 data/inspirations/recipes/recipes/cauldron/concrete/green.json
-fbb2c51f988fcab124e78fa21339adea574873fd data/inspirations/recipes/recipes/cauldron/concrete/light_blue.json
-e924b14746782032ba7c9d42f2fc0f1690d7a461 data/inspirations/recipes/recipes/cauldron/concrete/light_gray.json
-e855eacff3e29485d2afa28a7f32de2ac1282c5d data/inspirations/recipes/recipes/cauldron/concrete/lime.json
-c9fe6496cfa63c35077b24203e03d998894eb884 data/inspirations/recipes/recipes/cauldron/concrete/magenta.json
-fb8dc91fbfcae1dfd727f33b0060d1fcac403e44 data/inspirations/recipes/recipes/cauldron/concrete/orange.json
-1f56e41330563836986cac194620aefef8b3dd5a data/inspirations/recipes/recipes/cauldron/concrete/pink.json
-18c278c6376d06bb905e1440b6e56083acfe6079 data/inspirations/recipes/recipes/cauldron/concrete/purple.json
-79216a840f3246b32788c9c24d62939885272acd data/inspirations/recipes/recipes/cauldron/concrete/red.json
-c36d97efc6139a38362917b4f70af611a6363953 data/inspirations/recipes/recipes/cauldron/concrete/white.json
-920e42339c8565472ea117b55f6e8db8f962d903 data/inspirations/recipes/recipes/cauldron/concrete/yellow.json
-21f604795851709a2a5fd4b6f2e741b8f8d40bfb data/inspirations/recipes/recipes/cauldron/dry_cauldron.json
+0e413ff323876212be74571c02d7a1da5029f3d2 data/inspirations/recipes/recipes/cauldron/concrete/black.json
+ac46600ef33927fec3bbfeec0bab9056c3148862 data/inspirations/recipes/recipes/cauldron/concrete/blue.json
+7ace4ffd7e65670f377760174703d9ba9d15aae6 data/inspirations/recipes/recipes/cauldron/concrete/brown.json
+dcd2506fde5d1f5dd3c7a68acac9e3ffbea5e440 data/inspirations/recipes/recipes/cauldron/concrete/cyan.json
+72d147f6b2f9f4c8e928c5f8697aa107c77d8b13 data/inspirations/recipes/recipes/cauldron/concrete/gray.json
+8c45501c31a858841aa2faf25007fd19872c4767 data/inspirations/recipes/recipes/cauldron/concrete/green.json
+3f728016417d3cc290da3b38abb40b2efb1b6019 data/inspirations/recipes/recipes/cauldron/concrete/light_blue.json
+1dc71c0ea2e4ca03ac7cb98254609df1cfcb97bc data/inspirations/recipes/recipes/cauldron/concrete/light_gray.json
+8f4a4d2b7a189037d861bdc9ad108a8af32cb946 data/inspirations/recipes/recipes/cauldron/concrete/lime.json
+154c70ee9970f469480ea5fadd7d55d2ee8a55b7 data/inspirations/recipes/recipes/cauldron/concrete/magenta.json
+de4d8f6200ca5bff37aee10d22d0c6960676d088 data/inspirations/recipes/recipes/cauldron/concrete/orange.json
+7ffbc3ca29db34e510a6aec43b03950b2dbd0b2c data/inspirations/recipes/recipes/cauldron/concrete/pink.json
+921360717b921b870883d59caf73e6fa4b2db88d data/inspirations/recipes/recipes/cauldron/concrete/purple.json
+4cc35a80a7d051ba175f3109e73cc96bcce7d9a6 data/inspirations/recipes/recipes/cauldron/concrete/red.json
+486abf89406b3b41d5b6ad39b497c369b3b240b0 data/inspirations/recipes/recipes/cauldron/concrete/white.json
+a2a0f68bff93a511a93067c9908b2f199f0a6eca data/inspirations/recipes/recipes/cauldron/concrete/yellow.json
+2365d44b42e90bfe183573bc31f1723904174685 data/inspirations/recipes/recipes/cauldron/dry_cauldron.json
 76b1e9beb5a6facb9f15e8371481bbe30e683171 data/inspirations/recipes/recipes/cauldron/empty_bucket.json
 c49a70ef68bd82dd01a76e117d8d34377bec3e13 data/inspirations/recipes/recipes/cauldron/empty_water_bottle.json
 2b54da72e999ac88c3a26fdf0704bd06ce80dc90 data/inspirations/recipes/recipes/cauldron/fill_bucket.json
-d525c5e252de31c8d912d2777fe5586243446441 data/inspirations/recipes/recipes/cauldron/fill_water_bottle.json
+671084a2f99a4eeb3c729ea4a139a7d80faf7f96 data/inspirations/recipes/recipes/cauldron/fill_water_bottle.json
 0f1decbf0d527791fcf956bf199cfba5fa730072 data/inspirations/recipes/recipes/cauldron/mushroom_stew/empty_bowl.json
 def302b63a17ef3556026710133f421060c90dfc data/inspirations/recipes/recipes/cauldron/mushroom_stew/fill_bowl.json
-7771be7f9473ffdafce5c992cf1428462371d16f data/inspirations/recipes/recipes/cauldron/mushroom_stew/stew_large.json
-3c1c309d8e25a5075dd6628a4f73163b7e592b73 data/inspirations/recipes/recipes/cauldron/mushroom_stew/stew_small.json
+67c2477abb999527c987bf7f22f26d8b1de75305 data/inspirations/recipes/recipes/cauldron/mushroom_stew/stew_large.json
+c56b9b6571bce9b432e1d895f992f7704264e2aa data/inspirations/recipes/recipes/cauldron/mushroom_stew/stew_small.json
 58d531cf8366510412dc96632626733c9897c5bb data/inspirations/recipes/recipes/cauldron/potato_soup/empty_bowl.json
 03487ade1aaa38e408a2c7934672fe11578fd990 data/inspirations/recipes/recipes/cauldron/potato_soup/fill_bowl.json
 55b751b5237c3c8dbe171f55604e7c7a94df5923 data/inspirations/recipes/recipes/cauldron/potato_soup/item.json
@@ -419,8 +419,8 @@ def302b63a17ef3556026710133f421060c90dfc data/inspirations/recipes/recipes/cauld
 aad3506b0cc731722e532198acdb319c5435efa4 data/inspirations/recipes/recipes/cauldron/rabbit_stew/fill_bowl.json
 58afa39737eecfe66d86f840732217ca757c6b05 data/inspirations/recipes/recipes/cauldron/rabbit_stew/stew_large.json
 0305b565e6a256b2d29b6c95cf9a30ff106ecdb2 data/inspirations/recipes/recipes/cauldron/rabbit_stew/stew_small.json
-ce008b3e79cc99e164f808cf6b49fff51c083042 data/inspirations/recipes/recipes/cauldron/sticky_piston_cleaning.json
-7d457e6ccb9afc7e19e58275f9acd3309afe2a2f data/inspirations/recipes/recipes/cauldron/water_from_ice.json
+0c50714d42fa8c1102739251e10803d3e7ed13d4 data/inspirations/recipes/recipes/cauldron/sticky_piston_cleaning.json
+5003206cda94f6c73bf3cf395f5d167ce4a7bff2 data/inspirations/recipes/recipes/cauldron/water_from_ice.json
 1b4f5bba2d11fdbadda300c14af01e08a7c32163 data/inspirations/recipes/recipes/cauldron/wool/black.json
 0112a766363b620d7d24cda58b8b8f27535a0ee8 data/inspirations/recipes/recipes/cauldron/wool/blue.json
 538f110b4ce42596e22a2a9adc9359cdb92c545a data/inspirations/recipes/recipes/cauldron/wool/brown.json
@@ -435,7 +435,7 @@ e5b780ab9fb646624c77415a016ee491ab6e6f6d data/inspirations/recipes/recipes/cauld
 7ae245acf6d4e7448c9c378da868c72f10f14ddc data/inspirations/recipes/recipes/cauldron/wool/pink.json
 ddd52e287e070755057c4f72fda56af4a0792495 data/inspirations/recipes/recipes/cauldron/wool/purple.json
 e6e68450740d059b372f2723aae830e31957cbf1 data/inspirations/recipes/recipes/cauldron/wool/red.json
-1ed63722861370d4fa918626f6225bb667eeb0d9 data/inspirations/recipes/recipes/cauldron/wool/undye.json
+e2b6b85b3ad1f3afb54bb096cfd012e9fe759895 data/inspirations/recipes/recipes/cauldron/wool/undye.json
 f4f18ecab1ff73a6257c0f5442a863b65ab66357 data/inspirations/recipes/recipes/cauldron/wool/white.json
 65ce50304886a83953b3d1c71b37167e20a93caa data/inspirations/recipes/recipes/cauldron/wool/yellow.json
 16a719f79bdc48f49c973b2ccd36073b4601d990 data/inspirations/recipes/tools/barometer.json

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/bed/undye.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/bed/undye.json
@@ -15,8 +15,8 @@
       "tag": "minecraft:beds"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/...erated/resources/data/inspirations/recipes/recipes/cauldron/beetroot_soup/stew_large.json b/...erated/resources/data/inspirations/recipes/recipes/cauldron/beetroot_soup/stew_large.json
@@ -16,8 +16,8 @@
     },
     "amount": 12,
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 2

diff --git a/...erated/resources/data/inspirations/recipes/recipes/cauldron/beetroot_soup/stew_small.json b/...erated/resources/data/inspirations/recipes/recipes/cauldron/beetroot_soup/stew_small.json
@@ -16,8 +16,8 @@
     },
     "amount": 6,
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1,

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/carpet/undye.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/carpet/undye.json
@@ -15,8 +15,8 @@
       "tag": "minecraft:carpets"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/...nerated/resources/data/inspirations/recipes/recipes/cauldron/carpeted_trapdoor/undye.json b/...nerated/resources/data/inspirations/recipes/recipes/cauldron/carpeted_trapdoor/undye.json
@@ -19,8 +19,8 @@
       "tag": "inspirations:carpeted_trapdoors"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/black.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/black.json
@@ -15,8 +15,8 @@
       "item": "minecraft:black_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/blue.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/blue.json
@@ -15,8 +15,8 @@
       "item": "minecraft:blue_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/brown.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/brown.json
@@ -15,8 +15,8 @@
       "item": "minecraft:brown_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/cyan.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/cyan.json
@@ -15,8 +15,8 @@
       "item": "minecraft:cyan_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/gray.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/gray.json
@@ -15,8 +15,8 @@
       "item": "minecraft:gray_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/green.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/green.json
@@ -15,8 +15,8 @@
       "item": "minecraft:green_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/light_blue.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/light_blue.json
@@ -15,8 +15,8 @@
       "item": "minecraft:light_blue_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/light_gray.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/light_gray.json
@@ -15,8 +15,8 @@
       "item": "minecraft:light_gray_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/lime.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/lime.json
@@ -15,8 +15,8 @@
       "item": "minecraft:lime_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/magenta.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/magenta.json
@@ -15,8 +15,8 @@
       "item": "minecraft:magenta_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/orange.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/orange.json
@@ -15,8 +15,8 @@
       "item": "minecraft:orange_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/pink.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/pink.json
@@ -15,8 +15,8 @@
       "item": "minecraft:pink_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/purple.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/purple.json
@@ -15,8 +15,8 @@
       "item": "minecraft:purple_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/red.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/red.json
@@ -15,8 +15,8 @@
       "item": "minecraft:red_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/white.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/white.json
@@ -15,8 +15,8 @@
       "item": "minecraft:white_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/yellow.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/concrete/yellow.json
@@ -15,8 +15,8 @@
       "item": "minecraft:yellow_concrete_powder"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/dry_cauldron.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/dry_cauldron.json
@@ -15,8 +15,8 @@
       "item": "minecraft:sponge"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/empty_water_bottle.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/empty_water_bottle.json
@@ -18,8 +18,8 @@
       "nbt": "{Potion:\"minecraft:water\"}"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "max": 2

diff --git a/src/generated/resources/data/inspirations/recipes/recipes/cauldron/fill_water_bottle.json b/src/generated/resources/data/inspirations/recipes/recipes/cauldron/fill_water_bottle.json
@@ -15,8 +15,8 @@
       "item": "minecraft:glass_bottle"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1

diff --git a/...erated/resources/data/inspirations/recipes/recipes/cauldron/mushroom_stew/stew_large.json b/...erated/resources/data/inspirations/recipes/recipes/cauldron/mushroom_stew/stew_large.json
@@ -16,8 +16,8 @@
     },
     "amount": 4,
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 2

diff --git a/...erated/resources/data/inspirations/recipes/recipes/cauldron/mushroom_stew/stew_small.json b/...erated/resources/data/inspirations/recipes/recipes/cauldron/mushroom_stew/stew_small.json
@@ -16,8 +16,8 @@
     },
     "amount": 2,
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1,

diff --git a/...enerated/resources/data/inspirations/recipes/recipes/cauldron/sticky_piston_cleaning.json b/...enerated/resources/data/inspirations/recipes/recipes/cauldron/sticky_piston_cleaning.json
@@ -15,8 +15,8 @@
       "item": "minecraft:sticky_piston"
     },
     "contents": {
-      "type": "inspirations:content_type",
-      "name": "inspirations:water"
+      "type": "inspirations:fluid",
+      "name": "minecraft:water"
     },
     "level": {
       "min": 1