From 65a1d8ce1007ca6244998ab99cf0f9db5f61aab0 Mon Sep 17 00:00:00 2001
From: Aria Sangarin <ariahyrule@gmail.com>
Date: Thu, 30 Jan 2020 22:01:29 +0100
Subject: [PATCH] Updated default configs to fit the crafting update

---
 src/main/resources/default/item/armor.yml     | 290 +++---------------
 src/main/resources/default/item/axe.yml       |  54 +---
 .../resources/default/item/consumable.yml     |  60 ++--
 .../resources/default/item/greatsword.yml     |  48 +--
 src/main/resources/default/item/material.yml  |  95 +-----
 src/main/resources/default/item/staff.yml     |  10 +-
 src/main/resources/default/item/sword.yml     | 134 ++------
 7 files changed, 109 insertions(+), 582 deletions(-)

diff --git a/src/main/resources/default/item/armor.yml b/src/main/resources/default/item/armor.yml
index 0a71b5cf..5cbb37cc 100644
--- a/src/main/resources/default/item/armor.yml
+++ b/src/main/resources/default/item/armor.yml
@@ -27,49 +27,13 @@ STEEL_HELMET:
   knockback-resistance: 0.01=0.03
   gem-sockets:
   - Green
-  advanced-craft-enabled: true
   set: STEEL
-  advanced-craft:
-    '4':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '6':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '7':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '8':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '3':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '0':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '1':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '5':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '2':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
+  crafting:
+    shaped:
+      '1':
+      - MATERIAL.STEEL_INGOT MATERIAL.STEEL_INGOT MATERIAL.STEEL_INGOT
+      - MATERIAL.STEEL_INGOT AIR MATERIAL.STEEL_INGOT
+      - AIR AIR AIR
 STEEL_CHESTPLATE:
   material: IRON_CHESTPLATE
   block-power: 5.0=7.0
@@ -83,46 +47,13 @@ STEEL_CHESTPLATE:
   knockback-resistance: 0.01=0.03
   gem-sockets:
   - Blue
-  advanced-craft-enabled: true
   set: STEEL
-  advanced-craft:
-    '1':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '3':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '7':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '6':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '8':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '5':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '4':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '0':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '2':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
+  crafting:
+    shaped:
+      '1':
+      - MATERIAL.STEEL_INGOT AIR MATERIAL.STEEL_INGOT
+      - MATERIAL.STEEL_INGOT MATERIAL.STEEL_INGOT MATERIAL.STEEL_INGOT
+      - MATERIAL.STEEL_INGOT MATERIAL.STEEL_INGOT MATERIAL.STEEL_INGOT
 STEEL_LEGGINGS:
   material: IRON_LEGGINGS
   block-power: 5.0=7.0
@@ -136,47 +67,13 @@ STEEL_LEGGINGS:
   knockback-resistance: 0.01=0.03
   gem-sockets:
   - Blue
-  advanced-craft-enabled: true
   set: STEEL
-  advanced-craft:
-    '4':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '7':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '8':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '6':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '3':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '0':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '1':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '2':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '5':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
+  crafting:
+    shaped:
+      '1':
+      - MATERIAL.STEEL_INGOT MATERIAL.STEEL_INGOT MATERIAL.STEEL_INGOT
+      - MATERIAL.STEEL_INGOT AIR MATERIAL.STEEL_INGOT
+      - MATERIAL.STEEL_INGOT AIR MATERIAL.STEEL_INGOT
 STEEL_BOOTS:
   material: IRON_BOOTS
   block-power: 5.0=7.0
@@ -190,50 +87,13 @@ STEEL_BOOTS:
   knockback-resistance: 0.01=0.03
   gem-sockets:
   - Green
-  advanced-craft-enabled: true
   set: STEEL
-  advanced-craft:
-    '0':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '1':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '2':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '4':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '7':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '6':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '3':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '8':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
-    '5':
-      type: MATERIAL
-      id: STEEL_INGOT
-      amount: 1
+  crafting:
+    shaped:
+      '1':
+      - MATERIAL.STEEL_INGOT AIR MATERIAL.STEEL_INGOT
+      - MATERIAL.STEEL_INGOT AIR MATERIAL.STEEL_INGOT
+      - AIR AIR AIR
 CURSED_WITHER_SKULL:
   material: WITHER_SKELETON_SKULL
   name: '&7Cursed Wither Skull'
