diff --git a/build.gradle b/build.gradle index 27dab03..8ca6c4e 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:5.7.1' + compileOnly 'com.willfp:eco:6.0.0' compileOnly 'org.jetbrains:annotations:19.0.0' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/EcoBossesPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/EcoBossesPlugin.java index 9be7e5a..0a74517 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/EcoBossesPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/EcoBossesPlugin.java @@ -1,10 +1,7 @@ package com.willfp.ecobosses; -import com.willfp.eco.core.AbstractPacketAdapter; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.command.impl.PluginCommand; -import com.willfp.eco.core.integrations.IntegrationLoader; -import com.willfp.ecobosses.bosses.EcoBosses; import com.willfp.ecobosses.bosses.listeners.AttackListeners; import com.willfp.ecobosses.bosses.listeners.AutoSpawnTimer; import com.willfp.ecobosses.bosses.listeners.DeathListeners; @@ -12,11 +9,9 @@ import com.willfp.ecobosses.bosses.listeners.PassiveListeners; import com.willfp.ecobosses.bosses.listeners.SpawnListeners; import com.willfp.ecobosses.bosses.util.BossUtils; import com.willfp.ecobosses.commands.CommandEcobosses; -import com.willfp.ecobosses.commands.CommandSpawn; import lombok.Getter; import org.bukkit.event.Listener; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -36,89 +31,25 @@ public class EcoBossesPlugin extends EcoPlugin { instance = this; } - /** - * Code executed on plugin enable. - */ @Override - public void enable() { - this.getExtensionLoader().loadExtensions(); - - if (this.getExtensionLoader().getLoadedExtensions().isEmpty()) { - this.getLogger().info("&cNo extensions found"); - } else { - this.getLogger().info("Extensions Loaded:"); - this.getExtensionLoader().getLoadedExtensions().forEach(extension -> this.getLogger().info("- " + extension.getName() + " v" + extension.getVersion())); - } - } - - /** - * Code executed on plugin disable. - */ - @Override - public void disable() { - this.getExtensionLoader().unloadExtensions(); - + protected void handleDisable() { BossUtils.killAllBosses(); } - /** - * Nothing is called on plugin load. - */ @Override - public void load() { - // Nothing needs to be called on load - } - - /** - * Code executed on reload. - */ - @Override - public void onReload() { + protected void handleReload() { this.getScheduler().runTimer(new AutoSpawnTimer(), 5, 1); } - /** - * Code executed after server is up. - */ @Override - public void postLoad() { - // Nothing is executed post-load. - } - - /** - * EcoEnchants-specific integrations. - * - * @return A list of all integrations. - */ - @Override - public List getIntegrationLoaders() { - return new ArrayList<>(); - } - - @Override - public List getPluginCommands() { + protected List loadPluginCommands() { return Arrays.asList( new CommandEcobosses(this) ); } - /** - * Packet Adapters for enchant display. - * - * @return A list of packet adapters. - */ @Override - public List getPacketAdapters() { - return new ArrayList<>(); - } - - /** - * EcoEnchants-specific listeners. - * - * @return A list of all listeners. - */ - @Override - public List getListeners() { + protected List loadListeners() { return Arrays.asList( new AttackListeners(this), new DeathListeners(this), @@ -126,17 +57,4 @@ public class EcoBossesPlugin extends EcoPlugin { new PassiveListeners(this) ); } - - @Override - public List> getUpdatableClasses() { - return Arrays.asList( - EcoBosses.class, - CommandSpawn.class - ); - } - - @Override - protected String getMinimumEcoVersion() { - return "5.7.1"; - } } 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 ddd0c7e..14e84e8 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 @@ -3,7 +3,7 @@ package com.willfp.ecobosses.bosses; import com.google.common.collect.ImmutableMap; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.PluginDependent; -import com.willfp.eco.core.config.Config; +import com.willfp.eco.core.config.interfaces.Config; import com.willfp.eco.core.tuples.Pair; import com.willfp.eco.util.StringUtils; import com.willfp.ecobosses.bosses.effects.Effect; @@ -377,11 +377,11 @@ public class EcoBoss extends PluginDependent { // Messages this.spawnMessages = new ArrayList<>(); for (String string : this.getConfig().getStrings("broadcast.spawn")) { - this.spawnMessages.add(StringUtils.translate(string)); + this.spawnMessages.add(StringUtils.format(string)); } this.deathMessages = new ArrayList<>(); for (String string : this.getConfig().getStrings("broadcast.death")) { - this.deathMessages.add(StringUtils.translate(string)); + this.deathMessages.add(StringUtils.format(string)); } // Top Damager Commands diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBosses.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBosses.java index d6d8362..190dcea 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBosses.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBosses.java @@ -3,7 +3,7 @@ package com.willfp.ecobosses.bosses; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableList; -import com.willfp.eco.core.config.ConfigUpdater; +import com.willfp.eco.core.config.updating.ConfigUpdater; import com.willfp.ecobosses.EcoBossesPlugin; import com.willfp.ecobosses.config.BaseBossConfig; import com.willfp.ecobosses.config.CustomConfig; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/CustomBossType.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/CustomBossType.java index ddbbf90..111db59 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/CustomBossType.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/CustomBossType.java @@ -1,8 +1,8 @@ package com.willfp.ecobosses.bosses.util.bosstype; +import com.willfp.ecobosses.EcoBossesPlugin; import com.willfp.ecobosses.proxy.proxies.CustomEntitySpawnerProxy; import com.willfp.ecobosses.proxy.util.CustomEntity; -import com.willfp.ecobosses.util.ProxyUtils; import org.bukkit.Location; import org.bukkit.entity.LivingEntity; import org.jetbrains.annotations.NotNull; @@ -24,6 +24,6 @@ class CustomBossType extends BossType { @Override public LivingEntity spawnBossEntity(@NotNull final Location location) { - return ProxyUtils.getProxy(CustomEntitySpawnerProxy.class).spawnCustomEntity(entityClass, location); + return EcoBossesPlugin.getInstance().getProxy(CustomEntitySpawnerProxy.class).spawnCustomEntity(entityClass, location); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/obj/OptionedSound.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/obj/OptionedSound.java index a2814a0..19bc520 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/obj/OptionedSound.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/obj/OptionedSound.java @@ -1,8 +1,6 @@ package com.willfp.ecobosses.bosses.util.obj; -import lombok.Getter; import org.bukkit.Sound; -import org.jetbrains.annotations.NotNull; public record OptionedSound(Sound sound, float volume, diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/BaseBossConfig.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/BaseBossConfig.java index 687efec..dd934fb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/BaseBossConfig.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/config/BaseBossConfig.java @@ -1,10 +1,10 @@ package com.willfp.ecobosses.config; -import com.willfp.eco.core.config.ExtendableConfig; +import com.willfp.eco.core.config.yaml.YamlExtendableConfig; import com.willfp.ecobosses.EcoBossesPlugin; import org.jetbrains.annotations.NotNull; -public class BaseBossConfig extends ExtendableConfig { +public class BaseBossConfig extends YamlExtendableConfig { /** * Create new EcoBoss config. * 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 580ea4d..a98b793 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 @@ -1,6 +1,6 @@ package com.willfp.ecobosses.config; -import com.willfp.eco.core.config.YamlConfig; +import com.willfp.eco.core.config.yaml.YamlConfig; import lombok.Getter; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/util/ProxyUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/util/ProxyUtils.java deleted file mode 100644 index a4983a1..0000000 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/util/ProxyUtils.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.willfp.ecobosses.util; - -import com.willfp.eco.core.proxy.AbstractProxy; -import com.willfp.ecobosses.EcoBossesPlugin; -import com.willfp.ecobosses.proxy.util.ProxyFactory; -import lombok.experimental.UtilityClass; -import org.jetbrains.annotations.NotNull; - -@UtilityClass -public class ProxyUtils { - /** - * Get the implementation of a specified proxy. - * - * @param proxyClass The proxy interface. - * @param The type of the proxy. - * @return The proxy implementation. - */ - public @NotNull T getProxy(@NotNull final Class proxyClass) { - return new ProxyFactory<>(EcoBossesPlugin.getInstance(), proxyClass).getProxy(); - } -} diff --git a/gradle.properties b/gradle.properties index 3b20eb6..86724d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 5.3.0 +version = 6.0.0 plugin-name = EcoBosses \ No newline at end of file diff --git a/lib/SpartanAPI.jar b/lib/SpartanAPI.jar deleted file mode 100644 index 1f2d578..0000000 Binary files a/lib/SpartanAPI.jar and /dev/null differ diff --git a/lib/aac-api-5.0.0.jar b/lib/aac-api-5.0.0.jar deleted file mode 100644 index 3222990..0000000 Binary files a/lib/aac-api-5.0.0.jar and /dev/null differ