From 6890ae765ad63de21c70c58c892361411f363bca Mon Sep 17 00:00:00 2001
From: Philipp Rustemeier <philipp@bytepool.net>
Date: Thu, 15 Mar 2018 16:42:45 +0100
Subject: [PATCH] Fix JSON recipe crafting with ore dictionary

In current Forge, you can use OD entries in normal crafting recipes; using the special forge crafting recipe types is no longer necessary.
---
 build.gradle                                                  | 2 +-
 .../resources/assets/ebwizardry/recipes/arcane_workbench.json | 4 ++--
 src/main/resources/assets/ebwizardry/recipes/magic_silk.json  | 2 +-
 .../assets/ebwizardry/recipes/transportation_stone.json       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index cb1e3410..712ab42d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = " 3.1.0 - MC 1.11.2"
+version = " 4.0.0 - MC 1.12.2"
 group= "electroblob.wizardry"// http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "Electroblob's Wizardry "
 
diff --git a/src/main/resources/assets/ebwizardry/recipes/arcane_workbench.json b/src/main/resources/assets/ebwizardry/recipes/arcane_workbench.json
index dfe6e470..ebae46d1 100644
--- a/src/main/resources/assets/ebwizardry/recipes/arcane_workbench.json
+++ b/src/main/resources/assets/ebwizardry/recipes/arcane_workbench.json
@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "vwv",
         "xyx",
@@ -11,7 +11,7 @@
         },
         "w": {
             "item": "minecraft:carpet",
-            "meta": 10
+            "data": 10
         },
         "x": {
             "item": "ebwizardry:magic_crystal"
diff --git a/src/main/resources/assets/ebwizardry/recipes/magic_silk.json b/src/main/resources/assets/ebwizardry/recipes/magic_silk.json
index 12fab051..7f2cad0c 100644
--- a/src/main/resources/assets/ebwizardry/recipes/magic_silk.json
+++ b/src/main/resources/assets/ebwizardry/recipes/magic_silk.json
@@ -15,6 +15,6 @@
     },
     "result": {
         "item": "ebwizardry:magic_silk",
-        "amount": 2
+        "count": 2
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/ebwizardry/recipes/transportation_stone.json b/src/main/resources/assets/ebwizardry/recipes/transportation_stone.json
index 5a4398fe..f28c629b 100644
--- a/src/main/resources/assets/ebwizardry/recipes/transportation_stone.json
+++ b/src/main/resources/assets/ebwizardry/recipes/transportation_stone.json
@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         " x ",
         "xyx",
@@ -16,6 +16,6 @@
     },
     "result": {
         "item": "ebwizardry:transportation_stone",
-        "amount": 2
+        "count": 2
     }
 }
\ No newline at end of file