From cebed9a4edd067999e4f14160b316bee0fb9326c Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Fri, 1 Jan 2021 15:28:55 +0000
Subject: [PATCH] Fixed config values and updated to use latest eco version

---
 build.gradle                                   |  2 +-
 .../illusioner/options/IllusionerOptions.java  | 18 +++++++++---------
 .../core-plugin/src/main/resources/plugin.yml  |  2 --
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index b30c79a..c449269 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 dependencies {
     implementation project(":eco-core").getSubprojects()
-    implementation 'com.willfp:eco:1.0.0'
+    implementation 'com.willfp:eco:1.0.1'
 }
 
 allprojects {
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/options/IllusionerOptions.java b/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/options/IllusionerOptions.java
index 74acc6b..95d3b87 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/options/IllusionerOptions.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/illusioner/illusioner/options/IllusionerOptions.java
@@ -109,19 +109,19 @@ public class IllusionerOptions {
 
         spawnSounds = new HashSet<>();
         IllusionerConfigs.SOUNDS.getConfig().getConfigurationSection("spawn").getKeys(false).forEach(key -> {
-            Sound sound = Sound.valueOf(Configs.CONFIG.getString("spawn." + key + ".sound"));
-            boolean broadcast = Configs.CONFIG.getBool("spawn." + key + ".broadcast");
-            float volume = (float) Configs.CONFIG.getDouble("spawn." + key + ".volume");
-            float pitch = (float) Configs.CONFIG.getDouble("spawn." + key + ".pitch");
+            Sound sound = Sound.valueOf(IllusionerConfigs.SOUNDS.getString("spawn." + key + ".sound"));
+            boolean broadcast = IllusionerConfigs.SOUNDS.getBool("spawn." + key + ".broadcast");
+            float volume = (float) IllusionerConfigs.SOUNDS.getDouble("spawn." + key + ".volume");
+            float pitch = (float) IllusionerConfigs.SOUNDS.getDouble("spawn." + key + ".pitch");
             spawnSounds.add(new OptionedSound(sound, volume, pitch, broadcast));
         });
 
         deathSounds = new HashSet<>();
         IllusionerConfigs.SOUNDS.getConfig().getConfigurationSection("death").getKeys(false).forEach(key -> {
-            Sound sound = Sound.valueOf(Configs.CONFIG.getString("death." + key + ".sound"));
-            boolean broadcast = Configs.CONFIG.getBool("death." + key + ".broadcast");
-            float volume = (float) Configs.CONFIG.getDouble("death." + key + ".volume");
-            float pitch = (float) Configs.CONFIG.getDouble("death." + key + ".pitch");
+            Sound sound = Sound.valueOf(IllusionerConfigs.SOUNDS.getString("death." + key + ".sound"));
+            boolean broadcast = IllusionerConfigs.SOUNDS.getBool("death." + key + ".broadcast");
+            float volume = (float) IllusionerConfigs.SOUNDS.getDouble("death." + key + ".volume");
+            float pitch = (float) IllusionerConfigs.SOUNDS.getDouble("death." + key + ".pitch");
             deathSounds.add(new OptionedSound(sound, volume, pitch, broadcast));
         });
 
@@ -135,7 +135,7 @@ public class IllusionerOptions {
 
         drops = new HashSet<>();
         IllusionerConfigs.DROPS.getConfig().getKeys(false).forEach(key -> {
-            ItemStack itemStack = Configs.CONFIG.getConfig().getItemStack(key);
+            ItemStack itemStack = IllusionerConfigs.DROPS.getConfig().getItemStack(key);
             drops.add(itemStack);
         });
     }
diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml
index 86b9e13..f627552 100644
--- a/eco-core/core-plugin/src/main/resources/plugin.yml
+++ b/eco-core/core-plugin/src/main/resources/plugin.yml
@@ -5,8 +5,6 @@ api-version: 1.15
 authors: [Auxilor]
 website: willfp.com
 load: STARTUP
-softdepend:
-  - PlaceholderAPI
 
 commands:
   ilreload: