From 016fecfd0b70a615019769be1e65aaecd3b3dd82 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 2 Apr 2021 22:27:23 +0100 Subject: [PATCH 1/4] Cleaned up dependencies and updated to eco 4.3.1 --- build.gradle | 2 +- eco-core/core-plugin/build.gradle | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index c40346f..db67d7b 100644 --- a/build.gradle +++ b/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' diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle index 85b3b5c..657249f 100644 --- a/eco-core/core-plugin/build.gradle +++ b/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' } \ No newline at end of file From 34192e3ed447a252d14c81483f6f61996716ed4d Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 2 Apr 2021 22:27:59 +0100 Subject: [PATCH 2/4] Updated to eco 4.3.1 configs --- .../src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java index 30d3d23..5ab863f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java +++ b/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. @@ -247,7 +247,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; From d204c10b50dfd405e324cf16230f2f484a0c5b45 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 2 Apr 2021 22:28:09 +0100 Subject: [PATCH 3/4] Updated to 5.0.0-pre4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7b032ae..f1aa6a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 5.0.0-pre3 +version = 5.0.0-pre4 plugin-name = EcoBosses \ No newline at end of file From 8cdc85a3fd7eb74ed78902820e3a952dc26bd423 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 2 Apr 2021 22:28:35 +0100 Subject: [PATCH 4/4] Removed unneeded getInstance() call --- .../src/main/java/com/willfp/ecobosses/config/CustomConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/CustomConfig.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/CustomConfig.java index e58c4ae..ddabfcb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/CustomConfig.java +++ b/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); } }