@@ -243,7 +103,6 @@ CURSED_WITHER_SKULL:
   - Red
   - Blue
   armor: 3.0
-  durability: 3
   armor-toughness: 2.0
   perm-effects:
     ABSORPTION: 1
@@ -256,52 +115,12 @@ CURSED_WITHER_SKULL:
       defense: 67.4
     fire:
       defense: 53.4
-  advanced-craft-enabled: true
-  advanced-craft:
-    '4':
-      type: MATERIAL
-      id: UNIQUE_WEAPON_ESSENCE
-      amount: 1
-    '8':
-      material: BONE
-      amount: 1
-      durability: 0
-      name: ''
-    '7':
-      material: BONE
-      amount: 1
-      durability: 0
-      name: ''
-    '6':
-      material: BONE
-      amount: 1
-      durability: 0
-      name: ''
-    '5':
-      material: BONE
-      amount: 1
-      durability: 0
-      name: ''
-    '2':
-      material: BONE
-      amount: 1
-      durability: 0
-      name: ''
-    '1':
-      material: BONE
-      amount: 1
-      durability: 0
-      name: ''
-    '0':
-      material: BONE
-      amount: 1
-      durability: 0
-      name: ''
-    '3':
-      material: BONE
-      amount: 1
-      durability: 0
-      name: ''
+  crafting:
+    shaped:
+      '1':
+      - BONE BONE BONE
+      - BONE MATERIAL.UNIQUE_WEAPON_ESSENCE BONE
+      - BONE BONE BONE
 HUGE_MOTHRON_WINGS:
   material: ELYTRA
   max-durability: 5.0
@@ -519,47 +338,12 @@ WYVERN_CAP:
     JUMP: 2
   lore:
   - '&7Grants permanent jump boost II'
-  advanced-craft:
-    '4':
-      amount: 1
-      material: AIR
-      durability: 0
-      name: ''
-    '6':
-      amount: 1
-      material: AIR
-      durability: 0
-      name: ''
-    '7':
-      amount: 1
-      material: AIR
-      durability: 0
-      name: ''
-    '8':
-      amount: 1
-      material: AIR
-      durability: 0
-      name: ''
-    '3':
-      type: TOME
-      id: WYVERN_FEATHER
-      amount: 1
-    '5':
-      type: TOME
-      id: WYVERN_FEATHER
-      amount: 1
-    '2':
-      type: TOME
-      id: WYVERN_FEATHER
-      amount: 1
-    '0':
-      type: TOME
-      id: WYVERN_FEATHER
-      amount: 1
-    '1':
-      type: TOME
-      id: WYVERN_SOUL
-      amount: 1
+  crafting:
+    shaped:
+      '1':
+      - TOME.WYVERN_FEATHER TOME.WYVERN_SOUL TOME.WYVERN_FEATHER
+      - TOME.WYVERN_FEATHER AIR TOME.WYVERN_FEATHER
+      - AIR AIR AIR
 TRAVEL_BOOTS:
   material: LEATHER_BOOTS
   name: §fTravel boots
@@ -655,4 +439,4 @@ SHADOWBOOTS:
   armor: 3.0
   max-health: 8.0
   movement-speed: 0.01
-  dye-color: 0 0 0
\ No newline at end of file
+  dye-color: 0 0 0
diff --git a/src/main/resources/default/item/axe.yml b/src/main/resources/default/item/axe.yml
index e3b83f1d..a7655dc2 100644
--- a/src/main/resources/default/item/axe.yml
+++ b/src/main/resources/default/item/axe.yml
@@ -18,11 +18,12 @@ BUTCHER_AXE:
       damage: 3.2
   gem-sockets:
   - Uncolored
-  craft-enabled: true
-  craft:
-  - IRON_BLOCK IRON_BLOCK AIR
-  - IRON_BLOCK STICK AIR
-  - AIR STICK AIR
+  crafting:
+    shaped:
+      '1':
+      - IRON_BLOCK IRON_BLOCK AIR
+      - IRON_BLOCK STICK AIR
+      - AIR STICK AIR
 BONE_CRACKER:
   material: STONE_AXE
   disable-repairing: true
@@ -71,40 +72,9 @@ SILVER_AXE:
   - '&7right-click to perform a devastating'
   - '&7circular slash, dealing &c6 &7damage'
   - '&7and knocking back nearby targets.'
