ScriptEntityPlus v1.1.9

yuttyann · yuttyann · commit 1b6ca526489f · 2021-11-23T00:15:38.000+09:00
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.yuttyann</groupId>
     <artifactId>ScriptEntityPlus</artifactId>
-    <version>1.1.8</version>
+    <version>1.1.9</version>
 
     <name>ScriptEntityPlus</name>
     <url>https://github.com/yuttyann/ScriptEntityPlus</url>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>com.github.yuttyann</groupId>
             <artifactId>ScriptBlockPlus</artifactId>
-            <version>2.1.7</version>
+            <version>2.1.8</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/src/main/java/com/github/yuttyann/scriptentityplus/ScriptEntity.java b/src/main/java/com/github/yuttyann/scriptentityplus/ScriptEntity.java
@@ -42,7 +42,7 @@
 
 public class ScriptEntity extends JavaPlugin {
 
-    public static final String SBP_VERSION = "2.1.7";
+    public static final String SBP_VERSION = "2.1.8";
 
     @Override
     public void onEnable() {
diff --git a/src/main/java/com/github/yuttyann/scriptentityplus/item/ScriptConnection.java b/src/main/java/com/github/yuttyann/scriptentityplus/item/ScriptConnection.java
@@ -18,7 +18,7 @@
 import com.github.yuttyann.scriptblockplus.BlockCoords;
 import com.github.yuttyann.scriptblockplus.file.config.SBConfig;
 import com.github.yuttyann.scriptblockplus.file.json.derived.BlockScriptJson;
-import com.github.yuttyann.scriptblockplus.file.json.element.BlockScript;
+import com.github.yuttyann.scriptblockplus.file.json.derived.element.BlockScript;
 import com.github.yuttyann.scriptblockplus.item.ChangeSlot;
 import com.github.yuttyann.scriptblockplus.item.ItemAction;
 import com.github.yuttyann.scriptblockplus.item.RunItem;
@@ -37,7 +37,9 @@
 import com.github.yuttyann.scriptentityplus.listener.EntityListener;
 import com.github.yuttyann.scriptentityplus.listener.PlayerListener;
 import org.bukkit.ChatColor;
+import org.bukkit.Material;
 import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemFlag;
 import org.bukkit.permissions.Permissible;
 import org.jetbrains.annotations.NotNull;
 
@@ -51,7 +53,8 @@ public class ScriptConnection extends ItemAction {
     private static final String KEY = Utils.randomUUID();
 
     public ScriptConnection() {
-        super(ToolMode.getItem());
+        super(Material.BONE, () -> "§dScript Connection", SEConfig.SCRIPT_CONNECTION::setListColor);
+        setItemFlags(ItemFlag.HIDE_ATTRIBUTES);
     }
 
     @Override
diff --git a/src/main/java/com/github/yuttyann/scriptentityplus/item/ToolMode.java b/src/main/java/com/github/yuttyann/scriptentityplus/item/ToolMode.java
@@ -17,16 +17,10 @@
 
 import com.github.yuttyann.scriptblockplus.enums.MatchType;
 import com.github.yuttyann.scriptblockplus.utils.ItemUtils;
-import com.github.yuttyann.scriptblockplus.utils.StringUtils;
-import com.github.yuttyann.scriptentityplus.file.SEConfig;
 import org.bukkit.Material;
-import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Objects;
-
 public enum ToolMode {
     NORMAL_SCRIPT("NORMAL MODE"),
     DEATH_SCRIPT("DEATH MODE");
@@ -45,17 +39,6 @@ public static boolean isItem(@NotNull ItemStack item) {
         return ItemUtils.compare(MatchType.TYPE, item, Material.BONE) && ItemUtils.compare(MatchType.NAME, item, "§dScript Connection");
     }
 
-    @NotNull
-    public static ItemStack getItem() {
-        ItemStack item = new ItemStack(Material.BONE);
-        ItemMeta meta = Objects.requireNonNull(item.getItemMeta());
-        meta.setDisplayName("§dScript Connection");
-        meta.setLore(StringUtils.setListColor(SEConfig.SCRIPT_CONNECTION.getValue()));
-        meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
-        item.setItemMeta(meta);
-        return item;
-    }
-
     @NotNull
     public static ToolMode getNextMode(@NotNull ToolMode toolMode) {
         return toolMode == NORMAL_SCRIPT ? DEATH_SCRIPT : NORMAL_SCRIPT;
