diff --git a/docs/_media/assets/ui_displayer_footer.png b/docs/_media/assets/ui_displayer_footer.png new file mode 100644 index 0000000..4850abb Binary files /dev/null and b/docs/_media/assets/ui_displayer_footer.png differ diff --git a/docs/_media/assets/ui_displayer_header.png b/docs/_media/assets/ui_displayer_header.png new file mode 100644 index 0000000..7541ace Binary files /dev/null and b/docs/_media/assets/ui_displayer_header.png differ diff --git a/docs/_media/assets/ui_displayer_slots.png b/docs/_media/assets/ui_displayer_slots.png new file mode 100644 index 0000000..2c08869 Binary files /dev/null and b/docs/_media/assets/ui_displayer_slots.png differ diff --git a/docs/_media/recipes/blank_crafting_table_recipe.png b/docs/_media/recipes/blank_recipes/blank_crafting_table_recipe.png similarity index 100% rename from docs/_media/recipes/blank_crafting_table_recipe.png rename to docs/_media/recipes/blank_recipes/blank_crafting_table_recipe.png diff --git a/docs/_media/recipes/blank_cutting_board_recipe.png b/docs/_media/recipes/blank_recipes/blank_cutting_board_recipe.png similarity index 100% rename from docs/_media/recipes/blank_cutting_board_recipe.png rename to docs/_media/recipes/blank_recipes/blank_cutting_board_recipe.png diff --git a/docs/_media/recipes/blank_furnace_recipe.png b/docs/_media/recipes/blank_recipes/blank_furnace_recipe.png similarity index 100% rename from docs/_media/recipes/blank_furnace_recipe.png rename to docs/_media/recipes/blank_recipes/blank_furnace_recipe.png diff --git a/docs/_media/showcase/item_showcase.png b/docs/_media/showcase/item_showcase.png new file mode 100644 index 0000000..9abbbd6 Binary files /dev/null and b/docs/_media/showcase/item_showcase.png differ diff --git a/docs/_scripts/build_item_showcase.py b/docs/_scripts/build_item_showcase.py new file mode 100644 index 0000000..63c0271 --- /dev/null +++ b/docs/_scripts/build_item_showcase.py @@ -0,0 +1,81 @@ +import glob +import math + +from PIL import Image + + +UI_HEADER = Image.open("../_media/assets/ui_displayer_header.png", "RGBA") +UI_SLOTS = Image.open("../_media/assets/ui_displayer_slots.png", "RGBA") +UI_FOOTER = Image.open("../_media/assets/ui_displayer_footer.png", "RGBA") +ITEMS_LOCATION = "../../tasty_supplies/src/assets/tasty_supplies/textures/item/*.png" + +item_textures = [] + + +def main(): + _load_item_textures() + im = _build_displayer() + im = _append_items(im) + + new_size = tuple(i * 3 for i in im.size) + im = im.resize(new_size, Image.Resampling.NEAREST) + + im.save("../_media/showcase/item_showcase.png") + + +def _load_item_textures(): + paths = glob.glob(ITEMS_LOCATION) + paths.sort() + + for path in paths: + texture = Image.open(path) + item_textures.append(texture) + + +def _build_displayer(): + col = 9 + raw = math.ceil(len(item_textures)/col) + + header_size = UI_HEADER.size + slots_size = UI_SLOTS.size + footer_size = UI_FOOTER.size + + im_height = header_size[1] + (slots_size[1]*raw) + footer_size[1] + im = Image.new("RGBA", (header_size[0], im_height), (0, 0, 0)) + + Image.Image.paste(im, UI_HEADER, (0, 0)) + + for r in range(raw): + Image.Image.paste(im, UI_SLOTS, ( + 0, header_size[1] + slots_size[1]*r + )) + + Image.Image.paste(im, UI_FOOTER, (0, im_height-footer_size[1])) + + return im + + +def _append_items(im): + padding = (7, UI_HEADER.size[1]) + + for texture in item_textures: + index = item_textures.index(texture) + raw = math.floor(index/9) + col = index - raw*9 + + mask = _create_a_mask(texture) + + im.paste(texture, ( + padding[0] + col*(16+1) + col+1, + padding[1] + raw*(16+1) + raw+1 + ), mask) + + return im + + +def _create_a_mask(im: Image): + return im.convert('LA') + + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/docs/_scripts/build_recipes.py b/docs/_scripts/build_recipes.py new file mode 100644 index 0000000..f11250d --- /dev/null +++ b/docs/_scripts/build_recipes.py @@ -0,0 +1,132 @@ +import glob +import io +import math +import json +import requests + +from PIL import Image + + +CRAFTING_TABLE_BG = Image.open("../_media/recipes/blank_recipes/blank_crafting_table_recipe.png").convert("RGBA") +FURNACE_TABLE_BG = Image.open("../_media/recipes/blank_recipes/blank_furnace_recipe.png").convert("RGBA") +CUTTING_BOARD_BG = Image.open("../_media/recipes/blank_recipes/blank_cutting_board_recipe.png").convert("RGBA") +RECIPES_LOCATION = "../../tasty_supplies/src/data/tasty_supplies/recipes/*.json" +ITEMS_LOCATION = "../../tasty_supplies/src/assets/tasty_supplies/textures/item" + +MC_TEXTURES_URL = "https://minecraft.wiki/images/Invicon_" + +recipes_data = [] + + +def main(): + _load_recipes_data() + + for recipe in recipes_data: + match _get_recipe_type(recipe): + case "crafting_shapeless": + im = _build_crafting_shapeless(recipe) + im.show() + case "crafting_shaped": + # _build_crafting_shaped(recipe) + pass + + +def _upscale(im, factor): + return im.resize(tuple(i * factor for i in im.size), Image.Resampling.NEAREST) + +def _build_crafting_shapeless(recipe): + im = _upscale(CRAFTING_TABLE_BG.copy(), 2) + padding = (58, 32) + + ingredients = recipe["ingredients"] + is_2x2 = len(ingredients) <= 4 + + index = 0 + for item in ingredients: + raw = math.floor(index/(2 if is_2x2 else 3)) + col = index - raw*(2 if is_2x2 else 3) + + if not item.get("item"): + texture = _get_item_texture("minecraft:barrier") + else: + texture = _get_item_texture(item["item"]) + mask = _create_a_mask(texture) + + im.paste(texture, ( + padding[0] + col*(32+2) + col+2, + padding[1] + raw*(32+2) + raw+2 + ), mask) + + index += 1 + + custom_model_data = _get_custom_model_data(recipe["result"]) + result_texture = _get_item_texture(recipe["result"]["id"], custom_model_data) + mask = _create_a_mask(result_texture) + im.paste(texture, (124, 35), mask) + + return im.convert("RGBA") + + +def _get_item_texture(item: str, custom_model_data: int = -1): + if custom_model_data == -1: + im = _get_minecraft_texture(item) + else: + item_name = item.removeprefix("tasty_supplies:") + im = Image.open(f"{ITEMS_LOCATION}/{item_name}.png") + + im = im.resize((32, 32), Image.Resampling.NEAREST) + return im + + +def _get_custom_texture(custom_model_data: int): + pass + + +def _get_minecraft_texture(item: str): + item_name = item.removeprefix("minecraft:") + item_name = item_name.replace("_", " ") + item_name = item_name.title() + item_name = item_name.replace(" ", "_") + + url = f"{MC_TEXTURES_URL}{item_name}.png" + + res = requests.get(url, stream=True) + if not res.ok: + return + + im = Image.open(res.raw) + im = im.convert("RGBA") + + return im + + +def _get_custom_model_data(recipe): + if recipe.get("components"): + return recipe["components"]["custom_model_data"] + + return -1 + + +def _load_recipes_data(): + paths = glob.glob(RECIPES_LOCATION) + + for recipe in paths: + if recipe.endswith("reversed.json"): + continue + + f = open(recipe) + data = json.load(f) + + recipes_data.append(data) + + +def _get_recipe_type(recipe): + return recipe["type"].removeprefix("minecraft:") + + +def _create_a_mask(im: Image): + return im.convert('LA') + + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/docs/home.md b/docs/home.md index 3909a72..1be78ff 100644 --- a/docs/home.md +++ b/docs/home.md @@ -6,7 +6,10 @@ **Tasty Supplies** is datapack that add a lot of new food, recipes and even cooking mechanics in Minecraft by remaining Vanilla.
You'll be able to prepare a wide variety of delicious dishes from cookies to salad and pies. -For now, the datapack is in early development and there are still many features and recipes to be added. To keep track of what's new and to keep an eye on the progress of the project, you can star the project on [GitHub](https://github.com/atomic-junky/tasty-supplies). +If you want to keep track of what's new and to keep an eye on the progress of the project, you can star the project on [GitHub](https://github.com/atomic-junky/tasty-supplies). + +All the items added by Tasty Supplies:
+![item showcase](./_media/showcase/item_showcase.png) ## Installation and Requirements diff --git a/requirements.txt b/requirements.txt index 91d67b1..9fb1078 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,4 @@ -beet[image] >= 0.104.1 -mecha >= 0.92.0 \ No newline at end of file +# beet[image] >= 0.107.0 +git+https://github.com/atomic-junky/beet.git +mecha >= 0.94.2 +requests >= 2.31.0 \ No newline at end of file diff --git a/tasty_supplies/beet.json b/tasty_supplies/beet.json index 8e5049e..b330c88 100644 --- a/tasty_supplies/beet.json +++ b/tasty_supplies/beet.json @@ -1,16 +1,16 @@ { - "version": "0.10.1", + "version": "0.11", "author": "Atomic Junky", "output": "build", "data_pack": { "name": "Tasty_Supplies_-_Data_Pack", - "pack_format": 41, - "supported_formats": {"min_inclusive": 39, "max_inclusive": 41}, + "pack_format": 48, + "supported_formats": {"min_inclusive": 48, "max_inclusive": 48}, "load": ["src"] }, "resource_pack": { "name": "Tasty_Supplies_-_Resource_Pack", - "pack_format": 32, + "pack_format": 34, "load": ["src"] }, "pipeline": [ diff --git a/tasty_supplies/src/assets/tasty_supplies/textures/item/cherry_blossom_pie.png b/tasty_supplies/src/assets/tasty_supplies/textures/item/cherry_blossom_pie.png new file mode 100644 index 0000000..7305804 Binary files /dev/null and b/tasty_supplies/src/assets/tasty_supplies/textures/item/cherry_blossom_pie.png differ diff --git a/tasty_supplies/src/assets/tasty_supplies/textures/item/cherry_blossom_pie_slice.png b/tasty_supplies/src/assets/tasty_supplies/textures/item/cherry_blossom_pie_slice.png new file mode 100644 index 0000000..b31372a Binary files /dev/null and b/tasty_supplies/src/assets/tasty_supplies/textures/item/cherry_blossom_pie_slice.png differ diff --git a/tasty_supplies/src/data/minecraft/tags/functions/tick.json b/tasty_supplies/src/data/minecraft/tags/function/tick.json similarity index 100% rename from tasty_supplies/src/data/minecraft/tags/functions/tick.json rename to tasty_supplies/src/data/minecraft/tags/function/tick.json diff --git a/tasty_supplies/src/data/tasty_supplies/advancements/_consume_horn_drink.json b/tasty_supplies/src/data/tasty_supplies/advancement/_consume_horn_drink.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/advancements/_consume_horn_drink.json rename to tasty_supplies/src/data/tasty_supplies/advancement/_consume_horn_drink.json diff --git a/tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/all_knives.json b/tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/all_knives.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/all_knives.json rename to tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/all_knives.json diff --git a/tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/barman.json b/tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/barman.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/barman.json rename to tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/barman.json diff --git a/tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/comforting.json b/tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/comforting.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/comforting.json rename to tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/comforting.json diff --git a/tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/fungus_among_us.json b/tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/fungus_among_us.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/fungus_among_us.json rename to tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/fungus_among_us.json diff --git a/tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/is_it_poisonous.json b/tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/is_it_poisonous.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/is_it_poisonous.json rename to tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/is_it_poisonous.json diff --git a/tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/knife.json b/tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/knife.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/knife.json rename to tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/knife.json diff --git a/tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/nether.json b/tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/nether.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/nether.json rename to tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/nether.json diff --git a/tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/root.json b/tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/root.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/advancements/tasty_supplies/root.json rename to tasty_supplies/src/data/tasty_supplies/advancement/tasty_supplies/root.json diff --git a/tasty_supplies/src/data/tasty_supplies/advancements/_consume_bucket_drink.json b/tasty_supplies/src/data/tasty_supplies/advancements/_consume_bucket_drink.json deleted file mode 100644 index 6c9944a..0000000 --- a/tasty_supplies/src/data/tasty_supplies/advancements/_consume_bucket_drink.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "display": { - "icon": { - "id": "minecraft:bucket", - "count": 1 - }, - "title": "_consume_bucket_drink", - "description": "_trigger_when_drinking_anything_in_a_bucket", - "background": "minecraft:textures/gui/advancements/backgrounds/husbandry.png", - "frame": "task", - "show_toast": false, - "announce_to_chat": false, - "hidden": true - }, - "criteria": { - "magma_gelatin": { - "trigger": "minecraft:consume_item", - "conditions": { - "item": { - "items": "minecraft:golden_carrot", - "components": { - "minecraft:custom_model_data": 2750034 - } - } - } - } - }, - "requirements": [ - [ - "magma_gelatin" - ] - ], - "rewards": { - "function": "tasty_supplies:bucket_drink" - }, - "sends_telemetry_event": true - } - \ No newline at end of file diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/attack.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/attack.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/attack.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/attack.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/break.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/break.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/break.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/break.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/cut_item.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/cut_item.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/cut_item.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/cut_item.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/drop.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/drop.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/drop.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/drop.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/drop_item/main.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/drop_item/main.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/drop_item/main.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/drop_item/main.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/drop_item/summon.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/drop_item/summon.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/drop_item/summon.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/drop_item/summon.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/interact.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/interact.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/interact.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/interact.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/place.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/place.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/place.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/place.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/place_item/main.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/place_item/main.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/place_item/main.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/place_item/main.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/place_item/place_custom.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/place_item/place_custom.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/place_item/place_custom.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/place_item/place_custom.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/place_item/remove_custom_item.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/place_item/remove_custom_item.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/place_item/remove_custom_item.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/place_item/remove_custom_item.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/place_item/remove_player_item.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/place_item/remove_player_item.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/place_item/remove_player_item.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/place_item/remove_player_item.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/apple_pie_slice.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/apple_pie_slice.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/apple_pie_slice.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/apple_pie_slice.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/cheese_slice.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/cheese_slice.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/cheese_slice.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/cheese_slice.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/chocolate_pie_slice.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/chocolate_pie_slice.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/chocolate_pie_slice.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/chocolate_pie_slice.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/glow_berry_pie_slice.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/glow_berry_pie_slice.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/glow_berry_pie_slice.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/glow_berry_pie_slice.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/potato_fries.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/potato_fries.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/potato_fries.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/potato_fries.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/sweet_berry_cheesecake_slice.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/sweet_berry_cheesecake_slice.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/sweet_berry_cheesecake_slice.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/recipes/sweet_berry_cheesecake_slice.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/tick.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/cutting_board/tick.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/cutting_board/tick.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/cutting_board/tick.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/horn_drink.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/horn_drink.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/horn_drink.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/horn_drink.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/horn_drink_core.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/horn_drink_core.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/horn_drink_core.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/horn_drink_core.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/tick.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/tick.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/tick.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/tick.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/uninstall.mcfunction b/tasty_supplies/src/data/tasty_supplies/function/uninstall.mcfunction similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/functions/uninstall.mcfunction rename to tasty_supplies/src/data/tasty_supplies/function/uninstall.mcfunction diff --git a/tasty_supplies/src/data/tasty_supplies/functions/bucket_drink.mcfunction b/tasty_supplies/src/data/tasty_supplies/functions/bucket_drink.mcfunction deleted file mode 100644 index 9f06567..0000000 --- a/tasty_supplies/src/data/tasty_supplies/functions/bucket_drink.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -advancement revoke @s only tasty_supplies:_consume_bucket_drink -execute as @s run schedule function tasty_supplies:bucket_drink_core 2t \ No newline at end of file diff --git a/tasty_supplies/src/data/tasty_supplies/functions/bucket_drink_core.mcfunction b/tasty_supplies/src/data/tasty_supplies/functions/bucket_drink_core.mcfunction deleted file mode 100644 index e73e240..0000000 --- a/tasty_supplies/src/data/tasty_supplies/functions/bucket_drink_core.mcfunction +++ /dev/null @@ -1 +0,0 @@ -give @p minecraft:bucket 1 \ No newline at end of file diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/apple_cider.json b/tasty_supplies/src/data/tasty_supplies/recipe/apple_cider.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/apple_cider.json rename to tasty_supplies/src/data/tasty_supplies/recipe/apple_cider.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/apple_cider_horn.json b/tasty_supplies/src/data/tasty_supplies/recipe/apple_cider_horn.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/apple_cider_horn.json rename to tasty_supplies/src/data/tasty_supplies/recipe/apple_cider_horn.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/apple_pie.json b/tasty_supplies/src/data/tasty_supplies/recipe/apple_pie.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/apple_pie.json rename to tasty_supplies/src/data/tasty_supplies/recipe/apple_pie.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/beef_skewer.json b/tasty_supplies/src/data/tasty_supplies/recipe/beef_skewer.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/beef_skewer.json rename to tasty_supplies/src/data/tasty_supplies/recipe/beef_skewer.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/beef_stew.json b/tasty_supplies/src/data/tasty_supplies/recipe/beef_stew.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/beef_stew.json rename to tasty_supplies/src/data/tasty_supplies/recipe/beef_stew.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/cheese_smelting.json b/tasty_supplies/src/data/tasty_supplies/recipe/cheese_smelting.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/cheese_smelting.json rename to tasty_supplies/src/data/tasty_supplies/recipe/cheese_smelting.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/cheese_smoking.json b/tasty_supplies/src/data/tasty_supplies/recipe/cheese_smoking.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/cheese_smoking.json rename to tasty_supplies/src/data/tasty_supplies/recipe/cheese_smoking.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/chocolate_pie.json b/tasty_supplies/src/data/tasty_supplies/recipe/chocolate_pie.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/chocolate_pie.json rename to tasty_supplies/src/data/tasty_supplies/recipe/chocolate_pie.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/cutting_board.json b/tasty_supplies/src/data/tasty_supplies/recipe/cutting_board.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/cutting_board.json rename to tasty_supplies/src/data/tasty_supplies/recipe/cutting_board.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/diamond_knife.json b/tasty_supplies/src/data/tasty_supplies/recipe/diamond_knife.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/diamond_knife.json rename to tasty_supplies/src/data/tasty_supplies/recipe/diamond_knife.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/flint_knife.json b/tasty_supplies/src/data/tasty_supplies/recipe/flint_knife.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/flint_knife.json rename to tasty_supplies/src/data/tasty_supplies/recipe/flint_knife.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/fried_egg_campfire.json b/tasty_supplies/src/data/tasty_supplies/recipe/fried_egg_campfire.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/fried_egg_campfire.json rename to tasty_supplies/src/data/tasty_supplies/recipe/fried_egg_campfire.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/fried_egg_smelting.json b/tasty_supplies/src/data/tasty_supplies/recipe/fried_egg_smelting.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/fried_egg_smelting.json rename to tasty_supplies/src/data/tasty_supplies/recipe/fried_egg_smelting.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/fried_egg_smoking.json b/tasty_supplies/src/data/tasty_supplies/recipe/fried_egg_smoking.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/fried_egg_smoking.json rename to tasty_supplies/src/data/tasty_supplies/recipe/fried_egg_smoking.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/fruit_salad.json b/tasty_supplies/src/data/tasty_supplies/recipe/fruit_salad.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/fruit_salad.json rename to tasty_supplies/src/data/tasty_supplies/recipe/fruit_salad.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/fungus_skewer.json b/tasty_supplies/src/data/tasty_supplies/recipe/fungus_skewer.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/fungus_skewer.json rename to tasty_supplies/src/data/tasty_supplies/recipe/fungus_skewer.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/fungus_skewer_reversed.json b/tasty_supplies/src/data/tasty_supplies/recipe/fungus_skewer_reversed.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/fungus_skewer_reversed.json rename to tasty_supplies/src/data/tasty_supplies/recipe/fungus_skewer_reversed.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/glow_berry_custard.json b/tasty_supplies/src/data/tasty_supplies/recipe/glow_berry_custard.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/glow_berry_custard.json rename to tasty_supplies/src/data/tasty_supplies/recipe/glow_berry_custard.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/glow_berry_custard_horn.json b/tasty_supplies/src/data/tasty_supplies/recipe/glow_berry_custard_horn.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/glow_berry_custard_horn.json rename to tasty_supplies/src/data/tasty_supplies/recipe/glow_berry_custard_horn.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/glow_berry_pie.json b/tasty_supplies/src/data/tasty_supplies/recipe/glow_berry_pie.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/glow_berry_pie.json rename to tasty_supplies/src/data/tasty_supplies/recipe/glow_berry_pie.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/golden_knife.json b/tasty_supplies/src/data/tasty_supplies/recipe/golden_knife.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/golden_knife.json rename to tasty_supplies/src/data/tasty_supplies/recipe/golden_knife.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/honey_cookie.json b/tasty_supplies/src/data/tasty_supplies/recipe/honey_cookie.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/honey_cookie.json rename to tasty_supplies/src/data/tasty_supplies/recipe/honey_cookie.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/hot_cocoa.json b/tasty_supplies/src/data/tasty_supplies/recipe/hot_cocoa.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/hot_cocoa.json rename to tasty_supplies/src/data/tasty_supplies/recipe/hot_cocoa.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/hot_cocoa_horn.json b/tasty_supplies/src/data/tasty_supplies/recipe/hot_cocoa_horn.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/hot_cocoa_horn.json rename to tasty_supplies/src/data/tasty_supplies/recipe/hot_cocoa_horn.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/ice_cream.json b/tasty_supplies/src/data/tasty_supplies/recipe/ice_cream.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/ice_cream.json rename to tasty_supplies/src/data/tasty_supplies/recipe/ice_cream.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/ice_cream_cone.json b/tasty_supplies/src/data/tasty_supplies/recipe/ice_cream_cone.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/ice_cream_cone.json rename to tasty_supplies/src/data/tasty_supplies/recipe/ice_cream_cone.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/iron_knife.json b/tasty_supplies/src/data/tasty_supplies/recipe/iron_knife.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/iron_knife.json rename to tasty_supplies/src/data/tasty_supplies/recipe/iron_knife.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/magma_gelatin.json b/tasty_supplies/src/data/tasty_supplies/recipe/magma_gelatin.json similarity index 92% rename from tasty_supplies/src/data/tasty_supplies/recipes/magma_gelatin.json rename to tasty_supplies/src/data/tasty_supplies/recipe/magma_gelatin.json index ac47d51..0cdb748 100644 --- a/tasty_supplies/src/data/tasty_supplies/recipes/magma_gelatin.json +++ b/tasty_supplies/src/data/tasty_supplies/recipe/magma_gelatin.json @@ -30,6 +30,9 @@ "nutrition": 1, "saturation": 6, "can_always_eat": true, + "using_converts_to": { + "id": "minecraft:bucket" + }, "effects": [ { "effect": { diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/melon_juice.json b/tasty_supplies/src/data/tasty_supplies/recipe/melon_juice.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/melon_juice.json rename to tasty_supplies/src/data/tasty_supplies/recipe/melon_juice.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/melon_juice_horn.json b/tasty_supplies/src/data/tasty_supplies/recipe/melon_juice_horn.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/melon_juice_horn.json rename to tasty_supplies/src/data/tasty_supplies/recipe/melon_juice_horn.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/melon_popsicle.json b/tasty_supplies/src/data/tasty_supplies/recipe/melon_popsicle.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/melon_popsicle.json rename to tasty_supplies/src/data/tasty_supplies/recipe/melon_popsicle.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/mushroom_skewer.json b/tasty_supplies/src/data/tasty_supplies/recipe/mushroom_skewer.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/mushroom_skewer.json rename to tasty_supplies/src/data/tasty_supplies/recipe/mushroom_skewer.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/mushroom_skewer_reversed.json b/tasty_supplies/src/data/tasty_supplies/recipe/mushroom_skewer_reversed.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/mushroom_skewer_reversed.json rename to tasty_supplies/src/data/tasty_supplies/recipe/mushroom_skewer_reversed.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/nether_salad.json b/tasty_supplies/src/data/tasty_supplies/recipe/nether_salad.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/nether_salad.json rename to tasty_supplies/src/data/tasty_supplies/recipe/nether_salad.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/netherite_knife.json b/tasty_supplies/src/data/tasty_supplies/recipe/netherite_knife.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/netherite_knife.json rename to tasty_supplies/src/data/tasty_supplies/recipe/netherite_knife.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/pie_crust.json b/tasty_supplies/src/data/tasty_supplies/recipe/pie_crust.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/pie_crust.json rename to tasty_supplies/src/data/tasty_supplies/recipe/pie_crust.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/sweet_berry_cheesecake.json b/tasty_supplies/src/data/tasty_supplies/recipe/sweet_berry_cheesecake.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/sweet_berry_cheesecake.json rename to tasty_supplies/src/data/tasty_supplies/recipe/sweet_berry_cheesecake.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/sweet_berry_cookie.json b/tasty_supplies/src/data/tasty_supplies/recipe/sweet_berry_cookie.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/sweet_berry_cookie.json rename to tasty_supplies/src/data/tasty_supplies/recipe/sweet_berry_cookie.json diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/warped_mutton.json b/tasty_supplies/src/data/tasty_supplies/recipe/warped_mutton.json similarity index 100% rename from tasty_supplies/src/data/tasty_supplies/recipes/warped_mutton.json rename to tasty_supplies/src/data/tasty_supplies/recipe/warped_mutton.json