-  advanced-craft:
-    '0':
-      material: AIR
-      amount: 1
-      name: ''
-    '3':
-      material: AIR
-      amount: 1
-      name: ''
-    '6':
-      material: AIR
-      amount: 1
-      name: ''
-    '8':
-      material: AIR
-      amount: 1
-      name: ''
-    '7':
-      material: STICK
-      amount: 1
-      name: ''
-    '4':
-      material: STICK
-      amount: 1
-      name: ''
-    '2':
-      type: MATERIAL
-      id: SILVER_INGOT
-      amount: 1
-    '1':
-      type: MATERIAL
-      id: SILVER_INGOT
-      amount: 1
-    '5':
-      type: MATERIAL
-      id: SILVER_INGOT
-      amount: 1
+  crafting:
+    shaped:
+      '1':
+      - MATERIAL.SILVER_INGOT MATERIAL.SILVER_INGOT AIR
+      - MATERIAL.SILVER_INGOT STICK AIR
+      - AIR STICK AIR
diff --git a/src/main/resources/default/item/consumable.yml b/src/main/resources/default/item/consumable.yml
index 34bb0f6b..6439bf9c 100644
--- a/src/main/resources/default/item/consumable.yml
+++ b/src/main/resources/default/item/consumable.yml
@@ -30,11 +30,12 @@ SCROLL_OF_IDENTIFICATION:
   name: '&fScroll of Identification'
   tier: '&8Uncommon'
   can-identify: true
-  craft-enabled: true
-  craft:
-  - AIR AIR AIR
-  - PAPER DIAMOND PAPER
-  - AIR AIR AIR
+  crafting:
+    shaped:
+      '1':
+      - AIR AIR AIR
+      - PAPER DIAMOND PAPER
+      - AIR AIR AIR
   inedible: true
 ITEM_CRUSHER:
   material: IRON_AXE
@@ -292,46 +293,21 @@ EGGNOG:
     '1':
       format: me Mmmmmh!
       cooldown: 3.0
-  advanced-craft:
-    '0':
-      material: AIR
-      amount: 1
-      name: ''
-    '1':
-      material: AIR
-      amount: 1
-      name: ''
-    '2':
-      material: AIR
-      amount: 1
-      name: ''
-    '3':
-      material: AIR
-      amount: 1
-      name: ''
-    '5':
-      material: AIR
-      amount: 1
-      name: ''
-    '6':
-      material: AIR
-      amount: 1
-      name: ''
-    '8':
-      material: AIR
-      amount: 1
-      name: ''
-    '4':
-      material: SUGAR
-      amount: 1
-      name: ''
-    '7':
-      material: EGG
-      amount: 1
-      name: ''
   lore:
   - '&eEarned during X-Mas 2018!'
   - '&e&oA fresh & cold eggnog!'
+  crafting:
+    shapeless:
+      '1':
+        item1: EGG
+        item2: SUGAR
+        item3: AIR
+        item4: AIR
+        item5: AIR
+        item6: AIR
+        item7: AIR
+        item8: AIR
+        item9: AIR
 MANGO:
   material: PLAYER_HEAD
   name: '&fMango'
diff --git a/src/main/resources/default/item/greatsword.yml b/src/main/resources/default/item/greatsword.yml
index 85ddc567..31591be9 100644
--- a/src/main/resources/default/item/greatsword.yml
+++ b/src/main/resources/default/item/greatsword.yml
@@ -58,48 +58,12 @@ MOLTEN_BLADE:
   name: '&cMolten Blade'
   attack-speed: 1.3
   attack-damage: 11.0
-  advanced-craft:
-    '0':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '2':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '6':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '8':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '7':
-      material: BLAZE_ROD
-      amount: 1
-      durability: 0
-      name: ''
-    '4':
-      type: MATERIAL
-      id: FIRE_ESSENCE
-      amount: 1
-    '3':
-      type: MATERIAL
-      id: FIRE_ESSENCE
-      amount: 1
-    '1':
-      type: MATERIAL
-      id: FIRE_ESSENCE
-      amount: 1
-    '5':
-      type: MATERIAL
-      id: FIRE_ESSENCE
-      amount: 1
+  crafting:
+    shaped:
+      '1':
+      - AIR MATERIAL.FIRE_ESSENCE AIR
+      - MATERIAL.FIRE_ESSENCE MATERIAL.FIRE_ESSENCE MATERIAL.FIRE_ESSENCE
+      - AIR BLAZE_ROD AIR
   ability:
     ability1:
       type: MAGMA_FISSURE
