From 3e4d3af21535d96e6912653e3984c45d3f609a9c Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 21 Jul 2021 18:28:17 +0100 Subject: [PATCH] Updated to eco 6 --- build.gradle | 2 +- .../com/willfp/ecobosses/EcoBossesPlugin.java | 90 +----------------- .../com/willfp/ecobosses/bosses/EcoBoss.java | 6 +- .../willfp/ecobosses/bosses/EcoBosses.java | 2 +- .../bosses/util/bosstype/CustomBossType.java | 4 +- .../bosses/util/obj/OptionedSound.java | 2 - .../ecobosses/config/BaseBossConfig.java | 4 +- .../willfp/ecobosses/config/CustomConfig.java | 2 +- .../com/willfp/ecobosses/util/ProxyUtils.java | 21 ---- gradle.properties | 2 +- lib/SpartanAPI.jar | Bin 15405 -> 0 bytes lib/aac-api-5.0.0.jar | Bin 4305 -> 0 bytes 12 files changed, 15 insertions(+), 120 deletions(-) delete mode 100644 eco-core/core-plugin/src/main/java/com/willfp/ecobosses/util/ProxyUtils.java delete mode 100644 lib/SpartanAPI.jar delete mode 100644 lib/aac-api-5.0.0.jar 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 1f2d578a14103df362628c2d461c260fda90635f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15405 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 diff --git a/lib/aac-api-5.0.0.jar b/lib/aac-api-5.0.0.jar deleted file mode 100644 index 32229901413c3c35cf80d388dc7dd50d1c06a562..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4305 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 Pm`OivQsd|GV@v)YL@PS#