Updated to eco 5.0.0

2025-12-21 16:09:24 +00:00 · 2021-04-04 15:07:57 +01:00
parent 05907d5876
commit 316d460585
23 changed files with 77 additions and 152 deletions
--- 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,9 @@
 package com.willfp.ecobosses;

-import com.willfp.eco.util.command.AbstractCommand;
-import com.willfp.eco.util.display.DisplayModule;
-import com.willfp.eco.util.integrations.IntegrationLoader;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
-import com.willfp.eco.util.protocollib.AbstractPacketAdapter;
+import com.willfp.eco.core.AbstractPacketAdapter;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.command.AbstractCommand;
+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.DeathListeners;
@@ -15,14 +14,13 @@ import com.willfp.ecobosses.commands.CommandEbspawn;
 import com.willfp.ecobosses.commands.TabCompleterEbspawn;
 import lombok.Getter;
 import org.bukkit.event.Listener;
-import org.jetbrains.annotations.Nullable;

 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

@SuppressWarnings("unused")
-public class EcoBossesPlugin extends AbstractEcoPlugin {
+public class EcoBossesPlugin extends EcoPlugin {
    /**
     * Instance of the plugin.
     */
@@ -132,10 +130,4 @@ public class EcoBossesPlugin extends AbstractEcoPlugin {
                TabCompleterEbspawn.class
        );
    }
-
-    @Override
-    @Nullable
-    protected DisplayModule createDisplayModule() {
-        return null;
-    }
 }
--- 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,17 +1,23 @@
 package com.willfp.ecobosses.bosses;

+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.config.Config;
+import com.willfp.eco.core.tuples.Pair;
 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;
 import com.willfp.ecobosses.bosses.effects.Effect;
 import com.willfp.ecobosses.bosses.effects.Effects;
 import com.willfp.ecobosses.bosses.util.bosstype.BossEntityUtils;
 import com.willfp.ecobosses.bosses.util.bosstype.BossType;
-import com.willfp.ecobosses.bosses.util.obj.*;
+import com.willfp.ecobosses.bosses.util.obj.BossbarProperties;
 import com.willfp.ecobosses.bosses.util.obj.EffectOption;
+import com.willfp.ecobosses.bosses.util.obj.ExperienceOptions;
+import com.willfp.ecobosses.bosses.util.obj.ImmunityOptions;
+import com.willfp.ecobosses.bosses.util.obj.OptionedSound;
+import com.willfp.ecobosses.bosses.util.obj.SpawnTotem;
 import com.willfp.ecobosses.bosses.util.obj.SummonsOption;
+import com.willfp.ecobosses.bosses.util.obj.TargetMode;
+import com.willfp.ecobosses.bosses.util.obj.TeleportOptions;
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.bukkit.Bukkit;
@@ -22,13 +28,22 @@ import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.*;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;

 public class EcoBoss extends PluginDependent {
@@ -255,7 +270,7 @@ public class EcoBoss extends PluginDependent {
     */
    public EcoBoss(@NotNull final String name,
                   @NotNull final Config config,
-                   @NotNull final AbstractEcoPlugin plugin) {
+                   @NotNull final EcoPlugin plugin) {
        super(plugin);
        this.config = config;
        this.name = name;
--- 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.util.config.updating.annotations.ConfigUpdater;
+import com.willfp.eco.internal.config.updating.annotations.ConfigUpdater;
 import com.willfp.ecobosses.EcoBossesPlugin;
 import com.willfp.ecobosses.config.BaseBossConfig;
 import com.willfp.ecobosses.config.CustomConfig;
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
@@ -1,16 +1,16 @@
 package com.willfp.ecobosses.bosses;

+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.scheduling.RunnableTask;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.StringUtils;
-import com.willfp.eco.util.bukkit.scheduling.EcoBukkitRunnable;
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.ecobosses.bosses.tick.BossTicker;
 import com.willfp.ecobosses.bosses.tick.tickers.BossBarTicker;
 import com.willfp.ecobosses.bosses.tick.tickers.HealthPlaceholderTicker;
 import com.willfp.ecobosses.bosses.tick.tickers.TargetTicker;
-import com.willfp.ecobosses.bosses.util.obj.OptionedSound;
 import com.willfp.ecobosses.bosses.util.obj.EffectOption;
+import com.willfp.ecobosses.bosses.util.obj.OptionedSound;
 import com.willfp.ecobosses.bosses.util.obj.SummonsOption;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -59,7 +59,7 @@ public class LivingEcoBoss extends PluginDependent {
     * @param entity The entity.
     * @param boss   The boss.
     */
-    public LivingEcoBoss(@NotNull final AbstractEcoPlugin plugin,
+    public LivingEcoBoss(@NotNull final EcoPlugin plugin,
                         @NotNull final LivingEntity entity,
                         @NotNull final EcoBoss boss) {
        super(plugin);
@@ -133,7 +133,7 @@ public class LivingEcoBoss extends PluginDependent {
    }

    private void tick(final long tick,
-                      @NotNull final EcoBukkitRunnable runnable) {
+                      @NotNull final RunnableTask runnable) {
        for (BossTicker ticker : tickers) {
            ticker.tick(boss, entity, tick);
        }
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AttackListeners.java
@@ -1,8 +1,8 @@
 package com.willfp.ecobosses.bosses.listeners;

+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.eco.util.NumberUtils;
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.ecobosses.bosses.EcoBoss;
 import com.willfp.ecobosses.bosses.LivingEcoBoss;
 import com.willfp.ecobosses.bosses.util.BossUtils;
@@ -34,7 +34,7 @@ public class AttackListeners extends PluginDependent implements Listener {
     *
     * @param plugin Instance of EcoBosses.
     */
-    public AttackListeners(@NotNull final AbstractEcoPlugin plugin) {
+    public AttackListeners(@NotNull final EcoPlugin plugin) {
        super(plugin);
    }

--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/DeathListeners.java
@@ -1,12 +1,12 @@
 package com.willfp.ecobosses.bosses.listeners;


+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.events.EntityDeathByEntityEvent;
+import com.willfp.eco.core.tuples.Pair;
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.eco.util.StringUtils;
-import com.willfp.eco.util.events.entitydeathbyentity.EntityDeathByEntityEvent;
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
-import com.willfp.eco.util.tuples.Pair;
 import com.willfp.ecobosses.bosses.EcoBoss;
 import com.willfp.ecobosses.bosses.util.BossUtils;
 import com.willfp.ecobosses.bosses.util.obj.DamagerProperty;
@@ -32,7 +32,7 @@ public class DeathListeners extends PluginDependent implements Listener {
     *
     * @param plugin Instance of EcoBosses.
     */
-    public DeathListeners(@NotNull final AbstractEcoPlugin plugin) {
+    public DeathListeners(@NotNull final EcoPlugin plugin) {
        super(plugin);
    }

--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/SpawnListeners.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/SpawnListeners.java
@@ -1,6 +1,7 @@
 package com.willfp.ecobosses.bosses.listeners;
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.AbstractEcoPlugin;
+
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
 import com.willfp.ecobosses.bosses.EcoBoss;
 import com.willfp.ecobosses.bosses.EcoBosses;
 import com.willfp.ecobosses.bosses.util.obj.SpawnTotem;
@@ -17,7 +18,7 @@ public class SpawnListeners extends PluginDependent implements Listener {
     *
     * @param plugin The plugin to link to.
     */
-    public SpawnListeners(@NotNull final AbstractEcoPlugin plugin) {
+    public SpawnListeners(@NotNull final EcoPlugin plugin) {
        super(plugin);
    }

--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/VanillaBossType.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/bosstype/VanillaBossType.java
@@ -23,6 +23,6 @@ class VanillaBossType extends BossType {

    @Override
    public LivingEntity spawnBossEntity(@NotNull final Location location) {
-        return (LivingEntity) Objects.requireNonNull(location.getWorld()).spawn(location, entityClass);
+        return Objects.requireNonNull(location.getWorld()).spawn(location, entityClass);
    }
 }
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/commands/CommandEbdrop.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/commands/CommandEbdrop.java
@@ -1,6 +1,6 @@
 package com.willfp.ecobosses.commands;

-import com.willfp.eco.util.command.AbstractCommand;
+import com.willfp.eco.core.command.AbstractCommand;
 import com.willfp.ecobosses.EcoBossesPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/commands/CommandEbreload.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/commands/CommandEbreload.java
@@ -1,6 +1,6 @@
 package com.willfp.ecobosses.commands;

-import com.willfp.eco.util.command.AbstractCommand;
+import com.willfp.eco.core.command.AbstractCommand;
 import com.willfp.ecobosses.EcoBossesPlugin;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/commands/CommandEbspawn.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/commands/CommandEbspawn.java
@@ -1,7 +1,7 @@
 package com.willfp.ecobosses.commands;

-import com.willfp.eco.util.command.AbstractCommand;
-import com.willfp.eco.util.command.AbstractTabCompleter;
+import com.willfp.eco.core.command.AbstractCommand;
+import com.willfp.eco.core.command.AbstractTabCompleter;
 import com.willfp.ecobosses.EcoBossesPlugin;
 import com.willfp.ecobosses.bosses.EcoBoss;
 import com.willfp.ecobosses.bosses.EcoBosses;
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/commands/TabCompleterEbspawn.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/commands/TabCompleterEbspawn.java
@@ -1,7 +1,7 @@
 package com.willfp.ecobosses.commands;

-import com.willfp.eco.util.command.AbstractTabCompleter;
-import com.willfp.eco.util.config.updating.annotations.ConfigUpdater;
+import com.willfp.eco.core.command.AbstractTabCompleter;
+import com.willfp.eco.internal.config.updating.annotations.ConfigUpdater;
 import com.willfp.ecobosses.bosses.EcoBoss;
 import com.willfp.ecobosses.bosses.EcoBosses;
 import org.bukkit.Bukkit;
--- 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,6 +1,6 @@
 package com.willfp.ecobosses.config;

-import com.willfp.eco.util.config.ExtendableConfig;
+import com.willfp.eco.core.config.ExtendableConfig;
 import com.willfp.ecobosses.EcoBossesPlugin;
 import org.jetbrains.annotations.NotNull;

--- 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,11 +1,17 @@
 package com.willfp.ecobosses.config;

-import com.willfp.eco.util.config.StaticOptionalConfig;
-import com.willfp.ecobosses.EcoBossesPlugin;
+import com.willfp.eco.core.config.YamlConfig;
+import lombok.Getter;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;

-public class CustomConfig extends StaticOptionalConfig {
+public class CustomConfig extends YamlConfig {
+    /**
+     * The name of the config.
+     */
+    @Getter
+    private final String configName;
+
    /**
     * Create new custom config.
     *
@@ -14,6 +20,7 @@ public class CustomConfig extends StaticOptionalConfig {
     */
    public CustomConfig(@NotNull final String configName,
                        @NotNull final YamlConfiguration config) {
-        super(configName, config);
+        super(config);
+        this.configName = configName;
    }
 }
--- 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
@@ -1,6 +1,6 @@
 package com.willfp.ecobosses.util;

-import com.willfp.eco.util.proxy.AbstractProxy;
+import com.willfp.eco.core.proxy.AbstractProxy;
 import com.willfp.ecobosses.EcoBossesPlugin;
 import com.willfp.ecobosses.proxy.util.ProxyFactory;
 import lombok.experimental.UtilityClass;
--- a/eco-core/core-plugin/src/main/resources/plugin.yml
+++ b/eco-core/core-plugin/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: EcoBosses
 version: ${projectVersion}
 main: com.willfp.ecobosses.EcoBossesPlugin
-api-version: 1.15
+api-version: 1.16
 authors: [Auxilor]
 website: willfp.com
 load: STARTUP