diff --git a/src/main/resources/default/item/material.yml b/src/main/resources/default/item/material.yml
index 14298567..c5152d2d 100644
--- a/src/main/resources/default/item/material.yml
+++ b/src/main/resources/default/item/material.yml
@@ -114,52 +114,12 @@ FIRE_ESSENCE:
   hide-enchants: true
   enchants:
     unbreaking: 1
-  advanced-craft:
-    '8':
-      material: BLAZE_POWDER
-      amount: 1
-      durability: 0
-      name: ''
-    '7':
-      material: BLAZE_POWDER
-      amount: 1
-      durability: 0
-      name: ''
-    '6':
-      material: BLAZE_POWDER
-      amount: 1
-      durability: 0
-      name: ''
-    '5':
-      material: BLAZE_POWDER
-      amount: 1
-      durability: 0
-      name: ''
-    '2':
-      material: BLAZE_POWDER
-      amount: 1
-      durability: 0
-      name: ''
-    '1':
-      material: BLAZE_POWDER
-      amount: 1
-      durability: 0
-      name: ''
-    '0':
-      material: BLAZE_POWDER
-      amount: 1
-      durability: 0
-      name: ''
-    '3':
-      material: BLAZE_POWDER
-      amount: 1
-      durability: 0
-      name: ''
-    '4':
-      material: BLAZE_ROD
-      amount: 1
-      durability: 0
-      name: ''
+  crafting:
+    shaped:
+      '1':
+      - BLAZE_POWDER BLAZE_POWDER BLAZE_POWDER
+      - BLAZE_POWDER BLAZE_ROD BLAZE_POWDER
+      - BLAZE_POWDER BLAZE_POWDER BLAZE_POWDER
 RARE_DIAMOND:
   material: DIAMOND
   enchants:
@@ -185,40 +145,9 @@ SILVER_INGOT:
     unbreaking: 1
   hide-enchants: true
   disable-crafting: true
-  advanced-craft:
-    '7':
-      type: MATERIAL
-      id: SILVER_COIN
-      amount: 1
-    '6':
-      type: MATERIAL
-      id: SILVER_COIN
-      amount: 1
-    '3':
-      type: MATERIAL
-      id: SILVER_COIN
-      amount: 1
-    '8':
-      type: MATERIAL
-      id: SILVER_COIN
-      amount: 1
-    '4':
-      type: MATERIAL
-      id: SILVER_COIN
-      amount: 1
-    '5':
-      type: MATERIAL
-      id: SILVER_COIN
-      amount: 1
-    '0':
-      type: MATERIAL
-      id: SILVER_COIN
-      amount: 1
-    '1':
-      type: MATERIAL
-      id: SILVER_COIN
-      amount: 1
-    '2':
-      type: MATERIAL
-      id: SILVER_COIN
-      amount: 1
\ No newline at end of file
+  crafting:
+    shaped:
+      '1':
+      - MATERIAL.SILVER_COIN MATERIAL.SILVER_COIN MATERIAL.SILVER_COIN
+      - MATERIAL.SILVER_COIN MATERIAL.SILVER_COIN MATERIAL.SILVER_COIN
+      - MATERIAL.SILVER_COIN MATERIAL.SILVER_COIN MATERIAL.SILVER_COIN
\ No newline at end of file
diff --git a/src/main/resources/default/item/staff.yml b/src/main/resources/default/item/staff.yml
index 4a8367a7..07e890a1 100644
--- a/src/main/resources/default/item/staff.yml
+++ b/src/main/resources/default/item/staff.yml
@@ -14,10 +14,12 @@ EARTH_STAFF:
   perm-effects:
     JUMP: 2
   craft-enabled: true
-  craft:
-  - JUNGLE_SAPLING EMERALD JUNGLE_SAPLING
-  - EMERALD STICK EMERALD
-  - JUNGLE_SAPLING EMERALD JUNGLE_SAPLING
+  crafting:
+    shaped:
+      '1':
+      - JUNGLE_SAPLING EMERALD JUNGLE_SAPLING
+      - EMERALD STICK EMERALD
+      - JUNGLE_SAPLING EMERALD JUNGLE_SAPLING
   element:
     earth:
       damage: 23.0
