mirror of
https://github.com/CarmJos/EasyPlugin.git
synced 2026-06-05 00:58:17 +08:00
Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 511d8d77c4 | |||
| 96ff3398c8 | |||
| 42860c332f | |||
| 5ea196b6df | |||
| fe34bbc17d | |||
| c575805c72 | |||
| 9c73fa81bc | |||
| 5a61c2db14 | |||
| d15204a38e | |||
| dcbf1678ba | |||
| 116f3419f2 | |||
| 29321f2b25 | |||
| ef453d9481 | |||
| d0d36023c8 | |||
| 4fa3ffaa93 | |||
| 6ba1be457f |
@@ -21,7 +21,7 @@
|
||||
}
|
||||
|
||||
a {
|
||||
color: #20a53a
|
||||
color: #7531c4
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
@@ -29,9 +29,11 @@
|
||||
<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>
|
||||
<li><a href="main">EasyPlugin-Main</a></li>
|
||||
<li><a href="command">EasyPlugin-Command</a></li>
|
||||
<li><a href="configuration">EasyPlugin-Configuration</a></li>
|
||||
<li><a href="gui">EasyPlugin-GUI</a></li>
|
||||
<li><a href="database">EasyPlugin-Database</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
+1
-1
@@ -1,2 +1,2 @@
|
||||
github: [ CarmJos ]
|
||||
#github: [ CarmJos ]
|
||||
custom: [ 'https://donate.carm.cc' ]
|
||||
@@ -1,7 +1,7 @@
|
||||
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
|
||||
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
|
||||
|
||||
name: Deploy
|
||||
name: Project Deployment
|
||||
|
||||
on:
|
||||
# 支持手动触发构建
|
||||
@@ -11,7 +11,7 @@ on:
|
||||
types: [ published ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
maven-deploy:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
@@ -26,8 +26,53 @@ jobs:
|
||||
server-id: github
|
||||
server-username: MAVEN_USERNAME
|
||||
server-password: MAVEN_TOKEN
|
||||
- name: "Deploy"
|
||||
|
||||
- name: "Maven Deploy"
|
||||
run: mvn -B deploy --file pom.xml -DskipTests
|
||||
env:
|
||||
MAVEN_USERNAME: ${{ github.repository_owner }}
|
||||
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||
|
||||
- name: "Copy Javadoc"
|
||||
run: |
|
||||
bash .scripts/copy-javadoc.sh
|
||||
|
||||
- name: "Generate Sitemap"
|
||||
id: sitemap
|
||||
uses: cicirello/generate-sitemap@v1
|
||||
with:
|
||||
base-url-path: https://carmjos.github.io/EasyPlugin
|
||||
path-to-root: docs
|
||||
|
||||
- name: Output stats
|
||||
run: |
|
||||
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:
|
||||
DEPLOY_PRI: ${{secrets.DEPLOY_PRI}}
|
||||
run: |
|
||||
sudo timedatectl set-timezone "Asia/Shanghai"
|
||||
mkdir -p ~/.ssh/
|
||||
echo "$DEPLOY_PRI" > ~/.ssh/id_rsa
|
||||
chmod 600 ~/.ssh/id_rsa
|
||||
ssh-keyscan github.com >> ~/.ssh/known_hosts
|
||||
git config --global user.name 'CarmJos'
|
||||
git config --global user.email 'carm@carm.cc'
|
||||
|
||||
- name: Commit documentation changes
|
||||
run: |
|
||||
cd docs
|
||||
git init
|
||||
git remote add origin git@github.com:CarmJos/EasyPlugin.git
|
||||
git checkout -b gh-pages
|
||||
git add -A
|
||||
git commit -m "API Document generated."
|
||||
|
||||
- name: Javadoc Website Push
|
||||
run: |
|
||||
cd docs
|
||||
git push origin HEAD:gh-pages --force
|
||||
@@ -1,78 +0,0 @@
|
||||
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
|
||||
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
|
||||
|
||||
name: Javadoc
|
||||
|
||||
on:
|
||||
# 支持手动触发构建
|
||||
workflow_dispatch:
|
||||
release:
|
||||
# 创建release的时候触发
|
||||
types: [ published ]
|
||||
|
||||
jobs:
|
||||
api-website:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout the repo
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Set up the Java JDK
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
cache: maven
|
||||
java-version: '11'
|
||||
distribution: 'adopt'
|
||||
server-id: github
|
||||
server-username: MAVEN_USERNAME
|
||||
server-password: MAVEN_TOKEN
|
||||
|
||||
- name: Generate docs
|
||||
run: mvn javadoc:javadoc -DskipTests
|
||||
env:
|
||||
MAVEN_USERNAME: ${{ github.repository_owner }}
|
||||
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
|
||||
|
||||
- name: Copy to Location
|
||||
run: |
|
||||
bash .scripts/copy-javadoc.sh
|
||||
|
||||
- name: Generate the sitemap
|
||||
id: sitemap
|
||||
uses: cicirello/generate-sitemap@v1
|
||||
with:
|
||||
base-url-path: https://carmjos.github.io/EasyPlugin
|
||||
path-to-root: docs
|
||||
|
||||
- name: Output stats
|
||||
run: |
|
||||
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:
|
||||
DEPLOY_PRI: ${{secrets.DEPLOY_PRI}}
|
||||
run: |
|
||||
sudo timedatectl set-timezone "Asia/Shanghai"
|
||||
mkdir -p ~/.ssh/
|
||||
echo "$DEPLOY_PRI" > ~/.ssh/id_rsa
|
||||
chmod 600 ~/.ssh/id_rsa
|
||||
ssh-keyscan github.com >> ~/.ssh/known_hosts
|
||||
git config --global user.name 'CarmJos'
|
||||
git config --global user.email 'carm@carm.cc'
|
||||
|
||||
- name: Commit documentation changes
|
||||
run: |
|
||||
cd docs
|
||||
git init
|
||||
git remote add origin git@github.com:CarmJos/EasyPlugin.git
|
||||
git checkout -b gh-pages
|
||||
git add -A
|
||||
git commit -m "API Document generated."
|
||||
- name: Push javadocs
|
||||
run: |
|
||||
cd docs
|
||||
git push origin HEAD:gh-pages --force
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
|
||||
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
|
||||
|
||||
name: Build
|
||||
name: Project Build & Tests
|
||||
|
||||
on:
|
||||
# 支持手动触发构建
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
rm -rf docs
|
||||
mkdir -vp docs
|
||||
|
||||
DOC_URL="target/site/apidocs"
|
||||
DOC_URL="target/apidocs"
|
||||
|
||||
for FILE in easyplugin-*; do
|
||||
|
||||
|
||||
+2
-24
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<licenses>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The MIT License</name>
|
||||
<url>https://opensource.org/licenses/MIT</url>
|
||||
@@ -61,26 +61,4 @@
|
||||
|
||||
</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>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
</project>
|
||||
+68
-15
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -23,6 +23,65 @@
|
||||
<description>轻松插件汇总导入模块,允许快捷导入相关的接口并避免版本不一致问题。</description>
|
||||
<url>https://github.com/CarmJos/EasyPlugin</url>
|
||||
|
||||
<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>
|
||||
|
||||
<distributionManagement>
|
||||
<downloadUrl>https://github.com/CarmJos/EasyPlugin/releases</downloadUrl>
|
||||
<repository>
|
||||
<id>github</id>
|
||||
<name>GitHub Packages</name>
|
||||
<url>https://maven.pkg.github.com/CarmJos/EasyPlugin</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
<repositories>
|
||||
|
||||
<repository>
|
||||
<id>carm-repo</id>
|
||||
<name>Carm's Repo</name>
|
||||
<url>https://repo.carm.cc/repository/maven-public/</url>
|
||||
</repository>
|
||||
|
||||
<repository>
|
||||
<id>central</id>
|
||||
<url>https://repo1.maven.org/maven2/</url>
|
||||
</repository>
|
||||
|
||||
<repository>
|
||||
<id>github</id>
|
||||
<name>GitHub Packages</name>
|
||||
<url>https://maven.pkg.github.com/CarmJos/*</url>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
|
||||
</repositories>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@@ -72,49 +131,43 @@
|
||||
<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-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-command</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>
|
||||
|
||||
<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>
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
package cc.carm.lib.easyplugin.command;
|
||||
|
||||
public class CommandsManager {
|
||||
}
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -59,6 +59,10 @@
|
||||
<type>pom</type>
|
||||
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyplugin-github</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyplugin-placeholderapi</artifactId>
|
||||
@@ -77,26 +81,4 @@
|
||||
|
||||
</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>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
</project>
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<licenses>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The MIT License</name>
|
||||
<url>https://opensource.org/licenses/MIT</url>
|
||||
|
||||
+9
-3
@@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ConfigSectionCast<V> extends FileConfigCachedValue<V> {
|
||||
|
||||
@@ -22,13 +23,19 @@ public class ConfigSectionCast<V> extends FileConfigCachedValue<V> {
|
||||
public ConfigSectionCast(@NotNull String sectionName,
|
||||
@NotNull Function<ConfigurationSection, V> valueCast,
|
||||
@Nullable V defaultValue) {
|
||||
this(null, sectionName, valueCast, defaultValue);
|
||||
this((Supplier<FileConfig>) null, sectionName, valueCast, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigSectionCast(@Nullable FileConfig source, @NotNull String sectionName,
|
||||
@NotNull Function<ConfigurationSection, V> valueCast,
|
||||
@Nullable V defaultValue) {
|
||||
super(source, sectionName);
|
||||
this(source == null ? null : () -> source, sectionName, valueCast, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigSectionCast(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
|
||||
@NotNull Function<ConfigurationSection, V> valueCast,
|
||||
@Nullable V defaultValue) {
|
||||
super(provider, sectionName);
|
||||
this.valueCast = valueCast;
|
||||
this.defaultValue = defaultValue;
|
||||
}
|
||||
@@ -51,7 +58,6 @@ public class ConfigSectionCast<V> extends FileConfigCachedValue<V> {
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void set(ConfigurationSection section) {
|
||||
}
|
||||
|
||||
|
||||
+9
-2
@@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ConfigStringCast<V> extends FileConfigCachedValue<V> {
|
||||
|
||||
@@ -21,13 +22,19 @@ public class ConfigStringCast<V> extends FileConfigCachedValue<V> {
|
||||
public ConfigStringCast(@NotNull String configSection,
|
||||
@NotNull Function<String, V> valueCast,
|
||||
@Nullable V defaultValue) {
|
||||
this(null, configSection, valueCast, defaultValue);
|
||||
this((Supplier<FileConfig>) null, configSection, valueCast, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigStringCast(@Nullable FileConfig source, @NotNull String sectionName,
|
||||
@NotNull Function<String, V> valueCast,
|
||||
@Nullable V defaultValue) {
|
||||
super(source, sectionName);
|
||||
this(source == null ? null : () -> source, sectionName, valueCast, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigStringCast(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
|
||||
@NotNull Function<String, V> valueCast,
|
||||
@Nullable V defaultValue) {
|
||||
super(provider, sectionName);
|
||||
this.valueCast = valueCast;
|
||||
this.defaultValue = defaultValue;
|
||||
}
|
||||
|
||||
+5
-3
@@ -3,6 +3,8 @@ package cc.carm.lib.easyplugin.configuration.file;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public abstract class FileConfigCachedValue<V> extends FileConfigValue {
|
||||
|
||||
protected V cachedValue;
|
||||
@@ -12,10 +14,10 @@ public abstract class FileConfigCachedValue<V> extends FileConfigValue {
|
||||
super(sectionName);
|
||||
}
|
||||
|
||||
public FileConfigCachedValue(@Nullable FileConfig source, @NotNull String sectionName) {
|
||||
super(source, sectionName);
|
||||
public FileConfigCachedValue(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName) {
|
||||
super(provider, sectionName);
|
||||
}
|
||||
|
||||
|
||||
public V updateCache(V value) {
|
||||
this.updateTime = System.currentTimeMillis();
|
||||
this.cachedValue = value;
|
||||
|
||||
+9
-4
@@ -6,18 +6,19 @@ import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public abstract class FileConfigValue {
|
||||
|
||||
protected @Nullable FileConfig source;
|
||||
protected @Nullable Supplier<FileConfig> provider;
|
||||
private final @NotNull String sectionName;
|
||||
|
||||
public FileConfigValue(@NotNull String sectionName) {
|
||||
this(null, sectionName);
|
||||
}
|
||||
|
||||
public FileConfigValue(@Nullable FileConfig source, @NotNull String sectionName) {
|
||||
this.source = source;
|
||||
public FileConfigValue(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName) {
|
||||
this.provider = provider;
|
||||
this.sectionName = sectionName;
|
||||
}
|
||||
|
||||
@@ -52,7 +53,7 @@ public abstract class FileConfigValue {
|
||||
}
|
||||
|
||||
public @Nullable FileConfig getSource() {
|
||||
return source == null ? FileConfig.getPluginConfiguration() : source;
|
||||
return provider == null || provider.get() == null ? defaultSource() : provider.get();
|
||||
}
|
||||
|
||||
public Optional<FileConfig> getSourceOptional() {
|
||||
@@ -71,4 +72,8 @@ public abstract class FileConfigValue {
|
||||
return clazz.isInstance(val) ? clazz.cast(val) : defaultValue;
|
||||
}
|
||||
|
||||
public FileConfig defaultSource() {
|
||||
return FileConfig.getPluginConfiguration();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+152
@@ -0,0 +1,152 @@
|
||||
package cc.carm.lib.easyplugin.configuration.impl;
|
||||
|
||||
import cc.carm.lib.easyplugin.configuration.cast.ConfigSectionCast;
|
||||
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
|
||||
import cc.carm.lib.easyplugin.utils.ItemStackFactory;
|
||||
import cc.carm.lib.easyplugin.utils.MessageUtils;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ConfigItem extends ConfigSectionCast<ConfigItem.ItemConfiguration> {
|
||||
|
||||
@Nullable
|
||||
String[] itemParams;
|
||||
|
||||
public ConfigItem(@NotNull String configSection) {
|
||||
this(configSection, null, null);
|
||||
}
|
||||
|
||||
public ConfigItem(@NotNull String configSection,
|
||||
@Nullable String[] itemParams) {
|
||||
this(configSection, itemParams, null);
|
||||
}
|
||||
|
||||
public ConfigItem(@NotNull String configSection,
|
||||
@Nullable ItemConfiguration defaultValue) {
|
||||
this(configSection, null, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigItem(@NotNull String sectionName,
|
||||
@Nullable String[] itemParams,
|
||||
@Nullable ItemConfiguration defaultValue) {
|
||||
this(null, sectionName, itemParams, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigItem(@Nullable Supplier<FileConfig> provider,
|
||||
@NotNull String sectionName,
|
||||
@Nullable String[] itemParams,
|
||||
@Nullable ItemConfiguration defaultValue) {
|
||||
this(provider, sectionName, ConfigItem::parseItemConfiguration, itemParams, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigItem(@Nullable Supplier<FileConfig> provider,
|
||||
@NotNull String sectionName,
|
||||
@NotNull Function<ConfigurationSection, ItemConfiguration> valueCast,
|
||||
@Nullable String[] itemParams,
|
||||
@Nullable ItemConfiguration defaultValue) {
|
||||
super(provider, sectionName, valueCast, defaultValue);
|
||||
this.itemParams = itemParams;
|
||||
}
|
||||
|
||||
public ItemStack getItem(@NotNull Player player) {
|
||||
return getItem(player, null);
|
||||
}
|
||||
|
||||
public ItemStack getItem(@NotNull Player player,
|
||||
@Nullable Object[] values) {
|
||||
if (values != null && itemParams != null && itemParams.length > 0) {
|
||||
return getItem(player, itemParams, values);
|
||||
} else {
|
||||
return getItem(player, null, null);
|
||||
}
|
||||
}
|
||||
|
||||
public ItemStack getItem(@NotNull Player player,
|
||||
@Nullable String[] params,
|
||||
@Nullable Object[] values) {
|
||||
params = params == null ? new String[0] : params;
|
||||
values = values == null ? new Object[0] : values;
|
||||
|
||||
ItemConfiguration configuration = get();
|
||||
if (configuration == null) return null;
|
||||
|
||||
ItemStackFactory factory = new ItemStackFactory(configuration.getType());
|
||||
if (configuration.getName() != null) {
|
||||
factory.setDisplayName(MessageUtils.setCustomParams(configuration.getName(), params, values));
|
||||
}
|
||||
|
||||
if (configuration.getLore() != null) {
|
||||
factory.setLore(MessageUtils.setCustomParams(configuration.getLore(), params, values));
|
||||
}
|
||||
|
||||
return factory.toItemStack();
|
||||
}
|
||||
|
||||
public static class ItemConfiguration {
|
||||
|
||||
@NotNull Material type;
|
||||
@Nullable String name;
|
||||
@Nullable List<String> lore;
|
||||
|
||||
public ItemConfiguration(@NotNull Material type, @Nullable String name, @Nullable List<String> lore) {
|
||||
this.type = type;
|
||||
this.name = name;
|
||||
this.lore = lore;
|
||||
}
|
||||
|
||||
|
||||
public @NotNull Material getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public @Nullable String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
|
||||
public @Nullable List<String> getLore() {
|
||||
return lore;
|
||||
}
|
||||
|
||||
public static ItemConfiguration readFrom(@NotNull ConfigurationSection section) {
|
||||
String typeName = section.getString("type");
|
||||
if (typeName == null) return null;
|
||||
Material type = Material.matchMaterial(typeName);
|
||||
if (type == null) return null;
|
||||
String name = section.getString("name");
|
||||
List<String> lore = section.getStringList("lore");
|
||||
return new ItemConfiguration(type, name, lore);
|
||||
}
|
||||
}
|
||||
|
||||
private static ItemConfiguration parseItemConfiguration(@NotNull ConfigurationSection section) {
|
||||
return ItemConfiguration.readFrom(section);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static ItemConfiguration create(@NotNull Material type) {
|
||||
return create(type, null);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static ItemConfiguration create(@NotNull Material type,
|
||||
@Nullable String name) {
|
||||
return create(type, name, null);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static ItemConfiguration create(@NotNull Material type,
|
||||
@Nullable String name,
|
||||
@Nullable String[] lore) {
|
||||
return new ItemConfiguration(type, name, lore == null ? null : Arrays.asList(lore));
|
||||
}
|
||||
}
|
||||
+11
-2
@@ -9,6 +9,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ConfigSound extends ConfigStringCast<ConfigSound.SoundData> {
|
||||
|
||||
@@ -18,12 +19,20 @@ public class ConfigSound extends ConfigStringCast<ConfigSound.SoundData> {
|
||||
|
||||
public ConfigSound(@NotNull String configSection,
|
||||
@Nullable Sound defaultValue) {
|
||||
this(null, configSection, defaultValue);
|
||||
this((Supplier<FileConfig>) null, configSection, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigSound(@Nullable FileConfig source, @NotNull String configSection,
|
||||
@Nullable Sound defaultValue) {
|
||||
super(source, configSection, getSoundParser(), defaultValue == null ? null : new SoundData(defaultValue));
|
||||
this(source == null ? null : () -> source, configSection, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigSound(@Nullable Supplier<FileConfig> provider, @NotNull String configSection,
|
||||
@Nullable Sound defaultValue) {
|
||||
super(provider, configSection,
|
||||
getSoundParser(),
|
||||
defaultValue == null ? null : new SoundData(defaultValue)
|
||||
);
|
||||
}
|
||||
|
||||
public void set(@Nullable SoundData value) {
|
||||
|
||||
+85
-71
@@ -4,102 +4,116 @@ 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 net.md_5.bungee.api.ChatMessageType;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
public class EasyMessage {
|
||||
|
||||
@Nullable ConfigValue<String> configValue;
|
||||
@Nullable ConfigValue<String> configValue;
|
||||
|
||||
@Nullable String defaultValue;
|
||||
@Nullable String[] messageParams;
|
||||
@Nullable String defaultValue;
|
||||
@Nullable String[] messageParams;
|
||||
|
||||
public EasyMessage() {
|
||||
this(null);
|
||||
}
|
||||
public EasyMessage() {
|
||||
this(null);
|
||||
}
|
||||
|
||||
public EasyMessage(@Nullable String defaultValue) {
|
||||
this(defaultValue, null);
|
||||
}
|
||||
public EasyMessage(@Nullable String defaultValue) {
|
||||
this(defaultValue, null);
|
||||
}
|
||||
|
||||
public EasyMessage(@Nullable String defaultValue, @Nullable String[] messageParams) {
|
||||
this.defaultValue = defaultValue;
|
||||
this.messageParams = messageParams;
|
||||
}
|
||||
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());
|
||||
}
|
||||
public void initialize(@NotNull FileConfig source, @NotNull String sectionName) {
|
||||
this.configValue = new ConfigValue<>(() -> source, sectionName, String.class, getDefaultValue());
|
||||
}
|
||||
|
||||
private @Nullable String getDefaultValue() {
|
||||
return defaultValue;
|
||||
}
|
||||
private @Nullable String getDefaultValue() {
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
private @Nullable String[] getMessageParams() {
|
||||
return messageParams;
|
||||
}
|
||||
private @Nullable String[] getMessageParams() {
|
||||
return messageParams;
|
||||
}
|
||||
|
||||
private @NotNull String getDefaultMessages() {
|
||||
if (getDefaultValue() == null) return "";
|
||||
else return getDefaultValue();
|
||||
}
|
||||
private @NotNull String getDefaultMessages() {
|
||||
if (getDefaultValue() == null) return "";
|
||||
else return getDefaultValue();
|
||||
}
|
||||
|
||||
private @NotNull String getMessages() {
|
||||
if (configValue == null) {
|
||||
return getDefaultMessages();
|
||||
} else {
|
||||
return configValue.get();
|
||||
}
|
||||
}
|
||||
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) {
|
||||
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 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 @NotNull String get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
|
||||
String messages = getMessages();
|
||||
if (sender == null || messages.length() < 1) return messages;
|
||||
params = params == null ? new String[0] : params;
|
||||
values = values == null ? new Object[0] : values;
|
||||
return ColorParser.parse(MessageUtils.setPlaceholders(sender, messages, params, values));
|
||||
}
|
||||
|
||||
public void send(@Nullable CommandSender sender) {
|
||||
send(sender, null);
|
||||
}
|
||||
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 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 send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
|
||||
String message = get(sender, params, values);
|
||||
if (message.length() < 1) return;
|
||||
MessageUtils.send(sender, message);
|
||||
}
|
||||
|
||||
public void sendToAll() {
|
||||
sendToAll(null);
|
||||
}
|
||||
public void sendBar(@Nullable Player player) {
|
||||
sendBar(player, null);
|
||||
}
|
||||
|
||||
public void sendToAll(@Nullable Object[] values) {
|
||||
sendToAll(messageParams, values);
|
||||
}
|
||||
public void sendBar(@Nullable Player player, @Nullable Object[] values) {
|
||||
sendBar(player, getMessageParams(), values);
|
||||
}
|
||||
|
||||
public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
|
||||
Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
|
||||
}
|
||||
public void sendBar(@Nullable Player player, @Nullable String[] params, @Nullable Object[] values) {
|
||||
if (player == null) return;
|
||||
String message = get(player, params, values);
|
||||
|
||||
if (message.length() < 1) return;
|
||||
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(get(player, 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));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+69
-71
@@ -2,6 +2,7 @@ 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.ColorParser;
|
||||
import cc.carm.lib.easyplugin.utils.MessageUtils;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@@ -15,96 +16,93 @@ import java.util.List;
|
||||
|
||||
public class EasyMessageList {
|
||||
|
||||
@Nullable ConfigValueList<String> configValue;
|
||||
@Nullable ConfigValueList<String> configValue;
|
||||
|
||||
@Nullable String[] defaultValue;
|
||||
@Nullable String[] messageParams;
|
||||
@Nullable String[] defaultValue;
|
||||
@Nullable String[] messageParams;
|
||||
|
||||
public EasyMessageList() {
|
||||
this((String[]) null);
|
||||
}
|
||||
public EasyMessageList() {
|
||||
this((String[]) null);
|
||||
}
|
||||
|
||||
public EasyMessageList(@Nullable String... defaultValue) {
|
||||
this(defaultValue, null);
|
||||
}
|
||||
public EasyMessageList(@Nullable String... defaultValue) {
|
||||
this(defaultValue, null);
|
||||
}
|
||||
|
||||
public EasyMessageList(@Nullable String[] defaultValue,
|
||||
@Nullable String[] messageParams) {
|
||||
this.defaultValue = defaultValue;
|
||||
this.messageParams = messageParams;
|
||||
}
|
||||
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());
|
||||
}
|
||||
public void initialize(FileConfig sourceConfig, String sectionName) {
|
||||
configValue = new ConfigValueList<>(() -> sourceConfig, sectionName, String.class, getDefaultValue());
|
||||
}
|
||||
|
||||
private @Nullable String[] getDefaultValue() {
|
||||
return defaultValue;
|
||||
}
|
||||
private @Nullable String[] getDefaultValue() {
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
@Unmodifiable
|
||||
private @NotNull List<String> getDefaultMessages() {
|
||||
if (getDefaultValue() == null) return new ArrayList<>();
|
||||
else return Arrays.asList(getDefaultValue());
|
||||
}
|
||||
@Unmodifiable
|
||||
private @NotNull List<String> getDefaultMessages() {
|
||||
if (getDefaultValue() == null) return new ArrayList<>();
|
||||
else return Arrays.asList(getDefaultValue());
|
||||
}
|
||||
|
||||
private @Nullable String[] getMessageParams() {
|
||||
return messageParams;
|
||||
}
|
||||
|
||||
private @Nullable String[] getMessageParams() {
|
||||
return messageParams;
|
||||
}
|
||||
private @NotNull List<String> getMessages() {
|
||||
if (configValue == null) {
|
||||
return getDefaultMessages();
|
||||
} else {
|
||||
return configValue.get();
|
||||
}
|
||||
}
|
||||
|
||||
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) {
|
||||
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 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();
|
||||
params = params == null ? new String[0] : params;
|
||||
values = values == null ? new Object[0] : 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);
|
||||
}
|
||||
}
|
||||
return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages(), params, values));
|
||||
}
|
||||
|
||||
public void send(@Nullable CommandSender sender) {
|
||||
send(sender, null);
|
||||
}
|
||||
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 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 send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
|
||||
List<String> messages = get(sender, params, values);
|
||||
if (messages.isEmpty()) return;
|
||||
if (messages.size() == 1 && messages.get(0).length() == 0) return; //空消息不再发送
|
||||
MessageUtils.send(sender, messages);
|
||||
}
|
||||
|
||||
public void sendToAll() {
|
||||
sendToAll(null);
|
||||
}
|
||||
public void sendToAll() {
|
||||
sendToAll(null);
|
||||
}
|
||||
|
||||
public void sendToAll(@Nullable Object[] values) {
|
||||
sendToAll(messageParams, values);
|
||||
}
|
||||
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));
|
||||
}
|
||||
public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
|
||||
Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+65
-65
@@ -11,90 +11,90 @@ import java.util.Arrays;
|
||||
|
||||
public class MessagesInitializer {
|
||||
|
||||
private 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) {
|
||||
initialize(source, rootClazz, true);
|
||||
}
|
||||
|
||||
public static void initialize(FileConfig source, Class<? extends MessagesRoot> rootClazz, boolean saveDefault) {
|
||||
MessagesSection sectionAnnotation = rootClazz.getAnnotation(MessagesSection.class);
|
||||
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();
|
||||
}
|
||||
String rootSection = null;
|
||||
if (sectionAnnotation != null && sectionAnnotation.value().length() > 1) {
|
||||
rootSection = sectionAnnotation.value();
|
||||
}
|
||||
|
||||
for (Class<?> innerClass : rootClazz.getDeclaredClasses()) {
|
||||
initSection(source, rootSection, innerClass, saveDefault);
|
||||
}
|
||||
for (Class<?> innerClass : rootClazz.getDeclaredClasses()) {
|
||||
initSection(source, rootSection, innerClass, saveDefault);
|
||||
}
|
||||
|
||||
for (Field field : rootClazz.getFields()) {
|
||||
initMessage(source, rootSection, rootClazz, field, saveDefault);
|
||||
}
|
||||
for (Field field : rootClazz.getFields()) {
|
||||
initMessage(source, rootSection, rootClazz, field, saveDefault);
|
||||
}
|
||||
|
||||
if (saveDefault) {
|
||||
try {
|
||||
source.save();
|
||||
} catch (IOException ignore) {
|
||||
}
|
||||
}
|
||||
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;
|
||||
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));
|
||||
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);
|
||||
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));
|
||||
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);
|
||||
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 (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));
|
||||
}
|
||||
if (saveDefault && messageList.defaultValue != null && !source.getConfig().contains(section)) {
|
||||
source.getConfig().set(section, Arrays.asList(messageList.defaultValue));
|
||||
}
|
||||
|
||||
messageList.initialize(source, section);
|
||||
}
|
||||
messageList.initialize(source, section);
|
||||
}
|
||||
|
||||
} catch (IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
} 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 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("_", "-");
|
||||
}
|
||||
private static String getSectionName(String codeName) {
|
||||
return codeName.toLowerCase().replace("_", "-");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+61
-39
@@ -3,13 +3,17 @@ 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.ColorParser;
|
||||
import cc.carm.lib.easyplugin.utils.MessageUtils;
|
||||
import net.md_5.bungee.api.ChatMessageType;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ConfigMessage extends ConfigValue<String> {
|
||||
|
||||
@@ -23,70 +27,88 @@ public class ConfigMessage extends ConfigValue<String> {
|
||||
this(sectionName, defaultValue, null);
|
||||
}
|
||||
|
||||
public ConfigMessage(@NotNull String sectionName, @Nullable String defaultValue, String[] messageParams) {
|
||||
super(null, sectionName, String.class, defaultValue);
|
||||
this.messageParams = messageParams;
|
||||
public ConfigMessage(@NotNull String sectionName,
|
||||
@Nullable String defaultValue,
|
||||
String[] messageParams) {
|
||||
this((Supplier<FileConfig>) null, sectionName, defaultValue, messageParams);
|
||||
}
|
||||
|
||||
public ConfigMessage(@Nullable FileConfig source, @NotNull String sectionName,
|
||||
@Nullable String defaultValue, String[] messageParams) {
|
||||
super(source, sectionName, String.class, defaultValue);
|
||||
this(source == null ? null : () -> source, sectionName, defaultValue, messageParams);
|
||||
}
|
||||
|
||||
public ConfigMessage(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
|
||||
@Nullable String defaultValue, String[] messageParams) {
|
||||
super(provider, sectionName, String.class, defaultValue);
|
||||
this.messageParams = messageParams;
|
||||
}
|
||||
|
||||
public @NotNull String get(CommandSender sender) {
|
||||
return MessageUtils.setPlaceholders(sender, get());
|
||||
public String[] getMessageParams() {
|
||||
return messageParams;
|
||||
}
|
||||
|
||||
public @NotNull String get(CommandSender sender, Object[] values) {
|
||||
if (messageParams != null) {
|
||||
return get(sender, messageParams, values);
|
||||
} else {
|
||||
return get(sender);
|
||||
}
|
||||
public @NotNull String get(@Nullable CommandSender sender) {
|
||||
return get(sender, null);
|
||||
}
|
||||
|
||||
public @NotNull String get(CommandSender sender, String[] params, Object[] values) {
|
||||
return MessageUtils.setPlaceholders(sender, get(), params, values);
|
||||
public @NotNull String get(@Nullable CommandSender sender, @Nullable Object[] values) {
|
||||
return get(sender, getMessageParams(), values);
|
||||
}
|
||||
|
||||
public void send(CommandSender sender) {
|
||||
MessageUtils.sendWithPlaceholders(sender, get());
|
||||
public @NotNull String get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
|
||||
String messages = get();
|
||||
if (sender == null || messages.length() < 1) return messages;
|
||||
params = params == null ? new String[0] : params;
|
||||
values = values == null ? new Object[0] : values;
|
||||
return ColorParser.parse(MessageUtils.setPlaceholders(sender, messages, params, values));
|
||||
}
|
||||
|
||||
public void send(CommandSender sender, Object[] values) {
|
||||
if (messageParams != null) {
|
||||
send(sender, messageParams, values);
|
||||
} else {
|
||||
send(sender, new String[0], new Object[0]);
|
||||
}
|
||||
|
||||
public void send(@Nullable CommandSender sender) {
|
||||
send(sender, null);
|
||||
}
|
||||
|
||||
public void send(CommandSender sender, String[] params, Object[] values) {
|
||||
MessageUtils.sendWithPlaceholders(sender, Collections.singletonList(get()), params, values);
|
||||
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) {
|
||||
String message = get(sender, params, values);
|
||||
if (message.length() < 1) return;
|
||||
|
||||
MessageUtils.send(sender, message);
|
||||
}
|
||||
|
||||
public void sendBar(@Nullable Player player) {
|
||||
sendBar(player, null);
|
||||
}
|
||||
|
||||
public void sendBar(@Nullable Player player, @Nullable Object[] values) {
|
||||
sendBar(player, getMessageParams(), values);
|
||||
}
|
||||
|
||||
public void sendBar(@Nullable Player player, @Nullable String[] params, @Nullable Object[] values) {
|
||||
if (player == null) return;
|
||||
String message = get(player, params, values);
|
||||
if (message.length() < 1) return;
|
||||
|
||||
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(get(player, params, values)));
|
||||
}
|
||||
|
||||
public void sendToAll() {
|
||||
Bukkit.getOnlinePlayers().forEach(player -> MessageUtils.sendWithPlaceholders(player, Collections.singletonList(get())));
|
||||
sendToAll(null);
|
||||
}
|
||||
|
||||
public void sendToAll(Object[] values) {
|
||||
if (messageParams != null) {
|
||||
sendToAll(messageParams, values);
|
||||
} else {
|
||||
sendToAll();
|
||||
}
|
||||
public void sendToAll(@Nullable Object[] values) {
|
||||
sendToAll(messageParams, values);
|
||||
}
|
||||
|
||||
public void sendToAll(String[] params, Object[] values) {
|
||||
Bukkit.getOnlinePlayers().forEach(pl -> MessageUtils.sendWithPlaceholders(pl, Collections.singletonList(get()), params, values));
|
||||
public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
|
||||
Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable FileConfig getSource() {
|
||||
return source == null ? FileConfig.getMessageConfiguration() : source;
|
||||
public FileConfig defaultSource() {
|
||||
return FileConfig.getMessageConfiguration();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+43
-36
@@ -3,6 +3,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.ColorParser;
|
||||
import cc.carm.lib.easyplugin.utils.MessageUtils;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
@@ -10,6 +11,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ConfigMessageList extends ConfigValueList<String> {
|
||||
|
||||
@@ -23,68 +25,73 @@ public class ConfigMessageList extends ConfigValueList<String> {
|
||||
this(sectionName, defaultValue, null);
|
||||
}
|
||||
|
||||
public ConfigMessageList(@NotNull String sectionName, @Nullable String[] defaultValue, String[] messageParams) {
|
||||
super(null, sectionName, String.class, defaultValue);
|
||||
this.messageParams = messageParams;
|
||||
public ConfigMessageList(@NotNull String sectionName,
|
||||
@Nullable String[] defaultValue,
|
||||
String[] messageParams) {
|
||||
this((Supplier<FileConfig>) null, sectionName, defaultValue, null);
|
||||
}
|
||||
|
||||
public ConfigMessageList(@Nullable FileConfig source, @NotNull String sectionName,
|
||||
@Nullable String[] defaultValue, String[] messageParams) {
|
||||
super(source, sectionName, String.class, defaultValue);
|
||||
this(source == null ? null : () -> source, sectionName, defaultValue, messageParams);
|
||||
}
|
||||
|
||||
public ConfigMessageList(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
|
||||
@Nullable String[] defaultValue, String[] messageParams) {
|
||||
super(provider, sectionName, String.class, defaultValue);
|
||||
this.messageParams = messageParams;
|
||||
}
|
||||
|
||||
public String[] getMessageParams() {
|
||||
return messageParams;
|
||||
}
|
||||
|
||||
public @NotNull List<String> get(@Nullable CommandSender sender) {
|
||||
return MessageUtils.setPlaceholders(sender, get());
|
||||
return get(sender, null);
|
||||
}
|
||||
|
||||
public @NotNull List<String> get(@Nullable CommandSender sender, Object[] values) {
|
||||
if (messageParams != null) {
|
||||
return get(sender, messageParams, values);
|
||||
} else {
|
||||
return get(sender);
|
||||
}
|
||||
|
||||
public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable Object[] values) {
|
||||
return get(sender, getMessageParams(), values);
|
||||
}
|
||||
|
||||
public @NotNull List<String> get(@Nullable CommandSender sender, String[] params, Object[] values) {
|
||||
return MessageUtils.setPlaceholders(sender, get(), params, values);
|
||||
public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
|
||||
if (sender == null) return get();
|
||||
params = params == null ? new String[0] : params;
|
||||
values = values == null ? new Object[0] : values;
|
||||
|
||||
return ColorParser.parse(MessageUtils.setPlaceholders(sender, get(), params, values));
|
||||
}
|
||||
|
||||
public void send(@Nullable CommandSender sender) {
|
||||
MessageUtils.sendWithPlaceholders(sender, get());
|
||||
send(sender, null);
|
||||
}
|
||||
|
||||
public void send(@Nullable CommandSender sender, Object[] values) {
|
||||
if (messageParams != null) {
|
||||
send(sender, messageParams, values);
|
||||
} else {
|
||||
send(sender);
|
||||
}
|
||||
public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
|
||||
send(sender, getMessageParams(), values);
|
||||
}
|
||||
|
||||
public void send(@Nullable CommandSender sender, String[] params, Object[] values) {
|
||||
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 send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
|
||||
List<String> messages = get(sender, params, values);
|
||||
if (messages.isEmpty()) return;
|
||||
if (messages.size() == 1 && messages.get(0).length() == 0) return; //空消息不再发送
|
||||
MessageUtils.send(sender, messages);
|
||||
}
|
||||
|
||||
public void sendToAll() {
|
||||
Bukkit.getOnlinePlayers().forEach(player -> MessageUtils.sendWithPlaceholders(player, get()));
|
||||
sendToAll(null);
|
||||
}
|
||||
|
||||
public void sendToAll(Object[] values) {
|
||||
if (messageParams != null) {
|
||||
sendToAll(messageParams, values);
|
||||
} else {
|
||||
sendToAll();
|
||||
}
|
||||
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));
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable FileConfig getSource() {
|
||||
return source == null ? FileConfig.getMessageConfiguration() : source;
|
||||
public FileConfig defaultSource() {
|
||||
return FileConfig.getMessageConfiguration();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+9
-2
@@ -6,6 +6,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ConfigValue<V> extends FileConfigValue {
|
||||
private final @NotNull Class<V> clazz;
|
||||
@@ -19,13 +20,19 @@ public class ConfigValue<V> extends FileConfigValue {
|
||||
public ConfigValue(@NotNull String sectionName,
|
||||
@NotNull Class<V> clazz,
|
||||
@Nullable V defaultValue) {
|
||||
this(null, sectionName, clazz, defaultValue);
|
||||
this((Supplier<FileConfig>) null, sectionName, clazz, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigValue(@Nullable FileConfig source, @NotNull String sectionName,
|
||||
@NotNull Class<V> clazz,
|
||||
@Nullable V defaultValue) {
|
||||
super(source, sectionName);
|
||||
this(source == null ? null : () -> source, sectionName, clazz, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigValue(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
|
||||
@NotNull Class<V> clazz,
|
||||
@Nullable V defaultValue) {
|
||||
super(provider, sectionName);
|
||||
this.clazz = clazz;
|
||||
this.defaultValue = defaultValue;
|
||||
}
|
||||
|
||||
+7
-4
@@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Objects;
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ConfigValueList<V> extends FileConfigValue {
|
||||
@@ -28,15 +29,17 @@ public class ConfigValueList<V> extends FileConfigValue {
|
||||
this(null, sectionName, clazz, defaultValue);
|
||||
}
|
||||
|
||||
public ConfigValueList(@Nullable FileConfig configuration, @NotNull String sectionName,
|
||||
public ConfigValueList(@Nullable Supplier<FileConfig> provider,
|
||||
@NotNull String sectionName,
|
||||
Class<V> clazz) {
|
||||
this(configuration, sectionName, clazz, null);
|
||||
this(provider, sectionName, clazz, null);
|
||||
}
|
||||
|
||||
public ConfigValueList(@Nullable FileConfig configuration, @NotNull String sectionName,
|
||||
public ConfigValueList(@Nullable Supplier<FileConfig> provider,
|
||||
@NotNull String sectionName,
|
||||
@NotNull Class<V> clazz,
|
||||
@Nullable V[] defaultValue) {
|
||||
super(configuration, sectionName);
|
||||
super(provider, sectionName);
|
||||
this.clazz = clazz;
|
||||
this.defaultValue = defaultValue;
|
||||
}
|
||||
|
||||
+9
-2
@@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ConfigValueMap<K, V> extends FileConfigCachedValue<Map<K, V>> {
|
||||
|
||||
@@ -16,12 +17,18 @@ public class ConfigValueMap<K, V> extends FileConfigCachedValue<Map<K, V>> {
|
||||
|
||||
public ConfigValueMap(@NotNull String sectionName, @NotNull Function<String, K> keyCast,
|
||||
@NotNull Class<V> valueClazz) {
|
||||
this(null, sectionName, keyCast, valueClazz);
|
||||
this((Supplier<FileConfig>) null, sectionName, keyCast, valueClazz);
|
||||
}
|
||||
|
||||
|
||||
public ConfigValueMap(@Nullable FileConfig source, @NotNull String sectionName,
|
||||
@NotNull Function<String, K> keyCast, @NotNull Class<V> valueClazz) {
|
||||
super(source, sectionName);
|
||||
this(source == null ? null : () -> source, sectionName, keyCast, valueClazz);
|
||||
}
|
||||
|
||||
public ConfigValueMap(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
|
||||
@NotNull Function<String, K> keyCast, @NotNull Class<V> valueClazz) {
|
||||
super(provider, sectionName);
|
||||
this.keyCast = keyCast;
|
||||
this.valueClazz = valueClazz;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
<dependency>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easysql-beecp</artifactId>
|
||||
<version>0.2.7</version>
|
||||
<version>0.3.5</version>
|
||||
<optional>true</optional>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
+26
-3
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<licenses>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The MIT License</name>
|
||||
<url>https://opensource.org/licenses/MIT</url>
|
||||
@@ -58,5 +58,28 @@
|
||||
</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>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -4,6 +4,8 @@ import me.clip.placeholderapi.PlaceholderAPI;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.Contract;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Arrays;
|
||||
@@ -14,104 +16,132 @@ import java.util.stream.Collectors;
|
||||
|
||||
public class MessageUtils {
|
||||
|
||||
public static boolean hasPlaceholderAPI() {
|
||||
return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
|
||||
}
|
||||
public static boolean hasPlaceholderAPI() {
|
||||
return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
|
||||
}
|
||||
|
||||
|
||||
public static void send(@Nullable CommandSender sender, String... messages) {
|
||||
send(sender, Arrays.asList(messages));
|
||||
}
|
||||
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 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(@Nullable CommandSender sender, List<String> messages) {
|
||||
if (messages == null || messages.isEmpty() || sender == null) return;
|
||||
send(sender, setPlaceholders(sender, messages));
|
||||
}
|
||||
public static void sendWithPlaceholders(CommandSender sender, String... messages) {
|
||||
sendWithPlaceholders(sender, Arrays.asList(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) {
|
||||
if (messages == null || messages.isEmpty() || sender == null) return;
|
||||
send(sender, setPlaceholders(sender, messages));
|
||||
}
|
||||
|
||||
public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
|
||||
sendWithPlaceholders(sender, setCustomParams(messages, params, values));
|
||||
}
|
||||
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 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 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 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 setPlaceholders(@Nullable CommandSender sender, @Nullable 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 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;
|
||||
}
|
||||
@Nullable
|
||||
@Contract("_, !null -> !null")
|
||||
public static List<String> setPlaceholders(@Nullable CommandSender sender,
|
||||
@Nullable 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> setCustomParams(List<String> messages, String param, Object value) {
|
||||
return setCustomParams(messages, new String[]{param}, new Object[]{value});
|
||||
}
|
||||
public static String setPlaceholders(@Nullable CommandSender sender,
|
||||
@NotNull String message,
|
||||
@Nullable String[] params,
|
||||
@Nullable Object[] values) {
|
||||
return setPlaceholders(sender, setCustomParams(message, params, values));
|
||||
}
|
||||
|
||||
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> setPlaceholders(@Nullable CommandSender sender,
|
||||
@NotNull List<String> messages,
|
||||
@Nullable String[] params,
|
||||
@Nullable Object[] values) {
|
||||
return setPlaceholders(sender, setCustomParams(messages, params, values));
|
||||
}
|
||||
|
||||
public static String setCustomParams(@NotNull String message,
|
||||
@NotNull String param,
|
||||
@NotNull Object value) {
|
||||
return setCustomParams(message, new String[]{param}, new Object[]{value});
|
||||
}
|
||||
|
||||
public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
|
||||
return messages.stream().map(message -> setCustomParams(message, params)).collect(Collectors.toList());
|
||||
}
|
||||
@Nullable
|
||||
@Contract("!null, _, _-> !null ; null, _, _->null ")
|
||||
public static String setCustomParams(@Nullable String message,
|
||||
@Nullable String[] params,
|
||||
@Nullable Object[] values) {
|
||||
if (message == null) return null;
|
||||
if (params == null || values == null) return message;
|
||||
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);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static String setCustomParams(@NotNull String message, @NotNull 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;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static List<String> setCustomParams(@NotNull List<String> messages,
|
||||
@NotNull String param,
|
||||
@NotNull Object value) {
|
||||
return setCustomParams(messages, new String[]{param}, new Object[]{value});
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static List<String> setCustomParams(@NotNull List<String> messages,
|
||||
@Nullable String[] params,
|
||||
@Nullable Object[] values) {
|
||||
if (params == null || values == null) return messages;
|
||||
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);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
|
||||
return messages.stream()
|
||||
.map(message -> setCustomParams(message, params))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -14,13 +14,9 @@
|
||||
<groupId>cc.carm.lib</groupId>
|
||||
<artifactId>easyplugin-parent</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>1.3.1</version>
|
||||
<version>1.3.8</version>
|
||||
<modules>
|
||||
|
||||
<module>easyplugin-bom</module>
|
||||
<module>easyplugin-all</module>
|
||||
<module>easyplugin-common</module>
|
||||
|
||||
<module>easyplugin-main</module>
|
||||
|
||||
<module>easyplugin-database</module>
|
||||
@@ -32,6 +28,10 @@
|
||||
<module>easyplugin-placeholderapi</module>
|
||||
<module>easyplugin-lp</module>
|
||||
|
||||
<module>easyplugin-bom</module>
|
||||
<module>easyplugin-all</module>
|
||||
<module>easyplugin-common</module>
|
||||
|
||||
</modules>
|
||||
|
||||
<name>EasyPlugin</name>
|
||||
@@ -86,6 +86,11 @@
|
||||
<url>https://repo1.maven.org/maven2/</url>
|
||||
</repository>
|
||||
|
||||
<repository>
|
||||
<id>sonatype</id>
|
||||
<url>https://oss.sonatype.org/content/groups/public</url>
|
||||
</repository>
|
||||
|
||||
<repository>
|
||||
<id>github</id>
|
||||
<name>GitHub Packages</name>
|
||||
@@ -155,9 +160,6 @@
|
||||
<version>3.2.0</version>
|
||||
<configuration>
|
||||
<classifier>javadoc</classifier>
|
||||
<links>
|
||||
<link>https://javadoc.io/doc/org.jetbrains/annotations/</link>
|
||||
</links>
|
||||
<detectJavaApiLink>false</detectJavaApiLink>
|
||||
<encoding>UTF-8</encoding>
|
||||
<charset>UTF-8</charset>
|
||||
|
||||
Reference in New Issue
Block a user