From 9ad12c2578c43c978114d74fe0519a264b6f0483 Mon Sep 17 00:00:00 2001 From: Will FP Date: Sun, 3 Dec 2023 15:28:44 +0000 Subject: [PATCH] Finally deprecated @ConfigUpdater for removal --- eco-api/src/main/java/com/willfp/eco/core/PluginProps.java | 2 +- .../com/willfp/eco/core/config/updating/ConfigUpdater.java | 6 +++++- .../eco/internal/config/handler/ReflectiveConfigHandler.kt | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/core/PluginProps.java b/eco-api/src/main/java/com/willfp/eco/core/PluginProps.java index 08316bf3e..7fd184c77 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/PluginProps.java +++ b/eco-api/src/main/java/com/willfp/eco/core/PluginProps.java @@ -55,7 +55,7 @@ public final class PluginProps { private final Map environment = new HashMap<>(); /** - * If the plugin uses reflective reload (via {@link com.willfp.eco.core.config.updating.ConfigUpdater}). + * If the plugin uses reflective reload. */ private boolean usesReflectiveReload = true; diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/updating/ConfigUpdater.java b/eco-api/src/main/java/com/willfp/eco/core/config/updating/ConfigUpdater.java index ac36f37c7..ad36d1611 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/updating/ConfigUpdater.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/updating/ConfigUpdater.java @@ -38,12 +38,16 @@ *

* By having a plugin as a parameter, you shouldn't really need getInstance() * calls in your code. - * + *

* While flexible, this can lead to long initialization times, so this feature * can be disabled in eco.yml with the uses-reflective-reload option. + * + * @deprecated This has been deprecated due to the poor control flow and long startup times. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) @Documented +@Deprecated(since = "6.67.0", forRemoval = true) +@SuppressWarnings("DeprecatedIsStillUsed") public @interface ConfigUpdater { } diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/handler/ReflectiveConfigHandler.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/handler/ReflectiveConfigHandler.kt index 8c6632306..5c92ed053 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/handler/ReflectiveConfigHandler.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/handler/ReflectiveConfigHandler.kt @@ -1,7 +1,6 @@ package com.willfp.eco.internal.config.handler import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.core.config.updating.ConfigUpdater import org.reflections.Reflections import org.reflections.scanners.MethodAnnotationsScanner @@ -14,7 +13,8 @@ class ReflectiveConfigHandler( ) override fun callUpdate() { - for (method in reflections.getMethodsAnnotatedWith(ConfigUpdater::class.java)) { + @Suppress("DEPRECATION", "REMOVAL") + for (method in reflections.getMethodsAnnotatedWith(com.willfp.eco.core.config.updating.ConfigUpdater::class.java)) { runCatching { when (method.parameterCount) { 0 -> method.invoke(null)