mirror of
https://github.com/Auxilor/EcoEnchants.git
synced 2025-02-15 04:21:20 +01:00
Fixed config updater system
This commit is contained in:
parent
39c725cd65
commit
a20c3d8b1f
@ -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<Class<? extends Updatable>> getUpdatableClasses() {
|
||||
public List<Class<?>> getUpdatableClasses() {
|
||||
return Arrays.asList(
|
||||
EcoEnchantsConfigs.class,
|
||||
EnchantmentCache.class,
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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.";
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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<Class<? extends Updatable>> updatableClasses = new HashSet<>();
|
||||
private final Set<Class<?>> 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<? extends Updatable> 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)) {
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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}.
|
||||
* <p>
|
||||
|
@ -1,4 +0,0 @@
|
||||
package com.willfp.eco.util.interfaces;
|
||||
|
||||
public interface Updatable {
|
||||
}
|
@ -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<Class<? extends Updatable>> updatableClasses = new ArrayList<>();
|
||||
private final List<Class<?>> 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<Class<? extends Updatable>> getUpdatableClasses();
|
||||
public abstract List<Class<?>> getUpdatableClasses();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user