From ea9b0a02d68a0ae79ed4ae3a2bd9f6fa66e2a284 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Wed, 12 Oct 2022 15:46:28 +0200
Subject: [PATCH] Update some unlock conditions for certain recipes

---
 .../unicopia/advancements/recipes/food/cider.json  | 14 +++++++++-----
 .../advancements/recipes/friendship_bracelet.json  |  2 +-
 .../unicopia/advancements/recipes/spellbook.json   |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/cider.json b/src/main/resources/data/unicopia/advancements/recipes/food/cider.json
index 2fafa819..f11ac1be 100644
--- a/src/main/resources/data/unicopia/advancements/recipes/food/cider.json
+++ b/src/main/resources/data/unicopia/advancements/recipes/food/cider.json
@@ -2,7 +2,8 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "unicopia:cider"
+      "unicopia:cider",
+      "unicopia:easy_cider"
     ]
   },
   "criteria": {
@@ -19,12 +20,15 @@
       "conditions": {
         "recipe": "unicopia:cider"
       }
+    },
+    "has_the_easy_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "unicopia:easy_cider"
+      }
     }
   },
   "requirements": [
-    [
-      "has_ingredients",
-      "has_the_recipe"
-    ]
+    [ "has_ingredients", "has_the_recipe", "has_the_easy_recipe" ]
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/advancements/recipes/friendship_bracelet.json b/src/main/resources/data/unicopia/advancements/recipes/friendship_bracelet.json
index 25c00178..278fdaad 100644
--- a/src/main/resources/data/unicopia/advancements/recipes/friendship_bracelet.json
+++ b/src/main/resources/data/unicopia/advancements/recipes/friendship_bracelet.json
@@ -10,7 +10,7 @@
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
-          { "items": [ "minecraft:leather" ] }
+          { "items": [ "minecraft:leather", "minecraft:string" ] }
         ]
       }
     },
diff --git a/src/main/resources/data/unicopia/advancements/recipes/spellbook.json b/src/main/resources/data/unicopia/advancements/recipes/spellbook.json
index d58c3f43..7d4a3307 100644
--- a/src/main/resources/data/unicopia/advancements/recipes/spellbook.json
+++ b/src/main/resources/data/unicopia/advancements/recipes/spellbook.json
@@ -10,7 +10,7 @@
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
-          { "items": [ "unicopia:gemstone" ] }
+          { "items": [ "unicopia:gemstone", "unicopia:botched_gem" ] }
         ]
       }
     },