diff --git a/src/main/java/com/minelittlepony/unicopia/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java index 0ee5fd35..6fada9ad 100644 --- a/src/main/java/com/minelittlepony/unicopia/UTags.java +++ b/src/main/java/com/minelittlepony/unicopia/UTags.java @@ -14,6 +14,8 @@ public interface UTags { Tag FALLS_SLOWLY = item("falls_slowly"); + Tag MAGIC_FEATHERS = item("magic_feathers"); + Tag FRAGILE = block("fragile"); Tag INTERESTING = block("interesting"); diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/burned_juice.json b/src/main/resources/data/unicopia/advancements/recipes/food/burned_juice.json new file mode 100644 index 00000000..1369075f --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/burned_juice.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:burned_juice" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "tag": "unicopia:juice" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:burned_juice" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/cider.json b/src/main/resources/data/unicopia/advancements/recipes/food/cider.json new file mode 100644 index 00000000..573a5373 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/cider.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:cider" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "item": "unicopia:burned_juice" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:cider" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/crystal_heart.json b/src/main/resources/data/unicopia/advancements/recipes/food/crystal_heart.json new file mode 100644 index 00000000..70d93850 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/crystal_heart.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:crystal_heart" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "item": "unicopia:crystal_shard" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:crystal_heart" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/empty_jar.json b/src/main/resources/data/unicopia/advancements/recipes/food/empty_jar.json new file mode 100644 index 00000000..2c94c678 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/empty_jar.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:empty_jar" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "item": "minecraft:glass" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:empty_jar" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/friendship_bracelet.json b/src/main/resources/data/unicopia/advancements/recipes/food/friendship_bracelet.json new file mode 100644 index 00000000..a3ccab35 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/friendship_bracelet.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:friendship_bracelet" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "item": "minecraft:leather" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:friendship_bracelet" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/gemstone.json b/src/main/resources/data/unicopia/advancements/recipes/food/gemstone.json new file mode 100644 index 00000000..b85aaac6 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/gemstone.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:gemstone" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "item": "unicopia:crystal_shard" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:gemstone" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/golden_feather.json b/src/main/resources/data/unicopia/advancements/recipes/food/golden_feather.json new file mode 100644 index 00000000..2878ae38 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/golden_feather.json @@ -0,0 +1,31 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:golden_feather", + "unicopia:pegasus_amulet" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "tag": "unicopia:magic_feathers" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:golden_feather" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/golden_wing.json b/src/main/resources/data/unicopia/advancements/recipes/food/golden_wing.json new file mode 100644 index 00000000..0c2ccf4f --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/golden_wing.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:golden_wing" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "item": "unicopia:golden_feather" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:golden_wing" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/juice.json b/src/main/resources/data/unicopia/advancements/recipes/food/juice.json new file mode 100644 index 00000000..9076bddc --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/juice.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:juice" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "tag": "unicopia:fresh_apples" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:juice" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/mug.json b/src/main/resources/data/unicopia/advancements/recipes/food/mug.json new file mode 100644 index 00000000..0a07ac97 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/mug.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:mug" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "tag": "minecraft:stick" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:mug" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/pegasus_amulet.json b/src/main/resources/data/unicopia/advancements/recipes/food/pegasus_amulet.json new file mode 100644 index 00000000..61b9c893 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/pegasus_amulet.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:pegasus_amulet" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "tag": "unicopia:golden_wing" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:pegasus_amulet" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/zap_apple_jam_jar.json b/src/main/resources/data/unicopia/advancements/recipes/food/zap_apple_jam_jar.json new file mode 100644 index 00000000..41fa0a26 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/zap_apple_jam_jar.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:zap_apple_jam_jar" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "tag": "unicopia:empty_jar" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:zap_apple_jam_jar" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/golden_feather.json b/src/main/resources/data/unicopia/recipes/golden_feather.json index aa680c7e..3977a01c 100644 --- a/src/main/resources/data/unicopia/recipes/golden_feather.json +++ b/src/main/resources/data/unicopia/recipes/golden_feather.json @@ -7,8 +7,7 @@ ], "key": { "#": [ - { "item": "unicopia:pegasus_feather" }, - { "item": "unicopia:gryphon_feather" } + { "tag": "unicopia:magic_feathers" } ], "*": { "item": "minecraft:gold_nugget" diff --git a/src/main/resources/data/unicopia/tags/items/magic_feathers.json b/src/main/resources/data/unicopia/tags/items/magic_feathers.json new file mode 100644 index 00000000..d1af83d6 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/magic_feathers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "unicopia:pegasus_feather", + "unicopia:gryphon_feather" + ] +}