From 217f13cdb0c28fe521c3bfc1def24d9628eb2c82 Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Tue, 19 Jan 2021 11:46:47 +0000
Subject: [PATCH] Updated manyullyn

---
 build.gradle                                  |  2 +-
 .../core-plugin/src/main/resources/sets.yml   | 16 +++++++-------
 .../core-plugin/src/main/resources/tiers.yml  | 22 ++++++++++++++++---
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index f5afd41..a0a5e62 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,7 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:3.0.0'
+        compileOnly 'com.willfp:eco:3.0.2'
 
         compileOnly 'org.jetbrains:annotations:19.0.0'
 
diff --git a/eco-core/core-plugin/src/main/resources/sets.yml b/eco-core/core-plugin/src/main/resources/sets.yml
index 2854c3b..d3ee669 100644
--- a/eco-core/core-plugin/src/main/resources/sets.yml
+++ b/eco-core/core-plugin/src/main/resources/sets.yml
@@ -5,13 +5,13 @@ Reaper:
     damage-taken-multiplier: 0.9
   advanced-lore:
     - ""
-    - "&6&lADVANCED BONUS"
+    - "<\$#f12711>&lADVANCED BONUS<\$#f5af19>"
     - "&8» &6Take 10% less damage"
     - "&8&oRequires full set to be worn"
-  advancement-shard-name: "&6Advancement Shard: &cReaper"
+  advancement-shard-name: "<\$#f12711>Advancement Shard:<\$#f5af19> &cReaper"
   advancement-shard-lore:
     - "&8Drop this onto &cReaper Armor"
-    - "&8to make it &6Advanced&8."
+    - "&8to make it <\$#f12711>Advanced<\$#f5af19>."
   shard-craftable: true
   shard-recipe:
     - prismarine_shard
@@ -32,7 +32,7 @@ Reaper:
     material: leather_helmet
     leather-color: "#303030"
     name: "&cReaper Helmet"
-    advanced-name: "&cAdvanced Reaper Helmet"
+    advanced-name: "<\$#f12711>Advanced<\$#f5af19>&c Reaper Helmet"
     lore:
       - "&c&lREAPER SET BONUS"
       - "&8» &cDeal 25% more damage"
@@ -59,7 +59,7 @@ Reaper:
     material: leather_chestplate
     leather-color: "#303030"
     name: "&cReaper Chestplate"
-    advanced-name: "&cAdvanced Reaper Chestplate"
+    advanced-name: "<\$#f12711>Advanced<\$#f5af19>&c Reaper Chestplate"
     lore:
       - "&c&lREAPER SET BONUS"
       - "&8» &cDeal 25% more damage"
@@ -85,7 +85,7 @@ Reaper:
       unbreaking: 3
     material: elytra
     name: "&cReaper Elytra"
-    advanced-name: "&cAdvanced Reaper Elytra"
+    advanced-name: "<\$#f12711>Advanced<\$#f5af19>&c Reaper Elytra"
     lore:
       - "&c&lREAPER SET BONUS"
       - "&8» &cDeal 25% more damage"
@@ -112,7 +112,7 @@ Reaper:
     material: leather_leggings
     leather-color: "#303030"
     name: "&cReaper Leggings"
-    advanced-name: "&cAdvanced Reaper Leggings"
+    advanced-name: "<\$#f12711>Advanced<\$#f5af19>&c Reaper Leggings"
     lore:
       - "&c&lREAPER SET BONUS"
       - "&8» &cDeal 25% more damage"
@@ -139,7 +139,7 @@ Reaper:
     material: leather_boots
     leather-color: "#303030"
     name: "&cReaper Boots"
-    advanced-name: "&cAdvanced Reaper Boots"
+    advanced-name: "<\$#f12711>Advanced<\$#f5af19>&c Reaper Boots"
     lore:
       - "&c&lREAPER SET BONUS"
       - "&8» &cDeal 25% more damage"
diff --git a/eco-core/core-plugin/src/main/resources/tiers.yml b/eco-core/core-plugin/src/main/resources/tiers.yml
index 6f9a6c6..dac9c3a 100644
--- a/eco-core/core-plugin/src/main/resources/tiers.yml
+++ b/eco-core/core-plugin/src/main/resources/tiers.yml
@@ -37,6 +37,10 @@ iron:
       armor: 6
       toughness: 0
       knockback-resistance: 0
+    elytra:
+      armor: 2
+      toughness: 0
+      knockback-resistance: 0
     leggings:
       armor: 5
       toughness: 0
@@ -76,6 +80,10 @@ diamond:
       armor: 8
       toughness: 2
       knockback-resistance: 0
+    elytra:
+      armor: 3
+      toughness: 0
+      knockback-resistance: 0
     leggings:
       armor: 6
       toughness: 2
@@ -115,6 +123,10 @@ netherite:
       armor: 8
       toughness: 3
       knockback-resistance: 1
+    elytra:
+      armor: 3
+      toughness: 0
+      knockback-resistance: 1
     leggings:
       armor: 6
       toughness: 3
@@ -125,10 +137,10 @@ netherite:
       knockback-resistance: 1
 
 manyullyn:
-  display: "&5&k!!&r &d&lMANYULLYN&r &5&k!!&r"
+  display: "&d&k!!&r <\$#f953c6>&lMANYULLYN<\$#b91d73>&r &d&k!!&r"
   requires-tier: netherite # Set to 'none' to always allow application
   crystal-craftable: true
-  crystal-name: "&dManyullyn Upgrade Crystal"
+  crystal-name: "<\$#f953c6>Manyullyn Upgrade Crystal<\$#b91d73>"
   crystal-recipe:
     - ecoarmor:upgrade_crystal_netherite
     - enchanted_golden_apple
@@ -144,7 +156,7 @@ manyullyn:
   crystal-lore:
     - "&8Drop this onto an armor piece"
     - "&8to set its tier to:"
-    - "&5&k!!&r &d&lMANYULLYN&r &5&k!!&r"
+    - "&d&k!!&r <\$#f953c6>&lMANYULLYN<\$#b91d73>&r &d&k!!&r"
   properties:
     helmet:
       armor: 3
@@ -154,6 +166,10 @@ manyullyn:
       armor: 8
       toughness: 5
       knockback-resistance: 2
+    elytra:
+      armor: 3
+      toughness: 0
+      knockback-resistance: 2
     leggings:
       armor: 6
       toughness: 5