1
mirror of https://github.com/CarmJos/EasyPlugin.git synced 2024-09-19 19:25:45 +00:00

build(all): 项目结构优化

优化整体项目结构,优化Javadoc生成方式与部署方式。
This commit is contained in:
Carm Jos 2022-05-22 23:01:52 +08:00
parent 94c9cc382d
commit 226121c1df
54 changed files with 211 additions and 2114 deletions

View File

@ -1,40 +0,0 @@
<!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: #7531c4
}
</style>
</head>
<body>
<div class="container">
<h1>EasyPlugin Javadocs</h1>
<ul>
<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>
</html>

View File

@ -20,7 +20,7 @@ jobs:
- name: "Set up JDK"
uses: actions/setup-java@v2
with:
java-version: '11'
java-version: '8'
distribution: 'adopt'
cache: maven
server-id: github
@ -33,9 +33,29 @@ jobs:
MAVEN_USERNAME: ${{ github.repository_owner }}
MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
javadoc-deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: "Set up JDK"
uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'
cache: maven
- name: "Generate Javadoc"
run: mvn -B javadoc:aggregate --file pom.xml -DskipTests
- name: "Copy Javadoc"
run: |
bash .scripts/copy-javadoc.sh
rm -rf docs
mkdir -vp docs
cp -vrf target/site/apidocs/* docs/
cp -vrf .documentation/javadoc/JAVADOC-README.md docs/README.md
- name: "Generate Sitemap"
id: sitemap

View File

@ -1,21 +0,0 @@
rm -rf docs
mkdir -vp docs
DOC_URL="target/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

View File

@ -23,31 +23,30 @@
- 轻便独立的功能模块,按需使用,避免大量打包!
- 详细的Javadoc与使用文档轻松上手方便使用
- 持续的更新与优化,需求不止,更新不止!
- 如需新功能支持,请通过 [Issues](https://github.com/CarmJos/EasyPlugin/issues) 提交功能需求。
- 如需新功能支持,请通过 [Issues](https://github.com/CarmJos/EasyPlugin/issues) 提交功能需求。
## 内容
项目初创不久,加 * 的仍在开发更新中...
### 集合部分
### 集合部分 (`/collection`)
- All [`easyplugin-all`](easyplugin-all)
- Common [`easyplugin-common`](easyplugin-common)
- All [`easyplugin-all`](collection/all)
- Common [`easyplugin-common`](collection/common)
### 主要部分
### 主要部分 (`/base`)
- Main [`easyplugin-main`](easyplugin-main)
- ~~Command*~~ (已独立项目到 [**EasyCommands**](https://github.com/CarmJos/EasyCommands))
- Main [`easyplugin-main`](base/main)
- ~~Command*~~ (已独立项目到 [**MineCommands**](https://github.com/CarmJos/MineCommands))
- ~~Messages*~~ (已独立项目到 [**EasyMessages**](https://github.com/CarmJos/EasyMessages))
- Configuration [`easyplugin-configuration`](easyplugin-configuration)
- Database* [`easyplugin-database`](easyplugin-database)
- GUI [`easyplugin-gui`](easyplugin-gui)
- ~~Configuration~~ (已独立项目到 [**MineConfiguration**](https://github.com/CarmJos/MineConfiguration))
- ~~Database~~ (已独立项目到 [**EasySQL**](https://github.com/CarmJos/EasySQL))
- GUI [`easyplugin-gui`](base/main)
### 附属部分
### 附属部分 (`/extension`)
- [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`](extension/papi)
- [Vault](https://github.com/MilkBowl/VaultAPI)* [`easyplugin-vault`](extension/vault)
## 开发

View File

@ -5,13 +5,14 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.9</version>
<version>1.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
@ -19,7 +20,7 @@
<artifactId>easyplugin-gui</artifactId>
<packaging>jar</packaging>
<name>13-EasyPlugin-GUI</name>
<name>EasyPlugin-GUI</name>
<description>轻松插件GUI接口模块方便快捷的创建箱子GUI界面。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>

View File

@ -5,13 +5,14 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.9</version>
<version>1.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
@ -20,7 +21,7 @@
<artifactId>easyplugin-main</artifactId>
<packaging>jar</packaging>
<name>10-EasyPlugin-Main</name>
<name>EasyPlugin-Main</name>
<description>轻松插件主要接口模块,包含方便的插件入口类与相关工具类。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>
@ -33,7 +34,7 @@
</developer>
</developers>
<licenses>
<licenses>
<license>
<name>The MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
@ -50,6 +51,17 @@
<url>https://github.com/CarmJos/EasyPlugin/actions/workflows/maven.yml</url>
</ciManagement>
<dependencies>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.10.9</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>

View File

@ -1,4 +1,3 @@
package cc.carm.lib.easyplugin.utils;
import java.util.Arrays;
@ -9,9 +8,10 @@ import java.util.stream.Collectors;
public class ColorParser {
public static final Pattern HEX_PATTERN = Pattern.compile("&\\(&?#([0-9a-fA-F]{6})\\)");
public static String parse(String text) {
text = parseHexColor(text);
return parseColor(text);
return parseBaseColor(parseHexColor(text));
}
public static String[] parse(String... texts) {
@ -22,23 +22,23 @@ public class ColorParser {
return texts.stream().map(ColorParser::parse).collect(Collectors.toList());
}
public static String parseColor(final String text) {
public static String parseBaseColor(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);
Matcher matcher = HEX_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());
text = matcher.replaceFirst(buildHexColor(matcher.group(1)).toLowerCase());
matcher.reset(text);
}
return text;
}
}
private static String buildHexColor(String hexCode) {
return Arrays.stream(hexCode.split(""))
.map(s -> '§' + s)
.collect(Collectors.joining("", '§' + "x", ""));
}
}

View File

@ -0,0 +1,105 @@
package cc.carm.lib.easyplugin.utils;
import org.jetbrains.annotations.Nullable;
import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@SuppressWarnings("ResultOfMethodCallIgnored")
public class JarResourceUtils {
public static final char JAR_SEPARATOR = '/';
public static @Nullable String[] readResource(@Nullable InputStream resourceStream) {
if (resourceStream == null) return null;
try (Scanner scanner = new Scanner(resourceStream, "UTF-8")) {
List<String> contents = new ArrayList<>();
while (scanner.hasNextLine()) {
contents.add(scanner.nextLine());
}
return contents.toArray(new String[0]);
} catch (Exception e) {
return null;
}
}
public static void copyFolderFromJar(String folderName, File destFolder, CopyOption option)
throws IOException {
copyFolderFromJar(folderName, destFolder, option, null);
}
public static void copyFolderFromJar(String folderName, File destFolder,
CopyOption option, PathTrimmer trimmer) throws IOException {
if (!destFolder.exists())
destFolder.mkdirs();
byte[] buffer = new byte[1024];
File fullPath;
String path = JarResourceUtils.class.getProtectionDomain().getCodeSource().getLocation().getPath();
if (trimmer != null)
path = trimmer.trim(path);
try {
if (!path.startsWith("file"))
path = "file://" + path;
fullPath = new File(new URI(path));
} catch (URISyntaxException e) {
e.printStackTrace();
return;
}
ZipInputStream zis = new ZipInputStream(new FileInputStream(fullPath));
ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
if (!entry.getName().startsWith(folderName + JAR_SEPARATOR))
continue;
String fileName = entry.getName();
if (fileName.charAt(fileName.length() - 1) == JAR_SEPARATOR) {
File file = new File(destFolder + File.separator + fileName);
if (file.isFile()) {
file.delete();
}
file.mkdirs();
continue;
}
File file = new File(destFolder + File.separator + fileName);
if (option == CopyOption.COPY_IF_NOT_EXIST && file.exists())
continue;
if (!file.getParentFile().exists())
file.getParentFile().mkdirs();
if (!file.exists())
file.createNewFile();
FileOutputStream fos = new FileOutputStream(file);
int len;
while ((len = zis.read(buffer)) > 0) {
fos.write(buffer, 0, len);
}
fos.close();
}
zis.closeEntry();
zis.close();
}
public enum CopyOption {
COPY_IF_NOT_EXIST, REPLACE_IF_EXIST
}
@FunctionalInterface
public interface PathTrimmer {
String trim(String original);
}
}

View File

@ -5,13 +5,14 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.9</version>
<version>1.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
@ -19,7 +20,7 @@
<artifactId>easyplugin-all</artifactId>
<packaging>jar</packaging>
<name>01-EasyPlugin-All</name>
<name>EasyPlugin-All</name>
<description>轻松插件全集,将打包全部工具类与工具接口。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>

View File

@ -5,13 +5,14 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.9</version>
<version>1.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
@ -19,7 +20,7 @@
<artifactId>easyplugin-bom</artifactId>
<packaging>pom</packaging>
<name>00-EasyPlugin-Bom</name>
<name>EasyPlugin-Bom</name>
<description>轻松插件汇总导入模块,允许快捷导入相关的接口并避免版本不一致问题。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>
@ -133,26 +134,11 @@
<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>
@ -163,11 +149,6 @@
<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>
</project>

View File

@ -5,13 +5,14 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.9</version>
<version>1.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
@ -19,7 +20,7 @@
<artifactId>easyplugin-common</artifactId>
<packaging>jar</packaging>
<name>02-EasyPlugin-Common</name>
<name>EasyPlugin-Common</name>
<description>轻松插件常用接口集,包含除附属插件模块外的所有模块。</description>
<url>https://github.com/CarmJos/EasyPlugin</url>

View File

@ -1,24 +0,0 @@
<?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.9</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-command</artifactId>
<packaging>jar</packaging>
<name>12-EasyPlugin-Command</name>
</project>

View File

@ -1,4 +0,0 @@
package cc.carm.lib.easyplugin.command;
public class CommandsManager {
}

View File

@ -1,129 +0,0 @@
<?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.9</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-configuration</artifactId>
<packaging>jar</packaging>
<name>11-EasyPlugin-Configuration</name>
<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>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
<artifactId>easyplugin-main</artifactId>
<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>

View File

@ -1,64 +0,0 @@
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;
import java.util.function.Supplier;
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((Supplier<FileConfig>) null, sectionName, valueCast, defaultValue);
}
public ConfigSectionCast(@Nullable FileConfig source, @NotNull String sectionName,
@NotNull Function<ConfigurationSection, V> valueCast,
@Nullable V defaultValue) {
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;
}
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) {
}
}

View File

@ -1,62 +0,0 @@
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;
import java.util.function.Supplier;
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((Supplier<FileConfig>) null, configSection, valueCast, defaultValue);
}
public ConfigStringCast(@Nullable FileConfig source, @NotNull String sectionName,
@NotNull Function<String, V> valueCast,
@Nullable V defaultValue) {
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;
}
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);
}
}

View File

@ -1,128 +0,0 @@
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.*;
import java.util.function.Supplier;
@SuppressWarnings("ResultOfMethodCallIgnored")
public class FileConfig {
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 getMessageConfiguration() {
return messageConfiguration == null ? null : messageConfiguration.get();
}
protected long updateTime;
protected final JavaPlugin plugin;
protected final File fileFolder;
protected final String fileName;
protected final String resourcePath;
protected File file;
protected FileConfiguration config;
public FileConfig(@NotNull JavaPlugin plugin) throws IOException {
this(plugin, "config.yml");
}
public FileConfig(@NotNull JavaPlugin plugin,
@NotNull String fileName) throws IOException {
this(plugin, fileName, fileName);
}
public FileConfig(@NotNull JavaPlugin plugin, @NotNull String resourcePath,
@NotNull String fileName) throws IOException {
this(plugin, resourcePath, plugin.getDataFolder(), fileName);
}
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();
}
protected void initFile() throws IOException {
if (!getFileFolder().exists()) getFileFolder().mkdirs();
this.file = new File(getFileFolder(), fileName);
if (!file.exists()) {
InputStream resourceStream = plugin.getResource(resourcePath);
if (resourceStream == null) {
throw new IOException("The resource " + resourcePath + " cannot find in " + plugin.getName() + " !");
}
OutputStream out = new FileOutputStream(file);
byte[] buffer = new byte[1024];
int readBytes;
while ((readBytes = resourceStream.read(buffer)) > 0) {
out.write(buffer, 0, readBytes);
}
out.close();
resourceStream.close();
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;
}
}

View File

@ -1,44 +0,0 @@
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;
protected long updateTime;
public FileConfigCachedValue(@NotNull String sectionName) {
super(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;
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;
}
}

View File

@ -1,79 +0,0 @@
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;
import java.util.function.Supplier;
public abstract class FileConfigValue {
protected @Nullable Supplier<FileConfig> provider;
private final @NotNull String sectionName;
public FileConfigValue(@NotNull String sectionName) {
this(null, sectionName);
}
public FileConfigValue(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName) {
this.provider = provider;
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 provider == null || provider.get() == null ? defaultSource() : provider.get();
}
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;
}
public FileConfig defaultSource() {
return FileConfig.getPluginConfiguration();
}
}

View File

@ -1,152 +0,0 @@
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));
}
}

View File

@ -1,127 +0,0 @@
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;
import org.bukkit.entity.Player;
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> {
public ConfigSound(@NotNull String configSection) {
this(configSection, null);
}
public ConfigSound(@NotNull String configSection,
@Nullable Sound defaultValue) {
this((Supplier<FileConfig>) null, configSection, defaultValue);
}
public ConfigSound(@Nullable FileConfig source, @NotNull String configSection,
@Nullable Sound 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) {
if (value == null) {
set((String) null);
} else if (value.pitch != 1) {
set(value.type, value.volume, value.pitch);
} else if (value.volume != 1) {
set(value.type, value.volume);
} else {
set(value.type);
}
}
public void set(Sound value) {
set(value.name());
}
public void set(Sound value, float volume) {
set(value.name() + (volume != 1 ? ":" + volume : ""));
}
public void set(Sound value, float volume, float pitch) {
set(value.name() + ":" + volume + (pitch != 1 ? ":" + pitch : ""));
}
public void play(Player player) {
SoundData data = get();
if (data != null) data.play(player);
}
public void playToAll() {
SoundData data = get();
if (data != null) {
Bukkit.getOnlinePlayers().forEach(data::play);
}
}
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 {
Sound type;
float volume;
float pitch;
public SoundData(Sound type) {
this(type, 1, 1);
}
public SoundData(Sound type, float volume) {
this(type, volume, 1);
}
public SoundData(Sound type, float volume, float pitch) {
this.type = type;
this.volume = volume;
this.pitch = pitch;
}
public void play(Player player) {
player.playSound(player.getLocation(), type, volume, pitch);
}
}
}

View File

@ -1,124 +0,0 @@
package cc.carm.lib.easyplugin.configuration.language;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.language.builder.EasyMessageBuilder;
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;
public class EasyMessage {
@Nullable ConfigValue<String> configValue;
@Nullable String defaultValue;
@Nullable String[] messageParams;
public static EasyMessageBuilder builder() {
return new EasyMessageBuilder();
}
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 source, @NotNull String sectionName) {
this.configValue = new ConfigValue<>(() -> source, 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, (Object[]) 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) {
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, (Object[]) 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) {
String message = get(sender, params, values);
if (message.length() < 1) return;
MessageUtils.send(sender, message);
}
public void sendBar(@Nullable Player player) {
sendBar(player, (Object[]) 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() {
sendToAll((Object[]) 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));
}
}

View File

@ -1,113 +0,0 @@
package cc.carm.lib.easyplugin.configuration.language;
import cc.carm.lib.easyplugin.configuration.file.FileConfig;
import cc.carm.lib.easyplugin.configuration.language.builder.EasyMessageListBuilder;
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;
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 static EasyMessageListBuilder builder() {
return new EasyMessageListBuilder();
}
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, (Object[]) 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();
params = params == null ? new String[0] : params;
values = values == null ? new Object[0] : values;
return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages(), params, values));
}
public void send(@Nullable CommandSender sender) {
send(sender, (Object[]) 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) {
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((Object[]) 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));
}
}

View File

@ -1,39 +0,0 @@
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());
}
}

View File

@ -1,100 +0,0 @@
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("_", "-");
}
}

View File

@ -1,5 +0,0 @@
package cc.carm.lib.easyplugin.configuration.language;
public abstract class MessagesRoot {
}

View File

@ -1,14 +0,0 @@
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 "";
}

View File

@ -1,55 +0,0 @@
package cc.carm.lib.easyplugin.configuration.language.builder;
import cc.carm.lib.easyplugin.configuration.language.EasyMessage;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
public class EasyMessageBuilder {
protected String content;
protected String[] params;
protected @Nullable String paramPrefix = "%(";
protected @Nullable String paramSuffix = ")";
public EasyMessageBuilder() {
}
public EasyMessageBuilder contents(String content) {
this.content = content;
return this;
}
public EasyMessageBuilder params(String... placeholders) {
this.params = placeholders;
return this;
}
public EasyMessageBuilder setParamPrefix(@Nullable String paramPrefix) {
this.paramPrefix = paramPrefix;
return this;
}
public EasyMessageBuilder setParamSuffix(@Nullable String paramSuffix) {
this.paramSuffix = paramSuffix;
return this;
}
public EasyMessageBuilder setParamFormat(@Nullable String paramPrefix, @Nullable String paramSuffix) {
this.paramPrefix = paramPrefix;
this.paramSuffix = paramSuffix;
return this;
}
protected @Nullable String[] buildParams() {
if (this.params == null) return null;
else return Arrays.stream(this.params).map(param -> paramPrefix + param + paramSuffix).toArray(String[]::new);
}
public EasyMessage build() {
return new EasyMessage(this.content, buildParams());
}
}

View File

@ -1,55 +0,0 @@
package cc.carm.lib.easyplugin.configuration.language.builder;
import cc.carm.lib.easyplugin.configuration.language.EasyMessageList;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
public class EasyMessageListBuilder {
protected String[] contents;
protected String[] params;
protected @Nullable String paramPrefix = "%(";
protected @Nullable String paramSuffix = ")";
public EasyMessageListBuilder() {
}
public EasyMessageListBuilder contents(String... contents) {
this.contents = contents;
return this;
}
public EasyMessageListBuilder params(String... placeholders) {
this.params = placeholders;
return this;
}
public EasyMessageListBuilder setParamPrefix(@Nullable String paramPrefix) {
this.paramPrefix = paramPrefix;
return this;
}
public EasyMessageListBuilder setParamSuffix(@Nullable String paramSuffix) {
this.paramSuffix = paramSuffix;
return this;
}
public EasyMessageListBuilder setParamFormat(@Nullable String paramPrefix, @Nullable String paramSuffix) {
this.paramPrefix = paramPrefix;
this.paramSuffix = paramSuffix;
return this;
}
protected @Nullable String[] buildParams() {
if (this.params == null) return null;
else return Arrays.stream(this.params).map(param -> paramPrefix + param + paramSuffix).toArray(String[]::new);
}
public EasyMessageList build() {
return new EasyMessageList(this.contents, buildParams());
}
}

View File

@ -1,114 +0,0 @@
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.function.Supplier;
public class ConfigMessage extends ConfigValue<String> {
String[] messageParams;
public ConfigMessage(@NotNull String sectionName) {
this(sectionName, null);
}
public ConfigMessage(@NotNull String sectionName, @Nullable String defaultValue) {
this(sectionName, defaultValue, null);
}
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) {
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 String[] getMessageParams() {
return messageParams;
}
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) {
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(@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) {
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() {
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));
}
@Override
public FileConfig defaultSource() {
return FileConfig.getMessageConfiguration();
}
}

View File

@ -1,97 +0,0 @@
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;
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> {
@Nullable String[] messageParams;
public ConfigMessageList(String sectionName) {
this(sectionName, new String[0]);
}
public ConfigMessageList(@NotNull String sectionName, @Nullable String[] defaultValue) {
this(sectionName, defaultValue, null);
}
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) {
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 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 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) {
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) {
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(@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 FileConfig defaultSource() {
return FileConfig.getMessageConfiguration();
}
}

View File

@ -1,64 +0,0 @@
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.Optional;
import java.util.function.Supplier;
public class ConfigValue<V> extends FileConfigValue {
private final @NotNull Class<V> clazz;
@Nullable V defaultValue;
public ConfigValue(@NotNull String sectionName,
@NotNull Class<V> clazz) {
this(sectionName, clazz, null);
}
public ConfigValue(@NotNull String sectionName,
@NotNull Class<V> clazz,
@Nullable V defaultValue) {
this((Supplier<FileConfig>) null, sectionName, clazz, defaultValue);
}
public ConfigValue(@Nullable FileConfig source, @NotNull String sectionName,
@NotNull Class<V> clazz,
@Nullable V defaultValue) {
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;
}
public V get() {
return getConfigOptional()
.map(config -> {
if (config.contains(getSectionName())) {
return castValue(config.get(getSectionName()), clazz, this.defaultValue);
} else {
return setDefault(); // 如果没有默认值就把配置写进去便于配置
}
})
.orElse(defaultValue);
}
public @NotNull Optional<V> getOptional() {
return Optional.ofNullable(get());
}
public void set(@Nullable V value) {
setIfPresent(value, true);
}
public V setDefault() {
if (this.defaultValue != null) set(this.defaultValue);
return this.defaultValue;
}
}

View File

@ -1,67 +0,0 @@
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.Objects;
import java.util.function.Supplier;
import java.util.stream.Collectors;
public class ConfigValueList<V> extends FileConfigValue {
private final @NotNull Class<V> clazz;
@Nullable V[] defaultValue;
public ConfigValueList(@NotNull String sectionName,
@NotNull Class<V> clazz) {
this(sectionName, clazz, null);
}
public ConfigValueList(@NotNull String sectionName,
@NotNull Class<V> clazz,
@Nullable V[] defaultValue) {
this(null, sectionName, clazz, defaultValue);
}
public ConfigValueList(@Nullable Supplier<FileConfig> provider,
@NotNull String sectionName,
Class<V> clazz) {
this(provider, sectionName, clazz, null);
}
public ConfigValueList(@Nullable Supplier<FileConfig> provider,
@NotNull String sectionName,
@NotNull Class<V> clazz,
@Nullable V[] defaultValue) {
super(provider, sectionName);
this.clazz = clazz;
this.defaultValue = defaultValue;
}
public @NotNull ArrayList<V> get() {
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());
}
public @NotNull ArrayList<V> getDefaultList() {
return defaultValue == null ? new ArrayList<>() : new ArrayList<>(Arrays.asList(defaultValue));
}
public void set(@Nullable ArrayList<V> value) {
setIfPresent(value, true);
}
}

View File

@ -1,63 +0,0 @@
package cc.carm.lib.easyplugin.configuration.values;
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.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>> {
@NotNull Function<String, K> keyCast;
@NotNull Class<V> valueClazz;
public ConfigValueMap(@NotNull String sectionName, @NotNull Function<String, K> keyCast,
@NotNull Class<V> 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) {
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;
}
@NotNull
public Map<K, V> get() {
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 Map<K, V> valuesMap) {
createSection(valuesMap);
}
}

View File

@ -1,118 +0,0 @@
<?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.9</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-database</artifactId>
<packaging>jar</packaging>
<name>14-EasyPlugin-Database</name>
<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>
<dependencies>
<dependency>
<groupId>cc.carm.lib</groupId>
<artifactId>easysql-beecp</artifactId>
<version>0.3.8</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>

View File

@ -1,77 +0,0 @@
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());
}
}

View File

@ -1,25 +0,0 @@
<?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.9</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-lp</artifactId>
<packaging>jar</packaging>
<name>23-EasyPlugin-LuckPerms</name>
</project>

View File

@ -5,13 +5,13 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.9</version>
<version>1.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
@ -19,6 +19,6 @@
<artifactId>easyplugin-placeholderapi</artifactId>
<packaging>jar</packaging>
<name>21-EasyPlugin-PlaceholderAPI</name>
<name>EasyPlugin-PlaceholderAPI</name>
</project>

View File

@ -5,13 +5,13 @@
<parent>
<artifactId>easyplugin-parent</artifactId>
<groupId>cc.carm.lib</groupId>
<version>1.3.9</version>
<version>1.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
@ -19,7 +19,7 @@
<artifactId>easyplugin-vault</artifactId>
<packaging>jar</packaging>
<name>22-EasyPlugin-Vault</name>
<name>EasyPlugin-Vault</name>
<dependencies>

43
pom.xml
View File

@ -5,8 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.jdk.version>8</project.jdk.version>
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties>
@ -14,22 +15,18 @@
<groupId>cc.carm.lib</groupId>
<artifactId>easyplugin-parent</artifactId>
<packaging>pom</packaging>
<version>1.3.9</version>
<version>1.4.0</version>
<modules>
<module>easyplugin-main</module>
<module>base/main</module>
<module>base/gui</module>
<module>easyplugin-database</module>
<module>easyplugin-gui</module>
<module>easyplugin-configuration</module>
<module>extension/papi</module>
<module>extension/vault</module>
<module>easyplugin-vault</module>
<module>easyplugin-placeholderapi</module>
<module>easyplugin-lp</module>
<module>easyplugin-bom</module>
<module>easyplugin-all</module>
<module>easyplugin-common</module>
<module>collection/all</module>
<module>collection/bom</module>
<module>collection/common</module>
</modules>
@ -95,15 +92,6 @@
<url>https://repo.carm.cc/repository/maven-public/</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>
<dependencies>
@ -115,17 +103,10 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.10.9</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>22.0.0</version>
<version>23.0.0</version>
<scope>provided</scope>
</dependency>