Fix Milk Teas and Mocha Coffee all hard require FD Milk Bottles, and …

…do not also accept Neapolitan ones. Close #13
DragonsPlusMinecraft · Oct 31, 2023 · 10fed0f · 10fed0f
1 parent 34e5550
commit 10fed0f
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 15 deletions.
diff --git a/src/generated/resources/data/respiteful/recipes/brewing/adzuki_milk_tea_alternative.json b/src/generated/resources/data/respiteful/recipes/brewing/adzuki_milk_tea_alternative.json
@@ -0,0 +1,20 @@
+{
+  "type": "farmersrespite:brewing",
+  "ingredients": [
+    {
+      "item": "neapolitan:roasted_adzuki_beans"
+    },
+    {
+      "item": "farmersrespite:black_tea_leaves"
+    }
+  ],
+  "result": {
+    "item": "respiteful:adzuki_milk_tea"
+  },
+  "container": {
+    "item": "neapolitan:milk_bottle"
+  },
+  "experience": 0.35,
+  "brewingtime": 2400,
+  "needwater": false
+}
diff --git a/src/generated/resources/data/respiteful/recipes/brewing/mocha_coffee_alternative.json b/src/generated/resources/data/respiteful/recipes/brewing/mocha_coffee_alternative.json
@@ -0,0 +1,20 @@
+{
+  "type": "farmersrespite:brewing",
+  "ingredients": [
+    {
+      "item": "neapolitan:chocolate_bar"
+    },
+    {
+      "item": "farmersrespite:coffee_beans"
+    }
+  ],
+  "result": {
+    "item": "respiteful:mocha_coffee"
+  },
+  "container": {
+    "item": "neapolitan:milk_bottle"
+  },
+  "experience": 0.35,
+  "brewingtime": 2400,
+  "needwater": false
+}
diff --git a/src/generated/resources/data/respiteful/recipes/brewing/vanilla_milk_tea_alternative.json b/src/generated/resources/data/respiteful/recipes/brewing/vanilla_milk_tea_alternative.json
@@ -0,0 +1,20 @@
+{
+  "type": "farmersrespite:brewing",
+  "ingredients": [
+    {
+      "item": "neapolitan:dried_vanilla_pods"
+    },
+    {
+      "item": "farmersrespite:yellow_tea_leaves"
+    }
+  ],
+  "result": {
+    "item": "respiteful:vanilla_milk_tea"
+  },
+  "container": {
+    "item": "neapolitan:milk_bottle"
+  },
+  "experience": 0.35,
+  "brewingtime": 2400,
+  "needwater": false
+}
diff --git a/src/main/java/plus/dragons/respiteful/entries/RespitefulItems.java b/src/main/java/plus/dragons/respiteful/entries/RespitefulItems.java
@@ -65,31 +65,52 @@ public class RespitefulItems {
     public static final ItemEntry<TeaItem> VANILLA_MILK_TEA = REGISTRATE.item("vanilla_milk_tea",
             prop -> new TeaItem(prop, true))
         .properties(prop -> prop.food(RespitefulFoods.VANILLA_MILK_TEA).stacksTo(16).craftRemainder(Items.GLASS_BOTTLE))
-        .recipe((ctx, prov) -> KettleRecipeBuilder
-            .kettleRecipe(ctx.getEntry(), 1, 2400, 0.35F, false, ModItems.MILK_BOTTLE.get())
-            .addIngredient(NeapolitanItems.DRIED_VANILLA_PODS.get())
-            .addIngredient(FRItems.YELLOW_TEA_LEAVES.get())
-            .build(prov, new ResourceLocation(ctx.getId().getNamespace(), "brewing/" + ctx.getName())))
+        .recipe((ctx, prov) -> {
+            KettleRecipeBuilder
+                    .kettleRecipe(ctx.getEntry(), 1, 2400, 0.35F, false, ModItems.MILK_BOTTLE.get())
+                    .addIngredient(NeapolitanItems.DRIED_VANILLA_PODS.get())
+                    .addIngredient(FRItems.YELLOW_TEA_LEAVES.get())
+                    .build(prov, new ResourceLocation(ctx.getId().getNamespace(), "brewing/" + ctx.getName()));
+            KettleRecipeBuilder
+                    .kettleRecipe(ctx.getEntry(), 1, 2400,  0.35F, false, NeapolitanItems.MILK_BOTTLE.get())
+                    .addIngredient(NeapolitanItems.DRIED_VANILLA_PODS.get())
+                    .addIngredient(FRItems.YELLOW_TEA_LEAVES.get())
+                    .build(prov, new ResourceLocation(ctx.getId().getNamespace(), "brewing/" + ctx.getName() + "_alternative"));
+        })
         .register();
 
     public static final ItemEntry<TeaItem> ADZUKI_MILK_TEA = REGISTRATE.item("adzuki_milk_tea",
             prop -> new TeaItem(prop, true))
         .properties(prop -> prop.food(RespitefulFoods.ADZUKI_MILK_TEA).stacksTo(16).craftRemainder(Items.GLASS_BOTTLE))
-        .recipe((ctx, prov) -> KettleRecipeBuilder
-            .kettleRecipe(ctx.getEntry(), 1, 2400, 0.35F, false, ModItems.MILK_BOTTLE.get())
-            .addIngredient(NeapolitanItems.ROASTED_ADZUKI_BEANS.get())
-            .addIngredient(FRItems.BLACK_TEA_LEAVES.get())
-            .build(prov, new ResourceLocation(ctx.getId().getNamespace(), "brewing/" + ctx.getName())))
+        .recipe((ctx, prov) -> {
+            KettleRecipeBuilder
+                    .kettleRecipe(ctx.getEntry(), 1, 2400, 0.35F, false, ModItems.MILK_BOTTLE.get())
+                    .addIngredient(NeapolitanItems.ROASTED_ADZUKI_BEANS.get())
+                    .addIngredient(FRItems.BLACK_TEA_LEAVES.get())
+                    .build(prov, new ResourceLocation(ctx.getId().getNamespace(), "brewing/" + ctx.getName()));
+            KettleRecipeBuilder
+                    .kettleRecipe(ctx.getEntry(), 1, 2400, 0.35F, false, NeapolitanItems.MILK_BOTTLE.get())
+                    .addIngredient(NeapolitanItems.ROASTED_ADZUKI_BEANS.get())
+                    .addIngredient(FRItems.BLACK_TEA_LEAVES.get())
+                    .build(prov, new ResourceLocation(ctx.getId().getNamespace(), "brewing/" + ctx.getName() + "_alternative"));
+        })
         .register();
 
     public static final ItemEntry<CoffeeItem> MOCHA_COFFEE = REGISTRATE.item("mocha_coffee",
             prop -> new CoffeeItem(prop, true))
         .properties(prop -> prop.food(RespitefulFoods.MOCHA_COFFEE).stacksTo(16).craftRemainder(Items.GLASS_BOTTLE))
-        .recipe((ctx, prov) -> KettleRecipeBuilder
-            .kettleRecipe(ctx.getEntry(), 1, 2400, 0.35F, false, ModItems.MILK_BOTTLE.get())
-            .addIngredient(NeapolitanItems.CHOCOLATE_BAR.get())
-            .addIngredient(FRItems.COFFEE_BEANS.get())
-            .build(prov, new ResourceLocation(ctx.getId().getNamespace(), "brewing/" + ctx.getName())))
+        .recipe((ctx, prov) -> {
+            KettleRecipeBuilder
+                    .kettleRecipe(ctx.getEntry(), 1, 2400, 0.35F, false, ModItems.MILK_BOTTLE.get())
+                    .addIngredient(NeapolitanItems.CHOCOLATE_BAR.get())
+                    .addIngredient(FRItems.COFFEE_BEANS.get())
+                    .build(prov, new ResourceLocation(ctx.getId().getNamespace(), "brewing/" + ctx.getName()));
+            KettleRecipeBuilder
+                    .kettleRecipe(ctx.getEntry(), 1, 2400, 0.35F, false, NeapolitanItems.MILK_BOTTLE.get())
+                    .addIngredient(NeapolitanItems.CHOCOLATE_BAR.get())
+                    .addIngredient(FRItems.COFFEE_BEANS.get())
+                    .build(prov, new ResourceLocation(ctx.getId().getNamespace(), "brewing/" + ctx.getName() + "_alternative"));
+        })
         .register();
 
     public static final ItemEntry<StrengthenEffectDrinkItem> SNOW_TOP_GREEN_TEA = REGISTRATE.item("snow_top_green_tea",