From 263bade3384122918fbffa1d9c7cbc51ac03eddf Mon Sep 17 00:00:00 2001
From: SquidDev <bonzoweb@hotmail.co.uk>
Date: Thu, 29 Jun 2017 10:45:24 +0100
Subject: [PATCH] Add some basic recipe advancements

This doesn't provide the ability to unlock the upgrade impostor recipes,
but I'm not sure that is currently feasible.
---
 .../recipes/advanced_computer.json            | 24 ++++++++++++
 .../recipes/advanced_monitor.json             | 31 +++++++++++++++
 .../recipes/advanced_pocket_computer.json     | 38 +++++++++++++++++++
 .../advancements/recipes/advanced_turtle.json | 24 ++++++++++++
 .../advancements/recipes/cable.json           | 38 +++++++++++++++++++
 .../recipes/command_computer.json             | 24 ++++++++++++
 .../advancements/recipes/disk_drive.json      | 31 +++++++++++++++
 .../advancements/recipes/ender_modem.json     | 38 +++++++++++++++++++
 .../advancements/recipes/normal_computer.json | 24 ++++++++++++
 .../advancements/recipes/normal_monitor.json  | 31 +++++++++++++++
 .../recipes/normal_pocket_computer.json       | 38 +++++++++++++++++++
 .../advancements/recipes/normal_turtle.json   | 24 ++++++++++++
 .../advancements/recipes/printer.json         | 31 +++++++++++++++
 .../advancements/recipes/speaker.json         | 38 +++++++++++++++++++
 .../advancements/recipes/wired_modem.json     | 38 +++++++++++++++++++
 .../advancements/recipes/wireless_modem.json  | 31 +++++++++++++++
 16 files changed, 503 insertions(+)
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/advanced_computer.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/advanced_monitor.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/advanced_pocket_computer.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/advanced_turtle.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/cable.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/command_computer.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/disk_drive.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/ender_modem.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/normal_computer.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/normal_monitor.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/normal_pocket_computer.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/normal_turtle.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/printer.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/speaker.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/wired_modem.json
 create mode 100644 src/main/resources/assets/computercraft/advancements/recipes/wireless_modem.json

