From e7e72447587cc5ed2b5f8354b63f6b3accd2480d Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Tue, 28 Dec 2021 18:40:51 +0200
Subject: [PATCH] Added (rough) initial recipes for all the spells

---
 .../ability/magic/spell/trait/TraitLoader.java  |  4 ++++
 .../unicopia/recipes/spellbook/catapult.json    | 16 ++++++++++++++++
 .../unicopia/recipes/spellbook/dark_vortex.json | 16 ++++++++++++++++
 .../recipes/spellbook/feather_fall.json         | 17 +++++++++++++++++
 .../unicopia/recipes/spellbook/fire_bolt.json   | 16 ++++++++++++++++
 .../data/unicopia/recipes/spellbook/flame.json  | 16 ++++++++++++++++
 .../spellbook/{burned_juice.json => frost.json} |  5 +++--
 .../unicopia/recipes/spellbook/infernal.json    | 16 ++++++++++++++++
 .../data/unicopia/recipes/spellbook/light.json  | 16 ++++++++++++++++
 .../unicopia/recipes/spellbook/necromancy.json  | 17 +++++++++++++++++
 .../data/unicopia/recipes/spellbook/reveal.json | 16 ++++++++++++++++
 .../data/unicopia/recipes/spellbook/scorch.json | 15 +++++++++++++++
 .../data/unicopia/recipes/spellbook/shield.json | 15 +++++++++++++++
 .../unicopia/recipes/spellbook/siphoning.json   | 16 ++++++++++++++++
 .../recipes/spellbook/transformation.json       | 15 +++++++++++++++
 .../data/unicopia/recipes/spellbook/vortex.json | 16 ++++++++++++++++
 16 files changed, 230 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/catapult.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/dark_vortex.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/feather_fall.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/fire_bolt.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/flame.json
 rename src/main/resources/data/unicopia/recipes/spellbook/{burned_juice.json => frost.json} (66%)
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/infernal.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/light.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/necromancy.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/reveal.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/scorch.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/shield.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/siphoning.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/transformation.json
 create mode 100644 src/main/resources/data/unicopia/recipes/spellbook/vortex.json

diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitLoader.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitLoader.java
index 0ab4ac11..64a83e14 100644
--- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitLoader.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitLoader.java
@@ -52,6 +52,10 @@ public class TraitLoader extends SinglePreparationResourceReloader<Map<Identifie
                         Map<String, String> data = JsonHelper.deserialize(Resources.GSON, reader, TYPE);
 
                         data.forEach((name, set) -> {
+                            if (set.isEmpty()) {
+                                return;
+                            }
+
                             try {
                                 Identifier id = new Identifier(name);
                                 SpellTraits.fromEntries(Arrays.stream(set.split(" ")).map(a -> a.split(":")).map(pair -> {
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/catapult.json b/src/main/resources/data/unicopia/recipes/spellbook/catapult.json
new file mode 100644
index 00000000..ccdf6400
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/catapult.json
@@ -0,0 +1,16 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "unicopia:flame"
+    }
+  },
+  "traits": {
+    "focus": 9, "air": 9
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:catapult"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/dark_vortex.json b/src/main/resources/data/unicopia/recipes/spellbook/dark_vortex.json
new file mode 100644
index 00000000..54c75c0d
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/dark_vortex.json
@@ -0,0 +1,16 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "unicopia:vortex"
+    }
+  },
+  "traits": {
+    "strength": 10, "knowledge": 8, "darkness": 9, "chaos": 8
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:dark_vortex"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/feather_fall.json b/src/main/resources/data/unicopia/recipes/spellbook/feather_fall.json
new file mode 100644
index 00000000..ba7737cb
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/feather_fall.json
@@ -0,0 +1,17 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "unicopia:shield"
+    }
+  },
+  "traits": {
+    "knowledge": 20, "life": 10, "chaos": 4,
+    "generosity": 10
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:feather_fall"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/fire_bolt.json b/src/main/resources/data/unicopia/recipes/spellbook/fire_bolt.json
new file mode 100644
index 00000000..69b18a38
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/fire_bolt.json
@@ -0,0 +1,16 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "unicopia:flame"
+    }
+  },
+  "traits": {
+    "focus": 9, "air": 9, "fire": 30
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:fire_bolt"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/flame.json b/src/main/resources/data/unicopia/recipes/spellbook/flame.json
new file mode 100644
index 00000000..e91a9b4e
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/flame.json
@@ -0,0 +1,16 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "unicopia:scorch"
+    }
+  },
+  "traits": {
+    "fire": 20
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:flame"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/burned_juice.json b/src/main/resources/data/unicopia/recipes/spellbook/frost.json
similarity index 66%
rename from src/main/resources/data/unicopia/recipes/spellbook/burned_juice.json
rename to src/main/resources/data/unicopia/recipes/spellbook/frost.json
index b8ccca13..d53a3231 100644
--- a/src/main/resources/data/unicopia/recipes/spellbook/burned_juice.json
+++ b/src/main/resources/data/unicopia/recipes/spellbook/frost.json
@@ -6,9 +6,10 @@
     }
   },
   "traits": {
-    "pestilence": 1
+    "ice": 1
   },
   "result": {
-    "item": "unicopia:burned_juice"
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:frost"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/infernal.json b/src/main/resources/data/unicopia/recipes/spellbook/infernal.json
new file mode 100644
index 00000000..12c8e0cf
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/infernal.json
@@ -0,0 +1,16 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "flame"
+    }
+  },
+  "traits": {
+    "fire": 50, "dark": 10
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:infernal"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/light.json b/src/main/resources/data/unicopia/recipes/spellbook/light.json
new file mode 100644
index 00000000..61f20e24
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/light.json
@@ -0,0 +1,16 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "unicopia:fire_bolt"
+    }
+  },
+  "traits": {
+    "ice": 30, "life": 30, "focus": 10
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:light"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/necromancy.json b/src/main/resources/data/unicopia/recipes/spellbook/necromancy.json
new file mode 100644
index 00000000..5403c7b1
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/necromancy.json
@@ -0,0 +1,17 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "unicopia:siphoning"
+    }
+  },
+  "traits": {
+    "strength": 10, "knowledge": 8, "darkness": 19, "chaos": 8,
+    "blood": 10, "poison": 9
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:necromancy"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/reveal.json b/src/main/resources/data/unicopia/recipes/spellbook/reveal.json
new file mode 100644
index 00000000..325750b5
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/reveal.json
@@ -0,0 +1,16 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "unicopia:shield"
+    }
+  },
+  "traits": {
+    "knowledge": 18, "life": 1, "order": 4
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:reveal"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/scorch.json b/src/main/resources/data/unicopia/recipes/spellbook/scorch.json
new file mode 100644
index 00000000..29451532
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/scorch.json
@@ -0,0 +1,15 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone"
+    }
+  },
+  "traits": {
+    "fire": 10
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:scorch"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/shield.json b/src/main/resources/data/unicopia/recipes/spellbook/shield.json
new file mode 100644
index 00000000..dd0df739
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/shield.json
@@ -0,0 +1,15 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone"
+    }
+  },
+  "traits": {
+    "strength": 10, "focus": 6, "power": 10
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:shield"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/siphoning.json b/src/main/resources/data/unicopia/recipes/spellbook/siphoning.json
new file mode 100644
index 00000000..008a8d26
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/siphoning.json
@@ -0,0 +1,16 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "unicopia:infernal"
+    }
+  },
+  "traits": {
+    "blood": 8, "poison": 10
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:siphoning"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/transformation.json b/src/main/resources/data/unicopia/recipes/spellbook/transformation.json
new file mode 100644
index 00000000..25bd642a
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/transformation.json
@@ -0,0 +1,15 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone"
+    }
+  },
+  "traits": {
+    "knowledge": 18, "life": 10, "chaos": 4
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:transformation"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/spellbook/vortex.json b/src/main/resources/data/unicopia/recipes/spellbook/vortex.json
new file mode 100644
index 00000000..eb64f467
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/spellbook/vortex.json
@@ -0,0 +1,16 @@
+{
+  "type": "unicopia:spellbook/crafting",
+  "material": {
+    "item": {
+      "item": "unicopia:gemstone",
+      "spell": "unicopia:shield"
+    }
+  },
+  "traits": {
+    "strength": 10, "knowledge": 8
+  },
+  "result": {
+    "item": "unicopia:gemstone",
+    "spell": "unicopia:vortex"
+  }
+}
\ No newline at end of file