From ddc438b2d39130b8d2e9c8bd2458c2205190351d Mon Sep 17 00:00:00 2001
From: YuTian <2953516620@qq.com>
Date: Tue, 28 Jan 2025 23:47:37 +0800
Subject: [PATCH] new-1.1

---
 .../elementoriginlib/command/handler/CommandHandler.java   | 4 ++--
 .../yutian/elementoriginlib/command/list/CommandHelp.java  | 3 +--
 .../com/io/yutian/elementoriginlib/item/TagStatItem.java   | 4 +---
 .../elementoriginlib/item/TagStatItemStackBuilder.java     | 7 ++++---
 .../yutian/elementoriginlib/item/stat/data/DoubleData.java | 1 -
 .../elementoriginlib/item/stat/data/EnumListData.java      | 2 --
 .../elementoriginlib/item/stat/data/StringListData.java    | 4 ----
 .../io/yutian/elementoriginlib/manager/CommandManager.java | 1 -
 8 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/io/yutian/elementoriginlib/command/handler/CommandHandler.java b/src/main/java/com/io/yutian/elementoriginlib/command/handler/CommandHandler.java
index 75f596e..76c3033 100644
--- a/src/main/java/com/io/yutian/elementoriginlib/command/handler/CommandHandler.java
+++ b/src/main/java/com/io/yutian/elementoriginlib/command/handler/CommandHandler.java
@@ -54,7 +54,7 @@ public class CommandHandler implements CommandExecutor, TabCompleter {
                 .filter(entry -> entry.getName().equalsIgnoreCase(currentArg))
                 .findFirst();
 
-        if (!optionalEntry.isPresent()) {
+        if (optionalEntry.isEmpty()) {
             sender.sendMessage(Lang.get("command.unknown-arg", index + 1, currentArg));
             return;
         }
@@ -164,7 +164,7 @@ public class CommandHandler implements CommandExecutor, TabCompleter {
         CommandEntity commandEntity = entityOptional.get();
         List<CommandEntry> entries = commandEntity.getChildrens();
 
-        if (entries.size() == 0) {
+        if (entries.isEmpty()) {
             return Collections.emptyList();
         }
 
diff --git a/src/main/java/com/io/yutian/elementoriginlib/command/list/CommandHelp.java b/src/main/java/com/io/yutian/elementoriginlib/command/list/CommandHelp.java
index 8246a4b..d711028 100644
--- a/src/main/java/com/io/yutian/elementoriginlib/command/list/CommandHelp.java
+++ b/src/main/java/com/io/yutian/elementoriginlib/command/list/CommandHelp.java
@@ -80,10 +80,9 @@ public class CommandHelp {
     private StringBuilder getCommandInfo(CommandEntity command, String commandAlias) {
         StringBuilder stringBuilder = new StringBuilder("§6/"+ commandAlias +" "+ command.getCommand());
         stringBuilder.append("§f");
-        if (command.getChildrens().size() > 0) {
+        if (!command.getChildrens().isEmpty()) {
             if (!(command.getChildrens().size() == 1 && command.getChildrens().get(0).isNodal())) {
                 for (CommandEntry child : command.getChildrens()) {
-
                 }
             }
         }
diff --git a/src/main/java/com/io/yutian/elementoriginlib/item/TagStatItem.java b/src/main/java/com/io/yutian/elementoriginlib/item/TagStatItem.java
index eba7be4..16ec1cb 100644
--- a/src/main/java/com/io/yutian/elementoriginlib/item/TagStatItem.java
+++ b/src/main/java/com/io/yutian/elementoriginlib/item/TagStatItem.java
@@ -87,9 +87,7 @@ public class TagStatItem {
     @Override
     public TagStatItem clone() {
         TagStatItem tagStatItem = new TagStatItem(itemStack.clone());
-        Iterator iterator = this.stats.keySet().iterator();
-        while(iterator.hasNext()) {
-            ItemStat itemStat = (ItemStat) iterator.next();
+        for (ItemStat itemStat : this.stats.keySet()) {
             tagStatItem.stats.put(itemStat, this.stats.get(itemStat));
         }
         return tagStatItem;
diff --git a/src/main/java/com/io/yutian/elementoriginlib/item/TagStatItemStackBuilder.java b/src/main/java/com/io/yutian/elementoriginlib/item/TagStatItemStackBuilder.java
index 3404c36..6beefad 100644
--- a/src/main/java/com/io/yutian/elementoriginlib/item/TagStatItemStackBuilder.java
+++ b/src/main/java/com/io/yutian/elementoriginlib/item/TagStatItemStackBuilder.java
@@ -2,6 +2,7 @@ package com.io.yutian.elementoriginlib.item;
 
 import com.io.yutian.elementoriginlib.tag.ItemProxy;
 import com.io.yutian.elementoriginlib.tag.TagCompound;
+import net.kyori.adventure.text.Component;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
@@ -46,10 +47,10 @@ public class TagStatItemStackBuilder {
         itemStack = itemProxy.getItemStack();
         itemMeta = itemStack.getItemMeta();
         tagStatItem.getStats().forEach((stat, statData) -> stat.applyMeta(this, statData));
-        itemStack.setItemMeta(itemMeta);
-        List<String> lores = itemMeta.hasLore() ? itemMeta.getLore() : new ArrayList<>();
+        List<Component> lores = itemMeta.hasLore() ? itemMeta.lore() : new ArrayList<>();
         tagStatItem.getStats().forEach((stat, statData) -> stat.whenApplyLore(this, statData, lores));
-        itemStack.setLore(lores);
+        itemMeta.lore(lores);
+        itemStack.setItemMeta(itemMeta);
     }
 
     @NotNull
diff --git a/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/DoubleData.java b/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/DoubleData.java
index d1b0885..d8a0b31 100644
--- a/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/DoubleData.java
+++ b/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/DoubleData.java
@@ -1,6 +1,5 @@
 package com.io.yutian.elementoriginlib.item.stat.data;
 
-import com.io.yutian.elementoriginlib.exception.itemstat.ItemStatDataLoadException;
 import com.io.yutian.elementoriginlib.item.stat.Mergeable;
 import com.io.yutian.elementoriginlib.item.stat.StatData;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/EnumListData.java b/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/EnumListData.java
index a09402e..7dd3680 100644
--- a/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/EnumListData.java
+++ b/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/EnumListData.java
@@ -1,7 +1,5 @@
 package com.io.yutian.elementoriginlib.item.stat.data;
 
-import com.io.yutian.elementoriginlib.item.stat.StatData;
-
 import java.util.List;
 
 public class EnumListData<E extends Enum> extends ListData<E> {
diff --git a/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/StringListData.java b/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/StringListData.java
index 751d775..0af362e 100644
--- a/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/StringListData.java
+++ b/src/main/java/com/io/yutian/elementoriginlib/item/stat/data/StringListData.java
@@ -1,9 +1,5 @@
 package com.io.yutian.elementoriginlib.item.stat.data;
 
-import com.io.yutian.elementoriginlib.item.stat.Mergeable;
-import com.io.yutian.elementoriginlib.item.stat.StatData;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
 
 public class StringListData extends ListData<String> {
diff --git a/src/main/java/com/io/yutian/elementoriginlib/manager/CommandManager.java b/src/main/java/com/io/yutian/elementoriginlib/manager/CommandManager.java
index 94fa183..b9c4b5b 100644
--- a/src/main/java/com/io/yutian/elementoriginlib/manager/CommandManager.java
+++ b/src/main/java/com/io/yutian/elementoriginlib/manager/CommandManager.java
@@ -3,7 +3,6 @@ package com.io.yutian.elementoriginlib.manager;
 import com.io.yutian.elementoriginlib.command.SimpleCommandManager;
 import com.io.yutian.elementoriginlib.command.list.CommandHelp;
 import com.io.yutian.elementoriginlib.command.list.CommandReload;
-import org.bukkit.plugin.Plugin;
 
 public class CommandManager extends SimpleCommandManager {