Updated to eco 6

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'
 

eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java

@@ -1,18 +1,13 @@
 package com.willfp.talismans;
 
-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.display.DisplayModule;
-import com.willfp.eco.core.integrations.IntegrationLoader;
-import com.willfp.talismans.command.CommandGive;
-import com.willfp.talismans.command.CommandReload;
 import com.willfp.talismans.command.CommandTalismans;
 import com.willfp.talismans.display.TalismanDisplay;
 import com.willfp.talismans.talismans.Talismans;
 import com.willfp.talismans.talismans.util.BlockPlaceListener;
 import com.willfp.talismans.talismans.util.DiscoverRecipeListener;
-import com.willfp.talismans.talismans.util.TalismanChecks;
 import com.willfp.talismans.talismans.util.TalismanCraftListener;
 import com.willfp.talismans.talismans.util.WatcherTriggers;
 import com.willfp.talismans.talismans.util.equipevent.SyncTalismanEquipEventTask;
@@ -22,7 +17,6 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -38,48 +32,17 @@ public class TalismansPlugin extends EcoPlugin {
      * Internal constructor called by bukkit on plugin load.
      */
     public TalismansPlugin() {
-        super(87377, 9865, "&6");
+        super(87377, 9865, "&6", true);
         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()));
-        }
-
+    protected void handleEnable() {
         this.getLogger().info(Talismans.values().size() + " Talismans Loaded");
     }
 
-    /**
-     * Code executed on plugin disable.
-     */
     @Override
-    public void disable() {
-        this.getExtensionLoader().unloadExtensions();
-    }
-
-    /**
-     * 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() {
         Talismans.values().forEach(talisman -> {
             HandlerList.unregisterAll(talisman);
 
@@ -92,48 +55,15 @@ public class TalismansPlugin extends EcoPlugin {
         SyncTalismanEquipEventTask.scheduleAutocheck(this);
     }
 
-    /**
-     * Code executed after server is up.
-     */
     @Override
