Skip to content

Commit

Permalink
imported ethical_textiles v1.1.1 patch, fixed advancement bug, remove…
Browse files Browse the repository at this point in the history
…d funding
  • Loading branch information
daenvil committed Jan 5, 2024
1 parent 11ad0a3 commit 6648f42
Show file tree
Hide file tree
Showing 11 changed files with 178 additions and 15 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

8 changes: 3 additions & 5 deletions datapack/README.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Daenvil's Vegancraft v1.0 (Full Datapack) for Minecraft 1.20+
# Daenvil's Vegancraft v1.0.1 (Full Datapack) for Minecraft 1.20+

This datapack is a merged version of the following datapacks:

- [Plant-based Foods v1.1](https://daenvil.github.io/MCDatapacks/plant-based_foods.html)
- [Omnivorous Pets v1.1](https://daenvil.github.io/MCDatapacks/omnivorous_pets.html)
- [Acacia Gum v1.1](https://daenvil.github.io/MCDatapacks/acacia_gum.html)
- [Ethical Textiles v1.1](https://daenvil.github.io/MCDatapacks/ethical_Textiles.html)
- [Ethical Textiles v1.1.1](https://daenvil.github.io/MCDatapacks/ethical_Textiles.html)
- [Plant Wax v1.1](https://daenvil.github.io/MCDatapacks/plant_wax.html)
- [Magnet Fishing v1.1](https://daenvil.github.io/MCDatapacks/magnet_fishing.html)

Expand All @@ -14,9 +14,7 @@ This datapack is a merged version of the following datapacks:
- On my website: https://daenvil.github.io/MCDatapacks/vegancraft.html
- On GitHub: https://www.github.com/daenvil/vegancraft

- If you like my datapacks, please consider leaving a tip at my ko-fi: https://ko-fi.com/daenvilmc

- This version was published on the 5th of June 2023. Check the webpages above for possible updates.
- This version was published on the 5th of January 2024. Check the webpages above for possible updates.

## Installation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ advancement revoke @s only dnv.vegancraft:food/recipes/cake
execute store success score @s dnv.knowledge_book_removed run clear @s minecraft:knowledge_book
execute if score @s dnv.knowledge_book_removed matches 0 run clear @s cake{dnv.Vegan:0b} 1
give @s minecraft:cake{display:{Name:'[{"translate":"dnv.vegan_food.item.cake_vegan","italic":false,"fallback":"Vegan Cake"}]'},dnv.Vegan:1b} 1
advancement grant @s only dnv.vegancraft:food/cake
execute if score dnv.dummy dnv.vegancraft matches 1 run advancement grant @s only dnv.vegancraft:food/cake
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ advancement revoke @s only dnv.vegancraft:food/recipes/cod
execute store success score @s dnv.knowledge_book_removed run clear @s minecraft:knowledge_book
execute if score @s dnv.knowledge_book_removed matches 0 run clear @s cod{dnv.Vegan:0b} 3
give @s minecraft:cod{display:{Name:'[{"translate":"dnv.vegan_food.item.not-fish_fillet","italic":false,"fallback":"Not-fish Fillet"}]'},dnv.Vegan:1b,CustomModelData:9261004} 3
advancement grant @s only dnv.vegancraft:food/fish
execute if score dnv.dummy dnv.vegancraft matches 1 run advancement grant @s only dnv.vegancraft:food/fish
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"display": {
"title": "Ethical Textiles",
"description": "Daenvil's Ethical Textiles datapack (v1.1, for MC1.20+)",
"description": "Daenvil's Ethical Textiles datapack (v1.1.1, for MC1.20+)",
"icon": {
"item": "minecraft:leather_leggings"
},
Expand Down
2 changes: 1 addition & 1 deletion datapack/data/global/advancements/dnv.vegancraft.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"display": {
"title": "Vegancraft",
"description": "Daenvil's Vegancraft 1.0 (for MC1.20+)",
"description": "Daenvil's Vegancraft 1.0.1 (for MC1.20+)",
"icon": {
"item": "minecraft:kelp"
},
Expand Down
13 changes: 11 additions & 2 deletions datapack/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"pack": {
"pack_format":15,
"pack_format":26,
"supported_formats": {"min_inclusive": 15, "max_inclusive": 27},
"description": [
{
"text": "Daenvil",
Expand All @@ -17,9 +18,17 @@
"underlined": true
},
{
"text": "\nv1.0, for MC1.20+",
"text": "\nv1.0.1, for MC1.20+",
"color":"gray"
}
]
},
"overlays": {
"entries": [
{
"formats": {"min_inclusive": 26, "max_inclusive": 99},
"directory": "patch_short_grass"
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"dnv.ethical_textiles:bed_grass",
"dnv.ethical_textiles:bed_hay",
"dnv.ethical_textiles:bed_jungle",
"dnv.ethical_textiles:knowledge_book/bed_grass",
"dnv.ethical_textiles:knowledge_book/bed_hay",
"dnv.ethical_textiles:knowledge_book/bed_jungle"
]
},
"criteria": {
"has_the_ingredient": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [{
"items": [
"minecraft:short_grass"
]
}]
}
},
"has_the_ingredient2": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [{
"items": [
"minecraft:hay_block"
]
}]
}
},
"has_the_ingredient3": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [{
"items": [
"minecraft:wheat"
]
}]
}
},
"has_the_ingredient4": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [{
"items": [
"minecraft:jungle_leaves"
]
}]
}
},
"has_the_ingredient5": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [{
"items": [
"minecraft:jungle_log"
]
}]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "dnv.ethical_textiles:bed_grass"
}
},
"has_the_recipe2": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "dnv.ethical_textiles:bed_hay"
}
},
"has_the_recipe3": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "dnv.ethical_textiles:bed_jungle"
}
},
"has_the_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [{
"tag": "minecraft:beds"
}]
}
},
"has_the_item2": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [{
"tag": "minecraft:wool"
}]
}
},
"sleep": {
"trigger": "minecraft:slept_in_bed"
}
},
"requirements": [
[
"has_the_ingredient",
"has_the_ingredient2",
"has_the_ingredient3",
"has_the_ingredient4",
"has_the_ingredient5",
"has_the_recipe",
"has_the_recipe2",
"has_the_recipe3",
"has_the_item",
"has_the_item2",
"sleep"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"###",
"OOO"
],
"key": {
"#": {
"item": "minecraft:short_grass"
},
"O": {
"tag": "minecraft:planks"
}
},
"result": {
"item": "minecraft:green_bed",
"count": 1
},
"group": "dnv.vegancraft.bed",
"category": "misc"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{"tag": "minecraft:planks"},
{"tag": "minecraft:planks"},
{"tag": "minecraft:planks"},
{"item": "minecraft:short_grass"},
{"item": "minecraft:short_grass"},
{"item": "minecraft:short_grass"},
{"item": "minecraft:short_grass"},
{"item": "minecraft:short_grass"},
{"item": "minecraft:short_grass"}
],
"result": {
"item": "minecraft:knowledge_book",
"count": 1
},
"group": "dnv.vegancraft.textiles",
"category": "misc"
}
4 changes: 1 addition & 3 deletions resourcepack/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ Read more on: https://daenvil.github.io/MCDatapacks/vegancraft.html
- On my website: https://daenvil.github.io/MCDatapacks/vegancraft.html
- On GitHub: https://www.github.com/daenvil/vegancraft

- If you like my datapacks, please consider leaving a tip at my ko-fi: https://ko-fi.com/daenvilmc

- This version was published on the 5th of June 2023. Check the webpages above for possible updates.
- This version was published on the 7th of June 2023. Check the webpages above for possible updates.

## Installation

Expand Down

0 comments on commit 6648f42

Please sign in to comment.