[1.5.0-beta5]修复编译报错，命令能否正常使用待测试

YufiriaMazenta · Nov 18, 2023 · 18bb59b · 18bb59b
1 parent 3dc7666
commit 18bb59b
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
 }
 
 group = "com.github.yufiriamazenta"
-version = "1.5.0-beta4"
+version = "1.5.0-beta5"
 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/cmd/PluginCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/PluginCommand.java
@@ -5,6 +5,7 @@
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
 import crypticlib.command.BukkitCommand;
 import crypticlib.command.RootCmdExecutor;
+import crypticlib.command.SubcmdExecutor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -30,7 +31,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             LangUtil.sendLang(sender, "command.not_enough_param", ContainerUtil.newHashMap("<number>", String.valueOf(1)));
             return true;
         }
-        ISubCmdExecutor subCommand = subCommandMap.get(argList.get(0));
+        SubcmdExecutor subCommand = subcommands().get(argList.get(0));
         if (subCommand != null) {
             String perm = subCommand.permission();
             if (perm != null) {

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/ItemCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/ItemCommand.java
@@ -2,14 +2,14 @@
 
 import com.github.yufiriamazenta.craftorithm.cmd.sub.item.ItemGiveCommand;
 import com.github.yufiriamazenta.craftorithm.cmd.sub.item.ItemSaveCommand;
-import crypticlib.command.ISubCmdExecutor;
+import crypticlib.command.SubcmdExecutor;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
 public final class ItemCommand extends AbstractSubCommand {
 
-    public static final ISubCmdExecutor INSTANCE = new ItemCommand();
+    public static final SubcmdExecutor INSTANCE = new ItemCommand();
 
     private ItemCommand() {
         super("item", "craftorithm.command.item");

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/ReloadCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/ReloadCommand.java
@@ -6,14 +6,14 @@
 import com.github.yufiriamazenta.craftorithm.recipe.RecipeManager;
 import com.github.yufiriamazenta.craftorithm.util.ItemUtil;
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
-import crypticlib.command.ISubCmdExecutor;
+import crypticlib.command.SubcmdExecutor;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
 public final class ReloadCommand extends AbstractSubCommand {
 
-    public static final ISubCmdExecutor INSTANCE = new ReloadCommand();
+    public static final SubcmdExecutor INSTANCE = new ReloadCommand();
 
     private ReloadCommand() {
         super("reload", "craftorithm.command.reload");

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/RemoveRecipeCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/RemoveRecipeCommand.java
@@ -2,7 +2,7 @@
 
 import com.github.yufiriamazenta.craftorithm.recipe.RecipeManager;
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
-import crypticlib.command.ISubCmdExecutor;
+import crypticlib.command.SubcmdExecutor;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
@@ -13,7 +13,7 @@
  */
 public final class RemoveRecipeCommand extends AbstractSubCommand {
 
-    public static final ISubCmdExecutor INSTANCE = new RemoveRecipeCommand();
+    public static final SubcmdExecutor INSTANCE = new RemoveRecipeCommand();
 
     private RemoveRecipeCommand() {
         super("remove", "craftorithm.command.remove");

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/VersionCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/VersionCommand.java
@@ -1,14 +1,14 @@
 package com.github.yufiriamazenta.craftorithm.cmd.sub;
 
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
-import crypticlib.command.ISubCmdExecutor;
+import crypticlib.command.SubcmdExecutor;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
 public final class VersionCommand extends AbstractSubCommand {
 
-    public static final ISubCmdExecutor INSTANCE = new VersionCommand();
+    public static final SubcmdExecutor INSTANCE = new VersionCommand();
 
     private VersionCommand() {
         super("version", "craftorithm.command.version");

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/ItemGiveCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/ItemGiveCommand.java
@@ -4,7 +4,7 @@
 import com.github.yufiriamazenta.craftorithm.item.ItemManager;
 import com.github.yufiriamazenta.craftorithm.util.ContainerUtil;
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
-import crypticlib.command.ISubCmdExecutor;
+import crypticlib.command.SubcmdExecutor;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -14,7 +14,7 @@
 
 public class ItemGiveCommand extends AbstractSubCommand {
 
-    public static final ISubCmdExecutor INSTANCE = new ItemGiveCommand();
+    public static final SubcmdExecutor INSTANCE = new ItemGiveCommand();
 
     private ItemGiveCommand() {
         super("give");

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/ItemSaveCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/item/ItemSaveCommand.java
@@ -3,7 +3,7 @@
 import com.github.yufiriamazenta.craftorithm.cmd.sub.AbstractSubCommand;
 import com.github.yufiriamazenta.craftorithm.item.ItemManager;
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
-import crypticlib.command.ISubCmdExecutor;
+import crypticlib.command.SubcmdExecutor;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -15,7 +15,7 @@
 
 public final class ItemSaveCommand extends AbstractSubCommand {
 
-    public static final ISubCmdExecutor INSTANCE = new ItemSaveCommand();
+    public static final SubcmdExecutor INSTANCE = new ItemSaveCommand();
 
     private ItemSaveCommand() {
         super("save");

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,7 +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 crypticlib.listener.BukkitListener;
 import crypticlib.util.TextUtil;
 import org.bukkit.Location;
 import org.bukkit.Material;

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,7 +4,7 @@
 import com.github.yufiriamazenta.craftorithm.arcenciel.ArcencielDispatcher;
 import com.github.yufiriamazenta.craftorithm.recipe.RecipeManager;
 import com.github.yufiriamazenta.craftorithm.util.ItemUtil;
-import crypticlib.annotations.BukkitListener;
+import crypticlib.listener.BukkitListener;
 import org.bukkit.NamespacedKey;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.HumanEntity;

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,7 +1,7 @@
 package com.github.yufiriamazenta.craftorithm.listener;
 
 import com.github.yufiriamazenta.craftorithm.recipe.RecipeManager;
-import crypticlib.annotations.BukkitListener;
+import crypticlib.listener.BukkitListener;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

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
@@ -2,7 +2,7 @@
 
 import com.github.yufiriamazenta.craftorithm.Craftorithm;
 import crypticlib.CrypticLib;
-import crypticlib.annotations.BukkitListener;
+import crypticlib.listener.BukkitListener;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryAction;