From a20c3d8b1f48088b04ecbedda454f72878d8dffb Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 29 Dec 2020 14:16:56 +0000 Subject: [PATCH] Fixed config updater system --- .../main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java | 3 +-- .../command/tabcompleters/TabCompleterEnchantinfo.java | 3 +-- .../com/willfp/ecoenchants/config/EcoEnchantsConfigs.java | 3 +-- .../java/com/willfp/ecoenchants/display/EnchantDisplay.java | 3 +-- .../com/willfp/ecoenchants/display/EnchantmentCache.java | 3 +-- .../com/willfp/ecoenchants/enchantments/EcoEnchants.java | 3 +-- .../ecoenchants/enchantments/meta/EnchantmentRarity.java | 3 +-- .../ecoenchants/enchantments/meta/EnchantmentTarget.java | 3 +-- .../ecoenchants/enchantments/meta/EnchantmentType.java | 3 +-- .../main/java/com/willfp/eco/util/config/ConfigHandler.java | 5 ++--- .../src/main/java/com/willfp/eco/util/config/Configs.java | 3 +-- .../java/com/willfp/eco/util/drops/internal/DropManager.java | 3 +-- .../main/java/com/willfp/eco/util/interfaces/Updatable.java | 4 ---- .../java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java | 5 ++--- 14 files changed, 15 insertions(+), 32 deletions(-) delete mode 100644 eco-util/src/main/java/com/willfp/eco/util/interfaces/Updatable.java diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java index 0583f123..1f1e9063 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java @@ -6,7 +6,6 @@ import com.willfp.eco.util.command.AbstractCommand; import com.willfp.eco.util.drops.telekinesis.TelekinesisTests; import com.willfp.eco.util.integrations.IntegrationLoader; import com.willfp.eco.util.interfaces.EcoRunnable; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.eco.util.packets.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.command.commands.CommandEcodebug; @@ -204,7 +203,7 @@ public class EcoEnchantsPlugin extends AbstractEcoPlugin { } @Override - public List> getUpdatableClasses() { + public List> getUpdatableClasses() { return Arrays.asList( EcoEnchantsConfigs.class, EnchantmentCache.class, diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java index 08d4b8f0..8401e075 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java @@ -4,7 +4,6 @@ import com.willfp.eco.util.StringUtils; import com.willfp.eco.util.command.AbstractCommand; import com.willfp.eco.util.command.AbstractTabCompleter; import com.willfp.eco.util.config.annotations.ConfigUpdater; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Bukkit; @@ -18,7 +17,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -public class TabCompleterEnchantinfo extends AbstractTabCompleter implements Updatable { +public class TabCompleterEnchantinfo extends AbstractTabCompleter { /** * The cached enchantment names. */ diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EcoEnchantsConfigs.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EcoEnchantsConfigs.java index 19eb1cde..7a65c9a2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EcoEnchantsConfigs.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EcoEnchantsConfigs.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.config; import com.willfp.eco.util.config.annotations.ConfigUpdater; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.ecoenchants.config.configs.EnchantmentConfig; import com.willfp.ecoenchants.config.configs.Rarity; import com.willfp.ecoenchants.config.configs.Target; @@ -13,7 +12,7 @@ import java.util.HashSet; import java.util.Set; @UtilityClass -public class EcoEnchantsConfigs implements Updatable { +public class EcoEnchantsConfigs { /** * target.yml. */ diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java index c03afa57..7fe3b60b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java @@ -3,7 +3,6 @@ package com.willfp.ecoenchants.display; import com.google.common.collect.Lists; import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.config.annotations.ConfigUpdater; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.display.options.DisplayOptions; import com.willfp.ecoenchants.enchantments.EcoEnchant; @@ -29,7 +28,7 @@ import java.util.List; */ @SuppressWarnings("DeprecatedIsStillUsed") @UtilityClass -public class EnchantDisplay implements Updatable { +public class EnchantDisplay { /** * Instance of EcoEnchants. */ diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java index e109fec7..39df1616 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java @@ -3,7 +3,6 @@ package com.willfp.ecoenchants.display; import com.google.common.collect.ImmutableSet; import com.willfp.eco.util.config.Configs; import com.willfp.eco.util.config.annotations.ConfigUpdater; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity; @@ -24,7 +23,7 @@ import java.util.Set; @UtilityClass @SuppressWarnings("deprecation") -public class EnchantmentCache implements Updatable { +public class EnchantmentCache { /** * The physical cache. */ diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java index 9d7bb175..0e4c9c74 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -5,7 +5,6 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableList; import com.willfp.eco.util.config.annotations.ConfigUpdater; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.AshArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CloudsArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CrimsonArtifact; @@ -241,7 +240,7 @@ import java.util.concurrent.atomic.AtomicBoolean; @UtilityClass @SuppressWarnings({"unused", "checkstyle:JavadocVariable"}) -public class EcoEnchants implements Updatable { +public class EcoEnchants { public static final String CONFIG_LOCATION = "config."; public static final String OBTAINING_LOCATION = "obtaining."; public static final String GENERAL_LOCATION = "general-config."; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java index 723df32a..7fd93605 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java @@ -6,7 +6,6 @@ import com.willfp.eco.util.config.annotations.ConfigUpdater; import com.willfp.eco.util.integrations.placeholder.PlaceholderEntry; import com.willfp.eco.util.integrations.placeholder.PlaceholderManager; import com.willfp.eco.util.interfaces.Registerable; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.ecoenchants.config.EcoEnchantsConfigs; import lombok.Getter; import org.jetbrains.annotations.NotNull; @@ -16,7 +15,7 @@ import java.util.HashSet; import java.util.Optional; import java.util.Set; -public class EnchantmentRarity implements Registerable, Updatable { +public class EnchantmentRarity implements Registerable { /** * All registered rarities. */ diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java index 166a1aa5..4f8ce350 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java @@ -3,7 +3,6 @@ package com.willfp.ecoenchants.enchantments.meta; import com.google.common.collect.ImmutableSet; import com.willfp.eco.util.config.annotations.ConfigUpdater; import com.willfp.eco.util.interfaces.Registerable; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.ecoenchants.config.EcoEnchantsConfigs; import lombok.Getter; import org.bukkit.Material; @@ -14,7 +13,7 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -public class EnchantmentTarget implements Registerable, Updatable { +public class EnchantmentTarget implements Registerable { /** * All registered targets. */ diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java index 3a609f9a..f3c8391f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java @@ -3,7 +3,6 @@ package com.willfp.ecoenchants.enchantments.meta; import com.google.common.collect.ImmutableList; import com.willfp.eco.util.config.Configs; import com.willfp.eco.util.config.annotations.ConfigUpdater; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.eco.util.lambda.ObjectCallable; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.itemtypes.Artifact; @@ -15,7 +14,7 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; -public class EnchantmentType implements Updatable { +public class EnchantmentType { /** * All registered types. */ diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java b/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java index b2a3f37a..2544c2bb 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java @@ -4,7 +4,6 @@ import com.willfp.eco.util.config.annotations.ConfigUpdater; import com.willfp.eco.util.config.annotations.InvalidUpdatableClassException; import com.willfp.eco.util.config.annotations.InvalidUpdateMethodException; import com.willfp.eco.util.injection.PluginDependent; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.jetbrains.annotations.NotNull; @@ -19,7 +18,7 @@ public class ConfigHandler extends PluginDependent { /** * A set of all classes that can be updated. */ - private final Set> updatableClasses = new HashSet<>(); + private final Set> updatableClasses = new HashSet<>(); /** * Creates a new config handler and links it to an {@link AbstractEcoPlugin}. @@ -58,7 +57,7 @@ public class ConfigHandler extends PluginDependent { * * @param updatableClass The class with an update method. */ - public void registerUpdatableClass(@NotNull final Class updatableClass) { + public void registerUpdatableClass(@NotNull final Class updatableClass) { boolean isValid = false; for (Method method : updatableClass.getDeclaredMethods()) { if (Modifier.isStatic(method.getModifiers()) && method.getParameterTypes().length == 0 && method.isAnnotationPresent(ConfigUpdater.class)) { diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/Configs.java b/eco-util/src/main/java/com/willfp/eco/util/config/Configs.java index 6ed19530..eeb9ab57 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/Configs.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/Configs.java @@ -3,11 +3,10 @@ package com.willfp.eco.util.config; import com.willfp.eco.util.config.annotations.ConfigUpdater; import com.willfp.eco.util.config.configs.Config; import com.willfp.eco.util.config.configs.Lang; -import com.willfp.eco.util.interfaces.Updatable; import lombok.experimental.UtilityClass; @UtilityClass -public final class Configs implements Updatable { +public final class Configs { /** * The {@link BaseConfig} implementation for lang.yml. */ diff --git a/eco-util/src/main/java/com/willfp/eco/util/drops/internal/DropManager.java b/eco-util/src/main/java/com/willfp/eco/util/drops/internal/DropManager.java index 94d0b5b8..89b539c6 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/drops/internal/DropManager.java +++ b/eco-util/src/main/java/com/willfp/eco/util/drops/internal/DropManager.java @@ -2,12 +2,11 @@ package com.willfp.eco.util.drops.internal; import com.willfp.eco.util.config.Configs; import com.willfp.eco.util.config.annotations.ConfigUpdater; -import com.willfp.eco.util.interfaces.Updatable; import lombok.Getter; import lombok.experimental.UtilityClass; @UtilityClass -public final class DropManager implements Updatable { +public final class DropManager { /** * The currently used type, or implementation, of {@link AbstractDropQueue}. *

diff --git a/eco-util/src/main/java/com/willfp/eco/util/interfaces/Updatable.java b/eco-util/src/main/java/com/willfp/eco/util/interfaces/Updatable.java deleted file mode 100644 index 5f97e64e..00000000 --- a/eco-util/src/main/java/com/willfp/eco/util/interfaces/Updatable.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.willfp.eco.util.interfaces; - -public interface Updatable { -} diff --git a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java index 31bc0493..a4bf2918 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java +++ b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java @@ -39,7 +39,6 @@ import com.willfp.eco.util.integrations.antigrief.plugins.AntigriefTowny; import com.willfp.eco.util.integrations.antigrief.plugins.AntigriefWorldGuard; import com.willfp.eco.util.integrations.placeholder.PlaceholderManager; import com.willfp.eco.util.integrations.placeholder.plugins.PlaceholderIntegrationPAPI; -import com.willfp.eco.util.interfaces.Updatable; import com.willfp.eco.util.optional.Prerequisite; import com.willfp.eco.util.packets.AbstractPacketAdapter; import com.willfp.eco.util.updater.UpdateChecker; @@ -92,7 +91,7 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { /** * Set of external plugin integrations. */ - private final List> updatableClasses = new ArrayList<>(); + private final List> updatableClasses = new ArrayList<>(); /** * The internal plugin logger. @@ -407,5 +406,5 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { * * @return A list of all updatable classes. */ - public abstract List> getUpdatableClasses(); + public abstract List> getUpdatableClasses(); }