Repo-Mirror/EcoMobs
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoMobs.git synced 2025-12-22 08:29:20 +00:00
Code Issues Releases 1 Activity

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

Browse Source
This commit is contained in:
Auxilor
2021-04-03 18:27:20 +01:00
parent f0203a3077 8cdc85a3fd
commit cbf9950bec
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

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

4
eco-core/core-plugin/build.gradle
View File

@@ -5,9 +5,5 @@ dependencies {
compileOnly project(":eco-core:core-proxy") compileOnly project(":eco-core:core-proxy")
compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT'
compileOnly 'commons-io:commons-io:2.8.0' 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.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'
} }

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

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

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

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