1
mirror of https://github.com/CarmJos/EasyPlugin.git synced 2026-06-05 00:58:17 +08:00

Compare commits

..

37 Commits

Author SHA1 Message Date
carm f170d654d6 [v1.3.1] [A] 更新EasySQL版本 2022-01-13 15:28:29 +08:00
carm ff4da6b73e [v1.3.1] [A] 添加PagedGUI接口 2022-01-13 02:00:32 +08:00
carm d39951bf65 修改Javadoc部署密钥 2022-01-09 13:26:28 +08:00
carm 90a276c1c1 修改库地址 2022-01-09 13:25:49 +08:00
carm f15e0a5bec [v1.3.0] 版本更新
- [U] 添加 MessagesInitializer 与 MessagesConfig 等相关消息配置,用于快捷创建消息静态类进行消文本消息的处理。
2022-01-09 13:13:30 +08:00
carm 2ac6fc1485 修改依赖版本 2022-01-08 17:39:34 +08:00
carm 7701efa34f 修改Javadoc路径 2022-01-08 02:34:34 +08:00
carm ff25446fd4 测试Javadoc部署 2022-01-08 02:32:05 +08:00
carm 40b66740e0 测试Javadoc部署 2022-01-08 02:31:44 +08:00
carm af79d41cf6 测试Javadoc部署 2022-01-08 02:26:32 +08:00
carm 6fad72c44f 测试Javadoc部署 2022-01-08 02:20:17 +08:00
carm a7ed8bc4fd 测试Javadoc部署 2022-01-08 02:13:02 +08:00
carm b18e6ec3d3 测试Javadoc部署 2022-01-08 02:07:54 +08:00
carm 3d9748c48e 测试Javadoc部署 2022-01-08 02:04:10 +08:00
carm aaba1a8097 测试Javadoc部署 2022-01-08 02:01:28 +08:00
carm 47966b0be3 测试Javadoc部署 2022-01-08 01:48:08 +08:00
carm b1b6b95a07 测试Javadoc部署 2022-01-08 01:47:49 +08:00
carm 55263a4d5b 添加赞助方式 2022-01-08 01:37:23 +08:00
carm d5632d371b 测试javadoc部署 2022-01-08 01:35:16 +08:00
carm 43643ba423 [v1.2.0] 版本更新
- [U] 采用新版本EasySQL,快捷操作数据库,优雅永不过时。
- [A] 针对DatabaseTable添加数个快捷操作的方式。
2022-01-08 01:11:23 +08:00
carm 80042aead7 [v1.2.0] 版本更新
- [U] 采用新版本EasySQL,快捷操作数据库,优雅永不过时。
- [A] 针对DatabaseTable添加数个快捷操作的方式。
2022-01-08 01:02:27 +08:00
carm 024efc7690 [v1.1.3] 版本更新
- [U] 采用 ConfigUpdater 项目,解决config中注释丢失的问题。
2022-01-06 16:19:15 +08:00
carm 54bf188c5c [v1.1.2] 版本更新
- [U] 对于可能为空的配置参数提供Optional方法
- [U] 将复用的方法提出为抽象类使用
- [U] 优化代码结构
2022-01-06 14:29:56 +08:00
carm 471bdab090 [v1.1.2] 版本更新
- [U] 对于可能为空的配置参数提供Optional方法
- [U] 将复用的方法提出为抽象类使用
- [U] 优化代码结构
2022-01-06 14:24:48 +08:00
carm 2628cb5c6a 修复格式错误 2022-01-05 05:29:05 +08:00
carm f7f382a874 [v1.1.1] 修复部署错误 2022-01-05 05:26:34 +08:00
carm c3119bb49a [v1.1.1] 修复部署错误 2022-01-05 05:25:59 +08:00
carm b753a5c331 移除CodeQL 2022-01-05 05:23:01 +08:00
carm eb073ce9dc 修复依赖 2022-01-05 05:19:40 +08:00
carm b2b5c41b86 修复依赖 2022-01-05 05:13:25 +08:00
carm 422d93eb1f 添加依赖方式介绍 2022-01-05 05:09:08 +08:00
carm 7be28a2c82 添加依赖方式介绍 2022-01-05 05:02:55 +08:00
carm fc948e7e24 [v1.1.0] 版本更新
- [U] 不再允许重写onLoad、onEnable与onDisable方法。
- [F] 修复GUI打开时的空指针异常。
- [A] 添加outputInfo方法,方便插件输出相关信息。
- [A] 添加 EasyPluginMessageProvider 用于实现多语言支持。
2022-01-05 03:55:49 +08:00
carm 33bef6b265 [v1.1.0] 版本更新
- [U] 不再允许重写onLoad、onEnable与onDisable方法。
- [F] 修复GUI打开时的空指针异常。
- [A] 添加outputInfo方法,方便插件输出相关信息。
- [A] 添加 EasyPluginMessageProvider 用于实现多语言支持。
2022-01-05 03:55:21 +08:00
carm 30832fc62b [v1.1.0] 版本更新
- [U] 不再允许重写onLoad、onEnable与onDisable方法。
- [F] 修复GUI打开时的空指针异常。
- [A] 添加outputInfo方法,方便插件输出相关信息。
- [A] 添加 EasyPluginMessageProvider 用于实现多语言支持。
2022-01-05 03:50:57 +08:00
carm 1713fb1324 [v1.1.0] 版本更新
- [U] 不再允许重写onLoad、onEnable与onDisable方法。
- [F] 修复GUI打开时的空指针异常。
- [A] 添加outputInfo方法,方便插件输出相关信息。
- [A] 添加 EasyPluginMessageProvider 用于实现多语言支持。
2022-01-05 03:45:24 +08:00
carm f216aba5e3 添加开发中标识 2022-01-04 23:34:07 +08:00
49 changed files with 2129 additions and 729 deletions
+38
View File
@@ -0,0 +1,38 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>EasyPlugin Javadocs</title>
<style>
.container {
width: 60%;
margin: 10% auto 0;
background-color: #f0f0f0;
padding: 2% 5%;
border-radius: 10px
}
ul {
padding-left: 20px;
}
ul li {
line-height: 2.3
}
a {
color: #20a53a
}
</style>
</head>
<body>
<div class="container">
<h1>EasyPlugin Javadocs</h1>
<ul>
<li><a href="main/index.html">EasyPlugin-Main</a></li>
<li><a href="command/index.html">EasyPlugin-Command</a></li>
<li><a href="configuration/index.html">EasyPlugin-Configuration</a></li>
</ul>
</div>
</body>
</html>
+2
View File
@@ -0,0 +1,2 @@
github: [ CarmJos ]
custom: [ 'https://donate.carm.cc' ]
-70
View File
@@ -1,70 +0,0 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '45 12 * * 1'
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'java' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support
steps:
- name: Checkout repository
uses: actions/checkout@v2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
#- run: |
# make bootstrap
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
+10 -6
View File
@@ -23,16 +23,19 @@ jobs:
cache: maven
java-version: '11'
distribution: 'adopt'
server-id: github
server-username: MAVEN_USERNAME
server-password: MAVEN_TOKEN
- name: Generate docs
run: mvn clean package -DskipTests
run: mvn javadoc:javadoc -DskipTests
env:
MAVEN_USERNAME: ${{ github.repository_owner }}
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Copy to Location
run: |
rm -rf docs
mkdir -vp docs
cp -vrf EasyPlugin-api/target/apidocs/* docs/
cp -vrf .documentation/JAVADOC-README.md docs/README.md
bash .scripts/copy-javadoc.sh
- name: Generate the sitemap
id: sitemap
@@ -46,6 +49,7 @@ jobs:
echo "sitemap-path = ${{ steps.sitemap.outputs.sitemap-path }}"
echo "url-count = ${{ steps.sitemap.outputs.url-count }}"
echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}"
ls -l docs
- name: Configure Git
env:
+6
View File
@@ -21,8 +21,14 @@ jobs:
cache: maven
java-version: '11'
distribution: 'adopt'
server-id: github
server-username: MAVEN_USERNAME
server-password: MAVEN_TOKEN
- name: "Package"
run: mvn -B package --file pom.xml -Dmaven.javadoc.skip=true
env:
MAVEN_USERNAME: ${{ github.repository_owner }}
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: "Target Stage"
run: mkdir staging && cp */target/*.jar staging
- name: "Upload artifact"
+21
View File
@@ -0,0 +1,21 @@
rm -rf docs
mkdir -vp docs
DOC_URL="target/site/apidocs"
for FILE in easyplugin-*; do
if test -e "$FILE/$DOC_URL"; then
MODULE_FILE="docs/${FILE:11}/"
mkdir -vp "$MODULE_FILE"
cp -vrf "$FILE"/"$DOC_URL"/* "$MODULE_FILE"
fi
done
cp -vrf .documentation/javadoc/JAVADOC-README.md docs/README.md
cp -vrf .documentation/javadoc/index.html docs/index.html
+64 -22
View File
@@ -23,26 +23,30 @@
- 轻便独立的功能模块,按需使用,避免大量打包!
- 详细的Javadoc与使用文档,轻松上手,方便使用!
- 持续的更新与优化,需求不止,更新不止!
- 如需新功能支持,请 [点击这里](https://github.com/CarmJos/EasyPlugin/issues/new?assignees=&labels=enhancement&template=feature_issues.md&title=) 提交功能需求。
- 如需新功能支持,请通过 [Issues](https://github.com/CarmJos/EasyPlugin/issues) 提交功能需求。
## 内容
项目初创不久,加 * 的仍在开发更新中...
### 集合部分
- All [`easyplugin-all`](easyplugin-all)
- Common [`easyplugin-common`](easyplugin-common)
### 主要部分
- Main [`easyplugin-main`](easyplugin-main)
- Command [`easyplugin-command`](easyplugin-command)
- Command* [`easyplugin-command`](easyplugin-command)
- Configuration [`easyplugin-configuration`](easyplugin-configuration)
- Database [`easyplugin-database`](easyplugin-database)
- Database* [`easyplugin-database`](easyplugin-database)
- GUI [`easyplugin-gui`](easyplugin-gui)
### 附属部分
- [PlaceholderAPI](https://www.spigotmc.org/resources/6245/) [`easyplugin-placeholderapi`](easyplugin-placeholderapi)
- [Vault](https://github.com/MilkBowl/VaultAPI) [`easyplugin-vault`](easyplugin-vault)
- [LuckPerms](https://www.spigotmc.org/resources/luckperms.28140/) [`easyplugin-lp`](easyplugin-lp)
- [PlaceholderAPI](https://www.spigotmc.org/resources/6245/)* [`easyplugin-placeholderapi`](easyplugin-placeholderapi)
- [Vault](https://github.com/MilkBowl/VaultAPI)* [`easyplugin-vault`](easyplugin-vault)
- [LuckPerms](https://www.spigotmc.org/resources/luckperms.28140/)* [`easyplugin-lp`](easyplugin-lp)
## 开发
@@ -54,32 +58,30 @@
### 依赖方式
#### Maven 依赖
<details>
<summary>远程库配置</summary>
<summary>展开查看 Maven 依赖方式</summary>
```xml
<project>
<repositories>
<repository>
<!--采用github依赖库,安全稳定,但需要配置 (推荐)-->
<id>EasyPlugin</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/CarmJos/EasyPlugin</url>
</repository>
<repository>
<!--采用我的私人依赖库,简单方便,但可能因为变故而无法使用-->
<id>carm-repo</id>
<name>Carm's Repo</name>
<url>https://repo.carm.cc/repository/maven-public/</url>
</repository>
</repositories>
</project>
```
</details>
<details>
<summary>原生依赖</summary>
```xml
<project>
<dependencies>
<!--大全集版本,包含项目内所有模块-->
<dependency>
@@ -89,7 +91,15 @@
<scope>compile</scope>
</dependency>
<!--轻松插件主要接口集,包含方便的插件入口类与相关工具类。-->
<!--常用接口集,包含除附属插件模块外的所有模块-->
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-common</artifactId>
<version>[LATEST RELEASE]</version>
<scope>compile</scope>
</dependency>
<!--插件主要接口模块,包含方便的插件入口类与相关工具类-->
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-main</artifactId>
@@ -97,12 +107,44 @@
<scope>compile</scope>
</dependency>
<!-- 其他模块自行选择,详见 “内容”-->
</dependencies>
</project>
```
</details>
<details>
<summary>展开查看 Gradle 依赖方式</summary>
```groovy
repositories {
// 采用github依赖库,安全稳定,但需要配置 (推荐)
maven { url 'https://maven.pkg.github.com/CarmJos/EasyPlugin' }
// 采用我的私人依赖库,简单方便,但可能因为变故而无法使用
maven { url 'https://repo.carm.cc/repository/maven-public/' }
}
dependencies {
//大全集版本,包含项目内所有模块
api "cc.carm.lib:easyplugin-all:[LATEST RELEASE]"
//常用接口集,包含除附属插件模块外的所有模块
api "cc.carm.lib:easyplugin-common:[LATEST RELEASE]"
//插件主要接口模块,包含方便的插件入口类与相关工具类
api "cc.carm.lib:easyplugin-main:[LATEST RELEASE]"
// 其他模块自行选择,详见 “内容”
}
```
</details>
## 支持与捐赠
若您觉得本插件做的不错,您可以通过捐赠支持我!
@@ -125,8 +167,8 @@
> - 你可以自由使用,复制,修改,可以用于自己的项目。
> - 可以免费分发或用来盈利。
> - 唯一的限制是必须包含许可声明。
>
>
> MIT 协议是所有开源许可中最宽松的一个,除了必须包含许可声明外,再无任何限制。
>
>
> *以上文字来自 [五种开源协议GPL,LGPL,BSD,MIT,Apache](https://www.oschina.net/question/54100_9455) 。*
</details>
+8 -28
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,7 +19,7 @@
<artifactId>easyplugin-all</artifactId>
<packaging>jar</packaging>
<name>EasyPlugin-All</name>
<name>01-EasyPlugin-All</name>
<description>轻松插件全集,将打包全部工具类与工具接口。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>
@@ -32,10 +32,10 @@
</developer>
</developers>
<licenses>
<licenses>
<license>
<name>GNU General Public License v3.0</name>
<url>https://opensource.org/licenses/GPL-3.0</url>
<name>The MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
@@ -51,34 +51,14 @@
<dependencies>
<!--通过 bom 快捷导入所有相关模块-->
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-common</artifactId>
<artifactId>easyplugin-bom</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-lp</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-placeholderapi</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-vault</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
<artifactId>easyplugin-bom</artifactId>
<packaging>pom</packaging>
<name>00-EasyPlugin-Bom</name>
<description>轻松插件汇总导入模块,允许快捷导入相关的接口并避免版本不一致问题。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-main</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-configuration</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-command</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-database</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-gui</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-placeholderapi</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-vault</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-lp</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-main</artifactId>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-configuration</artifactId>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-database</artifactId>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-gui</artifactId>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-command</artifactId>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-placeholderapi</artifactId>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-vault</artifactId>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-lp</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
+3 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,6 +17,8 @@
</properties>
<artifactId>easyplugin-command</artifactId>
<packaging>jar</packaging>
<name>12-EasyPlugin-Command</name>
</project>
+25 -34
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,8 +19,8 @@
<artifactId>easyplugin-common</artifactId>
<packaging>jar</packaging>
<name>EasyPlugin-Main</name>
<description>轻松插件常用接口集,包含除附属模块外的所有模块。</description>
<name>02-EasyPlugin-Common</name>
<description>轻松插件常用接口集,包含除附属插件模块外的所有模块。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>
<developers>
@@ -34,8 +34,8 @@
<licenses>
<license>
<name>GNU General Public License v3.0</name>
<url>https://opensource.org/licenses/GPL-3.0</url>
<name>The MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
@@ -50,40 +50,31 @@
</ciManagement>
<dependencies>
<!--通过 bom 快捷导入所有相关模块-->
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-main</artifactId>
<artifactId>easyplugin-bom</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-placeholderapi</artifactId>
</exclusion>
<exclusion>
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-lp</artifactId>
</exclusion>
<exclusion>
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-vault</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-command</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-configuration</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-gui</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-database</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
+73 -6
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,8 +20,8 @@
<packaging>jar</packaging>
<name>EasyPlugin-Configuration</name>
<description>轻松插件配置,可以方便快捷的将配置文件作为静态参数使用。</description>
<name>11-EasyPlugin-Configuration</name>
<description>轻松插件配置模块,可以方便快捷的将配置文件作为静态参数使用。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>
<developers>
@@ -33,10 +33,10 @@
</developer>
</developers>
<licenses>
<licenses>
<license>
<name>GNU General Public License v3.0</name>
<url>https://opensource.org/licenses/GPL-3.0</url>
<name>The MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
@@ -57,6 +57,73 @@
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<!--
ConfigUpdater - to save the comments in default configuration.
-> https://github.com/tchristofferson/Config-Updater
-->
<groupId>com.tchristofferson</groupId>
<artifactId>ConfigUpdater</artifactId>
<version>2.0-SNAPSHOT</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</execution>
</executions>
<configuration>
<relocations>
<relocation>
<pattern>com.tchristofferson.configupdater</pattern>
<shadedPattern>cc.carm.lib.easyplugin.configuration.updater</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>META-INF/*.txt</exclude>
</excludes>
</filter>
</filters>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,58 @@
package cc.carm.lib.easyplugin.configuration.cast;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.file.FileConfigCachedValue;
import org.bukkit.configuration.ConfigurationSection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Optional;
import java.util.function.Function;
public class ConfigSectionCast<V> extends FileConfigCachedValue<V> {
@NotNull Function<ConfigurationSection, V> valueCast;
@Nullable V defaultValue;
public ConfigSectionCast(@NotNull String configSection,
@NotNull Function<ConfigurationSection, V> valueCast) {
this(configSection, valueCast, null);
}
public ConfigSectionCast(@NotNull String sectionName,
@NotNull Function<ConfigurationSection, V> valueCast,
@Nullable V defaultValue) {
this(null, sectionName, valueCast, defaultValue);
}
public ConfigSectionCast(@Nullable FileConfig source, @NotNull String sectionName,
@NotNull Function<ConfigurationSection, V> valueCast,
@Nullable V defaultValue) {
super(source, sectionName);
this.valueCast = valueCast;
this.defaultValue = defaultValue;
}
public @Nullable V get() {
V cached = getCachedValue();
if (cached != null && !isExpired()) {
return cached;
} else {
return getConfigOptional()
.map(config -> config.getConfigurationSection(getSectionName()))
.map(section -> updateCache(valueCast.apply(section)))
.orElse(defaultValue);
}
}
public @NotNull Optional<V> getOptional() {
return Optional.ofNullable(get());
}
public void set(ConfigurationSection section) {
}
}
@@ -0,0 +1,55 @@
package cc.carm.lib.easyplugin.configuration.cast;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.file.FileConfigCachedValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Optional;
import java.util.function.Function;
public class ConfigStringCast<V> extends FileConfigCachedValue<V> {
@NotNull Function<String, V> valueCast;
@Nullable V defaultValue;
public ConfigStringCast(@NotNull String configSection,
@NotNull Function<String, V> valueCast) {
this(configSection, valueCast, null);
}
public ConfigStringCast(@NotNull String configSection,
@NotNull Function<String, V> valueCast,
@Nullable V defaultValue) {
this(null, configSection, valueCast, defaultValue);
}
public ConfigStringCast(@Nullable FileConfig source, @NotNull String sectionName,
@NotNull Function<String, V> valueCast,
@Nullable V defaultValue) {
super(source, sectionName);
this.valueCast = valueCast;
this.defaultValue = defaultValue;
}
public @Nullable V get() {
V cached = getCachedValue();
if (cached != null && !isExpired()) {
return cached;
} else {
return getConfigOptional()
.map(config -> config.getString(getSectionName()))
.map(s -> updateCache(valueCast.apply(s)))
.orElse(defaultValue);
}
}
public @NotNull Optional<V> getOptional() {
return Optional.ofNullable(get());
}
public void set(@Nullable String value) {
setIfPresent(value, true);
}
}
@@ -1,91 +1,128 @@
package cc.carm.lib.easyplugin.configuration.file;
import com.tchristofferson.configupdater.ConfigUpdater;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
import java.io.*;
import java.util.function.Supplier;
@SuppressWarnings("ResultOfMethodCallIgnored")
public class FileConfig {
public static Supplier<FileConfig> pluginConfiguration = null;
public static Supplier<FileConfig> messageConfiguration = null;
public static Supplier<FileConfig> pluginConfiguration = null;
public static Supplier<FileConfig> messageConfiguration = null;
@Nullable
public static FileConfig getPluginConfiguration() {
return pluginConfiguration == null ? null : pluginConfiguration.get();
}
@Nullable
public static FileConfig getPluginConfiguration() {
return pluginConfiguration == null ? null : pluginConfiguration.get();
}
@Nullable
public static FileConfig getMessageConfiguration() {
return messageConfiguration == null ? null : messageConfiguration.get();
}
@Nullable
public static FileConfig getMessageConfiguration() {
return messageConfiguration == null ? null : messageConfiguration.get();
}
private long updateTime;
protected long updateTime;
private final JavaPlugin plugin;
private final String fileName;
protected final JavaPlugin plugin;
protected final File fileFolder;
protected final String fileName;
protected final String resourcePath;
protected File file;
protected FileConfiguration config;
private File file;
private FileConfiguration config;
public FileConfig(@NotNull JavaPlugin plugin) throws IOException {
this(plugin, "config.yml");
}
public FileConfig(final JavaPlugin plugin) {
this(plugin, "config.yml");
}
public FileConfig(@NotNull JavaPlugin plugin,
@NotNull String fileName) throws IOException {
this(plugin, fileName, fileName);
}
public FileConfig(final JavaPlugin plugin, final String name) {
this.plugin = plugin;
this.fileName = name;
initFile();
}
public FileConfig(@NotNull JavaPlugin plugin, @NotNull String resourcePath,
@NotNull String fileName) throws IOException {
this(plugin, resourcePath, plugin.getDataFolder(), fileName);
}
private void initFile() {
this.updateTime = System.currentTimeMillis();
this.file = new File(plugin.getDataFolder(), fileName);
if (!this.file.exists()) {
if (!this.file.getParentFile().exists()) {
boolean success = this.file.getParentFile().mkdirs();
}
plugin.saveResource(fileName, true);
}
this.config = YamlConfiguration.loadConfiguration(this.file);
}
public FileConfig(@NotNull JavaPlugin plugin, @NotNull String resourcePath,
@NotNull File fileFolder, @NotNull String fileName) throws IOException {
this.plugin = plugin;
this.resourcePath = resourcePath;
this.fileFolder = fileFolder;
this.fileName = fileName;
initFile();
}
public File getFile() {
return file;
}
protected void initFile() throws IOException {
if (!getFileFolder().exists()) getFileFolder().mkdirs();
this.file = new File(getFileFolder(), fileName);
public FileConfiguration getConfig() {
return config;
}
if (!file.exists()) {
InputStream resourceStream = plugin.getResource(resourcePath);
if (resourceStream == null) {
throw new IOException("The resource " + resourcePath + " cannot find in " + plugin.getName() + " !");
}
public void save() {
try {
getConfig().save(getFile());
} catch (IOException e) {
e.printStackTrace();
}
}
OutputStream out = new FileOutputStream(file);
byte[] buffer = new byte[1024];
public void reload() {
this.updateTime = System.currentTimeMillis();
if (getFile().exists()) {
this.config = YamlConfiguration.loadConfiguration(getFile());
} else {
initFile();
}
}
int readBytes;
while ((readBytes = resourceStream.read(buffer)) > 0) {
out.write(buffer, 0, readBytes);
}
public long getUpdateTime() {
return updateTime;
}
out.close();
resourceStream.close();
public boolean isExpired(long time) {
return getUpdateTime() > time;
}
ConfigUpdater.update(plugin, resourcePath, file); // Save comments
}
this.updateTime = System.currentTimeMillis();
this.config = YamlConfiguration.loadConfiguration(this.file);
}
public File getFileFolder() {
return fileFolder;
}
public File getFile() {
return file;
}
public FileConfiguration getConfig() {
return config;
}
public JavaPlugin getPlugin() {
return plugin;
}
public void save() throws IOException {
getConfig().save(getFile());
ConfigUpdater.update(plugin, resourcePath, file); // Save comments
}
public void reload() throws IOException {
this.updateTime = System.currentTimeMillis();
if (getFile().exists()) {
this.config = YamlConfiguration.loadConfiguration(getFile());
} else {
initFile();
}
}
public long getUpdateTime() {
return updateTime;
}
public boolean isExpired(long time) {
return getUpdateTime() > time;
}
}
@@ -0,0 +1,42 @@
package cc.carm.lib.easyplugin.configuration.file;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public abstract class FileConfigCachedValue<V> extends FileConfigValue {
protected V cachedValue;
protected long updateTime;
public FileConfigCachedValue(@NotNull String sectionName) {
super(sectionName);
}
public FileConfigCachedValue(@Nullable FileConfig source, @NotNull String sectionName) {
super(source, sectionName);
}
public V updateCache(V value) {
this.updateTime = System.currentTimeMillis();
this.cachedValue = value;
return getCachedValue();
}
public boolean isExpired() {
return getSource() == null || getSource().isExpired(this.updateTime);
}
public long getUpdateTime() {
return updateTime;
}
@Nullable
public V getCachedValue() {
return cachedValue;
}
public void clearCache() {
this.cachedValue = null;
}
}
@@ -0,0 +1,74 @@
package cc.carm.lib.easyplugin.configuration.file;
import org.bukkit.configuration.file.FileConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Map;
import java.util.Optional;
public abstract class FileConfigValue {
protected @Nullable FileConfig source;
private final @NotNull String sectionName;
public FileConfigValue(@NotNull String sectionName) {
this(null, sectionName);
}
public FileConfigValue(@Nullable FileConfig source, @NotNull String sectionName) {
this.source = source;
this.sectionName = sectionName;
}
public @NotNull String getSectionName() {
return sectionName;
}
public void save() {
getSourceOptional().ifPresent(fileConfig -> {
try {
fileConfig.save();
} catch (Exception ex) {
fileConfig.getPlugin().getLogger().severe("Could not save the " + fileConfig.getFile() + " .");
ex.printStackTrace();
}
});
}
public void setIfPresent(@Nullable Object value, boolean save) {
getConfigOptional().ifPresent(configuration -> configuration.set(getSectionName(), value));
if (save) save();
}
public void createSection(Map<?, ?> values) {
getConfigOptional().ifPresent(configuration -> {
if (values == null) {
configuration.set(getSectionName(), null);
} else {
configuration.createSection(getSectionName(), values);
}
});
}
public @Nullable FileConfig getSource() {
return source == null ? FileConfig.getPluginConfiguration() : source;
}
public Optional<FileConfig> getSourceOptional() {
return Optional.ofNullable(getSource());
}
public Optional<FileConfiguration> getConfigOptional() {
return getSourceOptional().map(FileConfig::getConfig);
}
public static @Nullable <V> V castValue(@Nullable Object val, @NotNull Class<V> clazz) {
return castValue(val, clazz, null);
}
public static @Nullable <V> V castValue(@Nullable Object val, @NotNull Class<V> clazz, @Nullable V defaultValue) {
return clazz.isInstance(val) ? clazz.cast(val) : defaultValue;
}
}
@@ -1,73 +0,0 @@
package cc.carm.lib.easyplugin.configuration.impl;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import org.bukkit.configuration.ConfigurationSection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.function.Function;
public class ConfigSectionCast<V> {
@Nullable FileConfig source;
@NotNull String configSection;
@NotNull Function<ConfigurationSection, V> valueCast;
@Nullable V defaultValue;
V valueCache;
long updateTime;
public ConfigSectionCast(@NotNull String configSection, @NotNull Function<ConfigurationSection, V> valueCast) {
this(configSection, valueCast, null);
}
public ConfigSectionCast(@NotNull String configSection,
@NotNull Function<ConfigurationSection, V> valueCast,
@Nullable V defaultValue) {
this(null, configSection, valueCast, defaultValue);
}
public ConfigSectionCast(@Nullable FileConfig source, @NotNull String configSection,
@NotNull Function<ConfigurationSection, V> valueCast,
@Nullable V defaultValue) {
this.source = source;
this.configSection = configSection;
this.valueCast = valueCast;
this.defaultValue = defaultValue;
}
public @Nullable V get() {
FileConfig source = getSource();
if (source == null) return defaultValue;
if (valueCache != null && !source.isExpired(this.updateTime)) return valueCache;
if (!source.getConfig().contains(this.configSection)) return defaultValue;
try {
V finalValue = this.valueCast.apply(source.getConfig().getConfigurationSection(this.configSection));
if (finalValue != null) {
this.valueCache = finalValue;
this.updateTime = System.currentTimeMillis();
return finalValue;
} else {
return defaultValue;
}
} catch (Exception ignore) {
return defaultValue;
}
}
public void set(ConfigurationSection section) {
}
public void save() {
if (getSource() != null) getSource().save();
}
public @Nullable FileConfig getSource() {
return source == null ? FileConfig.getPluginConfiguration() : source;
}
}
@@ -1,5 +1,6 @@
package cc.carm.lib.easyplugin.configuration.impl;
import cc.carm.lib.easyplugin.configuration.cast.ConfigStringCast;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import org.bukkit.Bukkit;
import org.bukkit.Sound;
@@ -7,6 +8,8 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.function.Function;
public class ConfigSound extends ConfigStringCast<ConfigSound.SoundData> {
public ConfigSound(@NotNull String configSection) {
@@ -18,30 +21,9 @@ public class ConfigSound extends ConfigStringCast<ConfigSound.SoundData> {
this(null, configSection, defaultValue);
}
public ConfigSound(@Nullable FileConfig source, @NotNull String configSection, @Nullable Sound defaultValue) {
super(source, configSection, string -> {
Sound finalSound = defaultValue;
float volume = 1;
float pitch = 1;
if (string != null) {
String[] args = string.contains(":") ? string.split(":") : new String[]{string};
try {
if (args.length >= 1) finalSound = Sound.valueOf(args[0]);
if (args.length >= 2) volume = Float.parseFloat(args[1]);
if (args.length >= 3) pitch = Float.parseFloat(args[2]);
} catch (Exception exception) {
Bukkit.getLogger().severe("声音 " + configSection + " 配置错误,不存在 " + string + " ,请检查。");
Bukkit.getLogger().severe("In " + configSection + " (" + string + ") doesn't match any sound name.");
}
}
if (finalSound != null) {
return new SoundData(finalSound, volume, pitch);
} else {
return null;
}
}, defaultValue == null ? null : new SoundData(defaultValue));
public ConfigSound(@Nullable FileConfig source, @NotNull String configSection,
@Nullable Sound defaultValue) {
super(source, configSection, getSoundParser(), defaultValue == null ? null : new SoundData(defaultValue));
}
public void set(@Nullable SoundData value) {
@@ -73,12 +55,38 @@ public class ConfigSound extends ConfigStringCast<ConfigSound.SoundData> {
if (data != null) data.play(player);
}
public void save() {
if (getSource() != null) getSource().save();
public void playToAll() {
SoundData data = get();
if (data != null) {
Bukkit.getOnlinePlayers().forEach(data::play);
}
}
public @Nullable FileConfig getSource() {
return source == null ? FileConfig.getPluginConfiguration() : source;
public static @NotNull Function<@Nullable String, @Nullable SoundData> getSoundParser() {
return string -> {
if (string == null) return null;
Sound finalSound = null;
float volume = 1;
float pitch = 1;
String[] args = string.contains(":") ? string.split(":") : new String[]{string};
try {
if (args.length >= 1) finalSound = Sound.valueOf(args[0]);
if (args.length >= 2) volume = Float.parseFloat(args[1]);
if (args.length >= 3) pitch = Float.parseFloat(args[2]);
} catch (Exception exception) {
Bukkit.getLogger().severe("声音 " + string + " 配置错误,不存在同名声音,请检查。");
Bukkit.getLogger().severe("Sound " + string + " doesn't match any sound name.");
}
if (finalSound != null) {
return new SoundData(finalSound, volume, pitch);
} else {
return null;
}
};
}
public static class SoundData {
@@ -1,76 +0,0 @@
package cc.carm.lib.easyplugin.configuration.impl;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.function.Function;
public class ConfigStringCast<V> {
@Nullable FileConfig source;
@NotNull String configSection;
@NotNull Function<String, V> valueCast;
@Nullable V defaultValue;
V valueCache;
long updateTime;
public ConfigStringCast(@NotNull String configSection, @NotNull Function<String, V> valueCast) {
this(configSection, valueCast, null);
}
public ConfigStringCast(@NotNull String configSection, @NotNull Function<String, V> valueCast, @Nullable V defaultValue) {
this(null, configSection, valueCast, defaultValue);
}
public ConfigStringCast(@Nullable FileConfig source, @NotNull String configSection,
@NotNull Function<String, V> valueCast, @Nullable V defaultValue) {
this.source = source;
this.configSection = configSection;
this.valueCast = valueCast;
this.defaultValue = defaultValue;
}
public @Nullable V get() {
FileConfig source = getSource();
if (source == null) return defaultValue;
if (valueCache != null && !source.isExpired(this.updateTime)) return valueCache;
if (!source.getConfig().contains(this.configSection)) return defaultValue;
try {
V finalValue = this.valueCast.apply(source.getConfig().getString(this.configSection));
if (finalValue != null) {
this.valueCache = finalValue;
this.updateTime = System.currentTimeMillis();
return finalValue;
} else {
return defaultValue;
}
} catch (Exception ignore) {
return defaultValue;
}
}
public void set(@Nullable String value) {
FileConfig source = getSource();
if (source != null) {
source.getConfig().set(this.configSection, value);
source.save();
}
}
public void save() {
if (getSource() != null) {
getSource().save();
}
}
public @Nullable FileConfig getSource() {
return source == null ? FileConfig.getPluginConfiguration() : source;
}
}
@@ -0,0 +1,105 @@
package cc.carm.lib.easyplugin.configuration.language;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
import cc.carm.lib.easyplugin.utils.ColorParser;
import cc.carm.lib.easyplugin.utils.MessageUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
public class EasyMessage {
@Nullable ConfigValue<String> configValue;
@Nullable String defaultValue;
@Nullable String[] messageParams;
public EasyMessage() {
this(null);
}
public EasyMessage(@Nullable String defaultValue) {
this(defaultValue, null);
}
public EasyMessage(@Nullable String defaultValue, @Nullable String[] messageParams) {
this.defaultValue = defaultValue;
this.messageParams = messageParams;
}
public void initialize(@NotNull FileConfig sourceConfig, @NotNull String sectionName) {
this.configValue = new ConfigValue<>(sourceConfig, sectionName, String.class, getDefaultValue());
}
private @Nullable String getDefaultValue() {
return defaultValue;
}
private @Nullable String[] getMessageParams() {
return messageParams;
}
private @NotNull String getDefaultMessages() {
if (getDefaultValue() == null) return "";
else return getDefaultValue();
}
private @NotNull String getMessages() {
if (configValue == null) {
return getDefaultMessages();
} else {
return configValue.get();
}
}
public @NotNull String get(@Nullable CommandSender sender) {
return get(sender, null);
}
public @NotNull String get(@Nullable CommandSender sender, @Nullable Object[] values) {
return get(sender, getMessageParams(), values);
}
public @NotNull String get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
if (sender == null) return getMessages();
if (params == null || values == null) {
return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages()));
} else {
return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages(), params, values));
}
}
public void send(@Nullable CommandSender sender) {
send(sender, null);
}
public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
send(sender, getMessageParams(), values);
}
public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
if (params == null || values == null) {
MessageUtils.sendWithPlaceholders(sender, getMessages());
} else {
MessageUtils.sendWithPlaceholders(sender, Collections.singletonList(getMessages()), params, values);
}
}
public void sendToAll() {
sendToAll(null);
}
public void sendToAll(@Nullable Object[] values) {
sendToAll(messageParams, values);
}
public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
}
}
@@ -0,0 +1,110 @@
package cc.carm.lib.easyplugin.configuration.language;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.values.ConfigValueList;
import cc.carm.lib.easyplugin.utils.MessageUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.Unmodifiable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class EasyMessageList {
@Nullable ConfigValueList<String> configValue;
@Nullable String[] defaultValue;
@Nullable String[] messageParams;
public EasyMessageList() {
this((String[]) null);
}
public EasyMessageList(@Nullable String... defaultValue) {
this(defaultValue, null);
}
public EasyMessageList(@Nullable String[] defaultValue,
@Nullable String[] messageParams) {
this.defaultValue = defaultValue;
this.messageParams = messageParams;
}
public void initialize(FileConfig sourceConfig, String sectionName) {
configValue = new ConfigValueList<>(sourceConfig, sectionName, String.class, getDefaultValue());
}
private @Nullable String[] getDefaultValue() {
return defaultValue;
}
@Unmodifiable
private @NotNull List<String> getDefaultMessages() {
if (getDefaultValue() == null) return new ArrayList<>();
else return Arrays.asList(getDefaultValue());
}
private @Nullable String[] getMessageParams() {
return messageParams;
}
private @NotNull List<String> getMessages() {
if (configValue == null) {
return getDefaultMessages();
} else {
return configValue.get();
}
}
public @NotNull List<String> get(@Nullable CommandSender sender) {
return get(sender, null);
}
public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable Object[] values) {
return get(sender, getMessageParams(), values);
}
public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
if (sender == null) return getMessages();
if (params == null || values == null) {
return MessageUtils.setPlaceholders(sender, getMessages());
} else {
return MessageUtils.setPlaceholders(sender, getMessages(), params, values);
}
}
public void send(@Nullable CommandSender sender) {
send(sender, null);
}
public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
send(sender, getMessageParams(), values);
}
public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
if (params == null || values == null) {
MessageUtils.sendWithPlaceholders(sender, getMessages());
} else {
MessageUtils.sendWithPlaceholders(sender, getMessages(), params, values);
}
}
public void sendToAll() {
sendToAll(null);
}
public void sendToAll(@Nullable Object[] values) {
sendToAll(messageParams, values);
}
public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
}
}
@@ -0,0 +1,39 @@
package cc.carm.lib.easyplugin.configuration.language;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.io.IOException;
@SuppressWarnings("ResultOfMethodCallIgnored")
public class MessagesConfig extends FileConfig {
public MessagesConfig(@NotNull JavaPlugin plugin) throws IOException {
this(plugin, "messages.yml");
}
public MessagesConfig(@NotNull JavaPlugin plugin, @NotNull String fileName) throws IOException {
this(plugin, plugin.getDataFolder(), fileName);
}
public MessagesConfig(@NotNull JavaPlugin plugin, @NotNull File fileFolder, @NotNull String fileName) throws IOException {
super(plugin, fileName, fileFolder, fileName);
}
@Override
public void initFile() throws IOException {
if (!getFileFolder().exists()) getFileFolder().mkdirs();
this.file = new File(getFileFolder(), fileName);
if (!file.exists()) file.createNewFile();
this.config = YamlConfiguration.loadConfiguration(this.file);
}
@Override
public void save() throws IOException {
getConfig().save(getFile());
}
}
@@ -0,0 +1,100 @@
package cc.carm.lib.easyplugin.configuration.language;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Arrays;
public class MessagesInitializer {
private MessagesInitializer() {
// 静态方法类,不应当实例化。
}
public static void initialize(FileConfig source, Class<? extends MessagesRoot> rootClazz) {
initialize(source, rootClazz, true);
}
public static void initialize(FileConfig source, Class<? extends MessagesRoot> rootClazz, boolean saveDefault) {
MessagesSection sectionAnnotation = rootClazz.getAnnotation(MessagesSection.class);
String rootSection = null;
if (sectionAnnotation != null && sectionAnnotation.value().length() > 1) {
rootSection = sectionAnnotation.value();
}
for (Class<?> innerClass : rootClazz.getDeclaredClasses()) {
initSection(source, rootSection, innerClass, saveDefault);
}
for (Field field : rootClazz.getFields()) {
initMessage(source, rootSection, rootClazz, field, saveDefault);
}
if (saveDefault) {
try {
source.save();
} catch (IOException ignore) {
}
}
}
private static void initSection(FileConfig source, String parentSection, Class<?> clazz, boolean saveDefault) {
if (!Modifier.isStatic(clazz.getModifiers()) || !Modifier.isPublic(clazz.getModifiers())) return;
String section = getSection(clazz.getSimpleName(), parentSection, clazz.getAnnotation(MessagesSection.class));
for (Class<?> innerClass : clazz.getDeclaredClasses()) initSection(source, section, innerClass, saveDefault);
for (Field field : clazz.getFields()) initMessage(source, section, clazz, field, saveDefault);
}
private static void initMessage(FileConfig source, String parentSection, Class<?> clazz, Field field, boolean saveDefault) {
try {
String section = getSection(field.getName(), parentSection, field.getAnnotation(MessagesSection.class));
Object object = field.get(clazz);
if (object instanceof EasyMessage) {
EasyMessage message = ((EasyMessage) object);
if (saveDefault && message.defaultValue != null && !source.getConfig().contains(section)) {
source.getConfig().set(section, message.defaultValue);
}
message.initialize(source, section);
} else if (object instanceof EasyMessageList) {
EasyMessageList messageList = ((EasyMessageList) object);
if (saveDefault && messageList.defaultValue != null && !source.getConfig().contains(section)) {
source.getConfig().set(section, Arrays.asList(messageList.defaultValue));
}
messageList.initialize(source, section);
}
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
private static String getSection(@NotNull String name,
@Nullable String parentSection,
@Nullable MessagesSection sectionAnnotation) {
String parent = parentSection != null ? parentSection + "." : "";
if (sectionAnnotation != null && sectionAnnotation.value().length() > 0) {
return parent + sectionAnnotation.value();
} else {
return parent + getSectionName(name);
}
}
private static String getSectionName(String codeName) {
return codeName.toLowerCase().replace("_", "-");
}
}
@@ -0,0 +1,5 @@
package cc.carm.lib.easyplugin.configuration.language;
public abstract class MessagesRoot {
}
@@ -0,0 +1,14 @@
package cc.carm.lib.easyplugin.configuration.language;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target({ElementType.TYPE, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface MessagesSection {
String value() default "";
}
@@ -4,47 +4,50 @@ package cc.carm.lib.easyplugin.configuration.message;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
import cc.carm.lib.easyplugin.utils.MessageUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
public class ConfigMessage extends ConfigValue<String> {
String[] messageParams;
public ConfigMessage(@NotNull String configSection) {
this(configSection, null);
public ConfigMessage(@NotNull String sectionName) {
this(sectionName, null);
}
public ConfigMessage(@NotNull String configSection, @Nullable String defaultValue) {
this(configSection, defaultValue, null);
public ConfigMessage(@NotNull String sectionName, @Nullable String defaultValue) {
this(sectionName, defaultValue, null);
}
public ConfigMessage(@NotNull String configSection, @Nullable String defaultValue, String[] messageParams) {
super(null, configSection, String.class, defaultValue);
public ConfigMessage(@NotNull String sectionName, @Nullable String defaultValue, String[] messageParams) {
super(null, sectionName, String.class, defaultValue);
this.messageParams = messageParams;
}
public ConfigMessage(@Nullable FileConfig config, @NotNull String configSection,
public ConfigMessage(@Nullable FileConfig source, @NotNull String sectionName,
@Nullable String defaultValue, String[] messageParams) {
super(config, configSection, String.class, defaultValue);
super(source, sectionName, String.class, defaultValue);
this.messageParams = messageParams;
}
public @NotNull String get(CommandSender sender) {
return MessageUtils.setPlaceholders(sender, get());
}
public @NotNull String get(CommandSender sender, Object[] values) {
if (messageParams != null) {
return get(sender, messageParams, values);
} else {
return get(sender, new String[0], new Object[0]);
return get(sender);
}
}
public @NotNull String get(CommandSender sender, String[] params, Object[] values) {
List<String> messages = MessageUtils.setPlaceholders(sender, Collections.singletonList(get()), params, values);
return messages != null && !messages.isEmpty() ? messages.get(0) : "";
return MessageUtils.setPlaceholders(sender, get(), params, values);
}
public void send(CommandSender sender) {
@@ -64,6 +67,23 @@ public class ConfigMessage extends ConfigValue<String> {
MessageUtils.sendWithPlaceholders(sender, Collections.singletonList(get()), params, values);
}
public void sendToAll() {
Bukkit.getOnlinePlayers().forEach(player -> MessageUtils.sendWithPlaceholders(player, Collections.singletonList(get())));
}
public void sendToAll(Object[] values) {
if (messageParams != null) {
sendToAll(messageParams, values);
} else {
sendToAll();
}
}
public void sendToAll(String[] params, Object[] values) {
Bukkit.getOnlinePlayers().forEach(pl -> MessageUtils.sendWithPlaceholders(pl, Collections.singletonList(get()), params, values));
}
@Override
public @Nullable FileConfig getSource() {
return source == null ? FileConfig.getMessageConfiguration() : source;
}
@@ -4,6 +4,7 @@ package cc.carm.lib.easyplugin.configuration.message;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.values.ConfigValueList;
import cc.carm.lib.easyplugin.utils.MessageUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -14,22 +15,22 @@ public class ConfigMessageList extends ConfigValueList<String> {
@Nullable String[] messageParams;
public ConfigMessageList(String configSection) {
this(configSection, new String[0]);
public ConfigMessageList(String sectionName) {
this(sectionName, new String[0]);
}
public ConfigMessageList(@NotNull String configSection, @Nullable String[] defaultValue) {
this(configSection, defaultValue, null);
public ConfigMessageList(@NotNull String sectionName, @Nullable String[] defaultValue) {
this(sectionName, defaultValue, null);
}
public ConfigMessageList(@NotNull String configSection, @Nullable String[] defaultValue, String[] messageParams) {
super(null, configSection, String.class, defaultValue);
public ConfigMessageList(@NotNull String sectionName, @Nullable String[] defaultValue, String[] messageParams) {
super(null, sectionName, String.class, defaultValue);
this.messageParams = messageParams;
}
public ConfigMessageList(@Nullable FileConfig config, @NotNull String configSection,
public ConfigMessageList(@Nullable FileConfig source, @NotNull String sectionName,
@Nullable String[] defaultValue, String[] messageParams) {
super(config, configSection, String.class, defaultValue);
super(source, sectionName, String.class, defaultValue);
this.messageParams = messageParams;
}
@@ -45,7 +46,6 @@ public class ConfigMessageList extends ConfigValueList<String> {
}
}
public @NotNull List<String> get(@Nullable CommandSender sender, String[] params, Object[] values) {
return MessageUtils.setPlaceholders(sender, get(), params, values);
}
@@ -66,8 +66,25 @@ public class ConfigMessageList extends ConfigValueList<String> {
MessageUtils.sendWithPlaceholders(sender, get(), params, values);
}
public void sendToAll(String[] params, Object[] values) {
Bukkit.getOnlinePlayers().forEach(pl -> MessageUtils.sendWithPlaceholders(pl, get(), params, values));
}
public void sendToAll() {
Bukkit.getOnlinePlayers().forEach(player -> MessageUtils.sendWithPlaceholders(player, get()));
}
public void sendToAll(Object[] values) {
if (messageParams != null) {
sendToAll(messageParams, values);
} else {
sendToAll();
}
}
@Override
public @Nullable FileConfig getSource() {
return source == null ? FileConfig.getMessageConfiguration() : source;
}
}
@@ -1,64 +1,57 @@
package cc.carm.lib.easyplugin.configuration.values;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.file.FileConfigValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class ConfigValue<V> {
import java.util.Optional;
protected @Nullable FileConfig source;
private final @NotNull String configSection;
public class ConfigValue<V> extends FileConfigValue {
private final @NotNull Class<V> clazz;
@Nullable V defaultValue;
public ConfigValue(@NotNull String configSection, @NotNull Class<V> clazz) {
this(configSection, clazz, null);
public ConfigValue(@NotNull String sectionName,
@NotNull Class<V> clazz) {
this(sectionName, clazz, null);
}
public ConfigValue(@NotNull String configSection, @NotNull Class<V> clazz, @Nullable V defaultValue) {
this(null, configSection, clazz, defaultValue);
public ConfigValue(@NotNull String sectionName,
@NotNull Class<V> clazz,
@Nullable V defaultValue) {
this(null, sectionName, clazz, defaultValue);
}
public ConfigValue(@Nullable FileConfig source, @NotNull String configSection,
@NotNull Class<V> clazz, @Nullable V defaultValue) {
this.source = source;
this.configSection = configSection;
public ConfigValue(@Nullable FileConfig source, @NotNull String sectionName,
@NotNull Class<V> clazz,
@Nullable V defaultValue) {
super(source, sectionName);
this.clazz = clazz;
this.defaultValue = defaultValue;
}
public V get() {
FileConfig source = getSource();
if (source == null) return this.defaultValue;
return getConfigOptional()
.map(config -> {
if (config.contains(getSectionName())) {
return castValue(config.get(getSectionName()), clazz, this.defaultValue);
} else {
return setDefault(); // 如果没有默认值,就把配置写进去,便于配置
}
})
.orElse(defaultValue);
}
if (source.getConfig().contains(this.configSection)) {
Object val = source.getConfig().get(this.configSection, this.defaultValue);
return this.clazz.isInstance(val) ? this.clazz.cast(val) : this.defaultValue;
} else {
// 如果没有默认值,就把配置写进去,便于配置
return setDefault();
}
public @NotNull Optional<V> getOptional() {
return Optional.ofNullable(get());
}
public void set(@Nullable V value) {
FileConfig source = getSource();
if (source == null) return;
source.getConfig().set(this.configSection, value);
source.save();
}
public void save() {
if (getSource() != null) getSource().save();
setIfPresent(value, true);
}
public V setDefault() {
set(this.defaultValue);
if (this.defaultValue != null) set(this.defaultValue);
return this.defaultValue;
}
public @Nullable FileConfig getSource() {
return source == null ? FileConfig.getPluginConfiguration() : source;
}
}
@@ -2,78 +2,63 @@ package cc.carm.lib.easyplugin.configuration.values;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.file.FileConfigValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
public class ConfigValueList<V> {
public class ConfigValueList<V> extends FileConfigValue {
protected @Nullable FileConfig source;
private final @NotNull String configSection;
private final @NotNull Class<V> clazz;
@Nullable V[] defaultValue;
public ConfigValueList(@NotNull String configSection, @NotNull Class<V> clazz) {
this(configSection, clazz, null);
public ConfigValueList(@NotNull String sectionName,
@NotNull Class<V> clazz) {
this(sectionName, clazz, null);
}
public ConfigValueList(@NotNull String configSection, @NotNull Class<V> clazz, @Nullable V[] defaultValue) {
this(null, configSection, clazz, defaultValue);
public ConfigValueList(@NotNull String sectionName,
@NotNull Class<V> clazz,
@Nullable V[] defaultValue) {
this(null, sectionName, clazz, defaultValue);
}
public ConfigValueList(@Nullable FileConfig configuration, @NotNull String configSection, Class<V> clazz) {
this(configuration, configSection, clazz, null);
public ConfigValueList(@Nullable FileConfig configuration, @NotNull String sectionName,
Class<V> clazz) {
this(configuration, sectionName, clazz, null);
}
public ConfigValueList(@Nullable FileConfig configuration, @NotNull String configSection,
@NotNull Class<V> clazz, @Nullable V[] defaultValue) {
this.source = configuration;
this.configSection = configSection;
public ConfigValueList(@Nullable FileConfig configuration, @NotNull String sectionName,
@NotNull Class<V> clazz,
@Nullable V[] defaultValue) {
super(configuration, sectionName);
this.clazz = clazz;
this.defaultValue = defaultValue;
}
public @NotNull ArrayList<V> get() {
FileConfig source = getSource();
if (source == null) return new ArrayList<>();
return getConfigOptional()
.map(configuration -> configuration.getList(getSectionName()))
.map(list -> list.stream()
.map(o -> castValue(o, this.clazz))
.filter(Objects::nonNull)
.collect(Collectors.toCollection(ArrayList::new)))
.orElse(getDefaultList());
}
List<?> list = source.getConfig().getList(this.configSection);
if (list == null) {
if (defaultValue != null) {
return new ArrayList<>(Arrays.asList(defaultValue));
} else {
return new ArrayList<>();
}
} else {
ArrayList<V> result = new ArrayList<>();
public @NotNull ArrayList<V> getDefaultList() {
return defaultValue == null ? new ArrayList<>() : new ArrayList<>(Arrays.asList(defaultValue));
for (Object object : list) {
if (this.clazz.isInstance(object)) {
result.add(this.clazz.cast(object));
}
}
return result;
}
}
public void set(@Nullable ArrayList<V> value) {
FileConfig source = getSource();
if (source == null) return;
source.getConfig().set(this.configSection, value);
this.save();
setIfPresent(value, true);
}
public void save() {
if (getSource() != null) getSource().save();
}
public @Nullable FileConfig getSource() {
return this.source == null ? FileConfig.getPluginConfiguration() : this.source;
}
}
@@ -1,88 +1,56 @@
package cc.carm.lib.easyplugin.configuration.values;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import org.bukkit.configuration.ConfigurationSection;
import cc.carm.lib.easyplugin.configuration.file.FileConfigCachedValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
public class ConfigValueMap<K, V> {
@Nullable FileConfig source;
@NotNull String configSection;
public class ConfigValueMap<K, V> extends FileConfigCachedValue<Map<K, V>> {
@NotNull Function<String, K> keyCast;
@NotNull Class<V> valueClazz;
@Nullable LinkedHashMap<K, V> valueCache;
long updateTime;
public ConfigValueMap(@NotNull String configSection, @NotNull Function<String, K> keyCast,
public ConfigValueMap(@NotNull String sectionName, @NotNull Function<String, K> keyCast,
@NotNull Class<V> valueClazz) {
this(null, configSection, keyCast, valueClazz);
this(null, sectionName, keyCast, valueClazz);
}
public ConfigValueMap(@Nullable FileConfig configuration, @NotNull String configSection,
public ConfigValueMap(@Nullable FileConfig source, @NotNull String sectionName,
@NotNull Function<String, K> keyCast, @NotNull Class<V> valueClazz) {
this.source = configuration;
this.configSection = configSection;
super(source, sectionName);
this.keyCast = keyCast;
this.valueClazz = valueClazz;
}
public void clearCache() {
this.valueCache = null;
}
@NotNull
public Map<K, V> get() {
FileConfig source = getSource();
if (source == null) return new HashMap<>();
if (valueCache != null && !getSource().isExpired(this.updateTime)) return valueCache;
ConfigurationSection section = source.getConfig().getConfigurationSection(this.configSection);
if (section == null) return new LinkedHashMap<>();
Set<String> keys = section.getKeys(false);
if (keys.isEmpty()) return new LinkedHashMap<>();
else {
LinkedHashMap<K, V> result = new LinkedHashMap<>();
for (String key : keys) {
K finalKey = keyCast.apply(key);
Object val = section.get(key);
V finalValue = this.valueClazz.isInstance(val) ? this.valueClazz.cast(val) : null;
if (finalKey != null && finalValue != null) {
result.put(finalKey, finalValue);
}
}
this.updateTime = System.currentTimeMillis();
this.valueCache = result;
return result;
Map<K, V> cached = getCachedValue();
if (cached != null && !isExpired()) {
return cached;
} else {
return getConfigOptional()
.map(config -> config.getConfigurationSection(getSectionName()))
.map(section -> {
Map<K, V> result = new LinkedHashMap<>();
for (String key : section.getKeys(false)) {
K finalKey = keyCast.apply(key);
V finalValue = castValue(section.get(key), valueClazz);
if (finalKey != null && finalValue != null) {
result.put(finalKey, finalValue);
}
}
return updateCache(result);
}).orElse(new LinkedHashMap<>());
}
}
public void set(@Nullable HashMap<K, V> valuesMap) {
FileConfig source = getSource();
if (source == null) return;
source.getConfig().createSection(this.configSection, valuesMap);
source.save();
}
public void save() {
if (getSource() != null) getSource().save();
}
public @Nullable FileConfig getSource() {
return source == null ? FileConfig.getPluginConfiguration() : source;
public void set(@Nullable Map<K, V> valuesMap) {
createSection(valuesMap);
}
}
+85 -8
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,23 +19,100 @@
<artifactId>easyplugin-database</artifactId>
<packaging>jar</packaging>
<name>14-EasyPlugin-Database</name>
<description>轻松插件数据库模块,包含快速实现数据库功能的工具。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>
<repositories>
<repository>
<id>EasySQL</id>
<url>https://maven.pkg.github.com/CarmJos/EasySQL</url>
</repository>
</repositories>
<developers>
<developer>
<id>CarmJos</id>
<name>Carm Jos</name>
<email>carm@carm.cc</email>
<url>https://www.carm.cc</url>
</developer>
</developers>
<licenses>
<license>
<name>The MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/CarmJos/EasyPlugin/issues</url>
</issueManagement>
<ciManagement>
<system>GitHub Actions</system>
<url>https://github.com/CarmJos/EasyPlugin/actions/workflows/maven.yml</url>
</ciManagement>
<dependencies>
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>easysql-beecp</artifactId>
<version>0.2.3</version>
<version>0.2.7</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</execution>
</executions>
<configuration>
<relocations>
<relocation>
<pattern>cc.carm.lib.easysql</pattern>
<shadedPattern>cc.carm.lib.easyplugin.database</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>META-INF/*.txt</exclude>
</excludes>
</filter>
</filters>
</configuration>
</plugin>
</plugins>
</build>
</project>
@@ -0,0 +1,77 @@
package cc.carm.lib.easyplugin.database;
import cc.carm.lib.easysql.api.SQLManager;
import cc.carm.lib.easysql.api.action.PreparedSQLUpdateAction;
import cc.carm.lib.easysql.api.action.PreparedSQLUpdateBatchAction;
import cc.carm.lib.easysql.api.builder.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.sql.SQLException;
public class DatabaseTable {
private final @NotNull String tableName;
private final @NotNull String[] columns;
@Nullable String tableSettings;
public DatabaseTable(@NotNull String tableName, @NotNull String[] columns) {
this(tableName, columns, null);
}
public DatabaseTable(@NotNull String tableName, @NotNull String[] columns,
@Nullable String tableSettings) {
this.tableName = tableName;
this.columns = columns;
this.tableSettings = tableSettings;
}
public @NotNull String getTableName() {
return tableName;
}
public @NotNull String[] getColumns() {
return columns;
}
public @Nullable String getTableSettings() {
return tableSettings;
}
public int createTable(SQLManager sqlManager) throws SQLException {
TableCreateBuilder createAction = sqlManager.createTable(getTableName());
createAction.setColumns(getColumns());
if (getTableSettings() != null) createAction.setTableSettings(getTableSettings());
return createAction.build().execute();
}
public TableQueryBuilder createQuery(SQLManager sqlManager) {
return sqlManager.createQuery().inTable(getTableName());
}
public DeleteBuilder createDelete(SQLManager sqlManager) {
return sqlManager.createDelete(getTableName());
}
public UpdateBuilder createUpdate(SQLManager sqlManager) {
return sqlManager.createUpdate(getTableName());
}
public InsertBuilder<PreparedSQLUpdateAction> createInsert(SQLManager sqlManager) {
return sqlManager.createInsert(getTableName());
}
public InsertBuilder<PreparedSQLUpdateBatchAction> createInsertBatch(SQLManager sqlManager) {
return sqlManager.createInsertBatch(getTableName());
}
public ReplaceBuilder<PreparedSQLUpdateAction> createReplace(SQLManager sqlManager) {
return sqlManager.createReplace(getTableName());
}
public ReplaceBuilder<PreparedSQLUpdateBatchAction> createReplaceBatch(SQLManager sqlManager) {
return sqlManager.createReplaceBatch(getTableName());
}
}
+6 -6
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,8 +19,8 @@
<artifactId>easyplugin-gui</artifactId>
<packaging>jar</packaging>
<name>EasyPlugin-GUI</name>
<description>轻松插件界面相关接口,方便快捷的创建箱子GUI界面。</description>
<name>13-EasyPlugin-GUI</name>
<description>轻松插件GUI接口模块,方便快捷的创建箱子GUI界面。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>
<developers>
@@ -32,10 +32,10 @@
</developer>
</developers>
<licenses>
<licenses>
<license>
<name>GNU General Public License v3.0</name>
<url>https://opensource.org/licenses/GPL-3.0</url>
<name>The MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
@@ -25,7 +25,6 @@ public class GUI {
public static void initialize(JavaPlugin plugin) {
GUI.plugin = plugin;
}
public static JavaPlugin getPlugin() {
@@ -36,8 +35,8 @@ public class GUI {
return openedGUIs;
}
GUIType type;
String name;
protected GUIType type;
protected String name;
public HashMap<Integer, GUIItem> items;
public Inventory inv;
@@ -159,7 +158,7 @@ public class GUI {
if (this.type == GUIType.CANCEL) throw new NullPointerException("被取消或不存在的GUI");
Inventory inv = Bukkit.createInventory(null, this.type.getSize(), this.name);
IntStream.range(0, this.inv.getSize()).forEach(index -> inv.setItem(index, new ItemStack(Material.AIR)));
IntStream.range(0, inv.getSize()).forEach(index -> inv.setItem(index, new ItemStack(Material.AIR)));
getItems().forEach((index, item) -> inv.setItem(index, item.getDisplay()));
setOpenedGUI(player, this);
@@ -0,0 +1,96 @@
package cc.carm.lib.easyplugin.gui.paged;
import cc.carm.lib.easyplugin.gui.GUIItem;
import cc.carm.lib.easyplugin.gui.GUIType;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
import java.util.function.Function;
public class AutoPagedGUI extends CommonPagedGUI {
public static Function<Player, ItemStack> defaultPreviousPage = null;
public static Function<Player, ItemStack> defaultNextPage = null;
ItemStack previousPageUI;
ItemStack nextPageUI;
int previousPageSlot = -1;
int nextPageSlot = -1;
public AutoPagedGUI(GUIType type, String name, int[] range) {
super(type, name, range);
}
public AutoPagedGUI(GUIType type, String name, int a, int b) {
super(type, name, a, b);
}
public void setPreviousPageUI(ItemStack lastPageUI) {
this.previousPageUI = lastPageUI;
}
public void setNextPageUI(ItemStack nextPageUI) {
this.nextPageUI = nextPageUI;
}
public void setPreviousPageSlot(int slot) {
this.previousPageSlot = slot;
}
public void setNextPageSlot(int slot) {
this.nextPageSlot = slot;
}
@Override
public void openGUI(Player user) {
if (previousPageSlot >= 0) {
if (hasPreviousPage()) {
setItem(previousPageSlot, new GUIItem(
previousPageUI == null ? getDefaultPreviousPage(user) : previousPageUI) {
@Override
public void onClick(ClickType type) {
if (type == ClickType.RIGHT) {
goFirstPage();
} else {
goPreviousPage();
}
openGUI(user);
}
});
} else {
setItem(previousPageSlot, null);
}
}
if (nextPageSlot >= 0) {
if (hasNextPage()) {
setItem(nextPageSlot, new GUIItem(
nextPageUI == null ? getDefaultNextPage(user) : nextPageUI) {
@Override
public void onClick(ClickType type) {
if (type == ClickType.RIGHT) {
goLastPage();
} else {
goNextPage();
}
openGUI(user);
}
});
} else {
setItem(nextPageSlot, null);
}
}
super.openGUI(user);
}
private static ItemStack getDefaultNextPage(Player player) {
return defaultNextPage != null ? defaultNextPage.apply(player) : null;
}
private static ItemStack getDefaultPreviousPage(Player player) {
return defaultPreviousPage != null ? defaultPreviousPage.apply(player) : null;
}
}
@@ -0,0 +1,162 @@
package cc.carm.lib.easyplugin.gui.paged;
import cc.carm.lib.easyplugin.gui.GUIItem;
import cc.carm.lib.easyplugin.gui.GUIType;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class CommonPagedGUI extends PagedGUI {
private int[] range;
private CommonPagedGUI(GUIType type, String name) {
super(type, name);
}
public CommonPagedGUI(GUIType type, String Name, int a, int b) {
this(type, Name, toRange(type, a, b));
}
public CommonPagedGUI(GUIType type, String Name, int[] range) {
super(type, Name);
Arrays.sort(range);
this.range = range;
}
/*
int[] matrix = new int[]{
0, 1, 2, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53
}
*/
private static int[] toRange(GUIType type, int a, int b) {
if (a > b) {
a = a ^ b;
b = a ^ b;
a = a ^ b;
}
int lineA = getLine(a);
int columnA = getColumn(a);
int lineB = getLine(b);
int columnB = getColumn(b);
if (lineB > type.getLines())
throw new IndexOutOfBoundsException("页面内容范围超过了GUI的大小");
int[] range = new int[(lineB - lineA + 1) * (columnB - columnA + 1)];
for (int i = 0, l = 0; i < type.getSize(); i++) {
int li = getLine(i);
int ci = getColumn(i);
if (li >= lineA && li <= lineB && ci >= columnA && ci <= columnB) {
range[l] = i;
l++;
}
}
return range;
}
private static int getLine(int i) {
return i / 9 + 1;
}
private static int getColumn(int i) {
return i % 9 + 1;
}
@Override
public boolean hasPreviousPage() {
return page > 1;
}
@Override
public boolean hasNextPage() {
return page < getLastPageNumber();
}
/**
* 前往第一页
*/
public void goFirstPage() {
if (hasPreviousPage())
this.page = 1;
else
throw new IndexOutOfBoundsException();
}
/**
* 前往最后一页
*/
public void goLastPage() {
if (hasNextPage())
this.page = getLastPageNumber();
else
throw new IndexOutOfBoundsException();
}
/**
* 得到最后一页的页码
*
* @return 最后一页的页码
*/
public int getLastPageNumber() {
return (this.container.size() / range.length) + 1;
}
/**
* 得到第一页的页码
*
* @return 第一页页码(默认为1)
*/
public int getFirstPageNumber() {
return 1;
}
@Override
public void openGUI(Player player) {
if (container.isEmpty()) {
super.openGUI(player);
return;
}
List<GUIItem> list = new ArrayList<>();
int start = (page - 1) * range.length;
for (int i = start; i < start + range.length; i++) {
if (i < container.size()) {
list.add(container.get(i));
} else {
break;
}
}
int i = 0;
Arrays.stream(range).forEach(index -> setItem(index, null));
for (int index : range) {
if (i < list.size()) {
setItem(index, list.get(i));
i++;
} else {
break;
}
}
super.openGUI(player);
}
}
@@ -0,0 +1,79 @@
package cc.carm.lib.easyplugin.gui.paged;
import cc.carm.lib.easyplugin.gui.GUI;
import cc.carm.lib.easyplugin.gui.GUIItem;
import cc.carm.lib.easyplugin.gui.GUIType;
import java.util.ArrayList;
import java.util.List;
public abstract class PagedGUI extends GUI {
List<GUIItem> container = new ArrayList<>();
public int page = 1;
public PagedGUI(GUIType type, String name) {
super(type, name);
}
public int addItem(GUIItem i) {
container.add(i);
return container.size() - 1;
}
/**
* 从GUI中移除一个物品
*
* @param item 物品
*/
public void removeItem(GUIItem item) {
container.remove(item);
}
/**
* 从GUI中移除一个物品
*
* @param slot 物品格子数
*/
public void removeItem(int slot) {
container.remove(slot);
}
public List<GUIItem> getItemsContainer() {
return new ArrayList<>(container);
}
/**
* 前往上一页
*/
public void goPreviousPage() {
if (hasPreviousPage())
page--;
else
throw new IndexOutOfBoundsException();
}
/**
* 前往下一页
*/
public void goNextPage() {
if (hasNextPage())
page++;
else
throw new IndexOutOfBoundsException();
}
/**
* @return 是否有上一页
*/
public abstract boolean hasPreviousPage();
/**
* @return 是否有下一页
*/
public abstract boolean hasNextPage();
}
@@ -0,0 +1,52 @@
import cc.carm.lib.easyplugin.gui.configuration.GUIActionType;
import cc.carm.lib.easyplugin.gui.configuration.GUIConfiguration;
import org.bukkit.event.inventory.ClickType;
import org.junit.Test;
import java.util.Arrays;
import java.util.List;
public class ActionReadTest {
@Test
public void test() {
List<String> actions = Arrays.asList(
"[CHAT] 123123",
"[SHIFT_LEFT:CHAT] /test qwq",
"[CONSOLE] say hello",
"[CLOSE]"
);
for (String actionString : actions) {
int prefixStart = actionString.indexOf("[");
int prefixEnd = actionString.indexOf("]");
if (prefixStart < 0 || prefixEnd < 0) continue;
String prefix = actionString.substring(prefixStart + 1, prefixEnd);
ClickType clickType = null;
GUIActionType actionType;
if (prefix.contains(":")) {
String[] args = prefix.split(":");
clickType = GUIConfiguration.readClickType(args[0]);
actionType = GUIActionType.readActionType(args[1]);
} else {
actionType = GUIActionType.readActionType(prefix);
}
if (actionType == null) {
System.out.println("# " + actionString);
System.out.println("- actionType is Null");
continue;
}
System.out.println("# " + actionType.name() + " " + (clickType == null ? "" : clickType.name()));
System.out.println("- " + actionString.substring(prefixEnd + 1).trim());
}
}
}
+3 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,5 +19,7 @@
<artifactId>easyplugin-lp</artifactId>
<packaging>jar</packaging>
<name>23-EasyPlugin-LuckPerms</name>
</project>
+6 -6
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,8 +20,8 @@
<artifactId>easyplugin-main</artifactId>
<packaging>jar</packaging>
<name>EasyPlugin-Main</name>
<description>轻松插件主要接口,包含方便的插件入口类与相关工具类。</description>
<name>10-EasyPlugin-Main</name>
<description>轻松插件主要接口模块,包含方便的插件入口类与相关工具类。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>
<developers>
@@ -33,10 +33,10 @@
</developer>
</developers>
<licenses>
<licenses>
<license>
<name>GNU General Public License v3.0</name>
<url>https://opensource.org/licenses/GPL-3.0</url>
<name>The MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
@@ -1,6 +1,6 @@
package cc.carm.lib.easyplugin;
import cc.carm.lib.easyplugin.utils.ColorParser;
import cc.carm.lib.easyplugin.i18n.EasyPluginMessageProvider;
import cc.carm.lib.easyplugin.utils.SchedulerUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandExecutor;
@@ -18,55 +18,71 @@ import java.util.Map;
public abstract class EasyPlugin extends JavaPlugin {
protected EasyPluginMessageProvider messageProvider;
public EasyPlugin() {
this(new EasyPluginMessageProvider.en_US());
}
public EasyPlugin(EasyPluginMessageProvider messageProvider) {
this.messageProvider = messageProvider;
}
private SchedulerUtils scheduler;
private boolean initialized = false;
@Override
public void onLoad() {
public final void onLoad() {
scheduler = new SchedulerUtils(this);
if (!hasOverride("load")) return;
if (!isOverride("load")) return;
log(getName() + " " + getDescription().getVersion() + " &7开始加载...");
long startTime = System.currentTimeMillis();
log(messageProvider.loading(this));
load();
log("加载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
log(messageProvider.loaded(this, startTime));
}
@Override
public void onEnable() {
public final void onEnable() {
outputInfo();
log(getName() + " " + getDescription().getVersion() + " &7开始启动...");
log(messageProvider.enabling(this));
long startTime = System.currentTimeMillis();
this.initialized = initialize();
if (!isInitialized()) {
if (!(this.initialized = initialize())) {
setEnabled(false);
log(messageProvider.enableFailure(this, startTime));
return;
}
log("启用完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
log(messageProvider.enableSuccess(this, startTime));
}
@Override
public void onDisable() {
if (!isOverride("shutdown")) return;
public final void onDisable() {
if (!hasOverride("shutdown") || !isInitialized()) return;
outputInfo();
log(getName() + " " + getDescription().getVersion() + " 开始卸载...");
log(messageProvider.disabling(this));
long startTime = System.currentTimeMillis();
shutdown();
log("卸载完成 ,共耗时 " + (System.currentTimeMillis() - startTime) + " ms 。");
log(messageProvider.disabled(this, startTime));
}
public void load() {
protected void load() {
}
public abstract boolean initialize();
protected abstract boolean initialize();
public void shutdown() {
protected void shutdown() {
}
/**
* 重写以展示插件的相关信息,如插件横幅、下载地址等。
*/
public void outputInfo() {
}
public boolean isInitialized() {
@@ -99,28 +115,25 @@ public abstract class EasyPlugin extends JavaPlugin {
if (tabCompleter != null) command.setTabCompleter(tabCompleter);
}
public void print(@Nullable String prefix, @Nullable String... messages) {
messageProvider.print(this, prefix, messages);
}
public void log(@Nullable String... messages) {
print(null, messages);
}
public void print(@Nullable String prefix, @Nullable String... messages) {
Arrays.stream(messages)
.map(message -> "[" + getName() + "] " + (prefix == null ? "" : prefix) + message)
.map(ColorParser::parse)
.forEach(message -> Bukkit.getConsoleSender().sendMessage(message));
}
public void error(String... messages) {
print("&c[ERROR] &r", messages);
}
public void debug(@Nullable String... messages) {
if (isDebugging()) print("&7[DEBUG] &r", messages);
if (isDebugging()) print("&8[DEBUG] &r", messages);
}
private boolean isOverride(String methodName) {
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
private boolean hasOverride(String methodName) {
Map<Method, Method> methodMap = new HashMap<>();
Arrays.stream(EasyPlugin.class.getDeclaredMethods())
.filter(method -> method.getName().equals(methodName))
@@ -132,4 +145,5 @@ public abstract class EasyPlugin extends JavaPlugin {
);
return !methodMap.isEmpty();
}
}
@@ -0,0 +1,110 @@
package cc.carm.lib.easyplugin.i18n;
import cc.carm.lib.easyplugin.utils.ColorParser;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
public interface EasyPluginMessageProvider {
String loading(Plugin plugin);
String loaded(Plugin plugin, long startMillis);
String enabling(Plugin plugin);
String enableSuccess(Plugin plugin, long startMillis);
String enableFailure(Plugin plugin, long startMillis);
String disabling(Plugin plugin);
String disabled(Plugin plugin, long startMillis);
default void print(@NotNull Plugin plugin, @Nullable String prefix, @Nullable String... messages) {
Arrays.stream(messages)
.map(message -> "[" + plugin.getName() + "] " + (prefix == null ? "" : prefix) + message)
.map(ColorParser::parse)
.forEach(message -> Bukkit.getConsoleSender().sendMessage(message));
}
class zh_CN implements EasyPluginMessageProvider {
@Override
public String loading(Plugin plugin) {
return "&f" + plugin.getName() + " " + plugin.getDescription().getVersion() + " 开始加载...";
}
@Override
public String loaded(Plugin plugin, long startMillis) {
return "&f加载完成 ,共耗时 " + (System.currentTimeMillis() - startMillis) + " ms 。";
}
@Override
public String enabling(Plugin plugin) {
return "&f" + plugin.getName() + " " + plugin.getDescription().getVersion() + " 开始启动...";
}
@Override
public String enableSuccess(Plugin plugin, long startMillis) {
return "&a启用完成! &f共耗时 " + (System.currentTimeMillis() - startMillis) + " ms 。";
}
@Override
public String enableFailure(Plugin plugin, long startMillis) {
return "&c启用失败! &f已耗时 " + (System.currentTimeMillis() - startMillis) + " ms 。";
}
@Override
public String disabling(Plugin plugin) {
return "&f" + plugin.getName() + " " + plugin.getDescription().getVersion() + " 开始卸载...";
}
@Override
public String disabled(Plugin plugin, long startMillis) {
return "&f卸载完成! 共耗时 " + (System.currentTimeMillis() - startMillis) + " ms 。";
}
}
class en_US implements EasyPluginMessageProvider {
@Override
public String loading(Plugin plugin) {
return "&f" + plugin.getName() + " " + plugin.getDescription().getVersion() + " loading...";
}
@Override
public String loaded(Plugin plugin, long startMillis) {
return "&fLoaded after " + (System.currentTimeMillis() - startMillis) + " ms.";
}
@Override
public String enabling(Plugin plugin) {
return "&f" + plugin.getName() + " " + plugin.getDescription().getVersion() + " enabling...";
}
@Override
public String enableSuccess(Plugin plugin, long startMillis) {
return "&aEnabled successfully!&f Cost " + (System.currentTimeMillis() - startMillis) + " ms.";
}
@Override
public String enableFailure(Plugin plugin, long startMillis) {
return "&cEnabled failed after " + (System.currentTimeMillis() - startMillis) + " ms.";
}
@Override
public String disabling(Plugin plugin) {
return "&f" + plugin.getName() + " " + plugin.getDescription().getVersion() + " begin to shutdown...";
}
@Override
public String disabled(Plugin plugin, long startMillis) {
return "&fShutdown successfully, cost " + (System.currentTimeMillis() - startMillis) + " ms.";
}
}
}
@@ -1,33 +1,44 @@
package cc.carm.lib.easyplugin.utils;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
public class ColorParser {
public static String parse(String text) {
text = parseHexColor(text);
return parseColor(text);
}
public static String parse(String text) {
text = parseHexColor(text);
return parseColor(text);
}
public static String parseColor(final String text) {
return text.replaceAll("&", "§").replace("§§", "&");
}
public static String[] parse(String... texts) {
return parse(Arrays.asList(texts)).toArray(new String[0]);
}
public static String parseHexColor(String text) {
Pattern pattern = Pattern.compile("&\\((&?#[0-9a-fA-F]{6})\\)");
Matcher matcher = pattern.matcher(text);
while (matcher.find()) {
String hexColor = text.substring(matcher.start() + 2, matcher.end() - 1);
hexColor = hexColor.replace("&", "");
StringBuilder bukkitColorCode = new StringBuilder('§' + "x");
for (int i = 1; i < hexColor.length(); i++) {
bukkitColorCode.append('§').append(hexColor.charAt(i));
}
text = text.replaceAll("&\\(" + hexColor + "\\)", bukkitColorCode.toString().toLowerCase());
matcher.reset(text);
}
return text;
}
public static List<String> parse(List<String> texts) {
return texts.stream().map(ColorParser::parse).collect(Collectors.toList());
}
public static String parseColor(final String text) {
return text.replaceAll("&", "§").replace("§§", "&");
}
public static String parseHexColor(String text) {
Pattern pattern = Pattern.compile("&\\((&?#[0-9a-fA-F]{6})\\)");
Matcher matcher = pattern.matcher(text);
while (matcher.find()) {
String hexColor = text.substring(matcher.start() + 2, matcher.end() - 1);
hexColor = hexColor.replace("&", "");
StringBuilder bukkitColorCode = new StringBuilder('§' + "x");
for (int i = 1; i < hexColor.length(); i++) {
bukkitColorCode.append('§').append(hexColor.charAt(i));
}
text = text.replaceAll("&\\(" + hexColor + "\\)", bukkitColorCode.toString().toLowerCase());
matcher.reset(text);
}
return text;
}
}
@@ -6,80 +6,112 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
public class MessageUtils {
public static boolean hasPlaceholderAPI() {
return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
}
public static void send(@Nullable CommandSender sender, List<String> messages) {
if (messages == null || messages.isEmpty() || sender == null) return;
for (String s : messages) {
sender.sendMessage(ColorParser.parse(s));
}
}
public static void send(@Nullable CommandSender sender, String... messages) {
send(sender, Arrays.asList(messages));
}
public static void sendWithPlaceholders(CommandSender sender, String... messages) {
sendWithPlaceholders(sender, Arrays.asList(messages));
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages) {
if (messages == null || messages.isEmpty() || sender == null) return;
send(sender, setPlaceholders(sender, messages));
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String param, Object value) {
sendWithPlaceholders(sender, messages, new String[]{param}, new Object[]{value});
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
sendWithPlaceholders(sender, setCustomParams(messages, params, values));
}
public static List<String> setPlaceholders(@Nullable CommandSender sender, List<String> messages) {
if (messages == null || messages.isEmpty() || sender == null) return messages;
if (hasPlaceholderAPI() && sender instanceof Player) {
return PlaceholderAPI.setPlaceholders((Player) sender, messages);
} else {
return messages;
}
}
public static List<String> setPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
return setPlaceholders(sender, setCustomParams(messages, params, values));
}
public static List<String> setCustomParams(List<String> messages, String param, Object value) {
return setCustomParams(messages, new String[]{param}, new Object[]{value});
}
public static List<String> setCustomParams(List<String> messages, String[] params, Object[] values) {
if (params.length != values.length) return messages;
HashMap<String, Object> paramsMap = new HashMap<>();
for (int i = 0; i < params.length; i++) {
paramsMap.put(params[i], values[i]);
}
return setCustomParams(messages, paramsMap);
}
public static boolean hasPlaceholderAPI() {
return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
}
public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
List<String> list = new ArrayList<>();
for (String message : messages) {
String afterMessage = message;
for (Map.Entry<String, Object> entry : params.entrySet()) {
afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
}
list.add(afterMessage);
}
return list;
}
public static void send(@Nullable CommandSender sender, String... messages) {
send(sender, Arrays.asList(messages));
}
public static void send(@Nullable CommandSender sender, List<String> messages) {
if (messages == null || messages.isEmpty() || sender == null) return;
for (String s : messages) {
sender.sendMessage(ColorParser.parse(s));
}
}
public static void sendWithPlaceholders(CommandSender sender, String... messages) {
sendWithPlaceholders(sender, Arrays.asList(messages));
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages) {
if (messages == null || messages.isEmpty() || sender == null) return;
send(sender, setPlaceholders(sender, messages));
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String param, Object value) {
sendWithPlaceholders(sender, messages, new String[]{param}, new Object[]{value});
}
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
sendWithPlaceholders(sender, setCustomParams(messages, params, values));
}
public static String setPlaceholders(@Nullable CommandSender sender, String message) {
if (message == null || sender == null) return message;
if (hasPlaceholderAPI() && sender instanceof Player) {
return PlaceholderAPI.setPlaceholders((Player) sender, message);
} else {
return message;
}
}
public static List<String> setPlaceholders(@Nullable CommandSender sender, List<String> messages) {
if (messages == null || messages.isEmpty() || sender == null) return messages;
if (hasPlaceholderAPI() && sender instanceof Player) {
return PlaceholderAPI.setPlaceholders((Player) sender, messages);
} else {
return messages;
}
}
public static String setPlaceholders(@Nullable CommandSender sender, String message, String[] params, Object[] values) {
return setPlaceholders(sender, setCustomParams(message, params, values));
}
public static List<String> setPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
return setPlaceholders(sender, setCustomParams(messages, params, values));
}
public static String setCustomParams(String message, String param, Object value) {
return setCustomParams(message, new String[]{param}, new Object[]{value});
}
public static String setCustomParams(String message, String[] params, Object[] values) {
if (params.length != values.length) return message;
HashMap<String, Object> paramsMap = new HashMap<>();
for (int i = 0; i < params.length; i++) {
paramsMap.put(params[i], values[i]);
}
return setCustomParams(message, paramsMap);
}
public static String setCustomParams(String message, HashMap<String, Object> params) {
String afterMessage = message;
for (Map.Entry<String, Object> entry : params.entrySet()) {
afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
}
return afterMessage;
}
public static List<String> setCustomParams(List<String> messages, String param, Object value) {
return setCustomParams(messages, new String[]{param}, new Object[]{value});
}
public static List<String> setCustomParams(List<String> messages, String[] params, Object[] values) {
if (params.length != values.length) return messages;
HashMap<String, Object> paramsMap = new HashMap<>();
for (int i = 0; i < params.length; i++) {
paramsMap.put(params[i], values[i]);
}
return setCustomParams(messages, paramsMap);
}
public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
return messages.stream().map(message -> setCustomParams(message, params)).collect(Collectors.toList());
}
}
+3 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,6 +17,8 @@
</properties>
<artifactId>easyplugin-placeholderapi</artifactId>
<packaging>jar</packaging>
<name>21-EasyPlugin-PlaceholderAPI</name>
</project>
+3 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,6 +19,8 @@
<artifactId>easyplugin-vault</artifactId>
<packaging>jar</packaging>
<name>22-EasyPlugin-Vault</name>
<dependencies>
<dependency>
+20 -19
View File
@@ -14,8 +14,13 @@
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
<version>1.3.1</version>
<modules>
<module>easyplugin-bom</module>
<module>easyplugin-all</module>
<module>easyplugin-common</module>
<module>easyplugin-main</module>
<module>easyplugin-database</module>
@@ -25,10 +30,8 @@
<module>easyplugin-vault</module>
<module>easyplugin-placeholderapi</module>
<module>easyplugin-all</module>
<module>easyplugin-common</module>
<module>easyplugin-lp</module>
</modules>
<name>EasyPlugin</name>
@@ -46,8 +49,8 @@
<licenses>
<license>
<name>GNU General Public License v3.0</name>
<url>https://opensource.org/licenses/GPL-3.0</url>
<name>The MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
@@ -73,9 +76,9 @@
<repositories>
<repository>
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/CarmJos/EasyPlugin</url>
<id>carm-repo</id>
<name>Carm's Repo</name>
<url>https://repo.carm.cc/repository/maven-public/</url>
</repository>
<repository>
@@ -84,14 +87,12 @@
</repository>
<repository>
<id>carm-repo</id>
<name>Carm's Repo</name>
<url>https://repo.carm.cc/repository/maven-public/</url>
</repository>
<repository>
<id>nexus</id>
<url>https://mvn.lumine.io/repository/maven-public/</url>
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/CarmJos/*</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
@@ -101,14 +102,14 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.13-R0.1-SNAPSHOT</version>
<version>1.13.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.13-R0.1-SNAPSHOT</version>
<version>1.13.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>