feat(gui): 重构部分GUI代码，补全缺失的获取接口

2024-09-19 19:25:45 +00:00 · 2023-11-12 02:03:03 +08:00 · 2023-11-12 02:03:03 +08:00 · 1b7f60fe43
commit 1b7f60fe43
parent de4dbbe637
19 changed files with 51 additions and 19 deletions
--- a/base/color/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <properties>
--- a/base/command-alias/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <properties>
--- a/base/command/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/gui/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIItem.java
+++ b/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);
    }
--- a/base/gui/src/main/java/cc/carm/lib/easyplugin/gui/paged/CommonPagedGUI.java
+++ b/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);
    }

    /**
--- a/base/gui/src/main/java/cc/carm/lib/easyplugin/gui/paged/PagedGUI.java
+++ b/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, Math.min(page, getLastPageNumber()));
+        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();
    }
--- a/base/main/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/messages/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <properties>
--- a/base/storage/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/base/user/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <properties>
--- a/base/utils/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/collection/all/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/collection/bom/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/collection/common/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/extension/gh-checker/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/extension/papi/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/extension/vault/pom.xml
+++ b/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.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/pom.xml
+++ b/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.11</version>
    <modules>
        <module>base/color</module>
        <module>base/utils</module>