feat(user): Fixed user interfaces error

* feat(gui): 为GUI提供更多方法

* feat(gui): 修复翻页按钮消失的bug

.github/workflows/deploy.yml

@@ -14,9 +14,9 @@ jobs:
   packages-deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'adopt'
@@ -35,9 +35,9 @@ jobs:
   github-deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'adopt'
@@ -59,7 +59,7 @@ jobs:
         run: |
           rm -rf docs
           mkdir -vp docs
-          cp -vrf target/site/apidocs/* docs/
+          cp -vrf target/reports/apidocs/* docs/
           cp -vrf .documentation/javadoc/JAVADOC-README.md docs/README.md
 
       - name: "Generate Javadoc sitemap"
@@ -112,21 +112,21 @@ jobs:
     name: "Deploy Project (Central)"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '8'
           distribution: 'adopt'
           cache: maven
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: "Central Deploy"
-        run: mvn -B -Possrh deploy --file pom.xml -DskipTests
+        run: mvn -B -Pcentral deploy --file pom.xml -DskipTests
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASS }}

.github/workflows/maven.yml

@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           cache: maven
           java-version: '8'

base/color/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

base/color/src/main/java/cc/carm/lib/easyplugin/utils/ColorParser.java

@@ -34,7 +34,7 @@ public class ColorParser {
     public static @NotNull String clear(@NotNull String text) {
         text = HEX_PATTERN.matcher(text).replaceAll("");
         text = GRADIENT_PATTERN.matcher(text).replaceAll("");
-        text = COLOR_PATTERN.matcher(text).replaceAll("");
+        text = FORMAT_PATTERN.matcher(text).replaceAll("");
         return text;
     }
 

base/color/src/test/java/ColorParseTest.java

@@ -19,32 +19,7 @@ public class ColorParseTest {
         System.out.println(parse("&<#AAAAAA>&l我&r真&(#666666)的&<#BBBBBB>&o爱死&<#111111>你&<#FFFFFF>了&r！"));
         System.out.println(parse("&r正常的颜色理应&c&l不受影响&r。"));
 
-        System.out.println(clear("&f测试&<#AAAAAA>清理颜色代码&<#111111> &&这样应该&(#666666)不被影响 &f。"));
-    }
-
-    @Test
-    public void formatReadTest() {
-        LinkedHashMap<Integer, String> formats = new LinkedHashMap<>();
-        String text = "&k&l &m&1我&k爱你爱你爱你&o吗？";
-        Matcher matcher = ColorParser.FORMAT_PATTERN.matcher(text);
-        while (matcher.find()) {
-            String code = matcher.group();
-            formats.put(matcher.start(), code);
-            text = matcher.replaceFirst("");
-            matcher.reset(text);
-        }
-
-        formats.forEach((index, code) -> System.out.println(index + " -> " + code));
-
-        String[] parts = text.split("");
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < parts.length; i++) {
-            String format = formats.get(i);
-            if (format != null) builder.append(ColorParser.parseBaseColor(format));
-            builder.append(parts[i]);
-        }
-
-        System.out.println(builder);
+        System.out.println(clear("&f&l测试&<#AAAAAA>清理颜色代码&<#111111> &&这样应该&(#666666)不被影响 &f。"));
     }
 
 }

base/command-alias/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

base/command/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/gui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUI.java

@@ -81,6 +81,19 @@ public class GUI {
         }
     }
 
+    /**
+     * 设置GUI上方(箱子部分)
+     * @param row 行数，1为第1行
+     * @param column 列数，1为第1列
+     * @param item GUIItem
+     */
+    public void setItem(int row, int column, @NotNull GUIItem item){
+        if(row <= 0 || column <= 0) throw new IllegalArgumentException("行数和列数都不能小于等于零");
+        if(row > type.getLines()) throw new IllegalArgumentException("行数("+row+")大于GUI大小限制("+type.getLines()+")");
+        if(column > 9) throw new IllegalArgumentException("列数("+column+")不能大于9");
+        setItem(9*(row-1)+column-1, item);
+    }
+
     public GUIItem getItem(int index) {
         return this.items.get(index);
     }

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIItem.java