diff --git a/src/main/resources/assets/computercraft/advancements/recipes/advanced_computer.json b/src/main/resources/assets/computercraft/advancements/recipes/advanced_computer.json
new file mode 100644
index 000000000..96c0f57e4
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/advanced_computer.json
@@ -0,0 +1,24 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:advanced_computer" ]
+    },
+    "criteria": {
+        "has_redstone": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "minecraft:redstone" } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:advanced_computer" }
+        }
+    },
+    "requirements": [
+        [
+            "has_redstone",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/advanced_monitor.json b/src/main/resources/assets/computercraft/advancements/recipes/advanced_monitor.json
new file mode 100644
index 000000000..49106a8fc
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/advanced_monitor.json
@@ -0,0 +1,31 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:advanced_monitor" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:advanced_monitor" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/advanced_pocket_computer.json b/src/main/resources/assets/computercraft/advancements/recipes/advanced_pocket_computer.json
new file mode 100644
index 000000000..dd326529f
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/advanced_pocket_computer.json
@@ -0,0 +1,38 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:advanced_pocket_computer" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_apple": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "minecraft:golden_apple", "data": 0 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:advanced_pocket_computer" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_apple",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/advanced_turtle.json b/src/main/resources/assets/computercraft/advancements/recipes/advanced_turtle.json
new file mode 100644
index 000000000..03749528a
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/advanced_turtle.json
@@ -0,0 +1,24 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:advanced_turtle" ]
+    },
+    "criteria": {
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:advanced_turtle" }
+        }
+    },
+    "requirements": [
+        [
+            "has_advanced",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/cable.json b/src/main/resources/assets/computercraft/advancements/recipes/cable.json
new file mode 100644
index 000000000..8b6542cb7
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/cable.json
@@ -0,0 +1,38 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:cable" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_modem": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:cable", "data": 1 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:cable" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_modem",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/command_computer.json b/src/main/resources/assets/computercraft/advancements/recipes/command_computer.json
new file mode 100644
index 000000000..607b0aae1
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/command_computer.json
@@ -0,0 +1,24 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:command_computer" ]
+    },
+    "criteria": {
+        "has_redstone": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "minecraft:command_block", "data": 0 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:command_computer" }
+        }
+    },
+    "requirements": [
+        [
+            "has_redstone",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/disk_drive.json b/src/main/resources/assets/computercraft/advancements/recipes/disk_drive.json
new file mode 100644
index 000000000..1dd5d9ab5
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/disk_drive.json
@@ -0,0 +1,31 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:disk_drive" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:disk_drive" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/ender_modem.json b/src/main/resources/assets/computercraft/advancements/recipes/ender_modem.json
new file mode 100644
index 000000000..09f00373f
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/ender_modem.json
@@ -0,0 +1,38 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:ender_modem" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_wireless": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:peripheral", "data": 1 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:ender_modem" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_wireless",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/normal_computer.json b/src/main/resources/assets/computercraft/advancements/recipes/normal_computer.json
new file mode 100644
index 000000000..b8ef77055
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/normal_computer.json
@@ -0,0 +1,24 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:normal_computer" ]
+    },
+    "criteria": {
+        "has_redstone": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "minecraft:redstone" } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:normal_computer" }
+        }
+    },
+    "requirements": [
+        [
+            "has_redstone",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/normal_monitor.json b/src/main/resources/assets/computercraft/advancements/recipes/normal_monitor.json
new file mode 100644
index 000000000..dcd45755f
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/normal_monitor.json
@@ -0,0 +1,31 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:normal_monitor" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:normal_monitor" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/normal_pocket_computer.json b/src/main/resources/assets/computercraft/advancements/recipes/normal_pocket_computer.json
new file mode 100644
index 000000000..f04cda58d
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/normal_pocket_computer.json
@@ -0,0 +1,38 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:normal_pocket_computer" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_apple": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "minecraft:golden_apple", "data": 0 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:normal_pocket_computer" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_apple",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/normal_turtle.json b/src/main/resources/assets/computercraft/advancements/recipes/normal_turtle.json
new file mode 100644
index 000000000..339291df7
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/normal_turtle.json
@@ -0,0 +1,24 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:normal_turtle" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:normal_turtle" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/printer.json b/src/main/resources/assets/computercraft/advancements/recipes/printer.json
new file mode 100644
index 000000000..bbf1fe1d6
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/printer.json
@@ -0,0 +1,31 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:printer" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:printer" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/speaker.json b/src/main/resources/assets/computercraft/advancements/recipes/speaker.json
new file mode 100644
index 000000000..6fb43d936
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/speaker.json
@@ -0,0 +1,38 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:speaker" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_noteblock": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "minecraft:noteblock" } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:speaker" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_noteblock",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/wired_modem.json b/src/main/resources/assets/computercraft/advancements/recipes/wired_modem.json
new file mode 100644
index 000000000..88d3a1ea2
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/wired_modem.json
@@ -0,0 +1,38 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:wired_modem" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_cable": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:cable", "data": 0 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:wired_modem" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_cable",
+            "has_the_recipe"
+        ]
+    ]
+}
diff --git a/src/main/resources/assets/computercraft/advancements/recipes/wireless_modem.json b/src/main/resources/assets/computercraft/advancements/recipes/wireless_modem.json
new file mode 100644
index 000000000..16af43067
--- /dev/null
+++ b/src/main/resources/assets/computercraft/advancements/recipes/wireless_modem.json
@@ -0,0 +1,31 @@
+{
+    "parent": "minecraft:recipes/root",
+    "rewards": {
+        "recipes": [ "computercraft:wireless_modem" ]
+    },
+    "criteria": {
+        "has_normal": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+            }
+        },
+        "has_advanced": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+            }
+        },
+        "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
+            "conditions": { "recipe": "computercraft:wireless_modem" }
+        }
+    },
+    "requirements": [
+        [
+            "has_normal",
+            "has_advanced",
+            "has_the_recipe"
+        ]
+    ]
+}