[1.13.10.0]新增DataHolder接口,Menu和Icon默认实现此接口

Author: YufiriaMazenta

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.9.0"
+rootProject.version = "1.13.10.0"
 //全项目重构时更新大版本号
 //添加模块或有较大更改时更新次版本号
 //有API变动(新增/删除/更改声明)时更新修订号

module/bukkit/ui/src/main/java/crypticlib/ui/display/Icon.java

@@ -1,5 +1,6 @@
 package crypticlib.ui.display;
 
+import crypticlib.DataHolder;
 import crypticlib.chat.BukkitTextProcessor;
 import crypticlib.util.ItemHelper;
 import org.bukkit.Bukkit;
@@ -11,18 +12,21 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
-public class Icon {
+public class Icon implements DataHolder {
 
     protected ItemStack display;
     protected Consumer<InventoryClickEvent> clickAction;
     /**
      * 用于某些情况下图标需要解析玩家变量时使用,一般为图标所属页面的玩家,默认在{@link crypticlib.ui.menu.Menu#preprocessIconWhenDraw}前赋值
      */
     private @Nullable UUID parsePlayerId;
+    protected final Map<String, Object> dataMap = new ConcurrentHashMap<>();
 
     public Icon(@NotNull IconDisplay iconDisplay) {
         this.display = iconDisplay.display();
@@ -143,4 +147,33 @@ public String parseIconText(String originText) {
         return BukkitTextProcessor.color(BukkitTextProcessor.placeholder(iconParsePlayer, originText));
     }
 
+    @Override
+    public Map<String, Object> allData() {
+        return dataMap;
+    }
+
+    @Override
+    public void setAllData(Map<String, Object> data) {
+        this.dataMap.clear();
+        this.dataMap.putAll(data);
+    }
+
+    @Override
+    public Optional<Object> getData(String key) {
+        if (dataMap.containsKey(key)) {
+            return Optional.ofNullable(dataMap.get(key));
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public Object putData(String key, Object value) {
+        return dataMap.put(key, value);
+    }
+
+    @Override
+    public void clearData() {
+        dataMap.clear();
+    }
+
 }

module/bukkit/ui/src/main/java/crypticlib/ui/menu/Menu.java

@@ -1,6 +1,7 @@
 package crypticlib.ui.menu;
 
 import crypticlib.CrypticLibBukkit;
+import crypticlib.DataHolder;
 import crypticlib.chat.BukkitTextProcessor;
 import crypticlib.scheduler.task.TaskWrapper;
 import crypticlib.ui.display.Icon;
@@ -22,15 +23,17 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
-public class Menu implements InventoryHolder {
+public class Menu implements InventoryHolder, DataHolder {
 
     protected final Map<Integer, Icon> slotMap;
     protected final UUID playerId;
     protected MenuDisplay display;
     protected final Map<Character, List<Integer>> layoutSlotMap;
-    protected Inventory inventoryCache;
+    protected @Nullable Inventory inventoryCache;
+    protected final Map<String, Object> dataMap = new ConcurrentHashMap<>();
 
     public Menu(@NotNull Player player) {
         this(player, new MenuDisplay());
@@ -390,4 +393,33 @@ public Inventory inventoryCache() {
         return inventoryCache;
     }
 
+    @Override
+    public Map<String, Object> allData() {
+        return dataMap;
+    }
+
+    @Override
+    public void setAllData(Map<String, Object> data) {
+        this.dataMap.clear();
+        this.dataMap.putAll(data);
+    }
+
+    @Override
+    public Optional<Object> getData(String key) {
+        if (dataMap.containsKey(key)) {
+            return Optional.ofNullable(dataMap.get(key));
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public Object putData(String key, Object value) {
+        return dataMap.put(key, value);
+    }
+
+    @Override
+    public void clearData() {
+        dataMap.clear();
+    }
+
 }

platform/common/src/main/java/crypticlib/DataHolder.java

@@ -0,0 +1,37 @@
+package crypticlib;
+
+import java.util.Map;
+import java.util.Optional;
+
+public interface DataHolder {
+
+    /**
+     * 获取当前存储的所有数据
+     * @return
+     */
+    Map<String, Object> allData();
+
+    /**
+     * 设置当前存储的所有数据
+     * @param data
+     */
+    void setAllData(Map<String, Object> data);
+
+    /**
+     * 获取某个键存储的数据
+     * @param key
+     * @return
+     */
+    Optional<Object> getData(String key);
+
+    /**
+     * 记录一个数据
+     * @param key
+     * @param value
+     * @return 如果原本存在数据,返回被覆盖的数据
+     */
+    Object putData(String key, Object value);
+
+    void clearData();
+
+}