-    public void postLoad() {
-        // Nothing needs to be called after load.
-    }
-
-    /**
-     * Talismans-specific integrations.
-     *
-     * @return A list of all integrations.
-     */
-    @Override
-    public List<IntegrationLoader> getIntegrationLoaders() {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public List<PluginCommand> getPluginCommands() {
+    protected List<PluginCommand> loadPluginCommands() {
         return Arrays.asList(
                 new CommandTalismans(this)
         );
     }
 
-    /**
-     * Packet Adapters for talisman display.
-     *
-     * @return A list of packet adapters.
-     */
     @Override
-    public List<AbstractPacketAdapter> getPacketAdapters() {
-        return new ArrayList<>();
-    }
-
-    /**
-     * Talismans-specific listeners.
-     *
-     * @return A list of all listeners.
-     */
-    @Override
-    public List<Listener> getListeners() {
+    protected List<Listener> loadListeners() {
         return Arrays.asList(
                 new WatcherTriggers(this),
                 new BlockPlaceListener(),
@@ -143,23 +73,9 @@ public class TalismansPlugin extends EcoPlugin {
         );
     }
 
-    @Override
-    public List<Class<?>> getUpdatableClasses() {
-        return Arrays.asList(
-                TalismanChecks.class,
-                Talismans.class,
-                CommandGive.class
-        );
-    }
-
     @Override
     @Nullable
     protected DisplayModule createDisplayModule() {
         return new TalismanDisplay(this);
     }
-
-    @Override
-    protected String getMinimumEcoVersion() {
-        return "5.7.0";
-    }
 }

eco-core/core-plugin/src/main/java/com/willfp/talismans/config/TalismanConfig.java

@@ -1,11 +1,11 @@
 package com.willfp.talismans.config;
 
 import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.ExtendableConfig;
+import com.willfp.eco.core.config.yaml.YamlExtendableConfig;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
-public class TalismanConfig extends ExtendableConfig {
+public class TalismanConfig extends YamlExtendableConfig {
     /**
      * The name of the config.
      */
@@ -15,9 +15,9 @@ public class TalismanConfig extends ExtendableConfig {
     /**
      * Instantiate a new config for a talisman.
      *
-     * @param name     The name of the config.
-     * @param source   The provider of the talisman.
-     * @param plugin   Instance of talismans.
+     * @param name   The name of the config.
+     * @param source The provider of the talisman.
+     * @param plugin Instance of talismans.
      */
     public TalismanConfig(@NotNull final String name,
                           @NotNull final Class<?> source,

eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java

@@ -89,7 +89,6 @@ public abstract class Talisman implements Listener, Watcher {
      * This can be overridden but may lead to unexpected behavior.
      */
     public void update() {
-        config.update();
         disabledWorldNames.clear();
         disabledWorldNames.addAll(config.getStrings(Talismans.GENERAL_LOCATION + "disabled-in-worlds"));
         disabledWorlds.clear();

eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/TalismanLevel.java

@@ -1,7 +1,7 @@
 package com.willfp.talismans.talismans;
 
 import com.willfp.eco.core.EcoPlugin;
-import com.willfp.eco.core.config.Config;
+import com.willfp.eco.core.config.interfaces.Config;
 import com.willfp.eco.core.display.Display;
 import com.willfp.eco.core.items.CustomItem;
 import com.willfp.eco.core.items.Items;
@@ -19,10 +19,8 @@ import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
-import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -162,7 +160,7 @@ public class TalismanLevel {
         formattedDescription = Arrays.stream(
                 WordUtils.wrap(description, this.getPlugin().getConfigYml().getInt("description.wrap"), "\n", false)
                         .split("[\\r\\n]+")
-        ).map(s -> Display.PREFIX + StringUtils.translate(this.getPlugin().getLangYml().getString("description-color") + s)).collect(Collectors.toList());
+        ).map(s -> Display.PREFIX + StringUtils.format(this.getPlugin().getLangYml().getString("description-color") + s)).collect(Collectors.toList());
 
         craftable = config.getBool(Talismans.OBTAINING_LOCATION + "craftable");
 

eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talismans.java

@@ -3,7 +3,7 @@ package com.willfp.talismans.talismans;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableSet;
-import com.willfp.eco.core.config.ConfigUpdater;
+import com.willfp.eco.core.config.updating.ConfigUpdater;
 import com.willfp.talismans.talismans.talismans.AlchemyTalisman;
 import com.willfp.talismans.talismans.talismans.ArcheryTalisman;
 import com.willfp.talismans.talismans.talismans.AttackSpeedTalisman;

eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/AttackSpeedTalisman.java

@@ -5,7 +5,6 @@ import com.willfp.talismans.talismans.TalismanLevel;
 import com.willfp.talismans.talismans.Talismans;
 import com.willfp.talismans.talismans.util.equipevent.EquipType;
 import com.willfp.talismans.talismans.util.equipevent.TalismanEquipEvent;
-import org.bukkit.Bukkit;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.attribute.AttributeModifier;

eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanUtils.java

@@ -3,7 +3,6 @@ package com.willfp.talismans.talismans.util;
 
 import com.willfp.eco.util.NumberUtils;
 import com.willfp.talismans.TalismansPlugin;
-import com.willfp.talismans.talismans.Talisman;
 import com.willfp.talismans.talismans.TalismanLevel;
 import com.willfp.talismans.talismans.Talismans;
 import lombok.experimental.UtilityClass;

eco-core/core-plugin/src/main/resources/plugin.yml

@@ -8,19 +8,6 @@ load: STARTUP
 depend:
   - eco
   - ProtocolLib
-softdepend:
-  - WorldGuard
-  - GriefPrevention
-  - Towny
-  - FactionsUUID
-  - Lands
-  - Kingdoms
-  - NoCheatPlus
-  - AAC
-  - Matrix
-  - Spartan
-  - PlaceholderAPI
-  - mcMMO
 
 commands:
   talismans:

gradle.properties

@@ -1,2 +1,2 @@
-version = 3.10.0
+version = 4.0.0
 plugin-name = Talismans