diff --git a/src/main/resources/default/item/sword.yml b/src/main/resources/default/item/sword.yml
index df95325c..d5984ec3 100644
--- a/src/main/resources/default/item/sword.yml
+++ b/src/main/resources/default/item/sword.yml
@@ -35,48 +35,12 @@ FALCON_BLADE:
   disable-repairing: true
   disable-smelting: true
   tier: EPIC
-  advanced-craft:
-    '0':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '2':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '6':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '8':
-      material: AIR
-      durability: 0
-      amount: 1
-      name: ''
-    '4':
-      material: GOLDEN_SWORD
-      amount: 1
-      durability: 0
-      name: ''
-    '5':
-      type: MATERIAL
-      id: EPIC_WEAPON_ESSENCE
-      amount: 1
-    '7':
-      type: MATERIAL
-      id: EPIC_WEAPON_ESSENCE
-      amount: 1
-    '3':
-      type: MATERIAL
-      id: EPIC_WEAPON_ESSENCE
-      amount: 1
-    '1':
-      type: MATERIAL
-      id: EPIC_WEAPON_ESSENCE
-      amount: 1
+  crafting:
+    shaped:
+      '1':
+      - AIR MATERIAL.EPIC_WEAPON_ESSENCE AIR
+      - MATERIAL.EPIC_WEAPON_ESSENCE GOLDEN_SWORD MATERIAL.EPIC_WEAPON_ESSENCE
+      - AIR MATERIAL.EPIC_WEAPON_ESSENCE AIR
 KATANA:
   material: IRON_SWORD
   attack-damage: 7.0
@@ -106,43 +70,12 @@ SOULSTEALER:
       type: VAMPIRISM
       mode: ON_HIT
       cooldown: 7.0
-  advanced-craft:
-    '7':
-      type: MISCELLANEOUS
-      id: HUMAN_SOUL
-      amount: 1
-    '6':
-      type: MISCELLANEOUS
-      id: HUMAN_SOUL
-      amount: 1
-    '3':
-      type: MISCELLANEOUS
-      id: HUMAN_SOUL
-      amount: 1
-    '8':
-      type: MISCELLANEOUS
-      id: HUMAN_SOUL
-      amount: 1
-    '5':
-      type: MISCELLANEOUS
-      id: HUMAN_SOUL
-      amount: 1
-    '2':
-      type: MISCELLANEOUS
-      id: HUMAN_SOUL
-      amount: 1
-    '0':
-      type: MISCELLANEOUS
-      id: HUMAN_SOUL
-      amount: 1
-    '1':
-      type: MISCELLANEOUS
-      id: HUMAN_SOUL
-      amount: 1
-    '4':
-      type: SWORD
-      id: SILVER_SWORD
-      amount: 1
+  crafting:
+    shaped:
+      '1':
+      - MISCELLANEOUS.HUMAN_SOUL MISCELLANEOUS.HUMAN_SOUL MISCELLANEOUS.HUMAN_SOUL
+      - MISCELLANEOUS.HUMAN_SOUL SWORD.SILVER_SWORD MISCELLANEOUS.HUMAN_SOUL
+      - MISCELLANEOUS.HUMAN_SOUL MISCELLANEOUS.HUMAN_SOUL MISCELLANEOUS.HUMAN_SOUL
   lore:
   - '&7Drains &c10%&7 of the damage'
   - '&7dealt as health points.'
@@ -164,40 +97,9 @@ SILVER_SWORD:
   lore:
   - '&7May be upgraded.'
   required-level: 4.0
-  advanced-craft:
-    '0':
-      material: AIR
-      amount: 1
-      name: ''
-    '2':
-      material: AIR
-      amount: 1
-      name: ''
-    '3':
-      material: AIR
-      amount: 1
-      name: ''
-    '5':
-      material: AIR
-      amount: 1
-      name: ''
-    '6':
-      material: AIR
-      amount: 1
-      name: ''
-    '8':
-      material: AIR
-      amount: 1
-      name: ''
-    '4':
-      type: MATERIAL
-      id: SILVER_INGOT
-      amount: 1
-    '1':
-      type: MATERIAL
-      id: SILVER_INGOT
-      amount: 1
-    '7':
-      material: STICK
-      amount: 1
-      name: ''
+  crafting:
+    shaped:
+      '1':
+      - AIR MATERIAL.SILVER_INGOT AIR
+      - AIR MATERIAL.SILVER_INGOT AIR
+      - AIR STICK AIR