diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_cocoa.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_cocoa_from_cup.json similarity index 86% rename from src/generated/resources/data/simplytea/advancements/recipes/food/cup_cocoa.json rename to src/generated/resources/data/simplytea/advancements/recipes/food/cup_cocoa_from_cup.json index a0fe24c..f7fe67e 100644 --- a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_cocoa.json +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_cocoa_from_cup.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "simplytea:cup_cocoa" + "recipe": "simplytea:cup_cocoa_from_cup" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "simplytea:cup_cocoa" + "simplytea:cup_cocoa_from_cup" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_cocoa_from_teapot.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_cocoa_from_teapot.json new file mode 100644 index 0000000..69667dc --- /dev/null +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_cocoa_from_teapot.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bag": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cocoa_beans" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "simplytea:cup_cocoa_from_teapot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bag", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "simplytea:cup_cocoa_from_teapot" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_frothed_from_teapot.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_frothed_from_teapot.json new file mode 100644 index 0000000..9bda3fe --- /dev/null +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_frothed_from_teapot.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bag": { + "conditions": { + "items": [ + { + "items": [ + "simplytea:teapot_frothed" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "simplytea:cup_frothed_from_teapot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bag", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "simplytea:cup_frothed_from_teapot" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_frothed_with_cinnamon.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_frothed_with_cinnamon.json new file mode 100644 index 0000000..2658b07 --- /dev/null +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_frothed_with_cinnamon.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "simplytea:tea_stick" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "simplytea:cup_frothed_with_cinnamon" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "simplytea:cup_frothed_with_cinnamon" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chai.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_black_from_cup.json similarity index 85% rename from src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chai.json rename to src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_black_from_cup.json index fb8c1ad..beff87d 100644 --- a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chai.json +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_black_from_cup.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "simplytea:cup_tea_chai" + "recipe": "simplytea:cup_tea_black_from_cup" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "simplytea:cup_tea_chai" + "simplytea:cup_tea_black_from_cup" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_black_from_teapot.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_black_from_teapot.json new file mode 100644 index 0000000..d7676d9 --- /dev/null +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_black_from_teapot.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bag": { + "conditions": { + "items": [ + { + "items": [ + "simplytea:teabag_black" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "simplytea:cup_tea_black_from_teapot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bag", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "simplytea:cup_tea_black_from_teapot" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_black.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chai_from_cup.json similarity index 85% rename from src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_black.json rename to src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chai_from_cup.json index 712b2fa..0ab5cd1 100644 --- a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_black.json +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chai_from_cup.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "simplytea:cup_tea_black" + "recipe": "simplytea:cup_tea_chai_from_cup" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "simplytea:cup_tea_black" + "simplytea:cup_tea_chai_from_cup" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chai_from_teapot.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chai_from_teapot.json new file mode 100644 index 0000000..bdfa42f --- /dev/null +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chai_from_teapot.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bag": { + "conditions": { + "items": [ + { + "items": [ + "simplytea:teabag_black" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "simplytea:cup_tea_chai_from_teapot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bag", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "simplytea:cup_tea_chai_from_teapot" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chorus.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chorus_from_cup.json similarity index 85% rename from src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chorus.json rename to src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chorus_from_cup.json index 612d40e..1a09ede 100644 --- a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chorus.json +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chorus_from_cup.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "simplytea:cup_tea_chorus" + "recipe": "simplytea:cup_tea_chorus_from_cup" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "simplytea:cup_tea_chorus" + "simplytea:cup_tea_chorus_from_cup" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chorus_from_teapot.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chorus_from_teapot.json new file mode 100644 index 0000000..8fcf0bc --- /dev/null +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_chorus_from_teapot.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bag": { + "conditions": { + "items": [ + { + "items": [ + "simplytea:teabag_chorus" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "simplytea:cup_tea_chorus_from_teapot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bag", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "simplytea:cup_tea_chorus_from_teapot" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_floral.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_floral_from_cup.json similarity index 85% rename from src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_floral.json rename to src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_floral_from_cup.json index 619af78..b36c5a8 100644 --- a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_floral.json +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_floral_from_cup.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "simplytea:cup_tea_floral" + "recipe": "simplytea:cup_tea_floral_from_cup" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "simplytea:cup_tea_floral" + "simplytea:cup_tea_floral_from_cup" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_floral_from_teapot.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_floral_from_teapot.json new file mode 100644 index 0000000..6de7fb1 --- /dev/null +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_floral_from_teapot.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bag": { + "conditions": { + "items": [ + { + "items": [ + "simplytea:teabag_floral" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "simplytea:cup_tea_floral_from_teapot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bag", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "simplytea:cup_tea_floral_from_teapot" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_green.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_green_from_cup.json similarity index 85% rename from src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_green.json rename to src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_green_from_cup.json index 88bd7fe..ac85c06 100644 --- a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_green.json +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_green_from_cup.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "simplytea:cup_tea_green" + "recipe": "simplytea:cup_tea_green_from_cup" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "simplytea:cup_tea_green" + "simplytea:cup_tea_green_from_cup" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_green_from_teapot.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_green_from_teapot.json new file mode 100644 index 0000000..52f42c9 --- /dev/null +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_tea_green_from_teapot.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bag": { + "conditions": { + "items": [ + { + "items": [ + "simplytea:teabag_green" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "simplytea:cup_tea_green_from_teapot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bag", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "simplytea:cup_tea_green_from_teapot" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/advancements/recipes/food/cup_water_hot_from_teapot.json b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_water_hot_from_teapot.json new file mode 100644 index 0000000..fdffca5 --- /dev/null +++ b/src/generated/resources/data/simplytea/advancements/recipes/food/cup_water_hot_from_teapot.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bag": { + "conditions": { + "items": [ + { + "items": [ + "simplytea:teapot_hot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "simplytea:cup_water_hot_from_teapot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bag", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "simplytea:cup_water_hot_from_teapot" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/recipes/cup_cocoa_from_cup.json b/src/generated/resources/data/simplytea/recipes/cup_cocoa_from_cup.json new file mode 100644 index 0000000..15272d6 --- /dev/null +++ b/src/generated/resources/data/simplytea/recipes/cup_cocoa_from_cup.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "simplytea:cup" + }, + { + "item": "minecraft:cocoa_beans" + }, + { + "item": "minecraft:cocoa_beans" + }, + { + "item": "simplytea:cup_frothed" + } + ], + "result": { + "item": "simplytea:cup_cocoa" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/recipes/cup_cocoa.json b/src/generated/resources/data/simplytea/recipes/cup_cocoa_from_teapot.json similarity index 100% rename from src/generated/resources/data/simplytea/recipes/cup_cocoa.json rename to src/generated/resources/data/simplytea/recipes/cup_cocoa_from_teapot.json diff --git a/src/generated/resources/data/simplytea/recipes/cup_frothed_from_teapot.json b/src/generated/resources/data/simplytea/recipes/cup_frothed_from_teapot.json new file mode 100644 index 0000000..a7d19ae --- /dev/null +++ b/src/generated/resources/data/simplytea/recipes/cup_frothed_from_teapot.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "simplytea:cup" + }, + { + "item": "simplytea:teapot_frothed" + } + ], + "result": { + "item": "simplytea:cup_frothed" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/recipes/cup_frothed_with_cinnamon.json b/src/generated/resources/data/simplytea/recipes/cup_frothed_with_cinnamon.json new file mode 100644 index 0000000..73e3558 --- /dev/null +++ b/src/generated/resources/data/simplytea/recipes/cup_frothed_with_cinnamon.json @@ -0,0 +1,9 @@ +{ + "type": "simplytea:shapeless_honey", + "group": "simplytea:with_cinnamon", + "honey": { + "item": "simplytea:tea_stick" + }, + "tag": "with_cinnamon", + "tea": "simplytea:cup_frothed" +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/recipes/cup_tea_black_from_cup.json b/src/generated/resources/data/simplytea/recipes/cup_tea_black_from_cup.json new file mode 100644 index 0000000..7e424ec --- /dev/null +++ b/src/generated/resources/data/simplytea/recipes/cup_tea_black_from_cup.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "simplytea:cup" + }, + { + "item": "simplytea:teabag_black" + }, + { + "item": "simplytea:cup_water_hot" + } + ], + "result": { + "item": "simplytea:cup_tea_black" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/recipes/cup_tea_black.json b/src/generated/resources/data/simplytea/recipes/cup_tea_black_from_teapot.json similarity index 100% rename from src/generated/resources/data/simplytea/recipes/cup_tea_black.json rename to src/generated/resources/data/simplytea/recipes/cup_tea_black_from_teapot.json diff --git a/src/generated/resources/data/simplytea/recipes/cup_tea_chai_from_cup.json b/src/generated/resources/data/simplytea/recipes/cup_tea_chai_from_cup.json new file mode 100644 index 0000000..678701d --- /dev/null +++ b/src/generated/resources/data/simplytea/recipes/cup_tea_chai_from_cup.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "simplytea:cup" + }, + { + "item": "simplytea:teabag_black" + }, + { + "item": "simplytea:tea_stick" + }, + { + "item": "simplytea:cup_frothed" + } + ], + "result": { + "item": "simplytea:cup_tea_chai" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/recipes/cup_tea_chai.json b/src/generated/resources/data/simplytea/recipes/cup_tea_chai_from_teapot.json similarity index 100% rename from src/generated/resources/data/simplytea/recipes/cup_tea_chai.json rename to src/generated/resources/data/simplytea/recipes/cup_tea_chai_from_teapot.json diff --git a/src/generated/resources/data/simplytea/recipes/cup_tea_chorus_from_cup.json b/src/generated/resources/data/simplytea/recipes/cup_tea_chorus_from_cup.json new file mode 100644 index 0000000..b89b6a3 --- /dev/null +++ b/src/generated/resources/data/simplytea/recipes/cup_tea_chorus_from_cup.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "simplytea:cup" + }, + { + "item": "simplytea:teabag_chorus" + }, + { + "item": "simplytea:cup_water_hot" + } + ], + "result": { + "item": "simplytea:cup_tea_chorus" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/recipes/cup_tea_chorus.json b/src/generated/resources/data/simplytea/recipes/cup_tea_chorus_from_teapot.json similarity index 100% rename from src/generated/resources/data/simplytea/recipes/cup_tea_chorus.json rename to src/generated/resources/data/simplytea/recipes/cup_tea_chorus_from_teapot.json diff --git a/src/generated/resources/data/simplytea/recipes/cup_tea_floral_from_cup.json b/src/generated/resources/data/simplytea/recipes/cup_tea_floral_from_cup.json new file mode 100644 index 0000000..fa29320 --- /dev/null +++ b/src/generated/resources/data/simplytea/recipes/cup_tea_floral_from_cup.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "simplytea:cup" + }, + { + "item": "simplytea:teabag_floral" + }, + { + "item": "simplytea:cup_water_hot" + } + ], + "result": { + "item": "simplytea:cup_tea_floral" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/recipes/cup_tea_floral.json b/src/generated/resources/data/simplytea/recipes/cup_tea_floral_from_teapot.json similarity index 100% rename from src/generated/resources/data/simplytea/recipes/cup_tea_floral.json rename to src/generated/resources/data/simplytea/recipes/cup_tea_floral_from_teapot.json diff --git a/src/generated/resources/data/simplytea/recipes/cup_tea_green_from_cup.json b/src/generated/resources/data/simplytea/recipes/cup_tea_green_from_cup.json new file mode 100644 index 0000000..a101189 --- /dev/null +++ b/src/generated/resources/data/simplytea/recipes/cup_tea_green_from_cup.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "simplytea:cup" + }, + { + "item": "simplytea:teabag_green" + }, + { + "item": "simplytea:cup_water_hot" + } + ], + "result": { + "item": "simplytea:cup_tea_green" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/simplytea/recipes/cup_tea_green.json b/src/generated/resources/data/simplytea/recipes/cup_tea_green_from_teapot.json similarity index 100% rename from src/generated/resources/data/simplytea/recipes/cup_tea_green.json rename to src/generated/resources/data/simplytea/recipes/cup_tea_green_from_teapot.json diff --git a/src/generated/resources/data/simplytea/recipes/cup_water_hot_from_teapot.json b/src/generated/resources/data/simplytea/recipes/cup_water_hot_from_teapot.json new file mode 100644 index 0000000..c8b0845 --- /dev/null +++ b/src/generated/resources/data/simplytea/recipes/cup_water_hot_from_teapot.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "simplytea:cup" + }, + { + "item": "simplytea:teapot_hot" + } + ], + "result": { + "item": "simplytea:cup_water_hot" + } +} \ No newline at end of file diff --git a/src/main/java/knightminer/simplytea/core/ClientEvents.java b/src/main/java/knightminer/simplytea/core/ClientEvents.java index 10f65da..5e6bf10 100644 --- a/src/main/java/knightminer/simplytea/core/ClientEvents.java +++ b/src/main/java/knightminer/simplytea/core/ClientEvents.java @@ -4,9 +4,11 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.world.level.FoliageColor; +import net.minecraft.client.particle.SplashParticle; import net.minecraft.client.renderer.BiomeColors; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RegisterColorHandlersEvent; +import net.minecraftforge.client.event.RegisterParticleProvidersEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; @@ -24,6 +26,11 @@ public static void registerBlockColors(RegisterColorHandlersEvent.Block event) { }, Registration.tea_trunk); } + @SubscribeEvent + static void registerParticleFactories(RegisterParticleProvidersEvent event) { + event.registerSpriteSet(Registration.milk_splash, SplashParticle.Provider::new); + } + @SubscribeEvent public static void registerMisc(FMLClientSetupEvent event) { // set render types diff --git a/src/main/java/knightminer/simplytea/core/Config.java b/src/main/java/knightminer/simplytea/core/Config.java index 82b6098..c47d37c 100644 --- a/src/main/java/knightminer/simplytea/core/Config.java +++ b/src/main/java/knightminer/simplytea/core/Config.java @@ -1,6 +1,7 @@ package knightminer.simplytea.core; import knightminer.simplytea.core.config.CocoaDrink; +import knightminer.simplytea.core.config.CocoaDrink.ClearType; import knightminer.simplytea.core.config.TeaDrink; import knightminer.simplytea.core.config.TeaDrink.TeaEffect; import knightminer.simplytea.core.config.Teapot; @@ -14,7 +15,7 @@ public class Config { public static class Server { public TeaDrink black_tea, green_tea, floral_tea, chai_tea, chorus_tea, iced_tea; - public CocoaDrink cocoa; + public CocoaDrink cocoa, frothed_milk; public Teapot teapot; public Tree tree; public Server(Builder builder) { @@ -27,7 +28,8 @@ public Server(Builder builder) { chai_tea = new TeaDrink("chai", builder, TeaEffect.INVIGORATED, 5, 0.6, 150, 1); chorus_tea = new TeaDrink("chorus", builder, TeaEffect.ENDERFALLING, 3, 0.9, 150, 1); iced_tea = new TeaDrink("iced", builder, TeaEffect.ABSORPTION, 3, 0.9, 90, 1); - cocoa = new CocoaDrink(builder, 4, 0.6); + cocoa = new CocoaDrink("cocoa", builder, ClearType.NEGATIVE, 4, 0.6); + frothed_milk = new CocoaDrink("frothed_milk", builder, ClearType.ALL, 1, 0.2); builder.pop(); // other categories diff --git a/src/main/java/knightminer/simplytea/core/Registration.java b/src/main/java/knightminer/simplytea/core/Registration.java index 959a33e..d8a6402 100644 --- a/src/main/java/knightminer/simplytea/core/Registration.java +++ b/src/main/java/knightminer/simplytea/core/Registration.java @@ -10,6 +10,7 @@ import knightminer.simplytea.data.gen.ShapelessHoneyRecipe; import knightminer.simplytea.data.gen.WorldgenGenerator; import knightminer.simplytea.item.CocoaItem; +import knightminer.simplytea.item.ColdTeapotItem; import knightminer.simplytea.item.HotTeapotItem; import knightminer.simplytea.item.TeaCupItem; import knightminer.simplytea.item.TeaStickItem; @@ -26,6 +27,7 @@ import knightminer.simplytea.worldgen.TreeGenEnabledPlacement; import net.minecraft.core.HolderLookup; import net.minecraft.core.cauldron.CauldronInteraction; +import net.minecraft.core.particles.SimpleParticleType; import net.minecraft.core.registries.Registries; import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; @@ -41,6 +43,7 @@ import net.minecraft.world.effect.MobEffect; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTabs; @@ -135,7 +138,12 @@ public class Registration { public static Item cup_tea_chai; public static Item cup_tea_iced; public static Item cup_tea_chorus; + public static Item cup_water_hot; public static Item cup_cocoa; + public static Item cup_frothed; + + /* Particles */ + public static SimpleParticleType milk_splash; /* World Gen */ public static PlacementModifierType tree_gen_enabled; @@ -206,8 +214,8 @@ static void registerObjects(final RegisterEvent event) { // filled teapots props.craftRemainder(teapot).stacksTo(1); - teapot_water = register(r, new TooltipItem(props), "teapot_water"); - teapot_milk = register(r, new TooltipItem(props), "teapot_milk"); + teapot_water = register(r, new ColdTeapotItem(props), "teapot_water"); + teapot_milk = register(r, new ColdTeapotItem(props), "teapot_milk"); props.setNoRepair().durability(4); teapot_hot = register(r, new HotTeapotItem(props), "teapot_hot"); teapot_frothed = register(r, new HotTeapotItem(props), "teapot_frothed"); @@ -220,7 +228,13 @@ static void registerObjects(final RegisterEvent event) { cup_tea_chai = register(r, new TeaCupItem(props.food(Config.SERVER.chai_tea)), "cup_tea_chai"); cup_tea_iced = register(r, new TeaCupItem(props.food(Config.SERVER.iced_tea)), "cup_tea_iced"); cup_tea_chorus = register(r, new TeaCupItem(props.food(Config.SERVER.chorus_tea)), "cup_tea_chorus"); + cup_water_hot = register(r, new Item(props.food(new FoodProperties.Builder().alwaysEat().build())), "cup_water_hot"); cup_cocoa = register(r, new CocoaItem(props.food(Config.SERVER.cocoa)), "cup_cocoa"); + cup_frothed = register(r, new CocoaItem(props.food(Config.SERVER.frothed_milk)), "cup_frothed"); + }); + + event.register(Registries.PARTICLE_TYPE, r -> { + milk_splash = register(r, new SimpleParticleType(false), "milk_splash"); }); event.register(Registries.CREATIVE_MODE_TAB, r -> { diff --git a/src/main/java/knightminer/simplytea/core/config/CocoaDrink.java b/src/main/java/knightminer/simplytea/core/config/CocoaDrink.java index 90734c2..875b8f7 100644 --- a/src/main/java/knightminer/simplytea/core/config/CocoaDrink.java +++ b/src/main/java/knightminer/simplytea/core/config/CocoaDrink.java @@ -11,11 +11,11 @@ public class CocoaDrink extends Drink { * @param hunger Default hunger value * @param saturation Default saturation value */ - public CocoaDrink(ForgeConfigSpec.Builder builder, int hunger, double saturation) { - super("cocoa", builder, hunger, saturation); - this.clear_effects = builder.comment("If ALL, drinking cocoa clears status effects like milk", "If NEGATIVE, clears only negative effects (default)", "If NONE, does not clear effects", "For all values, regular cocoa clears just the first effect, while cocoa with cinnamon clears all") + public CocoaDrink(String name, ForgeConfigSpec.Builder builder, ClearType defaultClearEffects, int hunger, double saturation) { + super(name, builder, hunger, saturation); + this.clear_effects = builder.comment("If ALL, drinking clears status effects like milk", "If NEGATIVE, clears only negative effects (default)", "If NONE, does not clear effects", "For all values, regular cocoa or frothed milk clears just the first effect, while cocoa with cinnamon clears all") .translation("simplytea.config.tea.clear_effects") - .defineEnum("clear_effects", ClearType.NEGATIVE); + .defineEnum("clear_effects", defaultClearEffects); builder.pop(); } diff --git a/src/main/java/knightminer/simplytea/data/gen/RecipeGenerator.java b/src/main/java/knightminer/simplytea/data/gen/RecipeGenerator.java index 07a8358..6dc003e 100644 --- a/src/main/java/knightminer/simplytea/data/gen/RecipeGenerator.java +++ b/src/main/java/knightminer/simplytea/data/gen/RecipeGenerator.java @@ -27,12 +27,14 @@ import static knightminer.simplytea.core.Registration.chorus_petal; import static knightminer.simplytea.core.Registration.cup; import static knightminer.simplytea.core.Registration.cup_cocoa; +import static knightminer.simplytea.core.Registration.cup_frothed; import static knightminer.simplytea.core.Registration.cup_tea_black; import static knightminer.simplytea.core.Registration.cup_tea_chai; import static knightminer.simplytea.core.Registration.cup_tea_chorus; import static knightminer.simplytea.core.Registration.cup_tea_floral; import static knightminer.simplytea.core.Registration.cup_tea_green; import static knightminer.simplytea.core.Registration.cup_tea_iced; +import static knightminer.simplytea.core.Registration.cup_water_hot; import static knightminer.simplytea.core.Registration.tea_fence; import static knightminer.simplytea.core.Registration.tea_fence_gate; import static knightminer.simplytea.core.Registration.tea_leaf; @@ -108,11 +110,16 @@ protected void buildRecipes(Consumer consumer) { addTeaWithBag(consumer, tea_leaf, teabag_green, cup_tea_green); addTeaWithBag(consumer, black_tea, teabag_black, cup_tea_black); addTeaWithBag(consumer, chorus_petal, teabag_chorus, cup_tea_chorus); + addTea(consumer, cup_water_hot, "teapot", teapot_hot); // advanced tea - addTea(consumer, cup_cocoa, Items.COCOA_BEANS, Items.COCOA_BEANS, teapot_frothed); + addTea(consumer, cup_frothed, "teapot", teapot_frothed); + addHoney(consumer, RecipeCategory.FOOD, cup_frothed, tea_stick, CocoaItem.CINNAMON_TAG); + addTea(consumer, cup_cocoa, "teapot", Items.COCOA_BEANS, Items.COCOA_BEANS, teapot_frothed); + addTea(consumer, cup_cocoa, "cup", Items.COCOA_BEANS, Items.COCOA_BEANS, cup_frothed); addHoney(consumer, RecipeCategory.FOOD, cup_cocoa, tea_stick, CocoaItem.CINNAMON_TAG); - addTea(consumer, cup_tea_chai, teabag_black, tea_stick, teapot_frothed); + addTea(consumer, cup_tea_chai, "teapot", teabag_black, tea_stick, teapot_frothed); + addTea(consumer, cup_tea_chai, "cup", teabag_black, tea_stick, cup_frothed); addHoney(consumer, cup_tea_chai); ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, cup_tea_iced) .requires(cup) @@ -148,14 +155,14 @@ private static void boil(Consumer consumer, ItemLike cold, ItemL } /** Adds a recipe to pour tea */ - private static void addTea(Consumer consumer, ItemLike filledCup, ItemLike... ingredients) { + private static void addTea(Consumer consumer, ItemLike filledCup, String suffix, ItemLike... ingredients) { ShapelessRecipeBuilder builder = ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, filledCup); builder.requires(cup); for (ItemLike ingredient : ingredients) { builder.requires(ingredient); } builder.unlockedBy("has_bag", has(ingredients[0])); - builder.save(consumer); + builder.save(consumer, suffix(filledCup, "_from_" + suffix).toString()); } /** Creates a recipe to add honey to a tea */ @@ -189,7 +196,8 @@ private static void addTeaWithBag(Consumer consumer, ItemLike le .requires(leaf) .unlockedBy("has_leaf", has(leaf)) .save(consumer); - addTea(consumer, filledCup, filledTeabag, teapot_hot); + addTea(consumer, filledCup, "teapot", filledTeabag, teapot_hot); + addTea(consumer, filledCup, "cup", filledTeabag, cup_water_hot); addHoney(consumer, filledCup); } } diff --git a/src/main/java/knightminer/simplytea/item/CocoaItem.java b/src/main/java/knightminer/simplytea/item/CocoaItem.java index a4a11bb..d33b2c2 100644 --- a/src/main/java/knightminer/simplytea/item/CocoaItem.java +++ b/src/main/java/knightminer/simplytea/item/CocoaItem.java @@ -1,10 +1,11 @@ package knightminer.simplytea.item; -import knightminer.simplytea.core.Config; +import knightminer.simplytea.core.config.CocoaDrink; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TextColor; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.TooltipFlag; @@ -32,13 +33,15 @@ public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity li if (this.isEdible()) { ItemStack result = getCraftingRemainingItem(stack); living.eat(worldIn, stack); - if (!worldIn.isClientSide && Config.SERVER.cocoa.clearsEffects()) { + FoodProperties food = getFoodProperties(stack, living); + if (!worldIn.isClientSide && food instanceof CocoaDrink drink && drink.clearsEffects()) { // logic basically copied from living entity, so we can choose which effects to remove Iterator itr = living.getActiveEffectsMap().values().iterator(); boolean hasCinnamon = hasHoney(stack, CINNAMON_TAG); while (itr.hasNext()) { MobEffectInstance effect = itr.next(); - if ((Config.SERVER.cocoa.clearsPositive() || !effect.getEffect().isBeneficial()) + + if ((drink.clearsPositive() || !effect.getEffect().isBeneficial()) && effect.isCurativeItem(MILK_BUCKET) && !MinecraftForge.EVENT_BUS.post(new MobEffectEvent.Remove(living, effect))) { living.onEffectRemoved(effect); itr.remove(); diff --git a/src/main/java/knightminer/simplytea/item/ColdTeapotItem.java b/src/main/java/knightminer/simplytea/item/ColdTeapotItem.java new file mode 100644 index 0000000..46622f9 --- /dev/null +++ b/src/main/java/knightminer/simplytea/item/ColdTeapotItem.java @@ -0,0 +1,45 @@ +package knightminer.simplytea.item; + +import knightminer.simplytea.core.Registration; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.core.particles.SimpleParticleType; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.Level; + +public class ColdTeapotItem extends TooltipItem { + + public ColdTeapotItem(Properties props) { + super(props); + } + + @Override + public InteractionResult useOn(UseOnContext context) { + Level world = context.getLevel(); + Player player = context.getPlayer(); + ItemStack stack = context.getItemInHand(); + BlockPos pos = context.getClickedPos(); + if (player.isShiftKeyDown() && context.getClickedFace() != Direction.DOWN) { + player.playSound(SoundEvents.BUCKET_EMPTY, 1.0f, 1.0f); + if (!world.isClientSide) { + for (int i = 0; i < 5; i++) { + SimpleParticleType particle = stack.is(Registration.teapot_milk) ? Registration.milk_splash : ParticleTypes.SPLASH; + ((ServerLevel)world).sendParticles(particle, (double)pos.getX() + world.random.nextDouble(), (double)pos.getY() + 1, (double)pos.getZ() + world.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D); + } + // emptying a teapot will not create new empty teapots in creative mode if player already has an empty teapot + ItemStack emptyTeapot = ItemUtils.createFilledResult(stack, player, new ItemStack(Registration.teapot)); + player.setItemInHand(context.getHand(), emptyTeapot); + + return InteractionResult.SUCCESS; + } + } + return InteractionResult.PASS; + } +} diff --git a/src/main/java/knightminer/simplytea/item/TeapotItem.java b/src/main/java/knightminer/simplytea/item/TeapotItem.java index c87cf86..a4f3482 100644 --- a/src/main/java/knightminer/simplytea/item/TeapotItem.java +++ b/src/main/java/knightminer/simplytea/item/TeapotItem.java @@ -27,7 +27,6 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.FluidActionResult; import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.capability.IFluidHandler; import java.util.Optional; diff --git a/src/main/resources/assets/simplytea/lang/en_us.json b/src/main/resources/assets/simplytea/lang/en_us.json index cd37b3b..1fbc572 100644 --- a/src/main/resources/assets/simplytea/lang/en_us.json +++ b/src/main/resources/assets/simplytea/lang/en_us.json @@ -20,6 +20,7 @@ "item.simplytea.unfired_cup": "Unfired Tea Cup", "item.simplytea.cup": "Tea Cup", "item.simplytea.cup_water": "Cup of Water", + "item.simplytea.cup_water_hot": "Cup of Hot Water", "item.simplytea.cup_tea_green": "Cup of Green Tea", "item.simplytea.cup_tea_black": "Cup of Black Tea", "item.simplytea.cup_tea_floral": "Cup of Dandelion Tea", @@ -28,6 +29,7 @@ "item.simplytea.cup_tea_chamomile": "Cup of Chamomile Tea", "item.simplytea.cup_tea_chorus": "Cup of Chorus Tea", "item.simplytea.cup_cocoa": "Cup of Hot Chocolate", + "item.simplytea.cup_frothed": "Cup of Frothed Milk", "item.simplytea.cup.with_honey": "With Honey", "item.simplytea.cup.with_cinnamon": "With Cinnamon", diff --git a/src/main/resources/assets/simplytea/models/item/cup_frothed.json b/src/main/resources/assets/simplytea/models/item/cup_frothed.json new file mode 100644 index 0000000..4177d93 --- /dev/null +++ b/src/main/resources/assets/simplytea/models/item/cup_frothed.json @@ -0,0 +1,6 @@ +{ + "parent":"item/generated", + "textures": { + "layer0":"simplytea:item/cup_milk" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/simplytea/models/item/cup_water_hot.json b/src/main/resources/assets/simplytea/models/item/cup_water_hot.json new file mode 100644 index 0000000..260bb11 --- /dev/null +++ b/src/main/resources/assets/simplytea/models/item/cup_water_hot.json @@ -0,0 +1,6 @@ +{ + "parent":"item/generated", + "textures": { + "layer0":"simplytea:item/cup_water" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/simplytea/particles/milk_splash.json b/src/main/resources/assets/simplytea/particles/milk_splash.json new file mode 100644 index 0000000..1282f49 --- /dev/null +++ b/src/main/resources/assets/simplytea/particles/milk_splash.json @@ -0,0 +1,8 @@ +{ + "textures": [ + "simplytea:milk_splash_0", + "simplytea:milk_splash_1", + "simplytea:milk_splash_2", + "simplytea:milk_splash_3" + ] + } \ No newline at end of file diff --git a/src/main/resources/assets/simplytea/textures/item/cup_milk.png b/src/main/resources/assets/simplytea/textures/item/cup_milk.png new file mode 100644 index 0000000..d8d2d4a Binary files /dev/null and b/src/main/resources/assets/simplytea/textures/item/cup_milk.png differ diff --git a/src/main/resources/assets/simplytea/textures/particle/milk_splash_0.png b/src/main/resources/assets/simplytea/textures/particle/milk_splash_0.png new file mode 100644 index 0000000..77d9062 Binary files /dev/null and b/src/main/resources/assets/simplytea/textures/particle/milk_splash_0.png differ diff --git a/src/main/resources/assets/simplytea/textures/particle/milk_splash_1.png b/src/main/resources/assets/simplytea/textures/particle/milk_splash_1.png new file mode 100644 index 0000000..3917120 Binary files /dev/null and b/src/main/resources/assets/simplytea/textures/particle/milk_splash_1.png differ diff --git a/src/main/resources/assets/simplytea/textures/particle/milk_splash_2.png b/src/main/resources/assets/simplytea/textures/particle/milk_splash_2.png new file mode 100644 index 0000000..9689ebe Binary files /dev/null and b/src/main/resources/assets/simplytea/textures/particle/milk_splash_2.png differ diff --git a/src/main/resources/assets/simplytea/textures/particle/milk_splash_3.png b/src/main/resources/assets/simplytea/textures/particle/milk_splash_3.png new file mode 100644 index 0000000..3373e49 Binary files /dev/null and b/src/main/resources/assets/simplytea/textures/particle/milk_splash_3.png differ