更新CrypticLib版本,优化代码

YufiriaMazenta · Nov 14, 2023 · 22cb28f · 22cb28f
1 parent 0bff137
commit 22cb28f
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -8,5 +8,16 @@
 ----
 Craftorithm是一个基于BukkitAPI编写的配方管理插件，可以添加原版的各类配方，并可以进行合成限制，删除配方等管理操作
 
-## 使用方式
-#### [Craftorithm Wiki](https://yufiriamazenta.gitbook.io/craftorithm-wiki/)
+### 使用方式(Usage)
+#### [Craftorithm Wiki](https://yufiriamazenta.gitbook.io/craftorithm-wiki/)
+
+### 下载(Download)
+
+#### [spigotmc](https://www.spigotmc.org/resources/craftorithm-customized-crafting-management-plugin-1-13-1-20-folia-supported.108429/)
+
+#### [mcbbs](https://www.mcbbs.net/thread-1313942-1-1.html)
+
+#### [Modrinth](https://modrinth.com/plugin/craftorithm)
+
+
+
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,11 +34,11 @@ dependencies {
     compileOnly("com.github.LoneDev6:API-ItemsAdder:3.5.0b")
     compileOnly("com.github.oraxen:oraxen:1.160.0")
     compileOnly("io.lumine:Mythic-Dist:5.3.5")
-    implementation("com.crypticlib:CrypticLib:0.0.7")
+    implementation("com.crypticlib:CrypticLib:0.1.2")
 }
 
 group = "com.github.yufiriamazenta"
-version = "1.4.5"
+version = "1.4.6-dev1"
 var pluginVersion: String = version.toString() + "-" + SimpleDateFormat("yyyyMMdd").format(System.currentTimeMillis())
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 java.targetCompatibility = JavaVersion.VERSION_1_8

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java b/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java
@@ -61,11 +61,7 @@ private void loadBStat() {
     }
 
     private void regListeners() {
-        Bukkit.getPluginManager().registerEvents(CraftHandler.INSTANCE, this);
         Bukkit.getPluginManager().registerEvents(this, this);
-        Bukkit.getPluginManager().registerEvents(RecipeUnlockHandler.INSTANCE, this);
-        Bukkit.getPluginManager().registerEvents(AnvilRecipeHandler.INSTANCE, this);
-        Bukkit.getPluginManager().registerEvents(BukkitMenuDispatcher.INSTANCE, this);
         if (CrypticLib.minecraftVersion() >= 11400)
             Bukkit.getPluginManager().registerEvents(SmithingHandler.INSTANCE, this);
         if (CrypticLib.minecraftVersion() >= 11700)

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/bstat/Metrics.java b/src/main/java/com/github/yufiriamazenta/craftorithm/bstat/Metrics.java
@@ -79,7 +79,7 @@ public Metrics(JavaPlugin plugin, int serviceId) {
                         enabled,
                         this::appendPlatformData,
                         this::appendServiceData,
-                        submitDataTask -> CrypticLib.platform().scheduler().runTask(plugin, submitDataTask::run),
+                        submitDataTask -> CrypticLib.platform().scheduler().runTask(plugin, submitDataTask),
                         plugin::isEnabled,
                         (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error),
                         (message) -> this.plugin.getLogger().log(Level.INFO, message),

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/subcmd/AbstractSubCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/subcmd/AbstractSubCommand.java
@@ -5,6 +5,7 @@
 import crypticlib.command.ISubCmdExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -50,43 +51,13 @@ public boolean onCommand(CommandSender sender, List<String> args) {
         return true;
     }
 
-    @Override
-    public List<String> onTabComplete(CommandSender sender, List<String> args) {
-        if (subCommandMap == null)
-            return Collections.singletonList("");
-        if (args.size() <= 1) {
-            List<String> tabList = new ArrayList<>();
-            for (String subCmd : subCommandMap.keySet()) {
-                ISubCmdExecutor subCommand = subCommandMap.get(subCmd);
-                if (subCommand.permission() != null) {
-                    if (sender.hasPermission(subCommand.permission()))
-                        tabList.add(subCmd);
-                } else {
-                    tabList.add(subCmd);
-                }
-            }
-            tabList.removeIf(str -> !str.startsWith(args.get(0)));
-            return tabList;
-        }
-        ISubCmdExecutor subCommand = subCommandMap.get(args.get(0));
-        if (subCommand != null) {
-            if (subCommand.permission() != null) {
-                if (!sender.hasPermission(subCommand.permission()))
-                    return Collections.singletonList("");
-            }
-            return subCommand.onTabComplete(sender, args.subList(1, args.size()));
-        }
-        else
-            return Collections.singletonList("");
-    }
-
     @Override
     public String subCommandName() {
         return command;
     }
 
     @Override
-    public Map<String, ISubCmdExecutor> subCommands() {
+    public @NotNull Map<String, ISubCmdExecutor> subCommands() {
         return subCommandMap;
     }
 

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/AnvilRecipeHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/AnvilRecipeHandler.java
@@ -5,6 +5,7 @@
 import com.github.yufiriamazenta.craftorithm.recipe.RecipeManager;
 import com.github.yufiriamazenta.craftorithm.recipe.custom.AnvilRecipe;
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
+import crypticlib.annotations.BukkitListener;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -23,6 +24,7 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
+@BukkitListener
 public enum AnvilRecipeHandler implements Listener {
 
     INSTANCE;

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/CraftHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/CraftHandler.java
@@ -4,6 +4,8 @@
 import com.github.yufiriamazenta.craftorithm.arcenciel.ArcencielDispatcher;
 import com.github.yufiriamazenta.craftorithm.recipe.RecipeManager;
 import com.github.yufiriamazenta.craftorithm.util.ItemUtil;
+import crypticlib.annotations.BukkitCommand;
+import crypticlib.annotations.BukkitListener;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
@@ -16,6 +18,7 @@
 
 import java.util.List;
 
+@BukkitListener
 public enum CraftHandler implements Listener {
 
     INSTANCE;

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/listener/RecipeUnlockHandler.java b/src/main/java/com/github/yufiriamazenta/craftorithm/listener/RecipeUnlockHandler.java
@@ -1,6 +1,7 @@
 package com.github.yufiriamazenta.craftorithm.listener;
 
 import com.github.yufiriamazenta.craftorithm.recipe.RecipeManager;
+import crypticlib.annotations.BukkitListener;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -11,6 +12,7 @@
 import java.util.List;
 import java.util.Map;
 
+@BukkitListener
 public enum RecipeUnlockHandler implements Listener {
 
     INSTANCE;

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/bukkit/BukkitMenuDispatcher.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/bukkit/BukkitMenuDispatcher.java
@@ -3,6 +3,7 @@
 import com.github.yufiriamazenta.craftorithm.Craftorithm;
 import com.github.yufiriamazenta.craftorithm.menu.impl.recipe.RecipeDisplayMenuHolder;
 import crypticlib.CrypticLib;
+import crypticlib.annotations.BukkitListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryAction;
@@ -13,6 +14,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@BukkitListener
 public enum BukkitMenuDispatcher implements Listener {
 
     INSTANCE;