From f052eda340cf5455c0d74e967187ec13e6a4f934 Mon Sep 17 00:00:00 2001 From: Classic36 Date: Wed, 19 Jun 2024 23:38:41 +0100 Subject: [PATCH] v2.0.0-alpha1 --- .github/ISSUE_TEMPLATE/bug_report.yml | 3 +- README.md | 10 +++-- credits.txt | 9 ++++- .../misc/amethyst_block_to_shards.json | 32 ++++++++++++++++ .../advancement/recipes/misc/bell.json | 32 ++++++++++++++++ .../recipes/misc/copper_powered_rails.json | 32 ++++++++++++++++ .../recipes/misc/deepslate_to_cobbled.json | 32 ++++++++++++++++ .../recipes/misc/gilded_blackstone.json | 32 ++++++++++++++++ .../recipes/misc/glowstone_block_to_dust.json | 32 ++++++++++++++++ .../advancement/recipes/misc/large_fern.json | 32 ++++++++++++++++ .../recipes/misc/mushroom_blocks.json | 37 +++++++++++++++++++ .../advancement/recipes/misc/name_tag.json | 32 ++++++++++++++++ .../advancement/recipes/misc/rooted_dirt.json | 32 ++++++++++++++++ .../advancement/recipes/misc/saddle.json | 32 ++++++++++++++++ .../recipes/misc/stone_to_cobble.json | 32 ++++++++++++++++ .../recipes/misc/string_to_cobweb.json | 32 ++++++++++++++++ .../advancement/recipes/misc/tall_grass.json | 32 ++++++++++++++++ .../recipes/misc/wool_to_string.json | 32 ++++++++++++++++ data/crafting/recipe/wool_to_string.json | 12 ++++++ fabric.mod.json | 4 +- pack.mcmeta | 2 +- quilt.mod.json | 4 +- 22 files changed, 518 insertions(+), 11 deletions(-) create mode 100644 data/crafting/advancement/recipes/misc/amethyst_block_to_shards.json create mode 100644 data/crafting/advancement/recipes/misc/bell.json create mode 100644 data/crafting/advancement/recipes/misc/copper_powered_rails.json create mode 100644 data/crafting/advancement/recipes/misc/deepslate_to_cobbled.json create mode 100644 data/crafting/advancement/recipes/misc/gilded_blackstone.json create mode 100644 data/crafting/advancement/recipes/misc/glowstone_block_to_dust.json create mode 100644 data/crafting/advancement/recipes/misc/large_fern.json create mode 100644 data/crafting/advancement/recipes/misc/mushroom_blocks.json create mode 100644 data/crafting/advancement/recipes/misc/name_tag.json create mode 100644 data/crafting/advancement/recipes/misc/rooted_dirt.json create mode 100644 data/crafting/advancement/recipes/misc/saddle.json create mode 100644 data/crafting/advancement/recipes/misc/stone_to_cobble.json create mode 100644 data/crafting/advancement/recipes/misc/string_to_cobweb.json create mode 100644 data/crafting/advancement/recipes/misc/tall_grass.json create mode 100644 data/crafting/advancement/recipes/misc/wool_to_string.json create mode 100644 data/crafting/recipe/wool_to_string.json diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 098a9a3..f7dcf38 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -18,6 +18,7 @@ body: label: Version description: Which version of Better Craftables are you using? If it's not listed, please update! options: + - v2.0.0-alpha1 - v1.6.0+mod - v1.6.0 - v1.5.1+mod @@ -39,7 +40,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.15.11 with Fabric API v0.100.1 for Minecraft 1.21" + placeholder: "Example: Fabric Loader v0.15.11 with Fabric API v0.100.3 for Minecraft 1.21" validations: required: false - type: textarea diff --git a/README.md b/README.md index 696607e..c06875a 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ Recipes in this data pack/mod can be found on the wiki. | Minecraft Version | Better Craftables Version | | :--: | :--: | +| 1.21+ | [v2.0.0-alpha1](https://github.com/TheClassic36/Better-Craftables/releases/tag/v2.0.0-alpha1) | | 1.21 | [v1.6.0](https://github.com/TheClassic36/Better-Craftables/releases/tag/v1.6.0) | | 1.20.5 - 1.20.6 | [v1.5.1](https://github.com/TheClassic36/Better-Craftables/releases/tag/v1.5.1) | | 1.20.2 - 1.20.4 | [v1.4.0](https://github.com/TheClassic36/Better-Craftables/releases/tag/v1.4.0) | @@ -28,12 +29,15 @@ Recipes in this data pack/mod can be found on the wiki. Versions for older game versions and snapshots can be found [here](https://github.com/TheClassic36/Better-Craftables/wiki/Versions). ## Support & Feature Requests -Please open any support requests or feature requests on GitHub or on Discord: +Please open any support or feature requests [here on GitHub](https://github.com/TheClassic36/Better-Craftables/issues/new/choose) or on Discord: [![](https://img.shields.io/discord/1107084025442607206?label=Discord&style=for-the-badge&color=5865F2&logo=discord)](https://discord.gg/vZJSDjPcmu) ## Credits * [Vanilla Tweaks](https://vanillatweaks.net/) - * Nametag recipe + * Craftable Name Tag + * Unpackable Wool * [HexedHero](https://github.com/TheClassic36/Better-Craftables/issues/1) - * Cobweb recipe suggestion \ No newline at end of file + * Cobweb recipe suggestion +* [babarsc](https://github.com/TheClassic36/Better-Craftables/issues/4) + * Wool to String recipe suggestion \ No newline at end of file diff --git a/credits.txt b/credits.txt index 537b25f..72ab31d 100644 --- a/credits.txt +++ b/credits.txt @@ -1,9 +1,14 @@ CREDITS: Vanilla Tweaks -- Craftable Nametag +- Craftable Name Tag +- Unpackable Wool https://vanillatweaks.net HexedHero - Cobweb recipe suggestion -https://github.com/TheClassic36/Better-Craftables/issues/1 \ No newline at end of file +https://github.com/TheClassic36/Better-Craftables/issues/1 + +babarsc +- Wool to String recipe suggestion +https://github.com/TheClassic36/Better-Craftables/issues/4 \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/amethyst_block_to_shards.json b/data/crafting/advancement/recipes/misc/amethyst_block_to_shards.json new file mode 100644 index 0000000..fb25efd --- /dev/null +++ b/data/crafting/advancement/recipes/misc/amethyst_block_to_shards.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:amethyst_block_to_shards" + ] + }, + "criteria": { + "has_amethyst": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:amethyst_block" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:amethyst_block_to_shards" + } + } + }, + "requirements": [ + [ + "has_amethyst", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/bell.json b/data/crafting/advancement/recipes/misc/bell.json new file mode 100644 index 0000000..2486e63 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/bell.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:bell" + ] + }, + "criteria": { + "has_gold_block": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:gold_block" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:bell" + } + } + }, + "requirements": [ + [ + "has_gold_block", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/copper_powered_rails.json b/data/crafting/advancement/recipes/misc/copper_powered_rails.json new file mode 100644 index 0000000..752f839 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/copper_powered_rails.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:copper_powered_rails" + ] + }, + "criteria": { + "has_copper_ingot": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:copper_ingot" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:copper_powered_rails" + } + } + }, + "requirements": [ + [ + "has_copper_ingot", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/deepslate_to_cobbled.json b/data/crafting/advancement/recipes/misc/deepslate_to_cobbled.json new file mode 100644 index 0000000..cafb4f8 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/deepslate_to_cobbled.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:deepslate_to_cobbled" + ] + }, + "criteria": { + "has_deepslate": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:deepslate" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:deepslate_to_cobbled" + } + } + }, + "requirements": [ + [ + "has_deepslate", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/gilded_blackstone.json b/data/crafting/advancement/recipes/misc/gilded_blackstone.json new file mode 100644 index 0000000..230eab3 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/gilded_blackstone.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:gilded_blackstone" + ] + }, + "criteria": { + "has_gold_nugget": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:gold_nugget" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:gilded_blackstone" + } + } + }, + "requirements": [ + [ + "has_gold_nugget", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/glowstone_block_to_dust.json b/data/crafting/advancement/recipes/misc/glowstone_block_to_dust.json new file mode 100644 index 0000000..706ad13 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/glowstone_block_to_dust.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:glowstone_block_to_dust" + ] + }, + "criteria": { + "has_glowstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:glowstone" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:glowstone_block_to_dust" + } + } + }, + "requirements": [ + [ + "has_glowstone", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/large_fern.json b/data/crafting/advancement/recipes/misc/large_fern.json new file mode 100644 index 0000000..2b8e552 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/large_fern.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:large_fern" + ] + }, + "criteria": { + "has_fern": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:fern" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:large_fern" + } + } + }, + "requirements": [ + [ + "has_fern", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/mushroom_blocks.json b/data/crafting/advancement/recipes/misc/mushroom_blocks.json new file mode 100644 index 0000000..bf03e22 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/mushroom_blocks.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:brown_mushroom_block", + "crafting:red_mushroom_block", + "crafting:mushroom_stem" + ] + }, + "criteria": { + "has_mushrooms": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:red_mushroom" + }, + { + "item": "minecraft:brown_mushroom" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:mushroom_stem" + } + } + }, + "requirements": [ + [ + "has_mushrooms", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/name_tag.json b/data/crafting/advancement/recipes/misc/name_tag.json new file mode 100644 index 0000000..df88afd --- /dev/null +++ b/data/crafting/advancement/recipes/misc/name_tag.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:name_tag" + ] + }, + "criteria": { + "has_paper": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:paper" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:name_tag" + } + } + }, + "requirements": [ + [ + "has_paper", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/rooted_dirt.json b/data/crafting/advancement/recipes/misc/rooted_dirt.json new file mode 100644 index 0000000..6f18e54 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/rooted_dirt.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:rooted_dirt" + ] + }, + "criteria": { + "has_roots": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:hanging_roots" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:rooted_dirt" + } + } + }, + "requirements": [ + [ + "has_roots", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/saddle.json b/data/crafting/advancement/recipes/misc/saddle.json new file mode 100644 index 0000000..4af1117 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/saddle.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:saddle" + ] + }, + "criteria": { + "has_leather": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:leather" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:saddle" + } + } + }, + "requirements": [ + [ + "has_leather", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/stone_to_cobble.json b/data/crafting/advancement/recipes/misc/stone_to_cobble.json new file mode 100644 index 0000000..81aa8d9 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/stone_to_cobble.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:stone_to_cobble" + ] + }, + "criteria": { + "has_stone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:stone" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:stone_to_cobble" + } + } + }, + "requirements": [ + [ + "has_stone", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/string_to_cobweb.json b/data/crafting/advancement/recipes/misc/string_to_cobweb.json new file mode 100644 index 0000000..53ca410 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/string_to_cobweb.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:string_to_cobweb" + ] + }, + "criteria": { + "has_string": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:string" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:string" + } + } + }, + "requirements": [ + [ + "has_string", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/tall_grass.json b/data/crafting/advancement/recipes/misc/tall_grass.json new file mode 100644 index 0000000..ec945f8 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/tall_grass.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:tall_grass" + ] + }, + "criteria": { + "has_short_grass": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:short_grass" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:tall_grass" + } + } + }, + "requirements": [ + [ + "has_short_grass", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/advancement/recipes/misc/wool_to_string.json b/data/crafting/advancement/recipes/misc/wool_to_string.json new file mode 100644 index 0000000..9aa2bb6 --- /dev/null +++ b/data/crafting/advancement/recipes/misc/wool_to_string.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "crafting:wool_to_string" + ] + }, + "criteria": { + "has_wool": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:wool" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "crafting:wool_to_string" + } + } + }, + "requirements": [ + [ + "has_wool", + "has_recipe" + ] + ] +} \ No newline at end of file diff --git a/data/crafting/recipe/wool_to_string.json b/data/crafting/recipe/wool_to_string.json new file mode 100644 index 0000000..f43fa30 --- /dev/null +++ b/data/crafting/recipe/wool_to_string.json @@ -0,0 +1,12 @@ +{ + "type": "crafting_shapeless", + "result": { + "id": "minecraft:string", + "count": 4 + }, + "ingredients": [ + { + "tag": "minecraft:wool" + } + ] +} diff --git a/fabric.mod.json b/fabric.mod.json index 0f549fb..dd79be5 100644 --- a/fabric.mod.json +++ b/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "better_craftables", - "version": "1.6.0", + "version": "2.0.0", "name": "Better Craftables", "description": "Adds some improved crafting recipes to the game!", "authors": [ @@ -18,6 +18,6 @@ "environment": "*", "depends": { "fabric-resource-loader-v0":"*", - "minecraft":"1.21" + "minecraft":">=1.21" } } \ No newline at end of file diff --git a/pack.mcmeta b/pack.mcmeta index 535981e..fb1d359 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -2,6 +2,6 @@ "pack":{ "pack_format": 48, "supported_formats": {"min_inclusive": 48, "max_inclusive": 48}, - "description": "§bBetter Craftables §7v1.6.0\n§fMinecraft 1.21" + "description": "§bBetter Craftables §7v2.0.0-alpha1\n§fMinecraft 1.21" } } \ No newline at end of file diff --git a/quilt.mod.json b/quilt.mod.json index d7bec0a..6cfd446 100644 --- a/quilt.mod.json +++ b/quilt.mod.json @@ -3,10 +3,10 @@ "quilt_loader": { "group": "org.classic36media", "id": "better_craftables", - "version": "1.6.0", + "version": "2.0.0", "metadata": { "name": "Better Craftables", - "description": "A basic mod that adds some improved crafting recipes to the game.", + "description": "Adds some improved crafting recipes to the game!", "contributors": { "Classic36": "Developer" },