diff --git a/acacia_gum/1_21_1/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction b/acacia_gum/1_21_1/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction deleted file mode 100644 index f54232a..0000000 --- a/acacia_gum/1_21_1/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -execute store result score @s dnv.acacia_gum.raycast_range run attribute @s player.block_interaction_range get -10 -scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled = @s dnv.acacia_gum.raycast_range -scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled *= #dnv dnv.2 -scoreboard players set @s dnv.acacia_gum.found_acacia 0 -execute anchored eyes positioned ^ ^ ^ anchored feet run function zz.dnv.vegancraft:find_acacia_bark_line -execute if score @s dnv.acacia_gum.found_acacia < @s dnv.acacia_gum.raycast_range anchored eyes positioned ^ ^ ^1 anchored feet run function zz.dnv.vegancraft:find_acacia_bark_wide -execute if score @s dnv.acacia_gum.found_acacia < @s dnv.acacia_gum.raycast_range_doubled run function zz.dnv.vegancraft:summon_acacia_gum_ball \ No newline at end of file diff --git a/acacia_gum/README.txt b/acacia_gum/README.txt index d8dc9ab..34e1efe 100644 --- a/acacia_gum/README.txt +++ b/acacia_gum/README.txt @@ -1,4 +1,4 @@ -# Acacia Gum (v1.2.2, for Minecraft 1.21+) +# Acacia Gum (v1.3, for Minecraft 1.21.4+) This datapack adds the item "Acacia Gumball" (a retextured Slimeball), which is obtained by stripping acacia logs. @@ -7,12 +7,12 @@ This datapack adds the item "Acacia Gumball" (a retextured Slimeball), which is - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/acacia-gum-slime-from-stripping-acacias/ - On my website: https://daenvil.github.io/MCDatapacks/acacia_gum.html -- This version was published on the 8th of November 2024. Check the webpages above for possible updates. +- This version was published on the 3rd of January 2025. Check the webpages above for possible updates. ## Installation - Drop the datapack zip file inside the "datapacks" folder of your world folder (/saves//datapacks/). -- Drop the resourcepack zip file ("vegancraft-RP_v1.2.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from one of the webpages above. +- Drop the resourcepack zip file ("vegancraft-RP_v1.3.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from one of the webpages above. ## Features diff --git a/acacia_gum/data/dnv.acacia_gum/function/give/acacia_gum_ball.mcfunction b/acacia_gum/data/dnv.acacia_gum/function/give/acacia_gum_ball.mcfunction index cf64d2d..a8a1ad6 100644 --- a/acacia_gum/data/dnv.acacia_gum/function/give/acacia_gum_ball.mcfunction +++ b/acacia_gum/data/dnv.acacia_gum/function/give/acacia_gum_ball.mcfunction @@ -1 +1 @@ -give @s slime_ball[item_name="{\"translate\":\"dnv.acacia_gum.item.acacia_gum_ball\",\"fallback\":\"Acacia Gum\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Acacia Gum\",\"color\":\"gold\",\"italic\":true}"],custom_model_data=9261005,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s slime_ball[item_name="{\"translate\":\"dnv.acacia_gum.item.acacia_gum_ball\",\"fallback\":\"Acacia Gum\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Acacia Gum\",\"color\":\"gold\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.acacia_gum:acacia_gum_ball"] \ No newline at end of file diff --git a/acacia_gum/data/dnv.acacia_gum/loot_table/drop.json b/acacia_gum/data/dnv.acacia_gum/loot_table/drop.json index c969c6b..a4640c1 100644 --- a/acacia_gum/data/dnv.acacia_gum/loot_table/drop.json +++ b/acacia_gum/data/dnv.acacia_gum/loot_table/drop.json @@ -15,10 +15,10 @@ "lore": [ "{\"text\":\"Daenvil's Acacia Gum\",\"color\":\"gold\",\"italic\":true}" ], - "custom_model_data": 9261005, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.acacia_gum:acacia_gum_ball" } } ], diff --git a/acacia_gum/data/global/advancement/dnv.acacia_gum.json b/acacia_gum/data/global/advancement/dnv.acacia_gum.json index b335adc..130ccf0 100644 --- a/acacia_gum/data/global/advancement/dnv.acacia_gum.json +++ b/acacia_gum/data/global/advancement/dnv.acacia_gum.json @@ -6,13 +6,13 @@ "italic": false }, "description": { - "text": "Daenvil's Acacia Gum 1.2.2 (for MC1.21+)", + "text": "Daenvil's Acacia Gum 1.3 (for MC1.21.4+)", "italic": false }, "icon": { "id": "slime_ball", "components": { - "custom_model_data": 9261005 + "item_model": "dnv.acacia_gum:acacia_gum_ball" } }, "show_toast": false, diff --git a/acacia_gum/pack.mcmeta b/acacia_gum/pack.mcmeta index 7e3e68c..f6dd97f 100644 --- a/acacia_gum/pack.mcmeta +++ b/acacia_gum/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv1.2.2, for MC1.21+", + "text": "\nv1.3, for MC1.21.4+", "color": "gray", "italic": false } @@ -23,18 +23,10 @@ "color": "green", "italic": false }, - "pack_format": 57, + "pack_format": 61, "supported_formats": { - "min_inclusive": 47, - "max_inclusive": 58 + "min_inclusive": 61, + "max_inclusive": 62 } - }, - "overlays": { - "entries": [ - { - "directory": "1_21_1", - "formats": { "min_inclusive": 47, "max_inclusive": 48 } - } - ] - } + } } \ No newline at end of file diff --git a/ethical_textiles/README.txt b/ethical_textiles/README.txt index ba05d00..ed0fd1c 100644 --- a/ethical_textiles/README.txt +++ b/ethical_textiles/README.txt @@ -1,4 +1,4 @@ -# Ethical Textiles (v2.0.3, for Minecraft 1.21.2+) +# Ethical Textiles (v2.1, for Minecraft 1.21.4+) A datapack that adds plant-based alternatives to leather, string, wool, and feathers. @@ -7,12 +7,12 @@ A datapack that adds plant-based alternatives to leather, string, wool, and feat - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/ethical-textiles-plant-string-and-leather/ - On my website: https://daenvil.github.io/MCDatapacks/ethical_textiles.html -- This version was published on the 8th of November 2024. Check the webpages above for possible updates. +- This version was published on the 3rd of January 2025. Check the webpages above for possible updates. ## Installation - Drop the datapack zip file inside the "datapacks" folder of your world folder (/saves//datapacks/). -- Drop the resourcepack zip file ("vegancraft-RP_v1.2.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from one of the webpages above. +- Drop the resourcepack zip file ("vegancraft-RP_v1.3.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from one of the webpages above. ## Features diff --git a/ethical_textiles/data/dnv.ethical_textiles/function/give/armor_scale.mcfunction b/ethical_textiles/data/dnv.ethical_textiles/function/give/armor_scale.mcfunction index c469a10..b164eea 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/function/give/armor_scale.mcfunction +++ b/ethical_textiles/data/dnv.ethical_textiles/function/give/armor_scale.mcfunction @@ -1 +1 @@ -give @s armadillo_scute[item_name="{\"translate\":\"dnv.ethical_textiles.item.armor_scale\",\"fallback\":\"Armor Scale\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261022,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s armadillo_scute[item_name="{\"translate\":\"dnv.ethical_textiles.item.armor_scale\",\"fallback\":\"Armor Scale\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.ethical_textiles:armor_scale"] \ No newline at end of file diff --git a/ethical_textiles/data/dnv.ethical_textiles/function/give/faux_feather.mcfunction b/ethical_textiles/data/dnv.ethical_textiles/function/give/faux_feather.mcfunction index 785bf79..27a2f71 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/function/give/faux_feather.mcfunction +++ b/ethical_textiles/data/dnv.ethical_textiles/function/give/faux_feather.mcfunction @@ -1 +1 @@ -give @s feather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_feather\",\"fallback\":\"Faux Feather\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261010,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s feather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_feather\",\"fallback\":\"Faux Feather\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.ethical_textiles:faux_feather"] \ No newline at end of file diff --git a/ethical_textiles/data/dnv.ethical_textiles/function/give/faux_leather.mcfunction b/ethical_textiles/data/dnv.ethical_textiles/function/give/faux_leather.mcfunction index 846f1be..2f5d550 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/function/give/faux_leather.mcfunction +++ b/ethical_textiles/data/dnv.ethical_textiles/function/give/faux_leather.mcfunction @@ -1 +1 @@ -give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.ethical_textiles:faux_leather"] \ No newline at end of file diff --git a/ethical_textiles/data/dnv.ethical_textiles/function/give/plant_string.mcfunction b/ethical_textiles/data/dnv.ethical_textiles/function/give/plant_string.mcfunction index a8cdbd1..0aeef89 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/function/give/plant_string.mcfunction +++ b/ethical_textiles/data/dnv.ethical_textiles/function/give/plant_string.mcfunction @@ -1 +1 @@ -give @s string[item_name="{\"translate\":\"dnv.ethical_textiles.item.plant_string\",\"fallback\":\"Plant String\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261007,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s string[item_name="{\"translate\":\"dnv.ethical_textiles.item.plant_string\",\"fallback\":\"Plant String\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.ethical_textiles:plant_string"] \ No newline at end of file diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/armor_scale.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/armor_scale.json index 4796a9f..0af3176 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/armor_scale.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/armor_scale.json @@ -18,10 +18,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261022, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:armor_scale" } } } \ No newline at end of file diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_feather.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_feather.json index c3bf5c5..a0e3f4f 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_feather.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_feather.json @@ -17,10 +17,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261010, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:faux_feather" } } } \ No newline at end of file diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json index c8d1f05..5c448b4 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json @@ -17,10 +17,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261006, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:faux_leather" } }, "group": "dnv.ethical_textiles.faux_leather" diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json index 9ef9dc7..99e2e20 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json @@ -18,10 +18,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261006, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:faux_leather" } }, "group": "dnv.ethical_textiles.faux_leather" diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json index 780ed7b..4dd262e 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json @@ -16,10 +16,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261007, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:plant_string" } }, "group": "dnv.ethical_textiles.plant_string" diff --git a/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_vines.json b/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_vines.json index 434fa92..821f35f 100644 --- a/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_vines.json +++ b/ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_vines.json @@ -16,10 +16,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261007, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:plant_string" } }, "group": "dnv.ethical_textiles.plant_string" diff --git a/ethical_textiles/data/global/advancement/dnv.ethical_textiles.json b/ethical_textiles/data/global/advancement/dnv.ethical_textiles.json index af50d46..635c3fd 100644 --- a/ethical_textiles/data/global/advancement/dnv.ethical_textiles.json +++ b/ethical_textiles/data/global/advancement/dnv.ethical_textiles.json @@ -6,13 +6,13 @@ "italic": false }, "description": { - "text": "Daenvil's Ethical Textiles 2.0.3 (for MC1.21.2+)", + "text": "Daenvil's Ethical Textiles 2.1 (for MC1.21.4+)", "italic": false }, "icon": { "id": "string", "components": { - "custom_model_data": 9261007 + "item_model": "dnv.ethical_textiles:plant_string" } }, "show_toast": false, diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction index c0e8518..df2504c 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor leather run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261006,"item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"item_model":"dnv.ethical_textiles:faux_leather","item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count faux_leather_3to1.count int 1 run scoreboard players get @s dnv.count.crafted_faux_leather_3to1 diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction index 4d84dd5..66f4e76 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":false},item_model="dnv.ethical_textiles:faux_leather"] $(count) \ No newline at end of file diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction index 3a5cf76..5280cc0 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor leather run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261006,"item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"item_model":"dnv.ethical_textiles:faux_leather","item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count faux_leather_6to1.count int 1 run scoreboard players get @s dnv.count.crafted_faux_leather_6to1 diff --git a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction index 4d84dd5..66f4e76 100644 --- a/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction +++ b/ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":false},item_model="dnv.ethical_textiles:faux_leather"] $(count) \ No newline at end of file diff --git a/ethical_textiles/pack.mcmeta b/ethical_textiles/pack.mcmeta index 2d96a45..0722f4b 100644 --- a/ethical_textiles/pack.mcmeta +++ b/ethical_textiles/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv2.0.3, for MC1.21.2+", + "text": "\nv2.1, for MC1.21.4+", "color": "gray", "italic": false } @@ -23,10 +23,10 @@ "color": "green", "italic": false }, - "pack_format": 57, + "pack_format": 61, "supported_formats": { - "min_inclusive": 57, - "max_inclusive": 58 + "min_inclusive": 61, + "max_inclusive": 62 } } } \ No newline at end of file diff --git a/magnet_fishing/1_21_1/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json b/magnet_fishing/1_21_1/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json deleted file mode 100644 index c5aa73c..0000000 --- a/magnet_fishing/1_21_1/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "crafting_shapeless", - "category": "equipment", - "ingredients": [ - { - "item": "fishing_rod" - }, - { - "item": "redstone" - }, - { - "item": "iron_ingot" - } - ], - "result": { - "id": "fishing_rod", - "components": { - "item_name": "{\"translate\":\"dnv.magnet_fishing.item.magnet_fishing_rod\",\"fallback\":\"Magnet Fishing Rod\",\"italic\":false}", - "lore": [ - "{\"text\":\"Daenvil's Magnet Fishing\",\"color\":\"aqua\",\"italic\":true}" - ], - "custom_model_data": 9261009 - } - } -} \ No newline at end of file diff --git a/magnet_fishing/README.txt b/magnet_fishing/README.txt index 8101974..4e727bb 100644 --- a/magnet_fishing/README.txt +++ b/magnet_fishing/README.txt @@ -1,4 +1,4 @@ -# Magnet Fishing (v2.0.2, for Minecraft 1.21+) +# Magnet Fishing (v2.1, for Minecraft 1.21.4+) A datapack that adds a magnet fishing rod, with which you can fish iron and iron items. Craft the magnet rod with a regular fishing rod, an iron ingot, and redstone dust. @@ -7,12 +7,12 @@ A datapack that adds a magnet fishing rod, with which you can fish iron and iron - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/magnet-fishing/ - On my website: https://daenvil.github.io/MCDatapacks/magnet_fishing.html -- This version was published on the 8th of November 2024. Check the webpages above for possible updates. +- This version was published on the 3rd of January 2025. Check the webpages above for possible updates. ## Installation - Drop the datapack zip file inside the "datapacks" folder of your world folder (/saves//datapacks/). -- OPTIONAL: drop the resourcepack zip file ("vegancraft-RP_v1.2.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from the PlanetMinecraft page above. +- OPTIONAL: drop the resourcepack zip file ("vegancraft-RP_v1.3.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from the PlanetMinecraft page above. ## Features diff --git a/magnet_fishing/data/dnv.magnet_fishing/function/give/magnet_fishing_rod.mcfunction b/magnet_fishing/data/dnv.magnet_fishing/function/give/magnet_fishing_rod.mcfunction index a7eca37..5d2de64 100644 --- a/magnet_fishing/data/dnv.magnet_fishing/function/give/magnet_fishing_rod.mcfunction +++ b/magnet_fishing/data/dnv.magnet_fishing/function/give/magnet_fishing_rod.mcfunction @@ -1 +1 @@ -give @s fishing_rod[item_name="{\"translate\":\"dnv.magnet_fishing.item.magnet_fishing_rod\",\"fallback\":\"Magnet Fishing Rod\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Magnet Fishing\",\"color\":\"aqua\",\"italic\":true}"],custom_model_data=9261009] \ No newline at end of file +give @s fishing_rod[item_name="{\"translate\":\"dnv.magnet_fishing.item.magnet_fishing_rod\",\"fallback\":\"Magnet Fishing Rod\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Magnet Fishing\",\"color\":\"aqua\",\"italic\":true}"],item_model="dnv.magnet_fishing:magnet_fishing_rod"] \ No newline at end of file diff --git a/magnet_fishing/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json b/magnet_fishing/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json index 0affdf4..51c4b07 100644 --- a/magnet_fishing/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json +++ b/magnet_fishing/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json @@ -13,7 +13,7 @@ "lore": [ "{\"text\":\"Daenvil's Magnet Fishing\",\"color\":\"aqua\",\"italic\":true}" ], - "custom_model_data": 9261009 + "item_model": "dnv.magnet_fishing:magnet_fishing_rod" } } } \ No newline at end of file diff --git a/magnet_fishing/data/global/advancement/dnv.magnet_fishing.json b/magnet_fishing/data/global/advancement/dnv.magnet_fishing.json index 0df2501..ac21f6c 100644 --- a/magnet_fishing/data/global/advancement/dnv.magnet_fishing.json +++ b/magnet_fishing/data/global/advancement/dnv.magnet_fishing.json @@ -6,13 +6,13 @@ "italic": false }, "description": { - "text": "Daenvil's Magnet Fishing 2.0.2 (for MC1.21+)", + "text": "Daenvil's Magnet Fishing 2.1 (for MC1.21.4+)", "italic": false }, "icon": { "id": "fishing_rod", "components": { - "custom_model_data": 9261009 + "item_model": "dnv.magnet_fishing:magnet_fishing_rod" } }, "show_toast": false, diff --git a/magnet_fishing/data/minecraft/loot_table/gameplay/fishing.json b/magnet_fishing/data/minecraft/loot_table/gameplay/fishing.json index b714e53..8f2ca18 100644 --- a/magnet_fishing/data/minecraft/loot_table/gameplay/fishing.json +++ b/magnet_fishing/data/minecraft/loot_table/gameplay/fishing.json @@ -6,12 +6,29 @@ { "condition": "inverted", "term": { - "condition": "match_tool", - "predicate": { - "components": { - "custom_model_data": 9261009 + "condition": "any_of", + "terms": [ + { + "condition": "match_tool", + "predicate": { + "components": { + "custom_model_data": { + "floats": [ + 9261009 + ] + } + } + } + }, + { + "condition": "match_tool", + "predicate": { + "components": { + "item_model": "dnv.magnet_fishing:magnet_fishing_rod" + } + } } - } + ] } } ], @@ -50,12 +67,29 @@ { "conditions": [ { - "condition": "match_tool", - "predicate": { - "components": { - "custom_model_data": 9261009 + "condition": "any_of", + "terms": [ + { + "condition": "match_tool", + "predicate": { + "components": { + "custom_model_data": { + "floats": [ + 9261009 + ] + } + } + } + }, + { + "condition": "match_tool", + "predicate": { + "components": { + "item_model": "dnv.magnet_fishing:magnet_fishing_rod" + } + } } - } + ] } ], "rolls": 1, diff --git a/magnet_fishing/pack.mcmeta b/magnet_fishing/pack.mcmeta index d5c3524..c1ccf2c 100644 --- a/magnet_fishing/pack.mcmeta +++ b/magnet_fishing/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv2.0.2, for MC1.21+", + "text": "\nv2.1, for MC1.21.4+", "color": "gray", "italic": false } @@ -23,18 +23,10 @@ "color": "green", "italic": false }, - "pack_format": 57, + "pack_format": 61, "supported_formats": { - "min_inclusive": 47, - "max_inclusive": 58 + "min_inclusive": 61, + "max_inclusive": 62 } - }, - "overlays": { - "entries": [ - { - "directory": "1_21_1", - "formats": { "min_inclusive": 47, "max_inclusive": 48 } - } - ] - } + } } \ No newline at end of file diff --git a/plant-based_foods/README.txt b/plant-based_foods/README.txt index 3c31d1c..1f4b0fd 100644 --- a/plant-based_foods/README.txt +++ b/plant-based_foods/README.txt @@ -1,4 +1,4 @@ -# Plant-based Foods (v2.0.2, for Minecraft 1.21.2+) +# Plant-based Foods (v2.1, for Minecraft 1.21.4+) A datapack that adds vegan alternatives to dairy, eggs, honey, and meat. @@ -7,12 +7,12 @@ A datapack that adds vegan alternatives to dairy, eggs, honey, and meat. - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/plant-based-foods/ - On my website: https://daenvil.github.io/MCDatapacks/plant-based_foods.html -- This version was published on the 8th of November 2024. Check the webpages above for possible updates. +- This version was published on the 3rd of January 2025. Check the webpages above for possible updates. ## Installation - Drop the datapack zip file inside the "datapacks" folder of your world folder (/saves//datapacks/). -- Drop the resourcepack zip file ("vegancraft-RP_v1.2.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from one of the webpages above. +- Drop the resourcepack zip file ("vegancraft-RP_v1.3.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from one of the webpages above. ## Features diff --git a/plant-based_foods/data/dnv.vegan_food/advancement/recipes/notsalmon_fillet.json b/plant-based_foods/data/dnv.vegan_food/advancement/recipes/notsalmon_fillet.json index 817c09c..a174575 100644 --- a/plant-based_foods/data/dnv.vegan_food/advancement/recipes/notsalmon_fillet.json +++ b/plant-based_foods/data/dnv.vegan_food/advancement/recipes/notsalmon_fillet.json @@ -27,7 +27,7 @@ "recipe": "dnv.vegan_food:notsalmon_fillet" } }, - "has_honey_bottle": { + "has_vegan_honey": { "trigger": "inventory_changed", "conditions": { "items": [ @@ -62,7 +62,7 @@ "has_kelp", "has_item_tag_fishes", "has_the_recipe", - "has_honey_bottle", + "has_vegan_honey", "player_hurt_cod", "player_hurt_salmon" ] diff --git a/plant-based_foods/data/dnv.vegan_food/advancement/recipes/seitan_stew.json b/plant-based_foods/data/dnv.vegan_food/advancement/recipes/seitan_stew.json index 77f82d0..21ecb78 100644 --- a/plant-based_foods/data/dnv.vegan_food/advancement/recipes/seitan_stew.json +++ b/plant-based_foods/data/dnv.vegan_food/advancement/recipes/seitan_stew.json @@ -29,7 +29,7 @@ "recipe": "rabbit_stew_red_mushroom" } }, - "has_cooked_beef": { + "has_vegan_steak": { "trigger": "inventory_changed", "conditions": { "items": [ @@ -57,7 +57,7 @@ "has_the_recipe", "has_recipe_rabbit_stew_brown_mushroom", "has_recipe_rabbit_stew_red_mushroom", - "has_cooked_beef", + "has_vegan_steak", "player_hurt_rabbit" ] ], diff --git a/plant-based_foods/data/dnv.vegan_food/advancement/recipes/vegan_honey_bottle_flowers.json b/plant-based_foods/data/dnv.vegan_food/advancement/recipes/vegan_honey_bottle_flowers.json index 109692d..320de5f 100644 --- a/plant-based_foods/data/dnv.vegan_food/advancement/recipes/vegan_honey_bottle_flowers.json +++ b/plant-based_foods/data/dnv.vegan_food/advancement/recipes/vegan_honey_bottle_flowers.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_item_tag_flowers": { + "has_item_tag_zz.dnv.core:flowers": { "trigger": "inventory_changed", "conditions": { "items": [ { - "items": "#flowers" + "items": "#zz.dnv.core:flowers" } ] } @@ -50,7 +50,7 @@ }, "requirements": [ [ - "has_item_tag_flowers", + "has_item_tag_zz.dnv.core:flowers", "has_honey_bottle", "has_honeycomb", "has_the_recipe", diff --git a/plant-based_foods/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction b/plant-based_foods/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction index 2ee5195..d3e56c0 100644 --- a/plant-based_foods/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction +++ b/plant-based_foods/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction @@ -1 +1 @@ -give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:notfish_fillet"] \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction b/plant-based_foods/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction index 0c32c39..a26046b 100644 --- a/plant-based_foods/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction +++ b/plant-based_foods/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction @@ -1 +1 @@ -give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:notsalmon_fillet"] \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/function/give/plant_milk_bucket.mcfunction b/plant-based_foods/data/dnv.vegan_food/function/give/plant_milk_bucket.mcfunction index e62f1e2..ef547a4 100644 --- a/plant-based_foods/data/dnv.vegan_food/function/give/plant_milk_bucket.mcfunction +++ b/plant-based_foods/data/dnv.vegan_food/function/give/plant_milk_bucket.mcfunction @@ -1 +1 @@ -give @s milk_bucket[item_name="{\"translate\":\"dnv.vegan_food.item.plant_milk_bucket\",\"fallback\":\"Plant Milk\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261001,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s milk_bucket[item_name="{\"translate\":\"dnv.vegan_food.item.plant_milk_bucket\",\"fallback\":\"Plant Milk\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:plant_milk_bucket"] \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/function/give/seitan_steak.mcfunction b/plant-based_foods/data/dnv.vegan_food/function/give/seitan_steak.mcfunction index 56d7562..1a54bc7 100644 --- a/plant-based_foods/data/dnv.vegan_food/function/give/seitan_steak.mcfunction +++ b/plant-based_foods/data/dnv.vegan_food/function/give/seitan_steak.mcfunction @@ -1 +1 @@ -give @s cooked_beef[item_name="{\"translate\":\"dnv.vegan_food.item.seitan_steak\",\"fallback\":\"Seitan Steak\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261003,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s cooked_beef[item_name="{\"translate\":\"dnv.vegan_food.item.seitan_steak\",\"fallback\":\"Seitan Steak\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:seitan_steak"] \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/function/give/seitan_stew.mcfunction b/plant-based_foods/data/dnv.vegan_food/function/give/seitan_stew.mcfunction index 1f8fad4..81817b9 100644 --- a/plant-based_foods/data/dnv.vegan_food/function/give/seitan_stew.mcfunction +++ b/plant-based_foods/data/dnv.vegan_food/function/give/seitan_stew.mcfunction @@ -1 +1 @@ -give @s rabbit_stew[item_name="{\"translate\":\"dnv.vegan_food.item.seitan_stew\",\"fallback\":\"Seitan Stew\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261025,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s rabbit_stew[item_name="{\"translate\":\"dnv.vegan_food.item.seitan_stew\",\"fallback\":\"Seitan Stew\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:seitan_stew"] \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/function/give/vegan_honey_bottle.mcfunction b/plant-based_foods/data/dnv.vegan_food/function/give/vegan_honey_bottle.mcfunction index 29d01cd..852dc23 100644 --- a/plant-based_foods/data/dnv.vegan_food/function/give/vegan_honey_bottle.mcfunction +++ b/plant-based_foods/data/dnv.vegan_food/function/give/vegan_honey_bottle.mcfunction @@ -1 +1 @@ -give @s honey_bottle[item_name="{\"translate\":\"dnv.vegan_food.item.vegan_honey_bottle\",\"fallback\":\"Vegan Honey\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261002,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s honey_bottle[item_name="{\"translate\":\"dnv.vegan_food.item.vegan_honey_bottle\",\"fallback\":\"Vegan Honey\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:vegan_honey_bottle"] \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/function/give/veggie_burger.mcfunction b/plant-based_foods/data/dnv.vegan_food/function/give/veggie_burger.mcfunction index 849700b..e8fc058 100644 --- a/plant-based_foods/data/dnv.vegan_food/function/give/veggie_burger.mcfunction +++ b/plant-based_foods/data/dnv.vegan_food/function/give/veggie_burger.mcfunction @@ -1 +1 @@ -give @s cooked_porkchop[item_name="{\"translate\":\"dnv.vegan_food.item.veggie_burger\",\"fallback\":\"Veggie Burger\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261024,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s cooked_porkchop[item_name="{\"translate\":\"dnv.vegan_food.item.veggie_burger\",\"fallback\":\"Veggie Burger\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:veggie_burger"] \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/notfish_fillet.json b/plant-based_foods/data/dnv.vegan_food/recipe/notfish_fillet.json index ccde42d..e851471 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/notfish_fillet.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/notfish_fillet.json @@ -15,7 +15,6 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261004, "food": { "nutrition": 5, "saturation": 6 @@ -25,7 +24,8 @@ }, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:notfish_fillet" } } } \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/notsalmon_fillet.json b/plant-based_foods/data/dnv.vegan_food/recipe/notsalmon_fillet.json index 932f2d5..ac61a6e 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/notsalmon_fillet.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/notsalmon_fillet.json @@ -13,7 +13,6 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261026, "food": { "nutrition": 6, "saturation": 9.6 @@ -23,7 +22,8 @@ }, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:notsalmon_fillet" } } } \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/plant_milk_bucket.json b/plant-based_foods/data/dnv.vegan_food/recipe/plant_milk_bucket.json index 6c579f0..232c12d 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/plant_milk_bucket.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/plant_milk_bucket.json @@ -18,10 +18,10 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261001, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:plant_milk_bucket" } } } \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak.json b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak.json index cc90674..37d5fab 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak.json @@ -14,11 +14,11 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261003, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:seitan_steak" } }, - "group": "dnv.vegan_food.seitan_steak" + "group": "dnv.vegan_food.seitan" } \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak_hay.json b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak_hay.json index 88254ca..0f0cdea 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak_hay.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_steak_hay.json @@ -13,11 +13,11 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261003, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:seitan_steak" } }, - "group": "dnv.vegan_food.seitan_steak" + "group": "dnv.vegan_food.seitan" } \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_stew.json b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_stew.json index 5066f40..4ee457f 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/seitan_stew.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/seitan_stew.json @@ -15,10 +15,10 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261025, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:seitan_stew" } } } \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json index 6489da2..546d99a 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json @@ -17,11 +17,11 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261002, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:vegan_honey_bottle" } }, - "group": "dnv.vegan_food.vegan_honey_bottle" + "group": "dnv.vegan_food:honey" } \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json index c4b79a5..0df1a7c 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json @@ -2,7 +2,7 @@ "type": "crafting_shaped", "category": "misc", "key": { - "F": "#flowers", + "F": "#zz.dnv.core:flowers", "W": "water_bucket", "G": "glass_bottle" }, @@ -18,11 +18,11 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261002, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:vegan_honey_bottle" } }, - "group": "dnv.vegan_food.vegan_honey_bottle" + "group": "dnv.vegan_food:honey" } \ No newline at end of file diff --git a/plant-based_foods/data/dnv.vegan_food/recipe/veggie_burger.json b/plant-based_foods/data/dnv.vegan_food/recipe/veggie_burger.json index 346065f..03f4585 100644 --- a/plant-based_foods/data/dnv.vegan_food/recipe/veggie_burger.json +++ b/plant-based_foods/data/dnv.vegan_food/recipe/veggie_burger.json @@ -13,10 +13,10 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261024, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:veggie_burger" } } } \ No newline at end of file diff --git a/plant-based_foods/data/global/advancement/dnv.vegan_food.json b/plant-based_foods/data/global/advancement/dnv.vegan_food.json index c647de2..9087b55 100644 --- a/plant-based_foods/data/global/advancement/dnv.vegan_food.json +++ b/plant-based_foods/data/global/advancement/dnv.vegan_food.json @@ -6,13 +6,13 @@ "italic": false }, "description": { - "text": "Daenvil's Plant-based Foods 2.0.2 (for MC1.21.2+)", + "text": "Daenvil's Plant-based Foods 2.1 (for MC1.21.4+)", "italic": false }, "icon": { "id": "cooked_porkchop", "components": { - "custom_model_data": 9261024 + "item_model": "dnv.vegan_food:veggie_burger" } }, "show_toast": false, diff --git a/plant-based_foods/data/zz.dnv.core/tags/item/flowers.json b/plant-based_foods/data/zz.dnv.core/tags/item/flowers.json new file mode 100644 index 0000000..3786d78 --- /dev/null +++ b/plant-based_foods/data/zz.dnv.core/tags/item/flowers.json @@ -0,0 +1,17 @@ +{ + "values": [ + "#small_flowers", + "flowering_azalea_leaves", + "flowering_azalea", + "mangrove_propagule", + "cherry_leaves", + "pink_petals", + "chorus_flower", + "spore_blossom", + "sunflower", + "lilac", + "peony", + "rose_bush", + "pitcher_plant" + ] +} \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction index 8bdb093..ab774c4 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_notfish_fillet 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor cod run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"custom_model_data":9261004,"food":{"nutrition":5,"saturation":6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"food":{"nutrition":5,"saturation":6},"item_model":"dnv.vegan_food:notfish_fillet","item_name":"{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_notfish_fillet 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count notfish_fillet.count int 1 run scoreboard players get @s dnv.count.crafted_notfish_fillet diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction index f37e688..69c1be9 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s cod[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":false},item_model="dnv.vegan_food:notfish_fillet"] $(count) \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction index 1b34443..5d58f1e 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_notsalmon_fillet 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor salmon run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"custom_model_data":9261026,"food":{"nutrition":6,"saturation":9.6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"food":{"nutrition":6,"saturation":9.6},"item_model":"dnv.vegan_food:notsalmon_fillet","item_name":"{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_notsalmon_fillet 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count notsalmon_fillet.count int 1 run scoreboard players get @s dnv.count.crafted_notsalmon_fillet diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction index a0018e7..7cff6c6 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s salmon[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":false},item_model="dnv.vegan_food:notsalmon_fillet"] $(count) \ No newline at end of file diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction index 1bfa2b3..7ca8a51 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_seitan_stew 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor rabbit_stew run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item replace entity @s player.cursor with suspicious_stew[custom_data={ "dnv.vegan": false }] 1 +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"item_model":"dnv.vegan_food:seitan_stew","item_name":"{\"translate\":\"dnv.vegan_food.item.seitan_stew\",\"fallback\":\"Seitan Stew\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_seitan_stew 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count seitan_stew.count int 1 run scoreboard players get @s dnv.count.crafted_seitan_stew diff --git a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction index 6b1167a..f193265 100644 --- a/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction +++ b/plant-based_foods/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s rabbit_stew[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s suspicious_stew[custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s rabbit_stew[item_name="{\"translate\":\"dnv.vegan_food.item.seitan_stew\",\"fallback\":\"Seitan Stew\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":false},item_model="dnv.vegan_food:seitan_stew"] $(count) \ No newline at end of file diff --git a/plant-based_foods/pack.mcmeta b/plant-based_foods/pack.mcmeta index 6cecd4f..35d5743 100644 --- a/plant-based_foods/pack.mcmeta +++ b/plant-based_foods/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv2.0.2, for MC1.21.2+", + "text": "\nv2.1, for MC1.21.4+", "color": "gray", "italic": false } @@ -23,10 +23,10 @@ "color": "green", "italic": false }, - "pack_format": 57, + "pack_format": 61, "supported_formats": { - "min_inclusive": 57, - "max_inclusive": 58 + "min_inclusive": 61, + "max_inclusive": 62 } } } \ No newline at end of file diff --git a/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json b/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json deleted file mode 100644 index 1e8eb2c..0000000 --- a/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "smelting", - "category": "misc", - "cookingtime": 200, - "experience": 0.1, - "ingredient": { - "item": "dead_bush" - }, - "result": { - "id": "honeycomb", - "components": { - "item_name": "{\"translate\":\"dnv.plant_wax.item.plant_wax\",\"fallback\":\"Plant Wax\",\"italic\":false}", - "lore": [ - "{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}" - ], - "custom_model_data": 9261008, - "custom_data": { - "dnv.vegan": true - } - } - } -} \ No newline at end of file diff --git a/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json b/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json deleted file mode 100644 index b731563..0000000 --- a/plant_wax/1_21_1/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "smelting", - "category": "misc", - "cookingtime": 200, - "experience": 0.1, - "ingredient": { - "item": "jungle_leaves" - }, - "result": { - "id": "honeycomb", - "components": { - "item_name": "{\"translate\":\"dnv.plant_wax.item.plant_wax\",\"fallback\":\"Plant Wax\",\"italic\":false}", - "lore": [ - "{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}" - ], - "custom_model_data": 9261008, - "custom_data": { - "dnv.vegan": true - } - } - } -} \ No newline at end of file diff --git a/plant_wax/README.txt b/plant_wax/README.txt index cb4e9a9..50a633f 100644 --- a/plant_wax/README.txt +++ b/plant_wax/README.txt @@ -1,4 +1,4 @@ -# Plant Wax (v2.0.2, for Minecraft 1.21+) +# Plant Wax (v2.1, for Minecraft 1.21.4+) A datapack that adds Plant Wax (a retextured Honeycomb). Obtained by smelting dead bushes or jungle leaves. @@ -7,12 +7,12 @@ A datapack that adds Plant Wax (a retextured Honeycomb). Obtained by smelting de - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/plant-wax/ - On my website: https://daenvil.github.io/MCDatapacks/plant_wax.html -- This version was published on the 8th of November 2024. Check the webpages above for possible updates. +- This version was published on the 3rd of January 2025. Check the webpages above for possible updates. ## Installation - Drop the datapack zip file inside the "datapacks" folder of your world folder (/saves//datapacks/). -- Drop the resourcepack zip file ("vegancraft-RP_v1.2.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from one of the webpages above. +- Drop the resourcepack zip file ("vegancraft-RP_v1.3.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from one of the webpages above. ## Features diff --git a/plant_wax/data/dnv.plant_wax/function/give/plant_wax.mcfunction b/plant_wax/data/dnv.plant_wax/function/give/plant_wax.mcfunction index d6e2bd1..5ba9408 100644 --- a/plant_wax/data/dnv.plant_wax/function/give/plant_wax.mcfunction +++ b/plant_wax/data/dnv.plant_wax/function/give/plant_wax.mcfunction @@ -1 +1 @@ -give @s honeycomb[item_name="{\"translate\":\"dnv.plant_wax.item.plant_wax\",\"fallback\":\"Plant Wax\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}"],custom_model_data=9261008,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s honeycomb[item_name="{\"translate\":\"dnv.plant_wax.item.plant_wax\",\"fallback\":\"Plant Wax\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.plant_wax:plant_wax"] \ No newline at end of file diff --git a/plant_wax/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json b/plant_wax/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json index 8c55f1d..b2cfe4e 100644 --- a/plant_wax/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json +++ b/plant_wax/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json @@ -11,10 +11,10 @@ "lore": [ "{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}" ], - "custom_model_data": 9261008, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.plant_wax:plant_wax" } } } \ No newline at end of file diff --git a/plant_wax/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json b/plant_wax/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json index ad6a4a6..527436a 100644 --- a/plant_wax/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json +++ b/plant_wax/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json @@ -11,10 +11,10 @@ "lore": [ "{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}" ], - "custom_model_data": 9261008, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.plant_wax:plant_wax" } } } \ No newline at end of file diff --git a/plant_wax/data/global/advancement/dnv.plant_wax.json b/plant_wax/data/global/advancement/dnv.plant_wax.json index 7d13c99..933769c 100644 --- a/plant_wax/data/global/advancement/dnv.plant_wax.json +++ b/plant_wax/data/global/advancement/dnv.plant_wax.json @@ -6,13 +6,13 @@ "italic": false }, "description": { - "text": "Daenvil's Plant Wax 2.0.2 (for MC1.21+)", + "text": "Daenvil's Plant Wax 2.1 (for MC1.21.4+)", "italic": false }, "icon": { "id": "honeycomb", "components": { - "custom_model_data": 9261008 + "item_model": "dnv.plant_wax:plant_wax" } }, "show_toast": false, diff --git a/plant_wax/pack.mcmeta b/plant_wax/pack.mcmeta index aa18fa8..c2a749a 100644 --- a/plant_wax/pack.mcmeta +++ b/plant_wax/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv2.0.2, for MC1.21+", + "text": "\nv2.1, for MC1.21.4+", "color": "gray", "italic": false } @@ -23,18 +23,10 @@ "color": "green", "italic": false }, - "pack_format": 57, + "pack_format": 61, "supported_formats": { - "min_inclusive": 47, - "max_inclusive": 58 + "min_inclusive": 61, + "max_inclusive": 62 } - }, - "overlays": { - "entries": [ - { - "directory": "1_21_1", - "formats": { "min_inclusive": 47, "max_inclusive": 48 } - } - ] - } + } } \ No newline at end of file diff --git a/vegancraft-DP/README.txt b/vegancraft-DP/README.txt index bdd7ae2..842381d 100644 --- a/vegancraft-DP/README.txt +++ b/vegancraft-DP/README.txt @@ -1,4 +1,4 @@ -# Daenvil's Vegancraft v1.2.2 (Full Datapack) for Minecraft 1.21.2+ +# Daenvil's Vegancraft v1.3 (Full Datapack) for Minecraft 1.21.4+ This datapack is a merged version of the following datapacks: @@ -15,12 +15,12 @@ And also contains additional content not present on those datapacks. - On my website: https://daenvil.github.io/MCDatapacks/vegancraft.html - On GitHub: https://www.github.com/daenvil/vegancraft -- This version was published on the 8th of November 2024. Check the webpages above for possible updates. +- This version was published on the 3rd of January 2025. Check the webpages above for possible updates. ## Installation - Drop the datapack zip file inside the "datapacks" folder of your world folder (/saves//datapacks/). -- Drop the resourcepack zip file ("vegancraft-RP_v1.2.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from one of the webpages above. +- Drop the resourcepack zip file ("vegancraft-RP_v1.3.zip") inside the "resourcepacks" folder of your minecraft folder. If you don't have the resourcepack, download it from one of the webpages above. ## Features diff --git a/vegancraft-DP/data/dnv.acacia_gum/function/give/acacia_gum_ball.mcfunction b/vegancraft-DP/data/dnv.acacia_gum/function/give/acacia_gum_ball.mcfunction index cf64d2d..a8a1ad6 100644 --- a/vegancraft-DP/data/dnv.acacia_gum/function/give/acacia_gum_ball.mcfunction +++ b/vegancraft-DP/data/dnv.acacia_gum/function/give/acacia_gum_ball.mcfunction @@ -1 +1 @@ -give @s slime_ball[item_name="{\"translate\":\"dnv.acacia_gum.item.acacia_gum_ball\",\"fallback\":\"Acacia Gum\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Acacia Gum\",\"color\":\"gold\",\"italic\":true}"],custom_model_data=9261005,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s slime_ball[item_name="{\"translate\":\"dnv.acacia_gum.item.acacia_gum_ball\",\"fallback\":\"Acacia Gum\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Acacia Gum\",\"color\":\"gold\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.acacia_gum:acacia_gum_ball"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.acacia_gum/loot_table/drop.json b/vegancraft-DP/data/dnv.acacia_gum/loot_table/drop.json index c969c6b..a4640c1 100644 --- a/vegancraft-DP/data/dnv.acacia_gum/loot_table/drop.json +++ b/vegancraft-DP/data/dnv.acacia_gum/loot_table/drop.json @@ -15,10 +15,10 @@ "lore": [ "{\"text\":\"Daenvil's Acacia Gum\",\"color\":\"gold\",\"italic\":true}" ], - "custom_model_data": 9261005, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.acacia_gum:acacia_gum_ball" } } ], diff --git a/vegancraft-DP/data/dnv.ethical_textiles/function/give/armor_scale.mcfunction b/vegancraft-DP/data/dnv.ethical_textiles/function/give/armor_scale.mcfunction index c469a10..b164eea 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/function/give/armor_scale.mcfunction +++ b/vegancraft-DP/data/dnv.ethical_textiles/function/give/armor_scale.mcfunction @@ -1 +1 @@ -give @s armadillo_scute[item_name="{\"translate\":\"dnv.ethical_textiles.item.armor_scale\",\"fallback\":\"Armor Scale\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261022,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s armadillo_scute[item_name="{\"translate\":\"dnv.ethical_textiles.item.armor_scale\",\"fallback\":\"Armor Scale\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.ethical_textiles:armor_scale"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.ethical_textiles/function/give/faux_feather.mcfunction b/vegancraft-DP/data/dnv.ethical_textiles/function/give/faux_feather.mcfunction index 785bf79..27a2f71 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/function/give/faux_feather.mcfunction +++ b/vegancraft-DP/data/dnv.ethical_textiles/function/give/faux_feather.mcfunction @@ -1 +1 @@ -give @s feather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_feather\",\"fallback\":\"Faux Feather\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261010,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s feather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_feather\",\"fallback\":\"Faux Feather\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.ethical_textiles:faux_feather"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.ethical_textiles/function/give/faux_leather.mcfunction b/vegancraft-DP/data/dnv.ethical_textiles/function/give/faux_leather.mcfunction index 846f1be..2f5d550 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/function/give/faux_leather.mcfunction +++ b/vegancraft-DP/data/dnv.ethical_textiles/function/give/faux_leather.mcfunction @@ -1 +1 @@ -give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.ethical_textiles:faux_leather"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.ethical_textiles/function/give/plant_string.mcfunction b/vegancraft-DP/data/dnv.ethical_textiles/function/give/plant_string.mcfunction index a8cdbd1..0aeef89 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/function/give/plant_string.mcfunction +++ b/vegancraft-DP/data/dnv.ethical_textiles/function/give/plant_string.mcfunction @@ -1 +1 @@ -give @s string[item_name="{\"translate\":\"dnv.ethical_textiles.item.plant_string\",\"fallback\":\"Plant String\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261007,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s string[item_name="{\"translate\":\"dnv.ethical_textiles.item.plant_string\",\"fallback\":\"Plant String\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.ethical_textiles:plant_string"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/armor_scale.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/armor_scale.json index 4796a9f..0af3176 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/armor_scale.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/armor_scale.json @@ -18,10 +18,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261022, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:armor_scale" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_feather.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_feather.json index c3bf5c5..a0e3f4f 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_feather.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_feather.json @@ -17,10 +17,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261010, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:faux_feather" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json index c8d1f05..5c448b4 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json @@ -17,10 +17,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261006, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:faux_leather" } }, "group": "dnv.ethical_textiles.faux_leather" diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json index 9ef9dc7..99e2e20 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json @@ -18,10 +18,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261006, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:faux_leather" } }, "group": "dnv.ethical_textiles.faux_leather" diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json index 780ed7b..4dd262e 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json @@ -16,10 +16,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261007, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:plant_string" } }, "group": "dnv.ethical_textiles.plant_string" diff --git a/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_vines.json b/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_vines.json index 434fa92..821f35f 100644 --- a/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_vines.json +++ b/vegancraft-DP/data/dnv.ethical_textiles/recipe/plant_string_vines.json @@ -16,10 +16,10 @@ "lore": [ "{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}" ], - "custom_model_data": 9261007, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.ethical_textiles:plant_string" } }, "group": "dnv.ethical_textiles.plant_string" diff --git a/vegancraft-DP/data/dnv.magnet_fishing/function/give/magnet_fishing_rod.mcfunction b/vegancraft-DP/data/dnv.magnet_fishing/function/give/magnet_fishing_rod.mcfunction index a7eca37..5d2de64 100644 --- a/vegancraft-DP/data/dnv.magnet_fishing/function/give/magnet_fishing_rod.mcfunction +++ b/vegancraft-DP/data/dnv.magnet_fishing/function/give/magnet_fishing_rod.mcfunction @@ -1 +1 @@ -give @s fishing_rod[item_name="{\"translate\":\"dnv.magnet_fishing.item.magnet_fishing_rod\",\"fallback\":\"Magnet Fishing Rod\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Magnet Fishing\",\"color\":\"aqua\",\"italic\":true}"],custom_model_data=9261009] \ No newline at end of file +give @s fishing_rod[item_name="{\"translate\":\"dnv.magnet_fishing.item.magnet_fishing_rod\",\"fallback\":\"Magnet Fishing Rod\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Magnet Fishing\",\"color\":\"aqua\",\"italic\":true}"],item_model="dnv.magnet_fishing:magnet_fishing_rod"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json b/vegancraft-DP/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json index 0affdf4..51c4b07 100644 --- a/vegancraft-DP/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json +++ b/vegancraft-DP/data/dnv.magnet_fishing/recipe/magnet_fishing_rod.json @@ -13,7 +13,7 @@ "lore": [ "{\"text\":\"Daenvil's Magnet Fishing\",\"color\":\"aqua\",\"italic\":true}" ], - "custom_model_data": 9261009 + "item_model": "dnv.magnet_fishing:magnet_fishing_rod" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.plant_wax/function/give/plant_wax.mcfunction b/vegancraft-DP/data/dnv.plant_wax/function/give/plant_wax.mcfunction index d6e2bd1..5ba9408 100644 --- a/vegancraft-DP/data/dnv.plant_wax/function/give/plant_wax.mcfunction +++ b/vegancraft-DP/data/dnv.plant_wax/function/give/plant_wax.mcfunction @@ -1 +1 @@ -give @s honeycomb[item_name="{\"translate\":\"dnv.plant_wax.item.plant_wax\",\"fallback\":\"Plant Wax\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}"],custom_model_data=9261008,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s honeycomb[item_name="{\"translate\":\"dnv.plant_wax.item.plant_wax\",\"fallback\":\"Plant Wax\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.plant_wax:plant_wax"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json b/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json index 8c55f1d..b2cfe4e 100644 --- a/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json +++ b/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_dead_bush.json @@ -11,10 +11,10 @@ "lore": [ "{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}" ], - "custom_model_data": 9261008, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.plant_wax:plant_wax" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json b/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json index ad6a4a6..527436a 100644 --- a/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json +++ b/vegancraft-DP/data/dnv.plant_wax/recipe/plant_wax_jungle_leaves.json @@ -11,10 +11,10 @@ "lore": [ "{\"text\":\"Daenvil's Plant Wax\",\"color\":\"#FAFAB0\",\"italic\":true}" ], - "custom_model_data": 9261008, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.plant_wax:plant_wax" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/notsalmon_fillet.json b/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/notsalmon_fillet.json index 817c09c..a174575 100644 --- a/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/notsalmon_fillet.json +++ b/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/notsalmon_fillet.json @@ -27,7 +27,7 @@ "recipe": "dnv.vegan_food:notsalmon_fillet" } }, - "has_honey_bottle": { + "has_vegan_honey": { "trigger": "inventory_changed", "conditions": { "items": [ @@ -62,7 +62,7 @@ "has_kelp", "has_item_tag_fishes", "has_the_recipe", - "has_honey_bottle", + "has_vegan_honey", "player_hurt_cod", "player_hurt_salmon" ] diff --git a/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/seitan_stew.json b/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/seitan_stew.json index 77f82d0..21ecb78 100644 --- a/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/seitan_stew.json +++ b/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/seitan_stew.json @@ -29,7 +29,7 @@ "recipe": "rabbit_stew_red_mushroom" } }, - "has_cooked_beef": { + "has_vegan_steak": { "trigger": "inventory_changed", "conditions": { "items": [ @@ -57,7 +57,7 @@ "has_the_recipe", "has_recipe_rabbit_stew_brown_mushroom", "has_recipe_rabbit_stew_red_mushroom", - "has_cooked_beef", + "has_vegan_steak", "player_hurt_rabbit" ] ], diff --git a/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/vegan_honey_bottle_flowers.json b/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/vegan_honey_bottle_flowers.json index 109692d..320de5f 100644 --- a/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/vegan_honey_bottle_flowers.json +++ b/vegancraft-DP/data/dnv.vegan_food/advancement/recipes/vegan_honey_bottle_flowers.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_item_tag_flowers": { + "has_item_tag_zz.dnv.core:flowers": { "trigger": "inventory_changed", "conditions": { "items": [ { - "items": "#flowers" + "items": "#zz.dnv.core:flowers" } ] } @@ -50,7 +50,7 @@ }, "requirements": [ [ - "has_item_tag_flowers", + "has_item_tag_zz.dnv.core:flowers", "has_honey_bottle", "has_honeycomb", "has_the_recipe", diff --git a/vegancraft-DP/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction b/vegancraft-DP/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction index 2ee5195..d3e56c0 100644 --- a/vegancraft-DP/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction +++ b/vegancraft-DP/data/dnv.vegan_food/function/give/notfish_fillet.mcfunction @@ -1 +1 @@ -give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:notfish_fillet"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction b/vegancraft-DP/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction index 0c32c39..a26046b 100644 --- a/vegancraft-DP/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction +++ b/vegancraft-DP/data/dnv.vegan_food/function/give/notsalmon_fillet.mcfunction @@ -1 +1 @@ -give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:notsalmon_fillet"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/function/give/plant_milk_bucket.mcfunction b/vegancraft-DP/data/dnv.vegan_food/function/give/plant_milk_bucket.mcfunction index e62f1e2..ef547a4 100644 --- a/vegancraft-DP/data/dnv.vegan_food/function/give/plant_milk_bucket.mcfunction +++ b/vegancraft-DP/data/dnv.vegan_food/function/give/plant_milk_bucket.mcfunction @@ -1 +1 @@ -give @s milk_bucket[item_name="{\"translate\":\"dnv.vegan_food.item.plant_milk_bucket\",\"fallback\":\"Plant Milk\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261001,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s milk_bucket[item_name="{\"translate\":\"dnv.vegan_food.item.plant_milk_bucket\",\"fallback\":\"Plant Milk\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:plant_milk_bucket"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/function/give/seitan_steak.mcfunction b/vegancraft-DP/data/dnv.vegan_food/function/give/seitan_steak.mcfunction index 56d7562..1a54bc7 100644 --- a/vegancraft-DP/data/dnv.vegan_food/function/give/seitan_steak.mcfunction +++ b/vegancraft-DP/data/dnv.vegan_food/function/give/seitan_steak.mcfunction @@ -1 +1 @@ -give @s cooked_beef[item_name="{\"translate\":\"dnv.vegan_food.item.seitan_steak\",\"fallback\":\"Seitan Steak\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261003,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s cooked_beef[item_name="{\"translate\":\"dnv.vegan_food.item.seitan_steak\",\"fallback\":\"Seitan Steak\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:seitan_steak"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/function/give/seitan_stew.mcfunction b/vegancraft-DP/data/dnv.vegan_food/function/give/seitan_stew.mcfunction index 1f8fad4..81817b9 100644 --- a/vegancraft-DP/data/dnv.vegan_food/function/give/seitan_stew.mcfunction +++ b/vegancraft-DP/data/dnv.vegan_food/function/give/seitan_stew.mcfunction @@ -1 +1 @@ -give @s rabbit_stew[item_name="{\"translate\":\"dnv.vegan_food.item.seitan_stew\",\"fallback\":\"Seitan Stew\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261025,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s rabbit_stew[item_name="{\"translate\":\"dnv.vegan_food.item.seitan_stew\",\"fallback\":\"Seitan Stew\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:seitan_stew"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/function/give/vegan_honey_bottle.mcfunction b/vegancraft-DP/data/dnv.vegan_food/function/give/vegan_honey_bottle.mcfunction index 29d01cd..852dc23 100644 --- a/vegancraft-DP/data/dnv.vegan_food/function/give/vegan_honey_bottle.mcfunction +++ b/vegancraft-DP/data/dnv.vegan_food/function/give/vegan_honey_bottle.mcfunction @@ -1 +1 @@ -give @s honey_bottle[item_name="{\"translate\":\"dnv.vegan_food.item.vegan_honey_bottle\",\"fallback\":\"Vegan Honey\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261002,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s honey_bottle[item_name="{\"translate\":\"dnv.vegan_food.item.vegan_honey_bottle\",\"fallback\":\"Vegan Honey\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:vegan_honey_bottle"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/function/give/veggie_burger.mcfunction b/vegancraft-DP/data/dnv.vegan_food/function/give/veggie_burger.mcfunction index 849700b..e8fc058 100644 --- a/vegancraft-DP/data/dnv.vegan_food/function/give/veggie_burger.mcfunction +++ b/vegancraft-DP/data/dnv.vegan_food/function/give/veggie_burger.mcfunction @@ -1 +1 @@ -give @s cooked_porkchop[item_name="{\"translate\":\"dnv.vegan_food.item.veggie_burger\",\"fallback\":\"Veggie Burger\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261024,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s cooked_porkchop[item_name="{\"translate\":\"dnv.vegan_food.item.veggie_burger\",\"fallback\":\"Veggie Burger\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegan_food:veggie_burger"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/notfish_fillet.json b/vegancraft-DP/data/dnv.vegan_food/recipe/notfish_fillet.json index ccde42d..e851471 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/notfish_fillet.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/notfish_fillet.json @@ -15,7 +15,6 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261004, "food": { "nutrition": 5, "saturation": 6 @@ -25,7 +24,8 @@ }, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:notfish_fillet" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/notsalmon_fillet.json b/vegancraft-DP/data/dnv.vegan_food/recipe/notsalmon_fillet.json index 932f2d5..ac61a6e 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/notsalmon_fillet.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/notsalmon_fillet.json @@ -13,7 +13,6 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261026, "food": { "nutrition": 6, "saturation": 9.6 @@ -23,7 +22,8 @@ }, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:notsalmon_fillet" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/plant_milk_bucket.json b/vegancraft-DP/data/dnv.vegan_food/recipe/plant_milk_bucket.json index 6c579f0..232c12d 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/plant_milk_bucket.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/plant_milk_bucket.json @@ -18,10 +18,10 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261001, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:plant_milk_bucket" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak.json b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak.json index cc90674..37d5fab 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak.json @@ -14,11 +14,11 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261003, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:seitan_steak" } }, - "group": "dnv.vegan_food.seitan_steak" + "group": "dnv.vegan_food.seitan" } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak_hay.json b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak_hay.json index 88254ca..0f0cdea 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak_hay.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_steak_hay.json @@ -13,11 +13,11 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261003, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:seitan_steak" } }, - "group": "dnv.vegan_food.seitan_steak" + "group": "dnv.vegan_food.seitan" } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_stew.json b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_stew.json index 5066f40..4ee457f 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_stew.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/seitan_stew.json @@ -15,10 +15,10 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261025, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:seitan_stew" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json index 6489da2..546d99a 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_apple.json @@ -17,11 +17,11 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261002, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:vegan_honey_bottle" } }, - "group": "dnv.vegan_food.vegan_honey_bottle" + "group": "dnv.vegan_food:honey" } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json index c4b79a5..0df1a7c 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/vegan_honey_bottle_flowers.json @@ -2,7 +2,7 @@ "type": "crafting_shaped", "category": "misc", "key": { - "F": "#flowers", + "F": "#zz.dnv.core:flowers", "W": "water_bucket", "G": "glass_bottle" }, @@ -18,11 +18,11 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261002, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:vegan_honey_bottle" } }, - "group": "dnv.vegan_food.vegan_honey_bottle" + "group": "dnv.vegan_food:honey" } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegan_food/recipe/veggie_burger.json b/vegancraft-DP/data/dnv.vegan_food/recipe/veggie_burger.json index 346065f..03f4585 100644 --- a/vegancraft-DP/data/dnv.vegan_food/recipe/veggie_burger.json +++ b/vegancraft-DP/data/dnv.vegan_food/recipe/veggie_burger.json @@ -13,10 +13,10 @@ "lore": [ "{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}" ], - "custom_model_data": 9261024, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegan_food:veggie_burger" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/acacia_gum.json b/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/acacia_gum.json index 934d0a1..991d2f6 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/acacia_gum.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/acacia_gum.json @@ -14,7 +14,7 @@ "icon": { "id": "slime_ball", "components": { - "custom_model_data": 9261005 + "item_model": "dnv.acacia_gum:acacia_gum_ball" } } }, diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/all_horns.json b/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/all_horns.json index dae40a1..185efdc 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/all_horns.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/all_horns.json @@ -14,7 +14,7 @@ "icon": { "id": "goat_horn", "components": { - "custom_model_data": 9261011 + "item_model": "dnv.vegancraft:copper_horn" } }, "frame": "challenge" diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/leather.json b/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/leather.json index bcebf45..8474394 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/leather.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/leather.json @@ -14,7 +14,7 @@ "icon": { "id": "leather", "components": { - "custom_model_data": 9261006 + "item_model": "dnv.ethical_textiles:faux_leather" } } }, diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/plant_wax.json b/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/plant_wax.json index 403c9ba..3104b09 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/plant_wax.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/crafting/plant_wax.json @@ -14,7 +14,7 @@ "icon": { "id": "honeycomb", "components": { - "custom_model_data": 9261008 + "item_model": "dnv.plant_wax:plant_wax" } } }, diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/food.json b/vegancraft-DP/data/dnv.vegancraft/advancement/food.json index 775bf3d..42c4a81 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/food.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/food.json @@ -14,7 +14,7 @@ "icon": { "id": "cooked_porkchop", "components": { - "custom_model_data": 9261024 + "item_model": "dnv.vegan_food:veggie_burger" } }, "show_toast": false, diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/food/hail_seitan.json b/vegancraft-DP/data/dnv.vegancraft/advancement/food/hail_seitan.json index 8b4e49f..3da799f 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/food/hail_seitan.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/food/hail_seitan.json @@ -14,7 +14,7 @@ "icon": { "id": "cooked_beef", "components": { - "custom_model_data": 9261003 + "item_model": "dnv.vegan_food:seitan_steak" } }, "frame": "challenge" diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/food/honey.json b/vegancraft-DP/data/dnv.vegancraft/advancement/food/honey.json index 644973e..dd18cc4 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/food/honey.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/food/honey.json @@ -14,7 +14,7 @@ "icon": { "id": "honey_bottle", "components": { - "custom_model_data": 9261002 + "item_model": "dnv.vegan_food:vegan_honey_bottle" } } }, diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/food/milk.json b/vegancraft-DP/data/dnv.vegancraft/advancement/food/milk.json index 942c322..79921bb 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/food/milk.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/food/milk.json @@ -14,7 +14,7 @@ "icon": { "id": "milk_bucket", "components": { - "custom_model_data": 9261001 + "item_model": "dnv.vegan_food:plant_milk_bucket" } } }, diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/magnet_fishing.json b/vegancraft-DP/data/dnv.vegancraft/advancement/magnet_fishing.json index 1d8c3a8..daf6c43 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/magnet_fishing.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/magnet_fishing.json @@ -15,7 +15,7 @@ "id": "fishing_rod", "components": { "damage": 0, - "custom_model_data": 9261009 + "item_model": "dnv.magnet_fishing:magnet_fishing_rod" } } }, @@ -32,7 +32,7 @@ }, "rod": { "components": { - "custom_model_data": 9261009 + "item_model": "dnv.magnet_fishing:magnet_fishing_rod" } } } diff --git a/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/white_dye_stonecutting.json b/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/white_dye_stonecutting.json index 74235d9..67539ca 100644 --- a/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/white_dye_stonecutting.json +++ b/vegancraft-DP/data/dnv.vegancraft/advancement/recipes/white_dye_stonecutting.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_item_tag_zz.dnv.core:birch_bark": { + "has_item_tag_dnv.vegancraft:white_dye_bark": { "trigger": "inventory_changed", "conditions": { "items": [ { - "items": "#zz.dnv.core:birch_bark" + "items": "#dnv.vegancraft:white_dye_bark" } ] } @@ -20,7 +20,7 @@ }, "requirements": [ [ - "has_item_tag_zz.dnv.core:birch_bark", + "has_item_tag_dnv.vegancraft:white_dye_bark", "has_the_recipe" ] ], diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/blazing_powder.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/blazing_powder.mcfunction index 5f47446..810073b 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/blazing_powder.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/blazing_powder.mcfunction @@ -1 +1 @@ -give @s blaze_powder[item_name="{\"translate\":\"dnv.vegancraft.item.blazing_powder\",\"fallback\":\"Blazing Powder\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261012,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s blaze_powder[item_name="{\"translate\":\"dnv.vegancraft.item.blazing_powder\",\"fallback\":\"Blazing Powder\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:blazing_powder"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/blazing_rod.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/blazing_rod.mcfunction index 053734c..c3b50b9 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/blazing_rod.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/blazing_rod.mcfunction @@ -1 +1 @@ -give @s blaze_rod[item_name="{\"translate\":\"dnv.vegancraft.item.blazing_rod\",\"fallback\":\"Blazing Rod\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261013,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s blaze_rod[item_name="{\"translate\":\"dnv.vegancraft.item.blazing_rod\",\"fallback\":\"Blazing Rod\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:blazing_rod"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/bouncy_boot.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/bouncy_boot.mcfunction index b256662..e4f45b2 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/bouncy_boot.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/bouncy_boot.mcfunction @@ -1 +1 @@ -give @s rabbit_foot[item_name="{\"translate\":\"dnv.vegancraft.item.bouncy_boot\",\"fallback\":\"Bouncy Boot\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.bouncy_boot.lore\",\"fallback\":\"(Use as rabbit's foot)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261018,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s rabbit_foot[item_name="{\"translate\":\"dnv.vegancraft.item.bouncy_boot\",\"fallback\":\"Bouncy Boot\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.bouncy_boot.lore\",\"fallback\":\"(Use as rabbit's foot)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:bouncy_boot"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/breezy_rod.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/breezy_rod.mcfunction index d6f8904..2b59d0e 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/breezy_rod.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/breezy_rod.mcfunction @@ -1 +1 @@ -give @s breeze_rod[item_name="{\"translate\":\"dnv.vegancraft.item.breezy_rod\",\"fallback\":\"Breezy Rod\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261027,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s breeze_rod[item_name="{\"translate\":\"dnv.vegancraft.item.breezy_rod\",\"fallback\":\"Breezy Rod\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:breezy_rod"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_admire.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_admire.mcfunction index c1e69e3..c9a5869 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_admire.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_admire.mcfunction @@ -1 +1 @@ -give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="admire_goat_horn",custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="admire_goat_horn",custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:copper_horn"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_call.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_call.mcfunction index ebe2262..04803a5 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_call.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_call.mcfunction @@ -1 +1 @@ -give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="call_goat_horn",custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="call_goat_horn",custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:copper_horn"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_dream.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_dream.mcfunction index f1332fe..d6e7405 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_dream.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_dream.mcfunction @@ -1 +1 @@ -give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="dream_goat_horn",custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="dream_goat_horn",custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:copper_horn"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_feel.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_feel.mcfunction index f608bda..52830d4 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_feel.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_feel.mcfunction @@ -1 +1 @@ -give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="feel_goat_horn",custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="feel_goat_horn",custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:copper_horn"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_ponder.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_ponder.mcfunction index 1476c7a..f125676 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_ponder.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_ponder.mcfunction @@ -1 +1 @@ -give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="ponder_goat_horn",custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="ponder_goat_horn",custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:copper_horn"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_seek.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_seek.mcfunction index e82bc66..47bea74 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_seek.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_seek.mcfunction @@ -1 +1 @@ -give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="seek_goat_horn",custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="seek_goat_horn",custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:copper_horn"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_sing.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_sing.mcfunction index 39857ad..92a9982 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_sing.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_sing.mcfunction @@ -1 +1 @@ -give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="sing_goat_horn",custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="sing_goat_horn",custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:copper_horn"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_yearn.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_yearn.mcfunction index 75a2bfd..ba8f03c 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_yearn.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/copper_horn_yearn.mcfunction @@ -1 +1 @@ -give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="yearn_goat_horn",custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="yearn_goat_horn",custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:copper_horn"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/end_mist.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/end_mist.mcfunction index 707d097..7e700f3 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/end_mist.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/end_mist.mcfunction @@ -1 +1 @@ -give @s dragon_breath[item_name="{\"translate\":\"dnv.vegancraft.item.end_mist\",\"fallback\":\"End's Mist\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.end_mist.lore\",\"fallback\":\"(Use as dragon's breath)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261017,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s dragon_breath[item_name="{\"translate\":\"dnv.vegancraft.item.end_mist\",\"fallback\":\"End's Mist\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.end_mist.lore\",\"fallback\":\"(Use as dragon's breath)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:end_mist"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/feathery_membrane.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/feathery_membrane.mcfunction index 874ff07..fdbd337 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/feathery_membrane.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/feathery_membrane.mcfunction @@ -1 +1 @@ -give @s phantom_membrane[item_name="{\"translate\":\"dnv.vegancraft.item.feathery_membrane\",\"fallback\":\"Feathery Membrane\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.feathery_membrane.lore\",\"fallback\":\"(Use as phantom membrane)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261021,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s phantom_membrane[item_name="{\"translate\":\"dnv.vegancraft.item.feathery_membrane\",\"fallback\":\"Feathery Membrane\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.feathery_membrane.lore\",\"fallback\":\"(Use as phantom membrane)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:feathery_membrane"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/fermented_sprout.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/fermented_sprout.mcfunction index 521e0b8..d0ea6e2 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/fermented_sprout.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/fermented_sprout.mcfunction @@ -1 +1 @@ -give @s fermented_spider_eye[item_name="{\"translate\":\"dnv.vegancraft.item.fermented_sprout\",\"fallback\":\"Fermented Sprout\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.item.fermented_sprout.lore\",\"fallback\":\"(Use as fermented spider eye)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261015,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s fermented_spider_eye[item_name="{\"translate\":\"dnv.vegancraft.item.fermented_sprout\",\"fallback\":\"Fermented Sprout\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.item.fermented_sprout.lore\",\"fallback\":\"(Use as fermented spider eye)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:fermented_sprout"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/hardened_seagrass.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/hardened_seagrass.mcfunction index 7764a3b..4f13acf 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/hardened_seagrass.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/hardened_seagrass.mcfunction @@ -1 +1 @@ -give @s turtle_scute[item_name="{\"translate\":\"dnv.vegancraft.item.hardened_seagrass\",\"fallback\":\"Hardened Seagrass\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.hardened_seagrass.lore\",\"fallback\":\"(Use as turtle scute)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261016,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s turtle_scute[item_name="{\"translate\":\"dnv.vegancraft.item.hardened_seagrass\",\"fallback\":\"Hardened Seagrass\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.hardened_seagrass.lore\",\"fallback\":\"(Use as turtle scute)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:hardened_seagrass"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/pitcher_fluid.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/pitcher_fluid.mcfunction index 6797695..de71646 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/pitcher_fluid.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/pitcher_fluid.mcfunction @@ -1 +1 @@ -give @s ghast_tear[item_name="{\"translate\":\"dnv.vegancraft.item.pitcher_fluid\",\"fallback\":\"Pitcher Fluid\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.item.pitcher_fluid.lore\",\"fallback\":\"(Use as ghast tear)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261023,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s ghast_tear[item_name="{\"translate\":\"dnv.vegancraft.item.pitcher_fluid\",\"fallback\":\"Pitcher Fluid\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.item.pitcher_fluid.lore\",\"fallback\":\"(Use as ghast tear)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:pitcher_fluid"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/poisonous_sprout.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/poisonous_sprout.mcfunction index 0eb6da0..764edd6 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/poisonous_sprout.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/poisonous_sprout.mcfunction @@ -1 +1 @@ -give @s spider_eye[item_name="{\"translate\":\"dnv.vegancraft.item.poisonous_sprout\",\"fallback\":\"Poisonous Sprout\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.poisonous_sprout.lore\",\"fallback\":\"(Use as spider eye)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261014,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s spider_eye[item_name="{\"translate\":\"dnv.vegancraft.item.poisonous_sprout\",\"fallback\":\"Poisonous Sprout\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.poisonous_sprout.lore\",\"fallback\":\"(Use as spider eye)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:poisonous_sprout"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/puffer_bubble.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/puffer_bubble.mcfunction index 59dbe99..85a818c 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/puffer_bubble.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/puffer_bubble.mcfunction @@ -1 +1 @@ -give @s pufferfish[item_name="{\"translate\":\"dnv.vegancraft.item.puffer_bubble\",\"fallback\":\"Puffer Bubble\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.puffer_bubble.lore\",\"fallback\":\"(Use as pufferfish)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261020,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s pufferfish[item_name="{\"translate\":\"dnv.vegancraft.item.puffer_bubble\",\"fallback\":\"Puffer Bubble\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.puffer_bubble.lore\",\"fallback\":\"(Use as pufferfish)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:puffer_bubble"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/function/give/writable_book_pencil.mcfunction b/vegancraft-DP/data/dnv.vegancraft/function/give/writable_book_pencil.mcfunction index 4a7cdbd..59fedd7 100644 --- a/vegancraft-DP/data/dnv.vegancraft/function/give/writable_book_pencil.mcfunction +++ b/vegancraft-DP/data/dnv.vegancraft/function/give/writable_book_pencil.mcfunction @@ -1 +1 @@ -give @s writable_book[item_name="{\"translate\":\"dnv.vegancraft.item.writable_book_pencil\",\"fallback\":\"Book and Pencil\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261028,custom_data={"dnv.vegan":true}] \ No newline at end of file +give @s writable_book[item_name="{\"translate\":\"dnv.vegancraft.item.writable_book_pencil\",\"fallback\":\"Book and Pencil\",\"italic\":false}",lore=["{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:writable_book_pencil"] \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_powder.json b/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_powder.json index 4691aff..f72b622 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_powder.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_powder.json @@ -16,10 +16,10 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261012, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:blazing_powder" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_rod.json b/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_rod.json index 30f7c2d..2c4c8a6 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_rod.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/blazing_rod.json @@ -13,10 +13,10 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261013, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:blazing_rod" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/bouncy_boot.json b/vegancraft-DP/data/dnv.vegancraft/recipe/bouncy_boot.json index 1d809eb..0bbf6fb 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/bouncy_boot.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/bouncy_boot.json @@ -18,10 +18,10 @@ "{\"translate\":\"dnv.vegancraft.bouncy_boot.lore\",\"fallback\":\"(Use as rabbit's foot)\",\"italic\":false}", "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261018, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:bouncy_boot" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/breezy_rod.json b/vegancraft-DP/data/dnv.vegancraft/recipe/breezy_rod.json index cb8b61c..05d22d8 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/breezy_rod.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/breezy_rod.json @@ -12,10 +12,10 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261027, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:breezy_rod" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn.json index fc16d19..e649e27 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn.json @@ -17,11 +17,11 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261011, "instrument": "ponder_goat_horn", "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:copper_horn" } }, "group": "dnv.vegancraft.copper_horns" diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_admire.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_admire.json index 8eef048..ba80813 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_admire.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_admire.json @@ -10,11 +10,11 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261011, "instrument": "admire_goat_horn", "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:copper_horn" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_call.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_call.json index 02ad532..d1c1d27 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_call.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_call.json @@ -10,11 +10,11 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261011, "instrument": "call_goat_horn", "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:copper_horn" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_dream.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_dream.json index 0537ec4..f4f20f1 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_dream.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_dream.json @@ -10,11 +10,11 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261011, "instrument": "dream_goat_horn", "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:copper_horn" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_feel.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_feel.json index f2e7afa..edfdb58 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_feel.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_feel.json @@ -10,11 +10,11 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261011, "instrument": "feel_goat_horn", "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:copper_horn" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_ponder.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_ponder.json index 80d5aa1..d9649c9 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_ponder.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_ponder.json @@ -10,11 +10,11 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261011, "instrument": "ponder_goat_horn", "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:copper_horn" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_seek.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_seek.json index e1cb64b..2631c79 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_seek.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_seek.json @@ -10,11 +10,11 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261011, "instrument": "seek_goat_horn", "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:copper_horn" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_sing.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_sing.json index 880f656..9975600 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_sing.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_sing.json @@ -10,11 +10,11 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261011, "instrument": "sing_goat_horn", "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:copper_horn" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_yearn.json b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_yearn.json index 1e983b0..d784da6 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_yearn.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/copper_horn_yearn.json @@ -10,11 +10,11 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261011, "instrument": "yearn_goat_horn", "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:copper_horn" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/end_mist.json b/vegancraft-DP/data/dnv.vegancraft/recipe/end_mist.json index 0a108f6..45a19d1 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/end_mist.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/end_mist.json @@ -14,10 +14,10 @@ "{\"translate\":\"dnv.vegancraft.end_mist.lore\",\"fallback\":\"(Use as dragon's breath)\",\"italic\":false}", "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261017, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:end_mist" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/feathery_membrane.json b/vegancraft-DP/data/dnv.vegancraft/recipe/feathery_membrane.json index 2de6132..4033704 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/feathery_membrane.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/feathery_membrane.json @@ -15,10 +15,10 @@ "{\"translate\":\"dnv.vegancraft.feathery_membrane.lore\",\"fallback\":\"(Use as phantom membrane)\",\"italic\":false}", "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261021, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:feathery_membrane" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/hardened_seagrass.json b/vegancraft-DP/data/dnv.vegancraft/recipe/hardened_seagrass.json index 69d3eeb..e03fd12 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/hardened_seagrass.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/hardened_seagrass.json @@ -13,10 +13,10 @@ "{\"translate\":\"dnv.vegancraft.hardened_seagrass.lore\",\"fallback\":\"(Use as turtle scute)\",\"italic\":false}", "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261016, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:hardened_seagrass" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/poisonous_sprout.json b/vegancraft-DP/data/dnv.vegancraft/recipe/poisonous_sprout.json index ad056ab..571f125 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/poisonous_sprout.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/poisonous_sprout.json @@ -13,10 +13,10 @@ "{\"translate\":\"dnv.vegancraft.poisonous_sprout.lore\",\"fallback\":\"(Use as spider eye)\",\"italic\":false}", "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261014, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:poisonous_sprout" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/puffer_bubble.json b/vegancraft-DP/data/dnv.vegancraft/recipe/puffer_bubble.json index a8578b1..b7ed7e6 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/puffer_bubble.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/puffer_bubble.json @@ -13,10 +13,10 @@ "{\"translate\":\"dnv.vegancraft.puffer_bubble.lore\",\"fallback\":\"(Use as pufferfish)\",\"italic\":false}", "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261020, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:puffer_bubble" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/white_dye_stonecutting.json b/vegancraft-DP/data/dnv.vegancraft/recipe/white_dye_stonecutting.json index e6b3371..7bc84c3 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/white_dye_stonecutting.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/white_dye_stonecutting.json @@ -1,6 +1,6 @@ { "type": "stonecutting", - "ingredient": "#zz.dnv.core:birch_bark", + "ingredient": "#dnv.vegancraft:white_dye_bark", "result": { "id": "white_dye", "count": 4 diff --git a/vegancraft-DP/data/dnv.vegancraft/recipe/writable_book_pencil.json b/vegancraft-DP/data/dnv.vegancraft/recipe/writable_book_pencil.json index 12684a6..9fca2d3 100644 --- a/vegancraft-DP/data/dnv.vegancraft/recipe/writable_book_pencil.json +++ b/vegancraft-DP/data/dnv.vegancraft/recipe/writable_book_pencil.json @@ -13,10 +13,10 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261028, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:writable_book_pencil" } } } \ No newline at end of file diff --git a/vegancraft-DP/data/dnv.vegancraft/tags/item/white_dye_bark.json b/vegancraft-DP/data/dnv.vegancraft/tags/item/white_dye_bark.json new file mode 100644 index 0000000..b1111cb --- /dev/null +++ b/vegancraft-DP/data/dnv.vegancraft/tags/item/white_dye_bark.json @@ -0,0 +1,7 @@ +{ + "values": [ + "birch_log", + "birch_wood", + "#pale_oak_logs" + ] +} \ No newline at end of file diff --git a/vegancraft-DP/data/global/advancement/dnv.acacia_gum.json b/vegancraft-DP/data/global/advancement/dnv.acacia_gum.json index af514f7..130ccf0 100644 --- a/vegancraft-DP/data/global/advancement/dnv.acacia_gum.json +++ b/vegancraft-DP/data/global/advancement/dnv.acacia_gum.json @@ -6,13 +6,13 @@ "italic": false }, "description": { - "text": "Daenvil's Acacia Gum 1.2.2 (for MC1.21.2+)", + "text": "Daenvil's Acacia Gum 1.3 (for MC1.21.4+)", "italic": false }, "icon": { "id": "slime_ball", "components": { - "custom_model_data": 9261005 + "item_model": "dnv.acacia_gum:acacia_gum_ball" } }, "show_toast": false, diff --git a/vegancraft-DP/data/global/advancement/dnv.ethical_textiles.json b/vegancraft-DP/data/global/advancement/dnv.ethical_textiles.json index af50d46..635c3fd 100644 --- a/vegancraft-DP/data/global/advancement/dnv.ethical_textiles.json +++ b/vegancraft-DP/data/global/advancement/dnv.ethical_textiles.json @@ -6,13 +6,13 @@ "italic": false }, "description": { - "text": "Daenvil's Ethical Textiles 2.0.3 (for MC1.21.2+)", + "text": "Daenvil's Ethical Textiles 2.1 (for MC1.21.4+)", "italic": false }, "icon": { "id": "string", "components": { - "custom_model_data": 9261007 + "item_model": "dnv.ethical_textiles:plant_string" } }, "show_toast": false, diff --git a/vegancraft-DP/data/global/advancement/dnv.magnet_fishing.json b/vegancraft-DP/data/global/advancement/dnv.magnet_fishing.json index 68cd411..ac21f6c 100644 --- a/vegancraft-DP/data/global/advancement/dnv.magnet_fishing.json +++ b/vegancraft-DP/data/global/advancement/dnv.magnet_fishing.json @@ -6,13 +6,13 @@ "italic": false }, "description": { - "text": "Daenvil's Magnet Fishing 2.0.2 (for MC1.21.2+)", + "text": "Daenvil's Magnet Fishing 2.1 (for MC1.21.4+)", "italic": false }, "icon": { "id": "fishing_rod", "components": { - "custom_model_data": 9261009 + "item_model": "dnv.magnet_fishing:magnet_fishing_rod" } }, "show_toast": false, diff --git a/vegancraft-DP/data/global/advancement/dnv.plant_wax.json b/vegancraft-DP/data/global/advancement/dnv.plant_wax.json index f1f683c..933769c 100644 --- a/vegancraft-DP/data/global/advancement/dnv.plant_wax.json +++ b/vegancraft-DP/data/global/advancement/dnv.plant_wax.json @@ -6,13 +6,13 @@ "italic": false }, "description": { - "text": "Daenvil's Plant Wax 2.0.2 (for MC1.21.2+)", + "text": "Daenvil's Plant Wax 2.1 (for MC1.21.4+)", "italic": false }, "icon": { "id": "honeycomb", "components": { - "custom_model_data": 9261008 + "item_model": "dnv.plant_wax:plant_wax" } }, "show_toast": false, diff --git a/vegancraft-DP/data/global/advancement/dnv.vegan_food.json b/vegancraft-DP/data/global/advancement/dnv.vegan_food.json index c647de2..9087b55 100644 --- a/vegancraft-DP/data/global/advancement/dnv.vegan_food.json +++ b/vegancraft-DP/data/global/advancement/dnv.vegan_food.json @@ -6,13 +6,13 @@ "italic": false }, "description": { - "text": "Daenvil's Plant-based Foods 2.0.2 (for MC1.21.2+)", + "text": "Daenvil's Plant-based Foods 2.1 (for MC1.21.4+)", "italic": false }, "icon": { "id": "cooked_porkchop", "components": { - "custom_model_data": 9261024 + "item_model": "dnv.vegan_food:veggie_burger" } }, "show_toast": false, diff --git a/vegancraft-DP/data/global/advancement/dnv.vegancraft.json b/vegancraft-DP/data/global/advancement/dnv.vegancraft.json index 680c287..96d0aa4 100644 --- a/vegancraft-DP/data/global/advancement/dnv.vegancraft.json +++ b/vegancraft-DP/data/global/advancement/dnv.vegancraft.json @@ -6,7 +6,7 @@ "italic": false }, "description": { - "text": "Daenvil's Vegancraft 1.2.2 (for MC1.21.2+)", + "text": "Daenvil's Vegancraft 1.3 (for MC1.21.4+)", "italic": false }, "icon": { diff --git a/vegancraft-DP/data/minecraft/loot_table/blocks/pale_oak_leaves.json b/vegancraft-DP/data/minecraft/loot_table/blocks/pale_oak_leaves.json new file mode 100644 index 0000000..2b0426a --- /dev/null +++ b/vegancraft-DP/data/minecraft/loot_table/blocks/pale_oak_leaves.json @@ -0,0 +1,202 @@ +{ + "type": "block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "alternatives", + "children": [ + { + "type": "item", + "conditions": [ + { + "condition": "any_of", + "terms": [ + { + "condition": "match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "weight": 1, + "name": "minecraft:pale_oak_leaves" + }, + { + "type": "item", + "conditions": [ + { + "condition": "survives_explosion" + }, + { + "condition": "table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.05, + 0.0625, + 0.083333336, + 0.1 + ] + } + ], + "weight": 1, + "name": "minecraft:pale_oak_sapling" + } + ] + } + ] + }, + { + "conditions": [ + { + "condition": "inverted", + "term": { + "condition": "any_of", + "terms": [ + { + "condition": "match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "rolls": 1, + "entries": [ + { + "type": "item", + "conditions": [ + { + "condition": "table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ] + } + ], + "weight": 1, + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2, + "min": 1 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "item", + "conditions": [ + { + "condition": "entity_properties", + "entity": "this", + "predicate": { + + } + }, + { + "condition": "entity_scores", + "entity": "this", + "scores": { + "dnv.xp_nerfer": { + "min": 0, + "max": { + "min": 200, + "max": 500 + } + } + } + }, + { + "condition": "value_check", + "value": { + "type": "score", + "target": { + "type": "fixed", + "name": "#dnv" + }, + "score": "dnv.xp_from_crops_disabled" + }, + "range": 0 + }, + { + "condition": "random_chance", + "chance": 0.2 + }, + { + "condition": "block_state_property", + "block": "pale_oak_leaves", + "properties": { + "persistent": "false" + } + } + ], + "weight": 1, + "functions": [ + { + "function": "minecraft:set_components", + "components": { + "custom_data": { + "dnv.xp_orb": true + } + } + } + ], + "name": "emerald" + } + ] + } + ], + "random_sequence": "minecraft:blocks/pale_oak_leaves" +} \ No newline at end of file diff --git a/vegancraft-DP/data/minecraft/loot_table/blocks/pitcher_crop.json b/vegancraft-DP/data/minecraft/loot_table/blocks/pitcher_crop.json index f89e86b..d7d4553 100644 --- a/vegancraft-DP/data/minecraft/loot_table/blocks/pitcher_crop.json +++ b/vegancraft-DP/data/minecraft/loot_table/blocks/pitcher_crop.json @@ -297,10 +297,10 @@ "{\"translate\":\"dnv.vegancraft.item.pitcher_fluid.lore\",\"fallback\":\"(Use as ghast tear)\",\"italic\":false}", "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261023, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:pitcher_fluid" } }, { diff --git a/vegancraft-DP/data/minecraft/loot_table/blocks/pitcher_plant.json b/vegancraft-DP/data/minecraft/loot_table/blocks/pitcher_plant.json index c27ea27..dda6854 100644 --- a/vegancraft-DP/data/minecraft/loot_table/blocks/pitcher_plant.json +++ b/vegancraft-DP/data/minecraft/loot_table/blocks/pitcher_plant.json @@ -168,10 +168,10 @@ "{\"translate\":\"dnv.vegancraft.item.pitcher_fluid.lore\",\"fallback\":\"(Use as ghast tear)\",\"italic\":false}", "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261023, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:pitcher_fluid" } }, { diff --git a/vegancraft-DP/data/minecraft/loot_table/blocks/torchflower.json b/vegancraft-DP/data/minecraft/loot_table/blocks/torchflower.json index ba0405a..5c2177b 100644 --- a/vegancraft-DP/data/minecraft/loot_table/blocks/torchflower.json +++ b/vegancraft-DP/data/minecraft/loot_table/blocks/torchflower.json @@ -146,10 +146,10 @@ "lore": [ "{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}" ], - "custom_model_data": 9261012, "custom_data": { "dnv.vegan": true - } + }, + "item_model": "dnv.vegancraft:blazing_powder" } }, { diff --git a/vegancraft-DP/data/minecraft/loot_table/gameplay/fishing.json b/vegancraft-DP/data/minecraft/loot_table/gameplay/fishing.json index b714e53..8f2ca18 100644 --- a/vegancraft-DP/data/minecraft/loot_table/gameplay/fishing.json +++ b/vegancraft-DP/data/minecraft/loot_table/gameplay/fishing.json @@ -6,12 +6,29 @@ { "condition": "inverted", "term": { - "condition": "match_tool", - "predicate": { - "components": { - "custom_model_data": 9261009 + "condition": "any_of", + "terms": [ + { + "condition": "match_tool", + "predicate": { + "components": { + "custom_model_data": { + "floats": [ + 9261009 + ] + } + } + } + }, + { + "condition": "match_tool", + "predicate": { + "components": { + "item_model": "dnv.magnet_fishing:magnet_fishing_rod" + } + } } - } + ] } } ], @@ -50,12 +67,29 @@ { "conditions": [ { - "condition": "match_tool", - "predicate": { - "components": { - "custom_model_data": 9261009 + "condition": "any_of", + "terms": [ + { + "condition": "match_tool", + "predicate": { + "components": { + "custom_model_data": { + "floats": [ + 9261009 + ] + } + } + } + }, + { + "condition": "match_tool", + "predicate": { + "components": { + "item_model": "dnv.magnet_fishing:magnet_fishing_rod" + } + } } - } + ] } ], "rolls": 1, diff --git a/vegancraft-DP/data/zz.dnv.core/tags/item/birch_bark.json b/vegancraft-DP/data/zz.dnv.core/tags/item/birch_bark.json deleted file mode 100644 index 2eeec70..0000000 --- a/vegancraft-DP/data/zz.dnv.core/tags/item/birch_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "birch_log", - "birch_wood" - ] -} \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.core/tags/item/flowers.json b/vegancraft-DP/data/zz.dnv.core/tags/item/flowers.json new file mode 100644 index 0000000..3786d78 --- /dev/null +++ b/vegancraft-DP/data/zz.dnv.core/tags/item/flowers.json @@ -0,0 +1,17 @@ +{ + "values": [ + "#small_flowers", + "flowering_azalea_leaves", + "flowering_azalea", + "mangrove_propagule", + "cherry_leaves", + "pink_petals", + "chorus_flower", + "spore_blossom", + "sunflower", + "lilac", + "peony", + "rose_bush", + "pitcher_plant" + ] +} \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_delayed_player.mcfunction index 982acb5..d79ee76 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_admire 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"admire_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"instrument":"admire_goat_horn","item_model":"dnv.vegancraft:copper_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_admire 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count copper_horn_admire.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_admire diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_replace_output.mcfunction index 9444914..f2519c7 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_admire_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="admire_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="admire_goat_horn",custom_data={"dnv.vegan":false},item_model="dnv.vegancraft:copper_horn"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_delayed_player.mcfunction index 6b6e365..e11ecca 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_call 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"call_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"instrument":"call_goat_horn","item_model":"dnv.vegancraft:copper_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_call 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count copper_horn_call.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_call diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_replace_output.mcfunction index 6995e16..5b928f7 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_call_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="call_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="call_goat_horn",custom_data={"dnv.vegan":false},item_model="dnv.vegancraft:copper_horn"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_delayed_player.mcfunction index a6e9a39..c580162 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"ponder_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"instrument":"ponder_goat_horn","item_model":"dnv.vegancraft:copper_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count copper_horn.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_delayed_player.mcfunction index c81a171..0c5130a 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_dream 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"dream_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"instrument":"dream_goat_horn","item_model":"dnv.vegancraft:copper_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_dream 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count copper_horn_dream.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_dream diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_replace_output.mcfunction index 3a3eda7..6bd2867 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_dream_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="dream_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="dream_goat_horn",custom_data={"dnv.vegan":false},item_model="dnv.vegancraft:copper_horn"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_delayed_player.mcfunction index 0aff6f5..4fbb756 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_feel 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"feel_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"instrument":"feel_goat_horn","item_model":"dnv.vegancraft:copper_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_feel 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count copper_horn_feel.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_feel diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_replace_output.mcfunction index 9ad4051..aff37dd 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_feel_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="feel_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="feel_goat_horn",custom_data={"dnv.vegan":false},item_model="dnv.vegancraft:copper_horn"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_delayed_player.mcfunction index 4308e69..fd0bd2c 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_ponder 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"ponder_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"instrument":"ponder_goat_horn","item_model":"dnv.vegancraft:copper_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_ponder 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count copper_horn_ponder.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_ponder diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_replace_output.mcfunction index b396363..de8a286 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_ponder_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="ponder_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="ponder_goat_horn",custom_data={"dnv.vegan":false},item_model="dnv.vegancraft:copper_horn"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_replace_output.mcfunction index b396363..de8a286 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="ponder_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="ponder_goat_horn",custom_data={"dnv.vegan":false},item_model="dnv.vegancraft:copper_horn"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_delayed_player.mcfunction index 1c3dfd4..747d641 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_seek 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"seek_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"instrument":"seek_goat_horn","item_model":"dnv.vegancraft:copper_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_seek 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count copper_horn_seek.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_seek diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_replace_output.mcfunction index 647b918..1d8920c 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_seek_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="seek_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="seek_goat_horn",custom_data={"dnv.vegan":false},item_model="dnv.vegancraft:copper_horn"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_delayed_player.mcfunction index 8afc81f..2fd3847 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_sing 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"sing_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"instrument":"sing_goat_horn","item_model":"dnv.vegancraft:copper_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_sing 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count copper_horn_sing.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_sing diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_replace_output.mcfunction index 019e839..e1fcc3c 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_sing_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="sing_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="sing_goat_horn",custom_data={"dnv.vegan":false},item_model="dnv.vegancraft:copper_horn"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_delayed_player.mcfunction index 504a8c9..e856513 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_copper_horn_yearn 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor goat_horn run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261011,"instrument":"yearn_goat_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"instrument":"yearn_goat_horn","item_model":"dnv.vegancraft:copper_horn","item_name":"{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_copper_horn_yearn 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count copper_horn_yearn.count int 1 run scoreboard players get @s dnv.count.crafted_copper_horn_yearn diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_replace_output.mcfunction index d2f501d..3989132 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_copper_horn_yearn_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s goat_horn[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261011,instrument="yearn_goat_horn",custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s goat_horn[item_name="{\"translate\":\"dnv.vegancraft.item.copper_horn\",\"fallback\":\"Copper Horn\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],instrument="yearn_goat_horn",custom_data={"dnv.vegan":false},item_model="dnv.vegancraft:copper_horn"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction index c0e8518..df2504c 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor leather run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261006,"item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"item_model":"dnv.ethical_textiles:faux_leather","item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count faux_leather_3to1.count int 1 run scoreboard players get @s dnv.count.crafted_faux_leather_3to1 diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction index 4d84dd5..66f4e76 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":false},item_model="dnv.ethical_textiles:faux_leather"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction index 3a5cf76..5280cc0 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor leather run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261006,"item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"item_model":"dnv.ethical_textiles:faux_leather","item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count faux_leather_6to1.count int 1 run scoreboard players get @s dnv.count.crafted_faux_leather_6to1 diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction index 4d84dd5..66f4e76 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":false},item_model="dnv.ethical_textiles:faux_leather"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_fermented_sprout.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_fermented_sprout.mcfunction index abbf3a7..39152ca 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_fermented_sprout.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_fermented_sprout.mcfunction @@ -1,7 +1,7 @@ advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_fermented_sprout scoreboard players set @s dnv.success 0 execute if items entity @s player.cursor fermented_spider_eye run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":true},"custom_model_data":9261015,"item_name":"{\"translate\":\"dnv.vegancraft.item.fermented_sprout\",\"fallback\":\"Fermented Sprout\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.item.fermented_sprout.lore\",\"fallback\":\"(Use as fermented spider eye)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":true},"item_model":"dnv.vegancraft:fermented_sprout","item_name":"{\"translate\":\"dnv.vegancraft.item.fermented_sprout\",\"fallback\":\"Fermented Sprout\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.item.fermented_sprout.lore\",\"fallback\":\"(Use as fermented spider eye)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run return 0 execute store success score @s dnv.success run clear @s fermented_spider_eye[!custom_data~{dnv.vegan:true}] 1 -execute unless score @s dnv.success matches 0 run give @s fermented_spider_eye[item_name="{\"translate\":\"dnv.vegancraft.item.fermented_sprout\",\"fallback\":\"Fermented Sprout\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.item.fermented_sprout.lore\",\"fallback\":\"(Use as fermented spider eye)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_model_data=9261015,custom_data={"dnv.vegan":true}] \ No newline at end of file +execute unless score @s dnv.success matches 0 run give @s fermented_spider_eye[item_name="{\"translate\":\"dnv.vegancraft.item.fermented_sprout\",\"fallback\":\"Fermented Sprout\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.item.fermented_sprout.lore\",\"fallback\":\"(Use as fermented spider eye)\",\"italic\":false}","{\"text\":\"Daenvil's Vegancraft\",\"color\":\"green\",\"italic\":true}"],custom_data={"dnv.vegan":true},item_model="dnv.vegancraft:fermented_sprout"] \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction index 8bdb093..ab774c4 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_notfish_fillet 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor cod run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"custom_model_data":9261004,"food":{"nutrition":5,"saturation":6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"food":{"nutrition":5,"saturation":6},"item_model":"dnv.vegan_food:notfish_fillet","item_name":"{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_notfish_fillet 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count notfish_fillet.count int 1 run scoreboard players get @s dnv.count.crafted_notfish_fillet diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction index f37e688..69c1be9 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notfish_fillet_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s cod[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261004,food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s cod[item_name="{\"translate\":\"dnv.vegan_food.item.notfish_fillet\",\"fallback\":\"Not-fish Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],food={"nutrition":5,"saturation":6},consumable={},custom_data={"dnv.vegan":false},item_model="dnv.vegan_food:notfish_fillet"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction index 1b34443..5d58f1e 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_notsalmon_fillet 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor salmon run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"custom_model_data":9261026,"food":{"nutrition":6,"saturation":9.6},"item_name":"{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"consumable":{},"custom_data":{"dnv.vegan":false},"food":{"nutrition":6,"saturation":9.6},"item_model":"dnv.vegan_food:notsalmon_fillet","item_name":"{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_notsalmon_fillet 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count notsalmon_fillet.count int 1 run scoreboard players get @s dnv.count.crafted_notsalmon_fillet diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction index a0018e7..7cff6c6 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_notsalmon_fillet_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s salmon[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_model_data=9261026,food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s salmon[item_name="{\"translate\":\"dnv.vegan_food.item.notsalmon_fillet\",\"fallback\":\"Not-salmon Fillet\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],food={"nutrition":6,"saturation":9.6},consumable={},custom_data={"dnv.vegan":false},item_model="dnv.vegan_food:notsalmon_fillet"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction index 1bfa2b3..7ca8a51 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_delayed_player.mcfunction @@ -3,7 +3,7 @@ execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_seitan_stew 0 execute if score @s dnv.success matches 1 run return 0 execute if items entity @s player.cursor rabbit_stew run scoreboard players set @s dnv.success 1 -execute unless score @s dnv.success matches 0 run item replace entity @s player.cursor with suspicious_stew[custom_data={ "dnv.vegan": false }] 1 +execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"item_model":"dnv.vegan_food:seitan_stew","item_name":"{\"translate\":\"dnv.vegan_food.item.seitan_stew\",\"fallback\":\"Seitan Stew\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"]}} execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_seitan_stew 0 execute unless score @s dnv.success matches 0 run return 0 execute store result storage dnv.vegancraft:craft_count seitan_stew.count int 1 run scoreboard players get @s dnv.count.crafted_seitan_stew diff --git a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction index 6b1167a..f193265 100644 --- a/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction +++ b/vegancraft-DP/data/zz.dnv.vegancraft/function/slots/on_crafted_seitan_stew_replace_output.mcfunction @@ -1,2 +1,2 @@ $execute store success score @s dnv.success run clear @s rabbit_stew[custom_data~{dnv.vegan:true}] $(count) -$execute unless score @s dnv.success matches 0 run give @s suspicious_stew[custom_data={"dnv.vegan":false}] $(count) \ No newline at end of file +$execute unless score @s dnv.success matches 0 run give @s rabbit_stew[item_name="{\"translate\":\"dnv.vegan_food.item.seitan_stew\",\"fallback\":\"Seitan Stew\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Plant-based Foods\",\"color\":\"dark_green\",\"italic\":true}"],custom_data={"dnv.vegan":false},item_model="dnv.vegan_food:seitan_stew"] $(count) \ No newline at end of file diff --git a/vegancraft-DP/pack.mcmeta b/vegancraft-DP/pack.mcmeta index 9c2063d..dcfb62e 100644 --- a/vegancraft-DP/pack.mcmeta +++ b/vegancraft-DP/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv1.2.2, for MC1.21.2+", + "text": "\nv1.3, for MC1.21.4+", "color": "gray", "italic": false } @@ -23,10 +23,10 @@ "color": "green", "italic": false }, - "pack_format": 57, + "pack_format": 61, "supported_formats": { - "min_inclusive": 57, - "max_inclusive": 58 + "min_inclusive": 61, + "max_inclusive": 62 } } } \ No newline at end of file diff --git a/vegancraft-RP/README.txt b/vegancraft-RP/README.txt index f7a1c17..22618ee 100644 --- a/vegancraft-RP/README.txt +++ b/vegancraft-RP/README.txt @@ -1,13 +1,13 @@ -# Vegancraft Resourcepack v1.2.2, for Minecraft 1.21.2+ +# Vegancraft Resourcepack v1.3 This resourcepack contains all the required resources for every Vegancraft datapack by Daenvil, including: -- [Plant-based Foods v2.0.2](https://daenvil.github.io/MCDatapacks/plant-based_foods.html) -- [Acacia Gum v1.2.2](https://daenvil.github.io/MCDatapacks/acacia_gum.html) -- [Ethical Textiles v2.0.3](https://daenvil.github.io/MCDatapacks/ethical_Textiles.html) -- [Plant Wax v2.0.2](https://daenvil.github.io/MCDatapacks/plant_wax.html) -- [Magnet Fishing v2.0.2](https://daenvil.github.io/MCDatapacks/magnet_fishing.html) -- [Vegancraft v1.2.2](https://daenvil.github.io/MCDatapacks/vegancraft.html) +- [Plant-based Foods v2.1](https://daenvil.github.io/MCDatapacks/plant-based_foods.html) +- [Acacia Gum v1.3](https://daenvil.github.io/MCDatapacks/acacia_gum.html) +- [Ethical Textiles v2.1](https://daenvil.github.io/MCDatapacks/ethical_Textiles.html) +- [Plant Wax v2.1](https://daenvil.github.io/MCDatapacks/plant_wax.html) +- [Magnet Fishing v2.1](https://daenvil.github.io/MCDatapacks/magnet_fishing.html) +- [Vegancraft v1.3](https://daenvil.github.io/MCDatapacks/vegancraft.html) Read more on: https://daenvil.github.io/MCDatapacks/vegancraft.html @@ -16,7 +16,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 -- This version was published on the 8th of November 2024. Check the webpages above for possible updates. +- This version was published on the 3rd of January 2025. Check the webpages above for possible updates. ## Installation diff --git a/vegancraft-RP/assets/dnv.acacia_gum/items/acacia_gum_ball.json b/vegancraft-RP/assets/dnv.acacia_gum/items/acacia_gum_ball.json new file mode 100644 index 0000000..5f2f440 --- /dev/null +++ b/vegancraft-RP/assets/dnv.acacia_gum/items/acacia_gum_ball.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.acacia_gum:item/acacia_gum_ball" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.ethical_textiles/items/armor_scale.json b/vegancraft-RP/assets/dnv.ethical_textiles/items/armor_scale.json new file mode 100644 index 0000000..1437bd4 --- /dev/null +++ b/vegancraft-RP/assets/dnv.ethical_textiles/items/armor_scale.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.ethical_textiles:item/armor_scale" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.ethical_textiles/items/faux_feather.json b/vegancraft-RP/assets/dnv.ethical_textiles/items/faux_feather.json new file mode 100644 index 0000000..2a583e9 --- /dev/null +++ b/vegancraft-RP/assets/dnv.ethical_textiles/items/faux_feather.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.ethical_textiles:item/faux_feather" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.ethical_textiles/items/faux_leather.json b/vegancraft-RP/assets/dnv.ethical_textiles/items/faux_leather.json new file mode 100644 index 0000000..a422465 --- /dev/null +++ b/vegancraft-RP/assets/dnv.ethical_textiles/items/faux_leather.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.ethical_textiles:item/faux_leather" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.ethical_textiles/items/plant_string.json b/vegancraft-RP/assets/dnv.ethical_textiles/items/plant_string.json new file mode 100644 index 0000000..c6bee34 --- /dev/null +++ b/vegancraft-RP/assets/dnv.ethical_textiles/items/plant_string.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.ethical_textiles:item/plant_string" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.magnet_fishing/items/magnet_fishing_rod.json b/vegancraft-RP/assets/dnv.magnet_fishing/items/magnet_fishing_rod.json new file mode 100644 index 0000000..2178838 --- /dev/null +++ b/vegancraft-RP/assets/dnv.magnet_fishing/items/magnet_fishing_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.magnet_fishing:item/magnet_fishing_rod" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.plant_wax/items/plant_wax.json b/vegancraft-RP/assets/dnv.plant_wax/items/plant_wax.json new file mode 100644 index 0000000..11fb0a4 --- /dev/null +++ b/vegancraft-RP/assets/dnv.plant_wax/items/plant_wax.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.plant_wax:item/plant_wax" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegan_food/items/notfish_fillet.json b/vegancraft-RP/assets/dnv.vegan_food/items/notfish_fillet.json new file mode 100644 index 0000000..cabc7ff --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegan_food/items/notfish_fillet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegan_food:item/notfish_fillet" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegan_food/items/notsalmon_fillet.json b/vegancraft-RP/assets/dnv.vegan_food/items/notsalmon_fillet.json new file mode 100644 index 0000000..df16d15 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegan_food/items/notsalmon_fillet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegan_food:item/notsalmon_fillet" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegan_food/items/plant_milk_bucket.json b/vegancraft-RP/assets/dnv.vegan_food/items/plant_milk_bucket.json new file mode 100644 index 0000000..91f0e50 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegan_food/items/plant_milk_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegan_food:item/plant_milk_bucket" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegan_food/items/seitan_steak.json b/vegancraft-RP/assets/dnv.vegan_food/items/seitan_steak.json new file mode 100644 index 0000000..51c50e6 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegan_food/items/seitan_steak.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegan_food:item/seitan_steak" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegan_food/items/seitan_stew.json b/vegancraft-RP/assets/dnv.vegan_food/items/seitan_stew.json new file mode 100644 index 0000000..16ceb00 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegan_food/items/seitan_stew.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegan_food:item/seitan_stew" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegan_food/items/vegan_honey_bottle.json b/vegancraft-RP/assets/dnv.vegan_food/items/vegan_honey_bottle.json new file mode 100644 index 0000000..98fb4c2 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegan_food/items/vegan_honey_bottle.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegan_food:item/vegan_honey_bottle" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegan_food/items/veggie_burger.json b/vegancraft-RP/assets/dnv.vegan_food/items/veggie_burger.json new file mode 100644 index 0000000..f7db516 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegan_food/items/veggie_burger.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegan_food:item/veggie_burger" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/blazing_powder.json b/vegancraft-RP/assets/dnv.vegancraft/items/blazing_powder.json new file mode 100644 index 0000000..3cc67e7 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/blazing_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/blazing_powder" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/blazing_rod.json b/vegancraft-RP/assets/dnv.vegancraft/items/blazing_rod.json new file mode 100644 index 0000000..e924db9 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/blazing_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/blazing_rod" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/bouncy_boot.json b/vegancraft-RP/assets/dnv.vegancraft/items/bouncy_boot.json new file mode 100644 index 0000000..8b2cdd7 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/bouncy_boot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/bouncy_boot" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/breezy_rod.json b/vegancraft-RP/assets/dnv.vegancraft/items/breezy_rod.json new file mode 100644 index 0000000..7a0d266 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/breezy_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/breezy_rod" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/copper_horn.json b/vegancraft-RP/assets/dnv.vegancraft/items/copper_horn.json new file mode 100644 index 0000000..f076313 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/copper_horn.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/copper_horn" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/end_mist.json b/vegancraft-RP/assets/dnv.vegancraft/items/end_mist.json new file mode 100644 index 0000000..98753df --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/end_mist.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/end_mist" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/feathery_membrane.json b/vegancraft-RP/assets/dnv.vegancraft/items/feathery_membrane.json new file mode 100644 index 0000000..25e02ab --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/feathery_membrane.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/feathery_membrane" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/fermented_sprout.json b/vegancraft-RP/assets/dnv.vegancraft/items/fermented_sprout.json new file mode 100644 index 0000000..135dc6b --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/fermented_sprout.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/fermented_sprout" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/hardened_seagrass.json b/vegancraft-RP/assets/dnv.vegancraft/items/hardened_seagrass.json new file mode 100644 index 0000000..3607c35 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/hardened_seagrass.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/hardened_seagrass" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/pitcher_fluid.json b/vegancraft-RP/assets/dnv.vegancraft/items/pitcher_fluid.json new file mode 100644 index 0000000..0f58d8c --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/pitcher_fluid.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/pitcher_fluid" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/poisonous_sprout.json b/vegancraft-RP/assets/dnv.vegancraft/items/poisonous_sprout.json new file mode 100644 index 0000000..143e47b --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/poisonous_sprout.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/poisonous_sprout" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/puffer_bubble.json b/vegancraft-RP/assets/dnv.vegancraft/items/puffer_bubble.json new file mode 100644 index 0000000..cd32cbe --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/puffer_bubble.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/puffer_bubble" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/dnv.vegancraft/items/writable_book_pencil.json b/vegancraft-RP/assets/dnv.vegancraft/items/writable_book_pencil.json new file mode 100644 index 0000000..596d5a7 --- /dev/null +++ b/vegancraft-RP/assets/dnv.vegancraft/items/writable_book_pencil.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "model", + "model": "dnv.vegancraft:item/writable_book_pencil" + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/armadillo_scute.json b/vegancraft-RP/assets/minecraft/items/armadillo_scute.json new file mode 100644 index 0000000..0747b9b --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/armadillo_scute.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261022, + "model": { + "type": "minecraft:model", + "model": "dnv.ethical_textiles:item/armor_scale" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/armadillo_scute" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/blaze_powder.json b/vegancraft-RP/assets/minecraft/items/blaze_powder.json new file mode 100644 index 0000000..730583b --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/blaze_powder.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261012, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/blazing_powder" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/blaze_powder" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/blaze_rod.json b/vegancraft-RP/assets/minecraft/items/blaze_rod.json new file mode 100644 index 0000000..f3a702b --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/blaze_rod.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261013, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/blazing_rod" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/blaze_rod" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/breeze_rod.json b/vegancraft-RP/assets/minecraft/items/breeze_rod.json new file mode 100644 index 0000000..9967e83 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/breeze_rod.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261027, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/breezy_rod" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/breeze_rod" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/cod.json b/vegancraft-RP/assets/minecraft/items/cod.json new file mode 100644 index 0000000..82ea946 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/cod.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261004, + "model": { + "type": "minecraft:model", + "model": "dnv.vegan_food:item/notfish_fillet" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/cod" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/cooked_beef.json b/vegancraft-RP/assets/minecraft/items/cooked_beef.json new file mode 100644 index 0000000..100f57b --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/cooked_beef.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261003, + "model": { + "type": "minecraft:model", + "model": "dnv.vegan_food:item/seitan_steak" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/cooked_beef" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/cooked_porkchop.json b/vegancraft-RP/assets/minecraft/items/cooked_porkchop.json new file mode 100644 index 0000000..b443a49 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/cooked_porkchop.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261024, + "model": { + "type": "minecraft:model", + "model": "dnv.vegan_food:item/veggie_burger" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/cooked_porkchop" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/dragon_breath.json b/vegancraft-RP/assets/minecraft/items/dragon_breath.json new file mode 100644 index 0000000..18a5eeb --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/dragon_breath.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261017, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/end_mist" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/dragon_breath" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/feather.json b/vegancraft-RP/assets/minecraft/items/feather.json new file mode 100644 index 0000000..d77332d --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/feather.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261010, + "model": { + "type": "minecraft:model", + "model": "dnv.ethical_textiles:item/faux_feather" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/feather" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/fermented_spider_eye.json b/vegancraft-RP/assets/minecraft/items/fermented_spider_eye.json new file mode 100644 index 0000000..ece0850 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/fermented_spider_eye.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261015, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/fermented_sprout" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/fermented_spider_eye" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/fishing_rod.json b/vegancraft-RP/assets/minecraft/items/fishing_rod.json new file mode 100644 index 0000000..9bf07ce --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/fishing_rod.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261009, + "model": { + "type": "minecraft:model", + "model": "dnv.magnet_fishing:item/magnet_fishing_rod" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/fishing_rod" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/ghast_tear.json b/vegancraft-RP/assets/minecraft/items/ghast_tear.json new file mode 100644 index 0000000..21f97c5 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/ghast_tear.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261023, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/pitcher_fluid" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/ghast_tear" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/goat_horn.json b/vegancraft-RP/assets/minecraft/items/goat_horn.json new file mode 100644 index 0000000..b71eb06 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/goat_horn.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261011, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/copper_horn" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/goat_horn" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/honey_bottle.json b/vegancraft-RP/assets/minecraft/items/honey_bottle.json new file mode 100644 index 0000000..f7f71cd --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/honey_bottle.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261002, + "model": { + "type": "minecraft:model", + "model": "dnv.vegan_food:item/vegan_honey_bottle" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/honey_bottle" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/honeycomb.json b/vegancraft-RP/assets/minecraft/items/honeycomb.json new file mode 100644 index 0000000..1799686 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/honeycomb.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261008, + "model": { + "type": "minecraft:model", + "model": "dnv.plant_wax:item/plant_wax" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/honeycomb" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/leather.json b/vegancraft-RP/assets/minecraft/items/leather.json new file mode 100644 index 0000000..981476c --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/leather.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261006, + "model": { + "type": "minecraft:model", + "model": "dnv.ethical_textiles:item/faux_leather" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/leather" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/milk_bucket.json b/vegancraft-RP/assets/minecraft/items/milk_bucket.json new file mode 100644 index 0000000..84b8a1b --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/milk_bucket.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261001, + "model": { + "type": "minecraft:model", + "model": "dnv.vegan_food:item/plant_milk_bucket" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/milk_bucket" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/phantom_membrane.json b/vegancraft-RP/assets/minecraft/items/phantom_membrane.json new file mode 100644 index 0000000..5b95fad --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/phantom_membrane.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261021, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/feathery_membrane" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/phantom_membrane" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/pufferfish.json b/vegancraft-RP/assets/minecraft/items/pufferfish.json new file mode 100644 index 0000000..e0e047e --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/pufferfish.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261020, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/puffer_bubble" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/pufferfish" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/rabbit_foot.json b/vegancraft-RP/assets/minecraft/items/rabbit_foot.json new file mode 100644 index 0000000..c91eeb4 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/rabbit_foot.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261018, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/bouncy_boot" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/rabbit_foot" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/rabbit_stew.json b/vegancraft-RP/assets/minecraft/items/rabbit_stew.json new file mode 100644 index 0000000..5f30d0e --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/rabbit_stew.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261025, + "model": { + "type": "minecraft:model", + "model": "dnv.vegan_food:item/seitan_stew" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/rabbit_stew" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/salmon.json b/vegancraft-RP/assets/minecraft/items/salmon.json new file mode 100644 index 0000000..3211b1f --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/salmon.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261026, + "model": { + "type": "minecraft:model", + "model": "dnv.vegan_food:item/notsalmon_fillet" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/salmon" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/slime_ball.json b/vegancraft-RP/assets/minecraft/items/slime_ball.json new file mode 100644 index 0000000..7354e92 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/slime_ball.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261005, + "model": { + "type": "minecraft:model", + "model": "dnv.acacia_gum:item/acacia_gum_ball" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/slime_ball" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/spider_eye.json b/vegancraft-RP/assets/minecraft/items/spider_eye.json new file mode 100644 index 0000000..67ba562 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/spider_eye.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261014, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/poisonous_sprout" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/spider_eye" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/string.json b/vegancraft-RP/assets/minecraft/items/string.json new file mode 100644 index 0000000..54e92ab --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/string.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261007, + "model": { + "type": "minecraft:model", + "model": "dnv.ethical_textiles:item/plant_string" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/string" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/turtle_scute.json b/vegancraft-RP/assets/minecraft/items/turtle_scute.json new file mode 100644 index 0000000..8566388 --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/turtle_scute.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261016, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/hardened_seagrass" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/turtle_scute" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/items/writable_book.json b/vegancraft-RP/assets/minecraft/items/writable_book.json new file mode 100644 index 0000000..446e49c --- /dev/null +++ b/vegancraft-RP/assets/minecraft/items/writable_book.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "range_dispatch", + "property": "custom_model_data", + "entries": [ + { + "threshold": 9261028, + "model": { + "type": "minecraft:model", + "model": "dnv.vegancraft:item/writable_book_pencil" + } + } + ], + "fallback": { + "type": "model", + "model": "minecraft:item/writable_book" + }, + "index": 0 + } +} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/armadillo_scute.json b/vegancraft-RP/assets/minecraft/models/item/armadillo_scute.json deleted file mode 100644 index b439661..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/armadillo_scute.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/armadillo_scute" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261022 - }, - "model": "dnv.ethical_textiles:item/armor_scale" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/blaze_powder.json b/vegancraft-RP/assets/minecraft/models/item/blaze_powder.json deleted file mode 100644 index 87788c4..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/blaze_powder.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/blaze_powder" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261012 - }, - "model": "dnv.vegancraft:item/blazing_powder" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/blaze_rod.json b/vegancraft-RP/assets/minecraft/models/item/blaze_rod.json deleted file mode 100644 index c24fd4e..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/blaze_rod.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "minecraft:item/blaze_rod" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261013 - }, - "model": "dnv.vegancraft:item/blazing_rod" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/breeze_rod.json b/vegancraft-RP/assets/minecraft/models/item/breeze_rod.json deleted file mode 100644 index fd8b196..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/breeze_rod.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "minecraft:item/breeze_rod" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261027 - }, - "model": "dnv.vegancraft:item/breezy_rod" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/cod.json b/vegancraft-RP/assets/minecraft/models/item/cod.json deleted file mode 100644 index 6e38844..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/cod.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "parent": "item/generated", - "display": { - "head": { - "rotation": [ - 0, - 90, - -60 - ], - "translation": [ - -7, - -4, - -7 - ], - "scale": [ - 0.8, - 0.8, - 0.8 - ] - } - }, - "textures": { - "layer0": "item/cod" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261004 - }, - "model": "dnv.vegan_food:item/notfish_fillet" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/cooked_beef.json b/vegancraft-RP/assets/minecraft/models/item/cooked_beef.json deleted file mode 100644 index 337a84f..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/cooked_beef.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/cooked_beef" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261003 - }, - "model": "dnv.vegan_food:item/seitan_steak" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/cooked_porkchop.json b/vegancraft-RP/assets/minecraft/models/item/cooked_porkchop.json deleted file mode 100644 index 819d633..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/cooked_porkchop.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/cooked_porkchop" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261024 - }, - "model": "dnv.vegan_food:item/veggie_burger" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/dragon_breath.json b/vegancraft-RP/assets/minecraft/models/item/dragon_breath.json deleted file mode 100644 index 50525ce..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/dragon_breath.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/dragon_breath" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261017 - }, - "model": "dnv.vegancraft:item/end_mist" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/feather.json b/vegancraft-RP/assets/minecraft/models/item/feather.json deleted file mode 100644 index 0db6c50..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/feather.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "parent": "item/generated", - "display": { - "head": { - "rotation": [ - 0, - 0, - 45 - ], - "translation": [ - -1, - 13, - 7 - ], - "scale": [ - 1, - 1, - 1 - ] - } - }, - "textures": { - "layer0": "item/feather" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261010 - }, - "model": "dnv.ethical_textiles:item/faux_feather" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/fermented_spider_eye.json b/vegancraft-RP/assets/minecraft/models/item/fermented_spider_eye.json deleted file mode 100644 index 5e8a612..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/fermented_spider_eye.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/fermented_spider_eye" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261015 - }, - "model": "dnv.vegancraft:item/fermented_sprout" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/fishing_rod.json b/vegancraft-RP/assets/minecraft/models/item/fishing_rod.json deleted file mode 100644 index 93008f6..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/fishing_rod.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "item/handheld_rod", - "textures": { - "layer0": "item/fishing_rod" - }, - "overrides": [ - { - "predicate": { - "cast": 1 - }, - "model": "item/fishing_rod_cast" - }, - { - "predicate": { - "custom_model_data": 9261009 - }, - "model": "dnv.magnet_fishing:item/magnet_fishing_rod" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/ghast_tear.json b/vegancraft-RP/assets/minecraft/models/item/ghast_tear.json deleted file mode 100644 index 3e53b3c..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/ghast_tear.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/ghast_tear" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261023 - }, - "model": "dnv.vegancraft:item/pitcher_fluid" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/goat_horn.json b/vegancraft-RP/assets/minecraft/models/item/goat_horn.json deleted file mode 100644 index b64f403..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/goat_horn.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "parent": "item/generated", - "display": { - "thirdperson_righthand": { - "rotation": [ - 0, - 180, - 0 - ], - "translation": [ - 0, - 3, - 1 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 0, - 0, - 0 - ], - "translation": [ - 0, - 3, - 1 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - -90, - 25 - ], - "translation": [ - 1.13, - 3.2, - 1.13 - ], - "scale": [ - 0.68, - 0.68, - 0.68 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 0, - 90, - -25 - ], - "translation": [ - 1.13, - 3.2, - 1.13 - ], - "scale": [ - 0.68, - 0.68, - 0.68 - ] - } - }, - "textures": { - "layer0": "item/goat_horn" - }, - "overrides": [ - { - "predicate": { - "tooting": 1 - }, - "model": "item/tooting_goat_horn" - }, - { - "predicate": { - "custom_model_data": 9261011 - }, - "model": "dnv.vegancraft:item/copper_horn" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/honey_bottle.json b/vegancraft-RP/assets/minecraft/models/item/honey_bottle.json deleted file mode 100644 index 59ded89..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/honey_bottle.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/honey_bottle" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261002 - }, - "model": "dnv.vegan_food:item/vegan_honey_bottle" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/honeycomb.json b/vegancraft-RP/assets/minecraft/models/item/honeycomb.json deleted file mode 100644 index 64fdd9b..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/honeycomb.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/honeycomb" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261008 - }, - "model": "dnv.plant_wax:item/plant_wax" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/leather.json b/vegancraft-RP/assets/minecraft/models/item/leather.json deleted file mode 100644 index 8ed65e7..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/leather.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/leather" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261006 - }, - "model": "dnv.ethical_textiles:item/faux_leather" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/milk_bucket.json b/vegancraft-RP/assets/minecraft/models/item/milk_bucket.json deleted file mode 100644 index 625d880..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/milk_bucket.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/milk_bucket" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261001 - }, - "model": "dnv.vegan_food:item/plant_milk_bucket" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/phantom_membrane.json b/vegancraft-RP/assets/minecraft/models/item/phantom_membrane.json deleted file mode 100644 index e815d72..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/phantom_membrane.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/phantom_membrane" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261021 - }, - "model": "dnv.vegancraft:item/feathery_membrane" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/pufferfish.json b/vegancraft-RP/assets/minecraft/models/item/pufferfish.json deleted file mode 100644 index db25ebb..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/pufferfish.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/pufferfish" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261020 - }, - "model": "dnv.vegancraft:item/puffer_bubble" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/rabbit_foot.json b/vegancraft-RP/assets/minecraft/models/item/rabbit_foot.json deleted file mode 100644 index 5549209..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/rabbit_foot.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/rabbit_foot" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261018 - }, - "model": "dnv.vegancraft:item/bouncy_boot" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/rabbit_stew.json b/vegancraft-RP/assets/minecraft/models/item/rabbit_stew.json deleted file mode 100644 index fe3261c..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/rabbit_stew.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/rabbit_stew" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261025 - }, - "model": "dnv.vegan_food:item/seitan_stew" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/salmon.json b/vegancraft-RP/assets/minecraft/models/item/salmon.json deleted file mode 100644 index 10c638e..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/salmon.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/salmon" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261026 - }, - "model": "dnv.vegan_food:item/notsalmon_fillet" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/slime_ball.json b/vegancraft-RP/assets/minecraft/models/item/slime_ball.json deleted file mode 100644 index e3d64c6..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/slime_ball.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/slime_ball" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261005 - }, - "model": "dnv.acacia_gum:item/acacia_gum_ball" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/spider_eye.json b/vegancraft-RP/assets/minecraft/models/item/spider_eye.json deleted file mode 100644 index 7b6e18c..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/spider_eye.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/spider_eye" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261014 - }, - "model": "dnv.vegancraft:item/poisonous_sprout" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/string.json b/vegancraft-RP/assets/minecraft/models/item/string.json deleted file mode 100644 index ec2a943..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/string.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/string" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261007 - }, - "model": "dnv.ethical_textiles:item/plant_string" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/turtle_scute.json b/vegancraft-RP/assets/minecraft/models/item/turtle_scute.json deleted file mode 100644 index a9c687f..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/turtle_scute.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/turtle_scute" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261016 - }, - "model": "dnv.vegancraft:item/hardened_seagrass" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/assets/minecraft/models/item/writable_book.json b/vegancraft-RP/assets/minecraft/models/item/writable_book.json deleted file mode 100644 index aac55dd..0000000 --- a/vegancraft-RP/assets/minecraft/models/item/writable_book.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/writable_book" - }, - "overrides": [ - { - "predicate": { - "custom_model_data": 9261028 - }, - "model": "dnv.vegancraft:item/writable_book_pencil" - } - ] -} \ No newline at end of file diff --git a/vegancraft-RP/pack.mcmeta b/vegancraft-RP/pack.mcmeta index 3936858..0c3ae47 100644 --- a/vegancraft-RP/pack.mcmeta +++ b/vegancraft-RP/pack.mcmeta @@ -15,7 +15,7 @@ "underlined": true }, { - "text": "\nv1.2.2, for MC1.21.2+", + "text": "\nv1.3, for MC1.21.4+", "color": "gray", "italic": false } @@ -23,9 +23,9 @@ "color": "green", "italic": false }, - "pack_format": 42, + "pack_format": 46, "supported_formats": { - "min_inclusive": 42, + "min_inclusive": 46, "max_inclusive": 999 } }