Merge branch 'mc-1.13.x' into mc-1.14-fabric

src/main/resources/data/computercraft/advancements/recipes/cable.json

@@ -7,19 +7,19 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_modem": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:cable", "data": 1 } ]
+                "items": [ { "item": "computercraft:cable" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/command_computer.json

@@ -7,7 +7,7 @@
         "has_redstone": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "minecraft:command_block", "data": 0 } ]
+                "items": [ { "item": "minecraft:command_block" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/disk_drive.json

@@ -7,13 +7,13 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/monitor_advanced.json

@@ -7,13 +7,13 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/monitor_normal.json

@@ -7,13 +7,13 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/pocket_computer_advanced.json

@@ -7,19 +7,19 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_apple": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "minecraft:golden_apple", "data": 0 } ]
+                "items": [ { "item": "minecraft:golden_apple" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/pocket_computer_normal.json

@@ -7,24 +7,24 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_apple": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "minecraft:golden_apple", "data": 0 } ]
+                "items": [ { "item": "minecraft:golden_apple" } ]
             }
         },
         "has_the_recipe": {
             "trigger": "minecraft:recipe_unlocked",
-            "conditions": { "recipe": "computercraft:normal_pocket_computer_normal" }
+            "conditions": { "recipe": "computercraft:pocket_computer_normal" }
         }
     },
     "requirements": [

src/main/resources/data/computercraft/advancements/recipes/printed_book.json

@@ -7,7 +7,7 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:printout", "data": 0 } ]
+                "items": [ { "item": "computercraft:printed_page" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/printed_pages.json

@@ -7,7 +7,7 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:peripheral", "data": 0 } ]
+                "items": [ { "item": "computercraft:printer" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/printer.json

@@ -7,13 +7,13 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/printout.json

@@ -7,7 +7,7 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:peripheral", "data": 0 } ]
+                "items": [ { "item": "computercraft:printer" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/skull_cloudy.json

@@ -7,7 +7,7 @@
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/skull_dan200.json

@@ -7,7 +7,7 @@
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/speaker.json

@@ -7,19 +7,19 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_noteblock": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "minecraft:noteblock" } ]
+                "items": [ { "item": "minecraft:note_block" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/turtle_advanced.json

@@ -7,7 +7,7 @@
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/turtle_normal.json

@@ -7,12 +7,12 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_the_recipe": {
             "trigger": "minecraft:recipe_unlocked",
-            "conditions": { "recipe": "computercraft:normal_turtle_normal" }
+            "conditions": { "recipe": "computercraft:turtle_normal" }
         }
     },
     "requirements": [

src/main/resources/data/computercraft/advancements/recipes/wired_modem.json

@@ -11,25 +11,25 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_cable": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:cable", "data": 0 } ]
+                "items": [ { "item": "computercraft:wired_modem" } ]
             }
         },
         "has_modem_full": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:wired_modem_full", "data": 0 } ]
+                "items": [ { "item": "computercraft:wired_modem_full" } ]
             }
         },
         "has_the_recipe": {

src/main/resources/data/computercraft/advancements/recipes/wireless_modem_advanced.json

@@ -1,30 +1,30 @@
 {
     "parent": "minecraft:recipes/root",
     "rewards": {
-        "recipes": [ "computercraft:ender_modem" ]
+        "recipes": [ "computercraft:wireless_modem_advanced" ]
     },
     "criteria": {
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_wireless": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:peripheral", "data": 1 } ]
+                "items": [ { "item": "computercraft:wireless_modem_normal" } ]
             }
         },
         "has_the_recipe": {
             "trigger": "minecraft:recipe_unlocked",
-            "conditions": { "recipe": "computercraft:ender_modem" }
+            "conditions": { "recipe": "computercraft:wireless_modem_advanced" }
         }
     },
     "requirements": [

src/main/resources/data/computercraft/advancements/recipes/wireless_modem_normal.json

@@ -7,13 +7,13 @@
         "has_normal": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 0 } ]
+                "items": [ { "item": "computercraft:computer_normal" } ]
             }
         },
         "has_advanced": {
             "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "items": [ { "item": "computercraft:computer", "data": 16384 } ]
+                "items": [ { "item": "computercraft:computer_advanced" } ]
             }
         },
         "has_the_recipe": {