From 9c86245fb85ec2317aba69d91aeb673bc44d6f45 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Tue, 6 Sep 2022 11:37:19 +0200
Subject: [PATCH] Adjust some recipes and traits

---
 .../minecraft/traits/blocks/overworld/mechanical.json |  7 +------
 .../traits/blocks/overworld/mechanical_powered.json   | 11 +++++++++++
 .../minecraft/traits/blocks/underworld/glowing.json   |  7 +++++++
 .../blocks/underworld/materials_from_the_ground.json  |  1 -
 .../minecraft/traits/items/overworld/special.json     |  2 +-
 .../data/unicopia/recipes/spells/fire_bolt.json       |  2 +-
 .../data/unicopia/recipes/spells/vortex.json          |  2 +-
 7 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 src/main/resources/data/minecraft/traits/blocks/overworld/mechanical_powered.json
 create mode 100644 src/main/resources/data/minecraft/traits/blocks/underworld/glowing.json

diff --git a/src/main/resources/data/minecraft/traits/blocks/overworld/mechanical.json b/src/main/resources/data/minecraft/traits/blocks/overworld/mechanical.json
index 79f63d42..680847bd 100644
--- a/src/main/resources/data/minecraft/traits/blocks/overworld/mechanical.json
+++ b/src/main/resources/data/minecraft/traits/blocks/overworld/mechanical.json
@@ -28,10 +28,6 @@
     "minecraft:target",
     "minecraft:conduit",
 
-    "minecraft:redstone",
-    "minecraft:redstone_torch",
-    "minecraft:redstone_block",
-   
     "minecraft:stonecutter",
     "minecraft:bell",
     "minecraft:lantern",
@@ -61,8 +57,7 @@
     "minecraft:powered_rail",
     "minecraft:detector_rail",
     "minecraft:rail",
-    "minecraft:activator_rail",
-    
+
     "minecraft:redstone_lamp",
     "minecraft:note_block",
     
diff --git a/src/main/resources/data/minecraft/traits/blocks/overworld/mechanical_powered.json b/src/main/resources/data/minecraft/traits/blocks/overworld/mechanical_powered.json
new file mode 100644
index 00000000..52bb537d
--- /dev/null
+++ b/src/main/resources/data/minecraft/traits/blocks/overworld/mechanical_powered.json
@@ -0,0 +1,11 @@
+{
+  "replace": false,
+  "traits": "knowledge:1 power:4",
+  "items": [
+    "minecraft:redstone",
+    "minecraft:redstone_torch",
+    "minecraft:redstone_block",
+
+    "minecraft:activator_rail"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/traits/blocks/underworld/glowing.json b/src/main/resources/data/minecraft/traits/blocks/underworld/glowing.json
new file mode 100644
index 00000000..89138ee8
--- /dev/null
+++ b/src/main/resources/data/minecraft/traits/blocks/underworld/glowing.json
@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "traits": "darkness:2 earth:-1 power:2 blood:4",
+  "items": [
+    "minecraft:glowstone"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/traits/blocks/underworld/materials_from_the_ground.json b/src/main/resources/data/minecraft/traits/blocks/underworld/materials_from_the_ground.json
index e5e204a9..dddd4a90 100644
--- a/src/main/resources/data/minecraft/traits/blocks/underworld/materials_from_the_ground.json
+++ b/src/main/resources/data/minecraft/traits/blocks/underworld/materials_from_the_ground.json
@@ -8,7 +8,6 @@
     "minecraft:polished_basalt",
     "minecraft:smooth_basalt",
     "minecraft:red_nether_bricks",
-    "minecraft:glowstone",
     "minecraft:nether_gold_ore",
     "minecraft:nether_quartz_ore",
     "minecraft:ancient_debris"
diff --git a/src/main/resources/data/minecraft/traits/items/overworld/special.json b/src/main/resources/data/minecraft/traits/items/overworld/special.json
index dca78667..e1ab5a93 100644
--- a/src/main/resources/data/minecraft/traits/items/overworld/special.json
+++ b/src/main/resources/data/minecraft/traits/items/overworld/special.json
@@ -9,7 +9,7 @@
     "minecraft:sugar": "happiness:1",
     "minecraft:totem_of_undying": "generosity:16",
     "minecraft:heart_of_the_sea": "kindness:17",
-    "minecraft:elytra": "power:1 focus:2",
+    "minecraft:elytra": "power:1 focus:2 air:5",
     "minecraft:turtle_helmet": "strength:4 darkness:1",
     "minecraft:stick": "earth:1",
     "minecraft:slime_ball": "rot:2",
diff --git a/src/main/resources/data/unicopia/recipes/spells/fire_bolt.json b/src/main/resources/data/unicopia/recipes/spells/fire_bolt.json
index 1de9ded3..b9c4e45e 100644
--- a/src/main/resources/data/unicopia/recipes/spells/fire_bolt.json
+++ b/src/main/resources/data/unicopia/recipes/spells/fire_bolt.json
@@ -2,7 +2,7 @@
   "type": "unicopia:spellbook/crafting",
   "material": { "item": "unicopia:gemstone", "spell": "unicopia:none" },
   "traits": {
-    "focus": 9, "air": 9, "fire": 30
+    "focus": 9, "fire": 30
   },
   "ingredients": [
     { "item": "unicopia:gemstone", "spell": "unicopia:flame" }
diff --git a/src/main/resources/data/unicopia/recipes/spells/vortex.json b/src/main/resources/data/unicopia/recipes/spells/vortex.json
index d664e8e9..62c4fcd1 100644
--- a/src/main/resources/data/unicopia/recipes/spells/vortex.json
+++ b/src/main/resources/data/unicopia/recipes/spells/vortex.json
@@ -2,7 +2,7 @@
   "type": "unicopia:spellbook/crafting",
   "material": { "item": "unicopia:gemstone", "spell": "unicopia:none" },
   "traits": {
-    "strength": 10, "knowledge": 8
+    "strength": 10, "knowledge": 8, "blood": 9
   },
   "ingredients": [
     { "item": "unicopia:gemstone", "spell": "unicopia:shield" }