From 81a56f6065768ca712ec8e3f7c7526fe40ef8497 Mon Sep 17 00:00:00 2001 From: Classic <24751415+TheClassic36@users.noreply.github.com> Date: Wed, 20 Nov 2024 16:11:37 +0000 Subject: [PATCH] v2.0.0-beta4 --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 +-- README.md | 2 +- .../recipes/misc/butter_recipes.json | 6 +++-- data/minecraft/recipe/clump_of_butter.json | 25 +++++++++++++++++++ .../recipe/clumpy_block_of_butter.json | 25 +++++++++++++++++++ .../recipe/enchanted_golden_carrot.json | 5 ++++ ...tter_nugget.json => nugget_of_butter.json} | 2 +- ...block.json => smooth_block_of_butter.json} | 2 +- data/minecraft/recipe/stick_of_butter.json | 2 +- data/minecraft/recipe/strange_potato.json | 2 +- pack.mcmeta | 6 ++--- 11 files changed, 69 insertions(+), 12 deletions(-) create mode 100644 data/minecraft/recipe/clump_of_butter.json create mode 100644 data/minecraft/recipe/clumpy_block_of_butter.json rename data/minecraft/recipe/{butter_nugget.json => nugget_of_butter.json} (91%) rename data/minecraft/recipe/{butter_block.json => smooth_block_of_butter.json} (90%) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index d9933a8..bfc71f3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -18,7 +18,7 @@ body: label: Version description: Which version of Silly Eatables are you using? If it's not listed, please update! options: - - v2.0.0-beta3 + - v2.0.0-beta4 - v1.3.1+mod - v1.3.1 - v1.2.0+mod @@ -38,7 +38,7 @@ body: attributes: label: Mod Loader Version description: If running as a mod, which mod loader & Fabric API version are you using? - placeholder: "Example: Fabric Loader v0.16.9 with Fabric API v0.108.0 for Minecraft 1.21.3" + placeholder: "Example: Fabric Loader v0.16.9 with Fabric API v0.109.0 for Minecraft 1.21.3" validations: required: false - type: textarea diff --git a/README.md b/README.md index eb9fa78..787f37d 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Food recipes in this data pack/mod can be found [here on the wiki](https://githu | Minecraft Version | Silly Eatables Version | | :--: | :--: | -| 1.21.4 (24w44a - 24w46a) | [v2.0.0-beta3](https://github.com/Classic36-Media/Silly-Eatables/releases/tag/v2.0.0-beta3) | +| 1.21.4 (24w46a - 1.21.4-pre1) | [v2.0.0-beta4](https://github.com/Classic36-Media/Silly-Eatables/releases/tag/v2.0.0-beta4) | | 1.21.2 - 1.21.3 | [v1.3.1](https://github.com/Classic36-Media/Silly-Eatables/releases/tag/v1.3.1) | | 1.21 - 1.21.1 | [v1.2.0](https://github.com/Classic36-Media/Silly-Eatables/releases/tag/v1.2.0) | | 1.20.5 - 1.20.6 | [v1.0.2](https://github.com/Classic36-Media/Silly-Eatables/releases/tag/v1.0.2) | diff --git a/data/minecraft/advancement/recipes/misc/butter_recipes.json b/data/minecraft/advancement/recipes/misc/butter_recipes.json index 16f85bc..88678f1 100644 --- a/data/minecraft/advancement/recipes/misc/butter_recipes.json +++ b/data/minecraft/advancement/recipes/misc/butter_recipes.json @@ -3,8 +3,10 @@ "rewards": { "recipes": [ "minecraft:stick_of_butter", - "minecraft:butter_block", - "minecraft:butter_nugget" + "minecraft:clump_of_butter", + "minecraft:smooth_block_of_butter", + "minecraft:clumpy_block_of_butter", + "minecraft:nugget_of_butter" ] }, "criteria": { diff --git a/data/minecraft/recipe/clump_of_butter.json b/data/minecraft/recipe/clump_of_butter.json new file mode 100644 index 0000000..fb153f4 --- /dev/null +++ b/data/minecraft/recipe/clump_of_butter.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "minecraft:raw_gold", + "minecraft:milk_bucket" + ], + "result": { + "id": "minecraft:raw_gold", + "count": 1, + "components": { + "minecraft:food": { + "nutrition": 2, + "saturation": 0.0, + "can_always_eat": false + }, + "minecraft:consumable": { + "consume_seconds": 1.8, + "animation": "eat", + "sound": "entity.generic.eat", + "has_consume_particles": true + }, + "minecraft:item_name": "\"Clump of Butter\"" + } + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/clumpy_block_of_butter.json b/data/minecraft/recipe/clumpy_block_of_butter.json new file mode 100644 index 0000000..9f78376 --- /dev/null +++ b/data/minecraft/recipe/clumpy_block_of_butter.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "minecraft:raw_gold_block", + "minecraft:milk_bucket" + ], + "result": { + "id": "minecraft:raw_gold_block", + "count": 1, + "components": { + "minecraft:food": { + "nutrition": 4, + "saturation": 2.0, + "can_always_eat": false + }, + "minecraft:consumable": { + "consume_seconds": 3.8, + "animation": "eat", + "sound": "entity.generic.eat", + "has_consume_particles": true + }, + "minecraft:item_name": "\"Clumpy Block of Butter\"" + } + } +} \ No newline at end of file diff --git a/data/minecraft/recipe/enchanted_golden_carrot.json b/data/minecraft/recipe/enchanted_golden_carrot.json index 082025e..41ea0a5 100644 --- a/data/minecraft/recipe/enchanted_golden_carrot.json +++ b/data/minecraft/recipe/enchanted_golden_carrot.json @@ -46,6 +46,11 @@ "id": "minecraft:resistance", "amplifier": 0, "duration": 2400 + }, + { + "id": "minecraft:slowness", + "amplifier": 4, + "duration": 400 } ] } diff --git a/data/minecraft/recipe/butter_nugget.json b/data/minecraft/recipe/nugget_of_butter.json similarity index 91% rename from data/minecraft/recipe/butter_nugget.json rename to data/minecraft/recipe/nugget_of_butter.json index 5e27de8..9e4482b 100644 --- a/data/minecraft/recipe/butter_nugget.json +++ b/data/minecraft/recipe/nugget_of_butter.json @@ -19,7 +19,7 @@ "sound": "entity.generic.eat", "has_consume_particles": true }, - "minecraft:item_name": "\"Butter Nugget\"" + "minecraft:item_name": "\"Nugget of Butter\"" } } } \ No newline at end of file diff --git a/data/minecraft/recipe/butter_block.json b/data/minecraft/recipe/smooth_block_of_butter.json similarity index 90% rename from data/minecraft/recipe/butter_block.json rename to data/minecraft/recipe/smooth_block_of_butter.json index 71c6a31..f1bf195 100644 --- a/data/minecraft/recipe/butter_block.json +++ b/data/minecraft/recipe/smooth_block_of_butter.json @@ -19,7 +19,7 @@ "sound": "entity.generic.eat", "has_consume_particles": true }, - "minecraft:item_name": "\"Butter Block\"" + "minecraft:item_name": "\"Smooth Block of Butter\"" } } } \ No newline at end of file diff --git a/data/minecraft/recipe/stick_of_butter.json b/data/minecraft/recipe/stick_of_butter.json index 817dcf7..cb6e45e 100644 --- a/data/minecraft/recipe/stick_of_butter.json +++ b/data/minecraft/recipe/stick_of_butter.json @@ -19,7 +19,7 @@ "sound": "entity.generic.eat", "has_consume_particles": true }, - "minecraft:item_name": "\"Stocl of Butter\"" + "minecraft:item_name": "\"Stick of Butter\"" } } } \ No newline at end of file diff --git a/data/minecraft/recipe/strange_potato.json b/data/minecraft/recipe/strange_potato.json index f513a14..1fb8c49 100644 --- a/data/minecraft/recipe/strange_potato.json +++ b/data/minecraft/recipe/strange_potato.json @@ -38,7 +38,7 @@ { "id": "minecraft:nausea", "amplifier": 2, - "duration": 280 + "duration": 200 } ] }, diff --git a/pack.mcmeta b/pack.mcmeta index a55252d..77fa846 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,7 +1,7 @@ { "pack":{ - "pack_format": 58, - "supported_formats": {"min_inclusive": 58, "max_inclusive": 60}, - "description": "§eSilly Eatables\n§7v2.0.0-b3 §8/ §f1.21.4 Snapshots" + "pack_format": 60, + "supported_formats": {"min_inclusive": 60, "max_inclusive": 60}, + "description": "§eSilly Eatables\n§7v2.0.0-b4 §8/ §f1.21.4 Snapshots" } } \ No newline at end of file