@@ -78,6 +78,14 @@ public class GUIItem {
 
     }
 
+    public Set<GUIClickAction> getActions() {
+        return actions;
+    }
+
+    public Set<GUIClickAction> getActionsIgnoreActive() {
+        return actionsIgnoreActive;
+    }
+
     public abstract static class GUIClickAction {
         public abstract void run(ClickType type, Player player);
     }

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIListener.java

@@ -6,6 +6,7 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryCreativeEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/paged/AutoPagedGUI.java

@@ -77,7 +77,14 @@ public class AutoPagedGUI extends CommonPagedGUI {
     public void openGUI(Player user) {
         if (previousPageSlot >= 0) {
             if (hasPreviousPage()) {
-                setItem(previousPageSlot, new GUIItem(Optional.ofNullable(defaultPreviousPage).map(d -> d.apply(user)).orElse(previousPageUI)) {
+                ItemStack finalPreviousPageUI;
+                if(previousPageUI != null)
+                    finalPreviousPageUI = previousPageUI;
+                else if (defaultPreviousPage != null)
+                    finalPreviousPageUI = defaultPreviousPage.apply(user);
+                else
+                    finalPreviousPageUI = null;
+                setItem(previousPageSlot, new GUIItem(finalPreviousPageUI) {
                     @Override
                     public void onClick(Player clicker, ClickType type) {
                         if (type == ClickType.RIGHT) {
@@ -95,7 +102,14 @@ public class AutoPagedGUI extends CommonPagedGUI {
 
         if (nextPageSlot >= 0) {
             if (hasNextPage()) {
-                setItem(nextPageSlot, new GUIItem(Optional.ofNullable(defaultNextPage).map(d -> d.apply(user)).orElse(nextPageUI)) {
+                ItemStack finalNextPageUI;
+                if(previousPageUI != null)
+                    finalNextPageUI = nextPageUI;
+                else if (defaultNextPage != null)
+                    finalNextPageUI = defaultNextPage.apply(user);
+                else
+                    finalNextPageUI = null;
+                setItem(nextPageSlot, new GUIItem(finalNextPageUI) {
                     @Override
                     public void onClick(Player clicker, ClickType type) {
                         if (type == ClickType.RIGHT) {

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/paged/CommonPagedGUI.java

@@ -80,8 +80,9 @@ public class CommonPagedGUI extends PagedGUI {
      *
      * @return 最后一页的页码
      */
+    @Override
     public int getLastPageNumber() {
-        return (this.container.size() / range.length) + ((this.container.size() % range.length) == 0 ? 0 : 1);
+        return getLastPageNumber(range.length);
     }
 
     /**
@@ -100,6 +101,8 @@ public class CommonPagedGUI extends PagedGUI {
             super.openGUI(player);
             return;
         }
+        if(page > getLastPageNumber())
+            page = getLastPageNumber();
         List<GUIItem> list = new ArrayList<>();
         int start = (page - 1) * range.length;
         for (int i = start; i < start + range.length; i++) {

base/gui/src/main/java/cc/carm/lib/easyplugin/gui/paged/PagedGUI.java

@@ -19,6 +19,29 @@ public abstract class PagedGUI extends GUI {
         super(type, title);
     }
 
+    public int setCurrentPage(int page) {
+        this.page = Math.max(1, page);
+        return this.page;
+    }
+
+    public int getCurrentPage() {
+        return page;
+    }
+
+
+    public int getLastPageNumber() {
+        return getLastPageNumber(getGUIType().getSize());
+    }
+
+    /**
+     * 得到最后一页的页码
+     *
+     * @return 最后一页的页码
+     */
+    public int getLastPageNumber(int size) {
+        return (this.container.size() / size) + ((this.container.size() % size) == 0 ? 0 : 1);
+    }
+
     public int addItem(@NotNull GUIItem i) {
         container.add(i);
         return container.size() - 1;
@@ -66,7 +89,7 @@ public abstract class PagedGUI extends GUI {
      */
     public void goPreviousPage() {
         if (hasPreviousPage()) {
-            page--;
+            this.page--;
             this.onPageChange(this.page);
         } else throw new IndexOutOfBoundsException();
     }
@@ -77,7 +100,7 @@ public abstract class PagedGUI extends GUI {
      */
     public void goNextPage() {
         if (hasNextPage()) {
-            page++;
+            this.page++;
             this.onPageChange(this.page);
         } else throw new IndexOutOfBoundsException();
     }

base/gui/src/test/java/PageTest.java

@@ -0,0 +1,21 @@
+import org.junit.Test;
+
+public class PageTest {
+
+
+    @Test
+    public void test() {
+        System.out.println(maxPage(0, 10));
+        System.out.println(maxPage(10, 10));
+        System.out.println(maxPage(5, 10));
+        System.out.println(maxPage(15, 10));
+        System.out.println(maxPage(19, 10));
+        System.out.println(maxPage(20, 10));
+
+    }
+
+    int maxPage(int contents, int size) {
+        if (contents == 0 || size == 0) return 1;
+        return (contents / size) + ((contents % size) == 0 ? 0 : 1);
+    }
+}

base/main/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/messages/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

base/storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

base/user/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyplugin-parent</artifactId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

base/user/src/main/java/cc/carm/lib/easyplugin/user/AbstractUserData.java

@@ -0,0 +1,52 @@
+package cc.carm.lib.easyplugin.user;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
+public abstract class AbstractUserData<K> implements UserData<K> {
+
+    protected final @NotNull K key;
+
+    /**
+     * Used to mark the data as dropping (save and unload) status.
+     */
+    protected boolean dropping = false;
+
+    protected AbstractUserData(@NotNull K key) {
+        this.key = key;
+    }
+
+    @Override
+    public @NotNull K key() {
+        return key;
+    }
+
+    /**
+     * @param dropping true if the data is dropping, false otherwise
+     */
+    public void setDropping(boolean dropping) {
+        this.dropping = dropping;
+    }
+
+    /**
+     * @return true if the data is dropping, false otherwise
+     */
+    public boolean isDropping() {
+        return dropping;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AbstractUserData<?> abstractUserData = (AbstractUserData<?>) o;
+        return key.equals(abstractUserData.key);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(key);
+    }
+
+}

base/user/src/main/java/cc/carm/lib/easyplugin/user/UserData.java

@@ -2,31 +2,17 @@ package cc.carm.lib.easyplugin.user;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Objects;
+public interface UserData<K> {
 
-public abstract class UserData<K> {
+    @NotNull K key();
 
-    protected final @NotNull K key;
-
-    protected UserData(@NotNull K key) {
-        this.key = key;
-    }
-
-    public @NotNull K getKey() {
-        return key;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        UserData<?> userData = (UserData<?>) o;
-        return key.equals(userData.key);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(key);
-    }
+    /**
+     * @param dropping true if the data is dropping, false otherwise
+     */
+    void setDropping(boolean dropping);
 
+    /**
+     * @return true if the data is dropping, false otherwise
+     */
+    boolean isDropping();
 }

base/user/src/main/java/cc/carm/lib/easyplugin/user/UserDataManager.java

@@ -1,15 +1,12 @@
 package cc.carm.lib.easyplugin.user;
 
 import cc.carm.lib.easyplugin.EasyPlugin;
-import com.google.common.collect.ImmutableSet;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
@@ -21,7 +18,7 @@ import java.util.function.Supplier;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-public abstract class UserDataManager<K, U extends UserData<K>> {
+public abstract class UserDataManager<K, U extends AbstractUserData<K>> implements UserDataRegistry<K, U> {
 
     protected final @NotNull EasyPlugin plugin;
 
@@ -47,6 +44,7 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
         this.dataCache = cacheMap;
     }
 
+    @Override
     public void shutdown() {
         this.executor.shutdown();
     }
@@ -55,14 +53,11 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
         return plugin;
     }
 
-    protected @NotNull Logger getLogger() {
+    @Override
+    public @NotNull Logger getLogger() {
         return getPlugin().getLogger();
     }
 
-    public String serializeKey(@NotNull K key) {
-        return key.toString();
-    }
-
     public abstract @NotNull U emptyUser(@NotNull K key);
 
     public @NotNull U errorUser(@NotNull K key) {
@@ -73,36 +68,17 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
 
     protected abstract void saveData(@NotNull U data) throws Exception;
 
-    public @NotNull CompletableFuture<U> load(@NotNull K key) {
-        return load(key, false);
-    }
-
-    public @NotNull CompletableFuture<U> load(@NotNull K key, boolean cache) {
-        return load(key, () -> cache);
-    }
-
-    public @NotNull Map<K, U> getDataCache() {
+    @Override
+    public @NotNull Map<K, U> cache() {
         return dataCache;
     }
 
-    @Unmodifiable
-    public @NotNull Set<U> list() {
-        return ImmutableSet.copyOf(getDataCache().values());
-    }
-
-    public @NotNull U get(@NotNull K key) {
-        return Optional.ofNullable(getNullable(key)).orElseThrow(() -> new NullPointerException("User " + key + " not found."));
-    }
-
-    public @Nullable U getNullable(@NotNull K key) {
-        return getDataCache().get(key);
-    }
-
-    public @NotNull Optional<@Nullable U> getOptional(@NotNull K key) {
-        return Optional.ofNullable(getNullable(key));
-    }
-
+    @Override
     public @NotNull CompletableFuture<U> load(@NotNull K key, @NotNull Supplier<Boolean> cacheCondition) {
+        U cached = getNullable(key);
+        if (cached != null) {
+            return CompletableFuture.supplyAsync(() -> cached); // Return cached data async.
+        }
         return CompletableFuture.supplyAsync(() -> {
             String identifier = serializeKey(key);
 
@@ -124,14 +100,15 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
             }
 
         }, executor).thenApply((data) -> {
-            if (cacheCondition.get()) dataCache.put(key, data);
+            if (cacheCondition.get() && !data.isDropping()) dataCache.put(key, data);
             return data;
         });
     }
 
+    @Override
     public @NotNull CompletableFuture<Boolean> save(@NotNull U user) {
         return CompletableFuture.supplyAsync(() -> {
-            String identifier = serializeKey(user.getKey());
+            String identifier = serializeKey(user.key());
 
             try {
                 long s1 = System.currentTimeMillis();
@@ -148,17 +125,18 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
         }, executor);
     }
 
-    public @NotNull CompletableFuture<Boolean> unload(@NotNull K key) {
-        return unload(key, true);
-    }
-
+    @Override
     public @NotNull CompletableFuture<Boolean> unload(@NotNull K key, boolean save) {
         U data = getNullable(key);
         if (data == null) return CompletableFuture.completedFuture(false);
-
+        data.setDropping(true); // Mark the data as unloading.
         if (save) {
             return save(data).thenApply(result -> {
-                this.dataCache.remove(key);
+                // Check if the data is still unloading,
+                // which cloud be interrupted by the next load.
+                if (data.isDropping()) {
+                    this.dataCache.remove(key);
+                }
                 return result;
             });
         } else {
@@ -168,6 +146,7 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
 
     }
 
+    @Override
     public @NotNull CompletableFuture<Boolean> modify(@NotNull K key, @NotNull Consumer<U> consumer) {
         U cached = getNullable(key);
         if (cached != null) {
@@ -176,13 +155,14 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
                 return true;
             }, executor);
         } else {
-            return load(key, false).thenApply((data) -> {
+            return load(key, true).thenApply((data) -> {
                 consumer.accept(data);
                 return data;
-            }).thenCompose(this::save);
+            }).thenCompose(data -> unload(key, true));
         }
     }
 
+    @Override
     public <V> @NotNull CompletableFuture<V> peek(@NotNull K key, @NotNull Function<U, V> function) {
         U cached = getNullable(key);
         if (cached != null) {
@@ -192,10 +172,6 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
         }
     }
 
-    public @NotNull CompletableFuture<Map<K, U>> loadOnline(@NotNull Function<Player, ? extends K> function) {
-        return loadGroup(Bukkit.getOnlinePlayers(), function, OfflinePlayer::isOnline);
-    }
-
     public <T> @NotNull CompletableFuture<Map<K, U>> loadGroup(@NotNull Collection<? extends T> users,
                                                                @NotNull Function<? super T, ? extends K> function,
                                                                @NotNull Predicate<T> cacheCondition) {
@@ -218,31 +194,24 @@ public abstract class UserDataManager<K, U extends UserData<K>> {
         return task.thenApply(Collections::unmodifiableMap);
     }
 
-    public @NotNull CompletableFuture<Map<K, U>> loadGroup(@NotNull Collection<K> allKeys,
-                                                           @NotNull Predicate<K> cacheCondition) {
-        return loadGroup(allKeys, Function.identity(), cacheCondition);
-    }
-
-    public @NotNull CompletableFuture<Map<K, U>> loadGroup(@NotNull Collection<K> allKeys) {
-        return loadGroup(allKeys, (v) -> false);
-    }
-
+    @Override
     public void saveAll() {
-        if (getDataCache().isEmpty()) return;
-        for (U u : getDataCache().values()) {
+        if (cache().isEmpty()) return;
+        for (U u : cache().values()) {
             try {
                 saveData(u);
             } catch (Exception e) {
-                getPlugin().error("保存用户 " + serializeKey(u.getKey()) + " 数据失败，请检查相关配置！");
+                getPlugin().error("保存用户 " + serializeKey(u.key()) + " 数据失败，请检查相关配置！");
                 e.printStackTrace();
             }
         }
     }
 
+    @Override
     public int unloadAll(boolean save) {
         if (save) saveAll();
-        int size = getDataCache().size();
-        getDataCache().clear();
+        int size = cache().size();
+        cache().clear();
         return size;
     }
 

base/user/src/main/java/cc/carm/lib/easyplugin/user/UserDataRegistry.java

@@ -0,0 +1,93 @@
+package cc.carm.lib.easyplugin.user;
+
+import com.google.common.collect.ImmutableSet;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.logging.Logger;
+
+public interface UserDataRegistry<K, U extends UserData<K>> {
+
+    void shutdown();
+
+    @NotNull Logger getLogger();
+
+    @NotNull Map<K, U> cache();
+
+    default String serializeKey(@NotNull K key) {
+        return key.toString();
+    }
+
+    default @NotNull CompletableFuture<U> load(@NotNull K key) {
+        return load(key, false);
+    }
+
+    default @NotNull CompletableFuture<U> load(@NotNull K key, boolean cache) {
+        return load(key, () -> cache);
+    }
+
+    @Unmodifiable
+    default @NotNull Set<U> list() {
+        return ImmutableSet.copyOf(cache().values());
+    }
+
+    default @NotNull U get(@NotNull K key) {
+        return Optional.ofNullable(getNullable(key)).orElseThrow(() -> new NullPointerException("User " + key + " not found."));
+    }
+
+    default @Nullable U getNullable(@NotNull K key) {
+        return cache().get(key);
+    }
+
+    default @NotNull Optional<@Nullable U> getOptional(@NotNull K key) {
+        return Optional.ofNullable(getNullable(key));
+    }
+
+    @NotNull CompletableFuture<U> load(@NotNull K key, @NotNull Supplier<Boolean> cacheCondition);
+
+    @NotNull CompletableFuture<Boolean> save(@NotNull U user);
+
+    default @NotNull CompletableFuture<Boolean> unload(@NotNull K key) {
+        return unload(key, true);
+    }
+
+    @NotNull CompletableFuture<Boolean> unload(@NotNull K key, boolean save);
+
+    @NotNull CompletableFuture<Boolean> modify(@NotNull K key, @NotNull Consumer<U> consumer);
+
+    <V> @NotNull CompletableFuture<V> peek(@NotNull K key, @NotNull Function<U, V> function);
+
+    default @NotNull CompletableFuture<Map<K, U>> loadOnline(@NotNull Function<Player, ? extends K> function) {
+        return loadGroup(Bukkit.getOnlinePlayers(), function, OfflinePlayer::isOnline);
+    }
+
+    <T> @NotNull CompletableFuture<Map<K, U>> loadGroup(@NotNull Collection<? extends T> users,
+                                                        @NotNull Function<? super T, ? extends K> function,
+                                                        @NotNull Predicate<T> cacheCondition);
+
+    default @NotNull CompletableFuture<Map<K, U>> loadGroup(@NotNull Collection<K> allKeys,
+                                                            @NotNull Predicate<K> cacheCondition) {
+        return loadGroup(allKeys, Function.identity(), cacheCondition);
+    }
+
+    default @NotNull CompletableFuture<Map<K, U>> loadGroup(@NotNull Collection<K> allKeys) {
+        return loadGroup(allKeys, (v) -> false);
+    }
+
+    void saveAll();
+
+    int unloadAll(boolean save);
+}

base/utils/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/bom/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

collection/common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

extension/gh-checker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

extension/papi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

extension/vault/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.5.10</version>
+        <version>1.5.14</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -15,7 +15,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyplugin-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.10</version>
+    <version>1.5.14</version>
     <modules>
         <module>base/color</module>
         <module>base/utils</module>
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>23.0.0</version>
+            <version>26.0.2</version>
             <scope>provided</scope>
         </dependency>
 
@@ -142,12 +142,12 @@
             <dependency>
                 <groupId>me.clip</groupId>
                 <artifactId>placeholderapi</artifactId>
-                <version>2.10.9</version>
+                <version>2.11.6</version>
             </dependency>
             <dependency>
                 <groupId>com.github.MilkBowl</groupId>
                 <artifactId>VaultAPI</artifactId>
-                <version>1.7</version>
+                <version>1.7.1</version>
             </dependency>
             <dependency>
                 <groupId>cc.carm.lib</groupId>
@@ -162,7 +162,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>3.5.2</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
@@ -170,7 +170,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.14.0</version>
                 <configuration>
                     <source>${project.jdk.version}</source>
                     <target>${project.jdk.version}</target>
@@ -181,12 +181,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.4.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -203,7 +203,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.2.7</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -223,7 +223,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
+                <version>3.1.1</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>
@@ -237,7 +237,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.11.2</version>
                     <configuration>
                         <classifier>javadoc</classifier>
                         <detectJavaApiLink>false</detectJavaApiLink>
@@ -258,7 +258,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.6.0</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -296,17 +296,24 @@
     <profiles>
 
         <profile>
-            <id>ossrh</id>
-            <distributionManagement>
-                <snapshotRepository>
-                    <id>ossrh</id>
-                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-                </snapshotRepository>
-                <repository>
-                    <id>ossrh</id>
-                    <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-                </repository>
-            </distributionManagement>
+            <id>central</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>0.7.0</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>central</publishingServerId>
+                            <autoPublish>true</autoPublish>
+                            <excludeArtifacts>
+                                <excludeArtifact>configured-demo</excludeArtifact>
+                            </excludeArtifacts>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
 
         <profile>

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}