Merge remote-tracking branch 'origin/master' into master

build.gradle

@@ -47,7 +47,7 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:4.2.0'
+        compileOnly 'com.willfp:eco:4.3.1'
 
         compileOnly 'org.jetbrains:annotations:19.0.0'
 

eco-core/core-plugin/build.gradle

@@ -5,9 +5,5 @@ dependencies {
     compileOnly project(":eco-core:core-proxy")
     compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT'
     compileOnly 'commons-io:commons-io:2.8.0'
-    compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.0-SNAPSHOT'
-    compileOnly 'net.ess3:EssentialsX:2.18.1'
     compileOnly 'com.destroystokyo.paper:paper-api:1.16.3-R0.1-SNAPSHOT'
-    compileOnly 'com.gmail.nossr50.mcMMO:mcMMO:2.1.157'
-    compileOnly 'me.clip:placeholderapi:2.10.9'
 }

eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java

@@ -1,7 +1,7 @@
 package com.willfp.ecobosses.bosses;
 
-import com.willfp.eco.internal.config.AbstractUndefinedConfig;
 import com.willfp.eco.util.StringUtils;
+import com.willfp.eco.util.config.Config;
 import com.willfp.eco.util.internal.PluginDependent;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.eco.util.tuples.Pair;
@@ -42,7 +42,7 @@ public class EcoBoss extends PluginDependent {
      * The config of the set.
      */
     @Getter(AccessLevel.PRIVATE)
-    private final AbstractUndefinedConfig config;
+    private final Config config;
 
     /**
      * The display name of the boss.
@@ -254,7 +254,7 @@ public class EcoBoss extends PluginDependent {
      * @param plugin Instance of EcoBosses.
      */
     public EcoBoss(@NotNull final String name,
-                   @NotNull final AbstractUndefinedConfig config,
+                   @NotNull final Config config,
                    @NotNull final AbstractEcoPlugin plugin) {
         super(plugin);
         this.config = config;

eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/CustomConfig.java

@@ -14,6 +14,6 @@ public class CustomConfig extends StaticOptionalConfig {
      */
     public CustomConfig(@NotNull final String configName,
                         @NotNull final YamlConfiguration config) {
-        super(configName, EcoBossesPlugin.getInstance(), config);
+        super(configName, config);
     }
 }