Fix wrong prop for milk bucket recipe

Depends on cauldron supporting fluids
KnightMiner · Sep 13, 2020 · 51efbf6 · 51efbf6
1 parent 64c0710
commit 51efbf6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -753,10 +753,10 @@ dfaacb0b691fc574aa0ae30a3f21aeb992ab6c3d data/inspirations/recipes/cauldron/dyea
 9ae36578e5b35e7c5d62206e70701b448abdadd1 data/inspirations/recipes/cauldron/dyeable/dye_leather_horse_armor.json
 e535dc27fcec8fe03c36a71a0061ffeac2da95f9 data/inspirations/recipes/cauldron/dyeable/dye_leather_leggings.json
 76b1e9beb5a6facb9f15e8371481bbe30e683171 data/inspirations/recipes/cauldron/empty_bucket.json
-3c88ffc4ee7893b5df93277a39c9a42bf7989591 data/inspirations/recipes/cauldron/empty_milk_bucket.json
+b3269435a312719811e5c445d496281ec9ca0c3b data/inspirations/recipes/cauldron/empty_milk_bucket.json
 079f53c94ad3f821efb34fbe3c92cfab01d46c15 data/inspirations/recipes/cauldron/empty_water_bottle.json
 2b54da72e999ac88c3a26fdf0704bd06ce80dc90 data/inspirations/recipes/cauldron/fill_bucket.json
-e916ab2cb03f031e1c389ec0b1869ed16ac9baf6 data/inspirations/recipes/cauldron/fill_milk_bucket.json
+56d06f36968df950a3a07de08e470fbdcb93e8fb data/inspirations/recipes/cauldron/fill_milk_bucket.json
 4d16f0fbec7fda0992e4b3ec3a4d08e31e42e1a1 data/inspirations/recipes/cauldron/fill_water_bottle.json
 8eaab1d162c52d950fa343a29660cac98892b0e5 data/inspirations/recipes/cauldron/ice/ice_from_water.json
 f00af2e14b6e07f9270c4acb3b79070c01b25fa5 data/inspirations/recipes/cauldron/ice/packed_ice_from_wet_ice.json

diff --git a/src/generated/resources/data/inspirations/recipes/cauldron/empty_milk_bucket.json b/src/generated/resources/data/inspirations/recipes/cauldron/empty_milk_bucket.json
@@ -6,7 +6,7 @@
       "type": "inspirations:config"
     },
     {
-      "prop": "cauldron_recipes",
+      "prop": "cauldron_fluids",
       "type": "inspirations:config"
     }
   ],

diff --git a/src/generated/resources/data/inspirations/recipes/cauldron/fill_milk_bucket.json b/src/generated/resources/data/inspirations/recipes/cauldron/fill_milk_bucket.json
@@ -6,7 +6,7 @@
       "type": "inspirations:config"
     },
     {
-      "prop": "cauldron_recipes",
+      "prop": "cauldron_fluids",
       "type": "inspirations:config"
     }
   ],

diff --git a/src/main/java/knightminer/inspirations/recipes/data/RecipesRecipeProvider.java b/src/main/java/knightminer/inspirations/recipes/data/RecipesRecipeProvider.java
@@ -252,6 +252,7 @@ private void addCauldronRecipes() {
     );
 
     // temporary milk recipes until Forge merges one of my milk bucket fixes
+    Consumer<IFinishedRecipe> milkConsumer = withCondition(ConfigEnabledCondition.CAULDRON_FLUIDS);
     ICauldronIngredient milkIngredient = CauldronIngredients.FLUID.of(InspirationsTags.Fluids.MILK);
     CauldronRecipeBuilder.cauldron(SizedIngredient.fromItems(Items.MILK_BUCKET), milkIngredient)
                          .maxLevels(2)
@@ -261,14 +262,14 @@ private void addCauldronRecipes() {
                          .noContainer()
                          .addCriterion("has_item", hasItem(Items.MILK_BUCKET))
                          .setSound(SoundEvents.ITEM_BUCKET_EMPTY)
-                         .build(cauldronRecipes, resource(folder + "empty_milk_bucket"));
+                         .build(milkConsumer, resource(folder + "empty_milk_bucket"));
     CauldronRecipeBuilder.cauldron(SizedIngredient.fromItems(Items.BUCKET), milkIngredient)
                          .matchFull()
                          .setEmpty()
                          .setOutput(Items.MILK_BUCKET)
                          .addCriterion("has_item", hasItem(Items.MILK_BUCKET))
                          .setSound(SoundEvents.ITEM_BUCKET_FILL)
-                         .build(cauldronRecipes, resource(folder + "fill_milk_bucket"));
+                         .build(milkConsumer, resource(folder + "fill_milk_bucket"));
 
 
     // dyes //