[1.13.13.0]更改AutoTask注解命名为LifeCycleTaskSettings, MinecraftVersion添加1.20.6-1.20.10

YufiriaMazenta · YufiriaMazenta · commit e8559fd1ea32 · 2025-11-01T21:29:08.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 java.targetCompatibility = JavaVersion.VERSION_1_8
 rootProject.group = "com.crypticlib"
-rootProject.version = "1.13.12.0"
+rootProject.version = "1.13.13.0"
 //全项目重构时更新大版本号
 //添加模块或有较大更改时更新次版本号
 //有API变动(新增/删除/更改声明)时更新修订号
diff --git a/module/bukkit/action/src/main/java/crypticlib/action/condition/ConditionFactory.java b/module/bukkit/action/src/main/java/crypticlib/action/condition/ConditionFactory.java
@@ -1,6 +1,6 @@
 package crypticlib.action.condition;
 
-import crypticlib.lifecycle.AutoTask;
+import crypticlib.lifecycle.LifeCycleTaskSettings;
 import crypticlib.lifecycle.BukkitLifeCycleTask;
 import crypticlib.lifecycle.LifeCycle;
 import crypticlib.lifecycle.TaskRule;
@@ -12,7 +12,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-@AutoTask(rules = @TaskRule(lifeCycle = LifeCycle.ENABLE, priority = Integer.MIN_VALUE))
+@LifeCycleTaskSettings(rules = @TaskRule(lifeCycle = LifeCycle.ENABLE, priority = Integer.MIN_VALUE))
 public enum ConditionFactory implements BukkitLifeCycleTask {
 
     INSTANCE;
diff --git a/module/bukkit/i18n/src/main/java/crypticlib/lang/LangManager.java b/module/bukkit/i18n/src/main/java/crypticlib/lang/LangManager.java
@@ -3,7 +3,7 @@
 import crypticlib.internal.PluginScanner;
 import crypticlib.lang.entry.LangEntry;
 import crypticlib.lang.entry.StringLangEntry;
-import crypticlib.lifecycle.AutoTask;
+import crypticlib.lifecycle.LifeCycleTaskSettings;
 import crypticlib.lifecycle.BukkitLifeCycleTask;
 import crypticlib.lifecycle.LifeCycle;
 import crypticlib.lifecycle.TaskRule;
@@ -16,11 +16,10 @@
 import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-@AutoTask(
+@LifeCycleTaskSettings(
     rules = {
         @TaskRule(lifeCycle = LifeCycle.ENABLE, priority = Integer.MIN_VALUE),
         @TaskRule(lifeCycle = LifeCycle.RELOAD),
diff --git a/module/bukkit/ui/src/main/java/crypticlib/ui/handler/MenuHandler.java b/module/bukkit/ui/src/main/java/crypticlib/ui/handler/MenuHandler.java
@@ -1,6 +1,6 @@
 package crypticlib.ui.handler;
 
-import crypticlib.lifecycle.AutoTask;
+import crypticlib.lifecycle.LifeCycleTaskSettings;
 import crypticlib.lifecycle.BukkitLifeCycleTask;
 import crypticlib.lifecycle.LifeCycle;
 import crypticlib.lifecycle.TaskRule;
@@ -22,7 +22,7 @@
 import java.util.Objects;
 
 @EventListener
-@AutoTask(rules = {@TaskRule(lifeCycle = LifeCycle.DISABLE)})
+@LifeCycleTaskSettings(rules = {@TaskRule(lifeCycle = LifeCycle.DISABLE)})
 public enum MenuHandler implements Listener, BukkitLifeCycleTask {
 
     INSTANCE;
diff --git a/platform/bukkit/src/main/java/crypticlib/BukkitPlugin.java b/platform/bukkit/src/main/java/crypticlib/BukkitPlugin.java
@@ -214,13 +214,13 @@ public final BukkitConfigWrapper removeConfigWrapper(String path) {
 
     private void runLifeCycleTasks(LifeCycle lifeCycle) {
         List<BukkitLifeCycleTaskWrapper> taskWrappers = new ArrayList<>();
-        pluginScanner.getAnnotatedClasses(AutoTask.class).forEach(
+        pluginScanner.getAnnotatedClasses(LifeCycleTaskSettings.class).forEach(
             taskClass -> {
                 try {
                     if (!BukkitLifeCycleTask.class.isAssignableFrom(taskClass)) {
                         return;
                     }
-                    AutoTask annotation = taskClass.getAnnotation(AutoTask.class);
+                    LifeCycleTaskSettings annotation = taskClass.getAnnotation(LifeCycleTaskSettings.class);
                     if (annotation == null) {
                         return;
                     }
@@ -237,7 +237,7 @@ private void runLifeCycleTasks(LifeCycle lifeCycle) {
                         }
                     }
                 } catch (Throwable throwable) {
-                    AutoTask annotation = taskClass.getAnnotation(AutoTask.class);
+                    LifeCycleTaskSettings annotation = taskClass.getAnnotation(LifeCycleTaskSettings.class);
                     List<Class<? extends Throwable>> ignoreExceptions = Arrays.asList(annotation.ignoreExceptions());
                     if (ignoreExceptions.contains(throwable.getClass())) {
                         return;
diff --git a/platform/bukkit/src/main/java/crypticlib/MinecraftVersion.java b/platform/bukkit/src/main/java/crypticlib/MinecraftVersion.java
@@ -53,7 +53,12 @@ public enum MinecraftVersion {
     V1_21_2(12102),
     V1_21_3(12103),
     V1_21_4(12104),
-    V1_21_5(12105);
+    V1_21_5(12105),
+    V1_21_6(12106),
+    V1_21_7(12107),
+    V1_21_8(12108),
+    V1_21_9(12109),
+    V1_21_10(12110);
 
     private final int version;
 
diff --git a/platform/bukkit/src/main/java/crypticlib/command/BukkitCommandManager.java b/platform/bukkit/src/main/java/crypticlib/command/BukkitCommandManager.java
@@ -1,6 +1,6 @@
 package crypticlib.command;
 
-import crypticlib.lifecycle.AutoTask;
+import crypticlib.lifecycle.LifeCycleTaskSettings;
 import crypticlib.lifecycle.BukkitLifeCycleTask;
 import crypticlib.lifecycle.LifeCycle;
 import crypticlib.lifecycle.TaskRule;
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-@AutoTask(rules = @TaskRule(lifeCycle = LifeCycle.INIT))
+@LifeCycleTaskSettings(rules = @TaskRule(lifeCycle = LifeCycle.INIT))
 public enum BukkitCommandManager implements CommandManager<TabExecutor, PluginCommand>, BukkitLifeCycleTask {
 
     INSTANCE;
diff --git a/platform/bukkit/src/main/java/crypticlib/scheduler/BukkitScheduler.java b/platform/bukkit/src/main/java/crypticlib/scheduler/BukkitScheduler.java
@@ -1,6 +1,6 @@
 package crypticlib.scheduler;
 
-import crypticlib.lifecycle.AutoTask;
+import crypticlib.lifecycle.LifeCycleTaskSettings;
 import crypticlib.lifecycle.BukkitLifeCycleTask;
 import crypticlib.lifecycle.LifeCycle;
 import crypticlib.lifecycle.TaskRule;
@@ -15,7 +15,7 @@
 /**
  * Bukkit平台的调度器
  */
-@AutoTask(
+@LifeCycleTaskSettings(
     rules = @TaskRule(lifeCycle = LifeCycle.INIT)
 )
 public enum BukkitScheduler implements Scheduler, BukkitLifeCycleTask {
diff --git a/platform/bukkit/src/main/java/crypticlib/scheduler/FoliaScheduler.java b/platform/bukkit/src/main/java/crypticlib/scheduler/FoliaScheduler.java
@@ -1,6 +1,6 @@
 package crypticlib.scheduler;
 
-import crypticlib.lifecycle.AutoTask;
+import crypticlib.lifecycle.LifeCycleTaskSettings;
 import crypticlib.lifecycle.BukkitLifeCycleTask;
 import crypticlib.lifecycle.LifeCycle;
 import crypticlib.lifecycle.TaskRule;
@@ -19,7 +19,7 @@
 /**
  * Folia平台的调度器
  */
-@AutoTask(
+@LifeCycleTaskSettings(
     rules = @TaskRule(lifeCycle = LifeCycle.INIT)
 )
 public enum FoliaScheduler implements Scheduler, BukkitLifeCycleTask {
diff --git a/platform/bungee/src/main/java/crypticlib/BungeePlugin.java b/platform/bungee/src/main/java/crypticlib/BungeePlugin.java
@@ -207,13 +207,13 @@ public final BungeeConfigWrapper removeConfigWrapper(String path) {
     
     private void runLifeCycleTasks(LifeCycle lifeCycle) {
         List<BungeeLifeCycleTaskWrapper> taskWrappers = new ArrayList<>();
-        pluginScanner.getAnnotatedClasses(AutoTask.class).forEach(
+        pluginScanner.getAnnotatedClasses(LifeCycleTaskSettings.class).forEach(
             taskClass -> {
                 try {
                     if (!BungeeLifeCycleTask.class.isAssignableFrom(taskClass)) {
                         return;
                     }
-                    AutoTask annotation = taskClass.getAnnotation(AutoTask.class);
+                    LifeCycleTaskSettings annotation = taskClass.getAnnotation(LifeCycleTaskSettings.class);
                     if (annotation == null) {
                         return;
                     }
@@ -230,7 +230,7 @@ private void runLifeCycleTasks(LifeCycle lifeCycle) {
                         }
                     }
                 } catch (Throwable throwable) {
-                    AutoTask annotation = taskClass.getAnnotation(AutoTask.class);
+                    LifeCycleTaskSettings annotation = taskClass.getAnnotation(LifeCycleTaskSettings.class);
                     List<Class<? extends Throwable>> ignoreExceptions = Arrays.asList(annotation.ignoreExceptions());
                     if (ignoreExceptions.contains(throwable.getClass())) {
                         return;
diff --git a/platform/bungee/src/main/java/crypticlib/command/BungeeCommandManager.java b/platform/bungee/src/main/java/crypticlib/command/BungeeCommandManager.java
@@ -1,6 +1,6 @@
 package crypticlib.command;
 
-import crypticlib.lifecycle.AutoTask;
+import crypticlib.lifecycle.LifeCycleTaskSettings;
 import crypticlib.lifecycle.BungeeLifeCycleTask;
 import crypticlib.lifecycle.LifeCycle;
 import crypticlib.lifecycle.TaskRule;
@@ -12,7 +12,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-@AutoTask(
+@LifeCycleTaskSettings(
     rules = @TaskRule(lifeCycle = LifeCycle.INIT)
 )
 public enum BungeeCommandManager implements CommandManager<Command, Command>, BungeeLifeCycleTask {
diff --git a/platform/common/src/main/java/crypticlib/lifecycle/LifeCycleTask.java b/platform/common/src/main/java/crypticlib/lifecycle/LifeCycleTask.java
@@ -1,5 +1,10 @@
 package crypticlib.lifecycle;
 
+/**
+ * 用于在指定的生命周期执行任务
+ * 需要搭配{@link LifeCycleTaskSettings}注解使用
+ * @param <Plugin>
+ */
 public interface LifeCycleTask<Plugin> {
 
     void lifecycle(Plugin plugin, LifeCycle lifeCycle);
diff --git a/platform/common/src/main/java/crypticlib/lifecycle/LifeCycleTaskSettings.java b/platform/common/src/main/java/crypticlib/lifecycle/LifeCycleTaskSettings.java
@@ -5,8 +5,12 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface AutoTask {
+public @interface LifeCycleTaskSettings {
 
+    /**
+     * 用于标记该生命周期任务的执行规则
+     * @return
+     */
     TaskRule[] rules();
 
     /**
diff --git a/platform/velocity/src/main/java/crypticlib/VelocityPlugin.java b/platform/velocity/src/main/java/crypticlib/VelocityPlugin.java
@@ -231,13 +231,13 @@ public final VelocityConfigWrapper removeConfigWrapper(String path) {
     
     private void runLifeCycleTasks(LifeCycle lifeCycle) {
         List<VelocityLifeCycleTaskWrapper> taskWrappers = new ArrayList<>();
-        pluginScanner.getAnnotatedClasses(AutoTask.class).forEach(
+        pluginScanner.getAnnotatedClasses(LifeCycleTaskSettings.class).forEach(
             taskClass -> {
                 try {
                     if (!VelocityLifeCycleTask.class.isAssignableFrom(taskClass)) {
                         return;
                     }
-                    AutoTask annotation = taskClass.getAnnotation(AutoTask.class);
+                    LifeCycleTaskSettings annotation = taskClass.getAnnotation(LifeCycleTaskSettings.class);
                     if (annotation == null) {
                         return;
                     }
@@ -254,7 +254,7 @@ private void runLifeCycleTasks(LifeCycle lifeCycle) {
                         }
                     }
                 } catch (Throwable throwable) {
-                    AutoTask annotation = taskClass.getAnnotation(AutoTask.class);
+                    LifeCycleTaskSettings annotation = taskClass.getAnnotation(LifeCycleTaskSettings.class);
                     List<Class<? extends Throwable>> ignoreExceptions = Arrays.asList(annotation.ignoreExceptions());
                     if (ignoreExceptions.contains(throwable.getClass())) {
                         return;
diff --git a/platform/velocity/src/main/java/crypticlib/chat/VelocityMsgSender.java b/platform/velocity/src/main/java/crypticlib/chat/VelocityMsgSender.java
@@ -4,7 +4,7 @@
 import com.velocitypowered.api.proxy.Player;
 import crypticlib.CrypticLib;
 import crypticlib.VelocityPlugin;
-import crypticlib.lifecycle.AutoTask;
+import crypticlib.lifecycle.LifeCycleTaskSettings;
 import crypticlib.lifecycle.LifeCycle;
 import crypticlib.lifecycle.TaskRule;
 import crypticlib.lifecycle.VelocityLifeCycleTask;
@@ -16,7 +16,7 @@
 
 import java.util.Map;
 
-@AutoTask(
+@LifeCycleTaskSettings(
     rules = @TaskRule(lifeCycle = LifeCycle.LOAD)
 )
 public enum VelocityMsgSender implements MsgSender<CommandSource, Component, Player>, VelocityLifeCycleTask {
diff --git a/platform/velocity/src/main/java/crypticlib/command/VelocityCommandManager.java b/platform/velocity/src/main/java/crypticlib/command/VelocityCommandManager.java
@@ -2,7 +2,7 @@
 
 import com.velocitypowered.api.command.Command;
 import crypticlib.VelocityPlugin;
-import crypticlib.lifecycle.AutoTask;
+import crypticlib.lifecycle.LifeCycleTaskSettings;
 import crypticlib.lifecycle.LifeCycle;
 import crypticlib.lifecycle.TaskRule;
 import crypticlib.lifecycle.VelocityLifeCycleTask;
@@ -12,7 +12,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-@AutoTask(
+@LifeCycleTaskSettings(
     rules = {
         @TaskRule(lifeCycle = LifeCycle.INIT)
     }

Original file line number	Diff line number	Diff line change
`@@ -214,13 +214,13 @@ public final BukkitConfigWrapper removeConfigWrapper(String path) {`
`214`	`214`
`215`	`215`	`private void runLifeCycleTasks(LifeCycle lifeCycle) {`
`216`	`216`	`List<BukkitLifeCycleTaskWrapper> taskWrappers = new ArrayList<>();`
`217`		`- pluginScanner.getAnnotatedClasses(AutoTask.class).forEach(`
	`217`	`+ pluginScanner.getAnnotatedClasses(LifeCycleTaskSettings.class).forEach(`
`218`	`218`	`taskClass -> {`
`219`	`219`	`try {`
`220`	`220`	`if (!BukkitLifeCycleTask.class.isAssignableFrom(taskClass)) {`
`221`	`221`	`return;`
`222`	`222`	`}`
`223`		`- AutoTask annotation = taskClass.getAnnotation(AutoTask.class);`
	`223`	`+ LifeCycleTaskSettings annotation = taskClass.getAnnotation(LifeCycleTaskSettings.class);`
`224`	`224`	`if (annotation == null) {`
`225`	`225`	`return;`
`226`	`226`	`}`
`@@ -237,7 +237,7 @@ private void runLifeCycleTasks(LifeCycle lifeCycle) {`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`	`} catch (Throwable throwable) {`
`240`		`- AutoTask annotation = taskClass.getAnnotation(AutoTask.class);`
	`240`	`+ LifeCycleTaskSettings annotation = taskClass.getAnnotation(LifeCycleTaskSettings.class);`
`241`	`241`	`List<Class<? extends Throwable>> ignoreExceptions = Arrays.asList(annotation.ignoreExceptions());`
`242`	`242`	`if (ignoreExceptions.contains(throwable.getClass())) {`
`243`	`243`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -207,13 +207,13 @@ public final BungeeConfigWrapper removeConfigWrapper(String path) {`
`207`	`207`
`208`	`208`	`private void runLifeCycleTasks(LifeCycle lifeCycle) {`
`209`	`209`	`List<BungeeLifeCycleTaskWrapper> taskWrappers = new ArrayList<>();`
`210`		`- pluginScanner.getAnnotatedClasses(AutoTask.class).forEach(`
	`210`	`+ pluginScanner.getAnnotatedClasses(LifeCycleTaskSettings.class).forEach(`
`211`	`211`	`taskClass -> {`
`212`	`212`	`try {`
`213`	`213`	`if (!BungeeLifeCycleTask.class.isAssignableFrom(taskClass)) {`
`214`	`214`	`return;`
`215`	`215`	`}`
`216`		`- AutoTask annotation = taskClass.getAnnotation(AutoTask.class);`
	`216`	`+ LifeCycleTaskSettings annotation = taskClass.getAnnotation(LifeCycleTaskSettings.class);`
`217`	`217`	`if (annotation == null) {`
`218`	`218`	`return;`
`219`	`219`	`}`
`@@ -230,7 +230,7 @@ private void runLifeCycleTasks(LifeCycle lifeCycle) {`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`	`} catch (Throwable throwable) {`
`233`		`- AutoTask annotation = taskClass.getAnnotation(AutoTask.class);`
	`233`	`+ LifeCycleTaskSettings annotation = taskClass.getAnnotation(LifeCycleTaskSettings.class);`
`234`	`234`	`List<Class<? extends Throwable>> ignoreExceptions = Arrays.asList(annotation.ignoreExceptions());`
`235`	`235`	`if (ignoreExceptions.contains(throwable.getClass())) {`
`236`	`236`	`return;`