diff --git a/README.md b/README.md index 9cdea38..fde2c32 100644 --- a/README.md +++ b/README.md @@ -114,4 +114,4 @@ Replace `beet` with `beet -p ./tasty_supplies/` if you want to stay in the root Like that if you make any changes for the data pack just type `/reload` in minecraft and if you make in any chnages for the resource pack, disable and re-enable the resource pack. ## Credits -All items texture/models come from the [Farmer's Delight](https://github.com/vectorwing/FarmersDelight) mod. \ No newline at end of file +Certain items texture/models come from or are base on [Farmer's Delight](https://github.com/vectorwing/FarmersDelight), [Nether's Delight](https://github.com/Chefs-Delight/NethersDelight_Forge) and [FastFood Delight](https://github.com/akaneoMT/FastFoodDelight). \ No newline at end of file diff --git a/tasty_supplies/src/assets/minecraft/models/item/bread.json b/tasty_supplies/src/assets/minecraft/models/item/bread.json index a6e0290..5bde4e1 100644 --- a/tasty_supplies/src/assets/minecraft/models/item/bread.json +++ b/tasty_supplies/src/assets/minecraft/models/item/bread.json @@ -5,6 +5,7 @@ }, "overrides": [ { "predicate": { "custom_model_data": 2750002 }, "model": "tasty_supplies:item/pie_crust" }, - { "predicate": { "custom_model_data": 2750008 }, "model": "tasty_supplies:item/egg_sandwich" } + { "predicate": { "custom_model_data": 2750008 }, "model": "tasty_supplies:item/egg_sandwich" }, + { "predicate": { "custom_model_data": 2750036 }, "model": "tasty_supplies:item/ice_cream_cone" } ] } \ No newline at end of file diff --git a/tasty_supplies/src/assets/minecraft/models/item/golden_carrot.json b/tasty_supplies/src/assets/minecraft/models/item/golden_carrot.json index 157d8da..1925906 100644 --- a/tasty_supplies/src/assets/minecraft/models/item/golden_carrot.json +++ b/tasty_supplies/src/assets/minecraft/models/item/golden_carrot.json @@ -8,6 +8,7 @@ { "predicate": { "custom_model_data": 2750027 }, "model": "tasty_supplies:item/beef_skewer" }, { "predicate": { "custom_model_data": 2750028 }, "model": "tasty_supplies:item/fungus_skewer" }, { "predicate": { "custom_model_data": 2750029 }, "model": "tasty_supplies:item/mushroom_skewer" }, - { "predicate": { "custom_model_data": 2750034 }, "model": "tasty_supplies:item/magma_gelatin" } + { "predicate": { "custom_model_data": 2750034 }, "model": "tasty_supplies:item/magma_gelatin" }, + { "predicate": { "custom_model_data": 2750037 }, "model": "tasty_supplies:item/ice_cream" } ] } \ No newline at end of file diff --git a/tasty_supplies/src/assets/minecraft/models/item/pumpkin_pie.json b/tasty_supplies/src/assets/minecraft/models/item/pumpkin_pie.json index 0b200b2..4841185 100644 --- a/tasty_supplies/src/assets/minecraft/models/item/pumpkin_pie.json +++ b/tasty_supplies/src/assets/minecraft/models/item/pumpkin_pie.json @@ -11,6 +11,8 @@ { "predicate": { "custom_model_data": 2750024 }, "model": "tasty_supplies:item/apple_pie_slice" }, { "predicate": { "custom_model_data": 2750025 }, "model": "tasty_supplies:item/sweet_berry_cheesecake_slice" }, { "predicate": { "custom_model_data": 2750026 }, "model": "tasty_supplies:item/chocolate_pie_slice" }, - { "predicate": { "custom_model_data": 2750027 }, "model": "tasty_supplies:item/glow_berry_pie_slice" } + { "predicate": { "custom_model_data": 2750027 }, "model": "tasty_supplies:item/glow_berry_pie_slice" }, + { "predicate": { "custom_model_data": 2750035 }, "model": "tasty_supplies:item/cheese" }, + { "predicate": { "custom_model_data": 2750038 }, "model": "tasty_supplies:item/cheese_slice" } ] } \ No newline at end of file diff --git a/tasty_supplies/src/assets/tasty_supplies/models/item/cheese.json b/tasty_supplies/src/assets/tasty_supplies/models/item/cheese.json new file mode 100644 index 0000000..74097e4 --- /dev/null +++ b/tasty_supplies/src/assets/tasty_supplies/models/item/cheese.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "tasty_supplies:item/cheese" + } +} \ No newline at end of file diff --git a/tasty_supplies/src/assets/tasty_supplies/models/item/cheese_slice.json b/tasty_supplies/src/assets/tasty_supplies/models/item/cheese_slice.json new file mode 100644 index 0000000..a97d48a --- /dev/null +++ b/tasty_supplies/src/assets/tasty_supplies/models/item/cheese_slice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "tasty_supplies:item/cheese_slice" + } +} \ No newline at end of file diff --git a/tasty_supplies/src/assets/tasty_supplies/models/item/ice_cream.json b/tasty_supplies/src/assets/tasty_supplies/models/item/ice_cream.json new file mode 100644 index 0000000..b717347 --- /dev/null +++ b/tasty_supplies/src/assets/tasty_supplies/models/item/ice_cream.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "tasty_supplies:item/ice_cream" + } +} \ No newline at end of file diff --git a/tasty_supplies/src/assets/tasty_supplies/models/item/ice_cream_cone.json b/tasty_supplies/src/assets/tasty_supplies/models/item/ice_cream_cone.json new file mode 100644 index 0000000..795aef6 --- /dev/null +++ b/tasty_supplies/src/assets/tasty_supplies/models/item/ice_cream_cone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "tasty_supplies:item/ice_cream_cone" + } +} \ No newline at end of file diff --git a/tasty_supplies/src/assets/tasty_supplies/textures/item/cheese.png b/tasty_supplies/src/assets/tasty_supplies/textures/item/cheese.png new file mode 100644 index 0000000..a4ec56d Binary files /dev/null and b/tasty_supplies/src/assets/tasty_supplies/textures/item/cheese.png differ diff --git a/tasty_supplies/src/assets/tasty_supplies/textures/item/cheese_slice.png b/tasty_supplies/src/assets/tasty_supplies/textures/item/cheese_slice.png new file mode 100644 index 0000000..170f4b4 Binary files /dev/null and b/tasty_supplies/src/assets/tasty_supplies/textures/item/cheese_slice.png differ diff --git a/tasty_supplies/src/assets/tasty_supplies/textures/item/ice_cream.png b/tasty_supplies/src/assets/tasty_supplies/textures/item/ice_cream.png new file mode 100644 index 0000000..91ee63d Binary files /dev/null and b/tasty_supplies/src/assets/tasty_supplies/textures/item/ice_cream.png differ diff --git a/tasty_supplies/src/assets/tasty_supplies/textures/item/ice_cream_cone.png b/tasty_supplies/src/assets/tasty_supplies/textures/item/ice_cream_cone.png new file mode 100644 index 0000000..9885c31 Binary files /dev/null and b/tasty_supplies/src/assets/tasty_supplies/textures/item/ice_cream_cone.png differ diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/cut_item.mcfunction b/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/cut_item.mcfunction index 8650d4c..1f8c543 100644 --- a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/cut_item.mcfunction +++ b/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/cut_item.mcfunction @@ -4,4 +4,5 @@ execute if data entity @s item{id: "minecraft:pumpkin_pie", components: {"minecr execute if data entity @s item{id: "minecraft:pumpkin_pie", components: {"minecraft:custom_model_data": 2750004}} run function tasty_supplies:cutting_board/recipes/sweet_berry_cheesecake_slice execute if data entity @s item{id: "minecraft:pumpkin_pie", components: {"minecraft:custom_model_data": 2750005}} run function tasty_supplies:cutting_board/recipes/chocolate_pie_slice execute if data entity @s item{id: "minecraft:pumpkin_pie", components: {"minecraft:custom_model_data": 2750014}} run function tasty_supplies:cutting_board/recipes/glow_berry_pie_slice +execute if data entity @s item{id: "minecraft:pumpkin_pie", components: {"minecraft:custom_model_data": 2750035}} run function tasty_supplies:cutting_board/recipes/cheese_slice execute if data entity @s item{id: "minecraft:baked_potato"} run function tasty_supplies:cutting_board/recipes/potato_fries diff --git a/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/cheese_slice.mcfunction b/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/cheese_slice.mcfunction new file mode 100644 index 0000000..545f184 --- /dev/null +++ b/tasty_supplies/src/data/tasty_supplies/functions/cutting_board/recipes/cheese_slice.mcfunction @@ -0,0 +1,3 @@ +summon minecraft:item ~ ~.5 ~ {Item:{id: "minecraft:pumpkin_pie", components:{custom_name: "{\"text\": \"Cheese Slice\", \"italic\": false}",custom_model_data: 2750038,food: {nutrition: 3, saturation: 2.2}}, count: 4}} + +kill @s \ No newline at end of file diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/cheese_smelting.json b/tasty_supplies/src/data/tasty_supplies/recipes/cheese_smelting.json new file mode 100644 index 0000000..1bc8bd9 --- /dev/null +++ b/tasty_supplies/src/data/tasty_supplies/recipes/cheese_smelting.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "minecraft:milk_bucket" + }, + "result": { + "id": "minecraft:pumpkin_pie", + "components": { + "custom_name": "{\"text\": \"Cheese\", \"italic\": false}", + "custom_model_data": 2750035, + "food": { + "nutrition": 8, + "saturation": 5.6 + } + } + }, + "experience": 0.5, + "cookingtime": 200 +} \ No newline at end of file diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/cheese_smoking.json b/tasty_supplies/src/data/tasty_supplies/recipes/cheese_smoking.json new file mode 100644 index 0000000..3239755 --- /dev/null +++ b/tasty_supplies/src/data/tasty_supplies/recipes/cheese_smoking.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:smoking", + "ingredient": { + "item": "minecraft:milk_bucket" + }, + "result": { + "id": "minecraft:pumpkin_pie", + "components": { + "custom_name": "{\"text\": \"Cheese\", \"italic\": false}", + "custom_model_data": 2750035, + "food": { + "nutrition": 8, + "saturation": 5.6 + } + } + }, + "experience": 0.5, + "cookingtime": 140 +} \ No newline at end of file diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/ice_cream.json b/tasty_supplies/src/data/tasty_supplies/recipes/ice_cream.json new file mode 100644 index 0000000..bab2510 --- /dev/null +++ b/tasty_supplies/src/data/tasty_supplies/recipes/ice_cream.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:snowball" + }, + { + "item": "minecraft:sugar" + }, + { + "item": "minecraft:bread" + } + ], + "result": { + "id": "minecraft:golden_carrot", + "components": { + "custom_name": "{\"text\": \"Ice Cream Cone\", \"italic\": false}", + "custom_model_data": 2750037 + }, + "count": 1 + } +} \ No newline at end of file diff --git a/tasty_supplies/src/data/tasty_supplies/recipes/ice_cream_cone.json b/tasty_supplies/src/data/tasty_supplies/recipes/ice_cream_cone.json new file mode 100644 index 0000000..aaa85ac --- /dev/null +++ b/tasty_supplies/src/data/tasty_supplies/recipes/ice_cream_cone.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "key": { + "W": { + "item": "minecraft:wheat" + } + }, + "pattern": [ + "W", + "W", + "W" + ], + "result": { + "id": "minecraft:bread", + "components": { + "custom_name": "{\"text\": \"Ice Cream Cone\", \"italic\": false}", + "custom_model_data": 2750036 + }, + "count": 1 + } +} \ No newline at end of file