mirror of
https://github.com/CarmJos/MineConfiguration.git
synced 2026-06-14 00:01:10 +08:00
Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2804543419 | |||
| f826014c09 | |||
| 616d24d885 | |||
| 8d58583a1e | |||
| 4b594269bd | |||
| b629a7d96d | |||
| 455ab775ed | |||
| d5f1e8b230 | |||
| 11b910a273 | |||
| 40ec299c64 | |||
| 483fbc7c4d | |||
| 65d7a32108 | |||
| 6aa220924d | |||
| f4a55f216b | |||
| 34a51c42a5 | |||
| c50df3bc56 |
@@ -0,0 +1,9 @@
|
|||||||
|
# MineConfiguration Javadoc
|
||||||
|
|
||||||
|
基于 [Github Pages](https://pages.github.com/) 搭建,请访问 [JavaDoc](https://carmjos.github.io/MineConfiguration) 。
|
||||||
|
|
||||||
|
## 如何实现?
|
||||||
|
|
||||||
|
若您也想通过 [Github Actions](https://docs.github.com/en/actions/learn-github-actions)
|
||||||
|
自动部署项目的Javadoc到 [Github Pages](https://pages.github.com/) ,
|
||||||
|
可以参考我的文章 [《自动部署Javadoc到Github Pages》](https://pages.carm.cc/doc/javadoc-in-github.html) 。
|
||||||
@@ -12,7 +12,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
gh-deploy:
|
gh-deploy:
|
||||||
name: "Publish Project (GitHub)"
|
name: "Deploy Project (GitHub)"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@@ -37,7 +37,7 @@ jobs:
|
|||||||
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
|
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
|
||||||
|
|
||||||
central-deploy:
|
central-deploy:
|
||||||
name: "Deploy Project (Central Repository)"
|
name: "Deploy Project (Central)"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
name: "Publish Javadoc"
|
||||||
|
|
||||||
|
on:
|
||||||
|
# 支持手动触发构建
|
||||||
|
workflow_dispatch:
|
||||||
|
release:
|
||||||
|
# 创建release的时候触发
|
||||||
|
types: [ published ]
|
||||||
|
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
|
||||||
|
javadoc-deploy:
|
||||||
|
name: "Deploy Javadoc (Github Pages)"
|
||||||
|
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: |
|
||||||
|
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
|
||||||
|
uses: cicirello/generate-sitemap@v1
|
||||||
|
with:
|
||||||
|
base-url-path: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}
|
||||||
|
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 '${{ github.repository_owner }}'
|
||||||
|
git config --global user.email '${{ github.repository_owner }}@users.noreply.github.com'
|
||||||
|
|
||||||
|
- name: Commit documentation changes
|
||||||
|
run: |
|
||||||
|
echo "Committing changes to git@github.com:${{ github.repository_owner }}/${{ github.event.repository.name }}.git ..."
|
||||||
|
cd docs
|
||||||
|
git init
|
||||||
|
git remote add origin git@github.com:${{ github.repository_owner }}/${{ github.event.repository.name }}.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
|
||||||
@@ -23,14 +23,17 @@ EasyConfiguration for MineCraft!
|
|||||||
### **MineConfiguration-Common**
|
### **MineConfiguration-Common**
|
||||||
|
|
||||||
全部版本的共用部分,包括
|
全部版本的共用部分,包括
|
||||||
|
|
||||||
- `ConfigMessage` (实现类为 `ConfiguredMessage<M>`)
|
- `ConfigMessage` (实现类为 `ConfiguredMessage<M>`)
|
||||||
- `ConfigMessageList` (实现类为 `ConfiguredMessageList<M>`)
|
- `ConfigMessageList` (实现类为 `ConfiguredMessageList<M>`)
|
||||||
|
|
||||||
如要使用,请访问对应实现类的builder() 方法来快速创建。
|
如要使用,请访问对应实现类的builder() 方法来快速创建。
|
||||||
|
|
||||||
### **MineConfiguration-CraftBukkit**
|
### MineConfiguration-Bukkit
|
||||||
|
|
||||||
CraftBukkit系通用依赖,不包含实现部分,请使用 **MineConfiguration-Bukkit** 或 **MineConfiguration-Spigot** 。
|
#### MineConfiguration-Bukkit-Base
|
||||||
|
|
||||||
|
Bukkit系通用依赖,不包含实现部分,请使用 **MineConfiguration-Bukkit-General** 或 **MineConfiguration-Bukkit-Native** 。
|
||||||
|
|
||||||
相较于基础版本,额外提供了以下功能:
|
相较于基础版本,额外提供了以下功能:
|
||||||
|
|
||||||
@@ -40,23 +43,22 @@ CraftBukkit系通用依赖,不包含实现部分,请使用 **MineConfigurati
|
|||||||
|
|
||||||
以上类型可以通过 `CraftConfigValue.builder()` 来创建,部分类型提供了 `of(...);` 方法来快速创建。
|
以上类型可以通过 `CraftConfigValue.builder()` 来创建,部分类型提供了 `of(...);` 方法来快速创建。
|
||||||
|
|
||||||
### **MineConfiguration-Bukkit**
|
#### **MineConfiguration-Bukkit** _(推荐)_
|
||||||
|
|
||||||
适用于Bukkit的版本,包含以Bukkit为基础的其他服务端 *(如Spigot、Paper、CatServer)* 。
|
适用于Bukkit的版本,包含以Bukkit为基础的其他服务端 *(如Spigot、Paper、CatServer)* 。
|
||||||
|
|
||||||
### **MineConfiguration-Spigot**
|
#### **MineConfiguration-Spigot**
|
||||||
|
|
||||||
适用于 Spigot(1.18+) 的版本,适配了1.18与更新版本自带的配置文件注释功能,随Spigot更新而优化,安全稳定。
|
适用于 Spigot(1.18+) 的版本,适配了1.18及以后版本Spigot原生自带的配置文件注释功能,随Spigot更新而优化,安全稳定。
|
||||||
|
|
||||||
### **MineConfiguration-Bungee**
|
### **MineConfiguration-Bungee**
|
||||||
|
|
||||||
适用于BungeeCord的版本,可用JSON与YAML格式,但**不支持配置文件注释**。
|
适用于BungeeCord的版本,可用JSON与YAML格式。其中JSON格式**不支持配置文件注释**。
|
||||||
|
|
||||||
如需使用配置文件注释,建议使用 [EasyConfiguration-YAML](https://github.com/CarmJos/EasyConfiguration) 。
|
|
||||||
|
|
||||||
## 开发
|
## 开发
|
||||||
|
|
||||||
请详见 [EasyConfiguration](https://github.com/CarmJos/EasyConfiguration) 的 [开发介绍](https://github.com/CarmJos/EasyConfiguration/tree/master/.documentation) 。
|
请详见 [EasyConfiguration](https://github.com/CarmJos/EasyConfiguration)
|
||||||
|
的 [开发介绍](https://github.com/CarmJos/EasyConfiguration/tree/master/.documentation) 。
|
||||||
|
|
||||||
### 依赖方式
|
### 依赖方式
|
||||||
|
|
||||||
|
|||||||
@@ -1,71 +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>mineconfiguration-parent</artifactId>
|
|
||||||
<groupId>cc.carm.lib</groupId>
|
|
||||||
<version>1.3.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
|
||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
<artifactId>mineconfiguration-bukkit</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>${project.parent.groupId}</groupId>
|
|
||||||
<artifactId>easyconfiguration-core</artifactId>
|
|
||||||
<version>${easyconfiguration.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>${project.parent.groupId}</groupId>
|
|
||||||
<artifactId>mineconfiguration-craftbukkit</artifactId>
|
|
||||||
<version>${project.parent.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>bukkit</artifactId>
|
|
||||||
<version>1.8.8-R0.1-SNAPSHOT</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>me.clip</groupId>
|
|
||||||
<artifactId>placeholderapi</artifactId>
|
|
||||||
<version>2.11.1</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<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-javadoc-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
+3
-23
@@ -5,12 +5,12 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>mineconfiguration-parent</artifactId>
|
<artifactId>mineconfiguration-parent</artifactId>
|
||||||
<groupId>cc.carm.lib</groupId>
|
<groupId>cc.carm.lib</groupId>
|
||||||
<version>1.3.0</version>
|
<version>2.0.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
|
||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
|
||||||
</properties>
|
</properties>
|
||||||
<artifactId>mineconfiguration-common</artifactId>
|
<artifactId>mineconfiguration-common</artifactId>
|
||||||
|
|
||||||
@@ -23,14 +23,6 @@
|
|||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>de.themoep</groupId>
|
|
||||||
<artifactId>minedown</artifactId>
|
|
||||||
<version>1.7.1-SNAPSHOT</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.md-5</groupId>
|
<groupId>net.md-5</groupId>
|
||||||
<artifactId>bungeecord-chat</artifactId>
|
<artifactId>bungeecord-chat</artifactId>
|
||||||
@@ -43,18 +35,6 @@
|
|||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<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>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
|||||||
+2
-3
@@ -1,11 +1,10 @@
|
|||||||
package cc.carm.lib.configuration.common.builder.message;
|
package cc.carm.lib.mineconfiguration.common.builder.message;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.data.AbstractText;
|
import cc.carm.lib.mineconfiguration.common.data.AbstractText;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
public abstract class MessageConfigBuilder<R, T extends AbstractText<R>> {
|
public abstract class MessageConfigBuilder<R, T extends AbstractText<R>> {
|
||||||
|
|
||||||
+4
-4
@@ -1,9 +1,9 @@
|
|||||||
package cc.carm.lib.configuration.common.builder.message;
|
package cc.carm.lib.mineconfiguration.common.builder.message;
|
||||||
|
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.data.AbstractText;
|
import cc.carm.lib.mineconfiguration.common.data.AbstractText;
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import cc.carm.lib.configuration.common.value.ConfigMessageList;
|
import cc.carm.lib.mineconfiguration.common.value.ConfigMessageList;
|
||||||
import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
|
import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+4
-4
@@ -1,8 +1,8 @@
|
|||||||
package cc.carm.lib.configuration.common.builder.message;
|
package cc.carm.lib.mineconfiguration.common.builder.message;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.data.AbstractText;
|
import cc.carm.lib.mineconfiguration.common.data.AbstractText;
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import cc.carm.lib.configuration.common.value.ConfigMessage;
|
import cc.carm.lib.mineconfiguration.common.value.ConfigMessage;
|
||||||
import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
|
import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package cc.carm.lib.configuration.common.data;
|
package cc.carm.lib.mineconfiguration.common.data;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package cc.carm.lib.configuration.common.utils;
|
package cc.carm.lib.mineconfiguration.common.utils;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package cc.carm.lib.configuration.common.utils;
|
package cc.carm.lib.mineconfiguration.common.utils;
|
||||||
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
package cc.carm.lib.configuration.common.value;
|
package cc.carm.lib.mineconfiguration.common.value;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.data.AbstractText;
|
import cc.carm.lib.mineconfiguration.common.data.AbstractText;
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import cc.carm.lib.configuration.core.function.ConfigValueParser;
|
import cc.carm.lib.configuration.core.function.ConfigValueParser;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
|
import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
package cc.carm.lib.configuration.common.value;
|
package cc.carm.lib.mineconfiguration.common.value;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.data.AbstractText;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.common.data.AbstractText;
|
||||||
import cc.carm.lib.configuration.core.function.ConfigDataFunction;
|
import cc.carm.lib.configuration.core.function.ConfigDataFunction;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import cc.carm.lib.configuration.core.value.type.ConfiguredList;
|
import cc.carm.lib.configuration.core.value.type.ConfiguredList;
|
||||||
@@ -1,78 +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>mineconfiguration-parent</artifactId>
|
|
||||||
<groupId>cc.carm.lib</groupId>
|
|
||||||
<version>1.3.0</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
|
||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
<artifactId>mineconfiguration-craftbukkit</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>${project.parent.groupId}</groupId>
|
|
||||||
<artifactId>easyconfiguration-core</artifactId>
|
|
||||||
<version>${easyconfiguration.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>${project.parent.groupId}</groupId>
|
|
||||||
<artifactId>mineconfiguration-common</artifactId>
|
|
||||||
<version>${project.parent.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>bukkit</artifactId>
|
|
||||||
<version>1.8.8-R0.1-SNAPSHOT</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>me.clip</groupId>
|
|
||||||
<artifactId>placeholderapi</artifactId>
|
|
||||||
<version>2.11.1</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.comphenix.protocol</groupId>
|
|
||||||
<artifactId>ProtocolLib</artifactId>
|
|
||||||
<version>4.8.0</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<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-javadoc-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
<?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>mineconfiguration-bukkit-parent</artifactId>
|
||||||
|
<groupId>cc.carm.lib</groupId>
|
||||||
|
<version>2.0.0</version>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<properties>
|
||||||
|
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
|
||||||
|
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
|
||||||
|
</properties>
|
||||||
|
<artifactId>mineconfiguration-bukkit-base</artifactId>
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.parent.groupId}</groupId>
|
||||||
|
<artifactId>mineconfiguration-common</artifactId>
|
||||||
|
<version>${project.parent.version}</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
</project>
|
||||||
+4
-4
@@ -1,10 +1,10 @@
|
|||||||
package cc.carm.lib.configuration.craft;
|
package cc.carm.lib.mineconfiguration.bukkit;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
|
import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
|
||||||
import cc.carm.lib.configuration.craft.builder.CraftConfigBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.CraftConfigBuilder;
|
||||||
import cc.carm.lib.configuration.craft.source.CraftConfigProvider;
|
import cc.carm.lib.mineconfiguration.bukkit.source.CraftConfigProvider;
|
||||||
import cc.carm.lib.configuration.craft.source.CraftSectionWrapper;
|
import cc.carm.lib.mineconfiguration.bukkit.source.CraftSectionWrapper;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package cc.carm.lib.configuration.craft.builder;
|
package cc.carm.lib.mineconfiguration.bukkit.builder;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.craft.source.CraftConfigProvider;
|
import cc.carm.lib.mineconfiguration.bukkit.source.CraftConfigProvider;
|
||||||
import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
|
import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
|
||||||
|
|
||||||
public abstract class AbstractCraftBuilder<T, B extends AbstractCraftBuilder<T, B>>
|
public abstract class AbstractCraftBuilder<T, B extends AbstractCraftBuilder<T, B>>
|
||||||
+8
-8
@@ -1,13 +1,13 @@
|
|||||||
package cc.carm.lib.configuration.craft.builder;
|
package cc.carm.lib.mineconfiguration.bukkit.builder;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.builder.ConfigBuilder;
|
import cc.carm.lib.configuration.core.builder.ConfigBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.item.ItemConfigBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.item.ItemConfigBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.message.CraftMessageBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.serializable.SerializableBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.serializable.SerializableBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.sound.SoundConfigBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.sound.SoundConfigBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.title.TitleConfigBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.title.TitleConfigBuilder;
|
||||||
import cc.carm.lib.configuration.craft.data.ItemConfig;
|
import cc.carm.lib.mineconfiguration.bukkit.data.ItemConfig;
|
||||||
import cc.carm.lib.configuration.craft.value.ConfiguredItem;
|
import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredItem;
|
||||||
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+8
-8
@@ -1,9 +1,9 @@
|
|||||||
package cc.carm.lib.configuration.craft.builder.item;
|
package cc.carm.lib.mineconfiguration.bukkit.builder.item;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.AbstractCraftBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.data.ItemConfig;
|
||||||
import cc.carm.lib.configuration.craft.data.ItemConfig;
|
import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredItem;
|
||||||
import cc.carm.lib.configuration.craft.value.ConfiguredItem;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@@ -17,11 +17,11 @@ import java.util.function.Function;
|
|||||||
public class ItemConfigBuilder extends AbstractCraftBuilder<ItemConfig, ItemConfigBuilder> {
|
public class ItemConfigBuilder extends AbstractCraftBuilder<ItemConfig, ItemConfigBuilder> {
|
||||||
|
|
||||||
protected Material type;
|
protected Material type;
|
||||||
protected short data;
|
protected short data = 0;
|
||||||
protected String name;
|
protected String name = null;
|
||||||
protected List<String> lore = new ArrayList<>();
|
protected List<String> lore = new ArrayList<>();
|
||||||
|
|
||||||
protected @NotNull String[] params;
|
protected @NotNull String[] params = new String[0];
|
||||||
protected @NotNull Function<@NotNull String, @NotNull String> paramFormatter = ParamsUtils.DEFAULT_PARAM_FORMATTER;
|
protected @NotNull Function<@NotNull String, @NotNull String> paramFormatter = ParamsUtils.DEFAULT_PARAM_FORMATTER;
|
||||||
|
|
||||||
public ItemConfigBuilder defaults(@NotNull Material type,
|
public ItemConfigBuilder defaults(@NotNull Material type,
|
||||||
+4
-4
@@ -1,8 +1,8 @@
|
|||||||
package cc.carm.lib.configuration.craft.builder.message;
|
package cc.carm.lib.mineconfiguration.bukkit.builder.message;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.builder.message.MessageConfigBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.data.TextConfig;
|
||||||
import cc.carm.lib.configuration.craft.data.TextConfig;
|
import cc.carm.lib.mineconfiguration.bukkit.utils.TextParser;
|
||||||
import cc.carm.lib.configuration.craft.utils.TextParser;
|
import cc.carm.lib.mineconfiguration.common.builder.message.MessageConfigBuilder;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+5
-5
@@ -1,9 +1,9 @@
|
|||||||
package cc.carm.lib.configuration.craft.builder.message;
|
package cc.carm.lib.mineconfiguration.bukkit.builder.message;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.builder.message.MessageListBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.data.TextConfig;
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessageList;
|
||||||
import cc.carm.lib.configuration.craft.data.TextConfig;
|
import cc.carm.lib.mineconfiguration.common.builder.message.MessageListBuilder;
|
||||||
import cc.carm.lib.configuration.craft.value.ConfiguredMessageList;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+5
-5
@@ -1,9 +1,9 @@
|
|||||||
package cc.carm.lib.configuration.craft.builder.message;
|
package cc.carm.lib.mineconfiguration.bukkit.builder.message;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.builder.message.MessageValueBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.data.TextConfig;
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessage;
|
||||||
import cc.carm.lib.configuration.craft.data.TextConfig;
|
import cc.carm.lib.mineconfiguration.common.builder.message.MessageValueBuilder;
|
||||||
import cc.carm.lib.configuration.craft.value.ConfiguredMessage;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
package cc.carm.lib.configuration.craft.builder.serializable;
|
package cc.carm.lib.mineconfiguration.bukkit.builder.serializable;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.AbstractCraftBuilder;
|
||||||
import cc.carm.lib.configuration.craft.value.ConfiguredSerializable;
|
import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredSerializable;
|
||||||
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
+4
-4
@@ -1,8 +1,8 @@
|
|||||||
package cc.carm.lib.configuration.craft.builder.sound;
|
package cc.carm.lib.mineconfiguration.bukkit.builder.sound;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.AbstractCraftBuilder;
|
||||||
import cc.carm.lib.configuration.craft.data.SoundConfig;
|
import cc.carm.lib.mineconfiguration.bukkit.data.SoundConfig;
|
||||||
import cc.carm.lib.configuration.craft.value.ConfiguredSound;
|
import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredSound;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
+8
-8
@@ -1,11 +1,11 @@
|
|||||||
package cc.carm.lib.configuration.craft.builder.title;
|
package cc.carm.lib.mineconfiguration.bukkit.builder.title;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.AbstractCraftBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.AbstractCraftBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.data.TitleConfig;
|
||||||
import cc.carm.lib.configuration.craft.data.TitleConfig;
|
import cc.carm.lib.mineconfiguration.bukkit.function.TitleSendConsumer;
|
||||||
import cc.carm.lib.configuration.craft.function.TitleSendConsumer;
|
import cc.carm.lib.mineconfiguration.bukkit.utils.ProtocolLibHelper;
|
||||||
import cc.carm.lib.configuration.craft.utils.ProtocolLibHelper;
|
import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredTitle;
|
||||||
import cc.carm.lib.configuration.craft.value.ConfiguredTitle;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@@ -28,7 +28,7 @@ public class TitleConfigBuilder extends AbstractCraftBuilder<TitleConfig, TitleC
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
protected @NotNull String[] params;
|
protected @NotNull String[] params = new String[0];
|
||||||
|
|
||||||
protected @Range(from = 0L, to = Integer.MAX_VALUE) int fadeIn = 10;
|
protected @Range(from = 0L, to = Integer.MAX_VALUE) int fadeIn = 10;
|
||||||
protected @Range(from = 0L, to = Integer.MAX_VALUE) int stay = 60;
|
protected @Range(from = 0L, to = Integer.MAX_VALUE) int stay = 60;
|
||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
package cc.carm.lib.configuration.craft.data;
|
package cc.carm.lib.mineconfiguration.bukkit.data;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
||||||
import cc.carm.lib.configuration.craft.utils.TextParser;
|
import cc.carm.lib.mineconfiguration.bukkit.utils.TextParser;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package cc.carm.lib.configuration.craft.data;
|
package cc.carm.lib.mineconfiguration.bukkit.data;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package cc.carm.lib.configuration.craft.data;
|
package cc.carm.lib.mineconfiguration.bukkit.data;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.data.AbstractText;
|
import cc.carm.lib.mineconfiguration.common.data.AbstractText;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.jetbrains.annotations.Contract;
|
import org.jetbrains.annotations.Contract;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
+3
-3
@@ -1,8 +1,8 @@
|
|||||||
package cc.carm.lib.configuration.craft.data;
|
package cc.carm.lib.mineconfiguration.bukkit.data;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
||||||
import cc.carm.lib.configuration.craft.function.TitleSendConsumer;
|
import cc.carm.lib.mineconfiguration.bukkit.function.TitleSendConsumer;
|
||||||
import cc.carm.lib.configuration.craft.utils.TextParser;
|
import cc.carm.lib.mineconfiguration.bukkit.utils.TextParser;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package cc.carm.lib.configuration.craft.function;
|
package cc.carm.lib.mineconfiguration.bukkit.function;
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package cc.carm.lib.configuration.craft.source;
|
package cc.carm.lib.mineconfiguration.bukkit.source;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.ConfigInitializer;
|
import cc.carm.lib.configuration.core.ConfigInitializer;
|
||||||
import cc.carm.lib.configuration.core.source.impl.FileConfigProvider;
|
import cc.carm.lib.configuration.core.source.impl.FileConfigProvider;
|
||||||
@@ -26,7 +26,7 @@ public abstract class CraftConfigProvider extends FileConfigProvider<CraftSectio
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void reload() throws Exception {
|
protected void onReload() throws Exception {
|
||||||
configuration.load(getFile());
|
configuration.load(getFile());
|
||||||
}
|
}
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package cc.carm.lib.configuration.craft.source;
|
package cc.carm.lib.mineconfiguration.bukkit.source;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
||||||
import org.bukkit.configuration.ConfigurationSection;
|
import org.bukkit.configuration.ConfigurationSection;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package cc.carm.lib.configuration.craft.utils;
|
package cc.carm.lib.mineconfiguration.bukkit.utils;
|
||||||
|
|
||||||
import me.clip.placeholderapi.PlaceholderAPI;
|
import me.clip.placeholderapi.PlaceholderAPI;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package cc.carm.lib.configuration.craft.utils;
|
package cc.carm.lib.mineconfiguration.bukkit.utils;
|
||||||
|
|
||||||
import com.comphenix.protocol.PacketType;
|
import com.comphenix.protocol.PacketType;
|
||||||
import com.comphenix.protocol.ProtocolLibrary;
|
import com.comphenix.protocol.ProtocolLibrary;
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
package cc.carm.lib.configuration.craft.utils;
|
package cc.carm.lib.mineconfiguration.bukkit.utils;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.utils.ColorParser;
|
import cc.carm.lib.mineconfiguration.common.utils.ColorParser;
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
+5
-5
@@ -1,13 +1,13 @@
|
|||||||
package cc.carm.lib.configuration.craft.value;
|
package cc.carm.lib.mineconfiguration.bukkit.value;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue;
|
||||||
|
import cc.carm.lib.mineconfiguration.bukkit.data.ItemConfig;
|
||||||
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import cc.carm.lib.configuration.core.function.ConfigValueParser;
|
import cc.carm.lib.configuration.core.function.ConfigValueParser;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
||||||
import cc.carm.lib.configuration.core.value.type.ConfiguredSection;
|
import cc.carm.lib.configuration.core.value.type.ConfiguredSection;
|
||||||
import cc.carm.lib.configuration.craft.CraftConfigValue;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.item.ItemConfigBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.item.ItemConfigBuilder;
|
|
||||||
import cc.carm.lib.configuration.craft.data.ItemConfig;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
+5
-5
@@ -1,10 +1,10 @@
|
|||||||
package cc.carm.lib.configuration.craft.value;
|
package cc.carm.lib.mineconfiguration.bukkit.value;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.value.ConfigMessage;
|
import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue;
|
||||||
|
import cc.carm.lib.mineconfiguration.bukkit.data.TextConfig;
|
||||||
|
import cc.carm.lib.mineconfiguration.common.value.ConfigMessage;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import cc.carm.lib.configuration.craft.CraftConfigValue;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageValueBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.message.CraftMessageValueBuilder;
|
|
||||||
import cc.carm.lib.configuration.craft.data.TextConfig;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
+5
-5
@@ -1,10 +1,10 @@
|
|||||||
package cc.carm.lib.configuration.craft.value;
|
package cc.carm.lib.mineconfiguration.bukkit.value;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.value.ConfigMessageList;
|
import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue;
|
||||||
|
import cc.carm.lib.mineconfiguration.bukkit.data.TextConfig;
|
||||||
|
import cc.carm.lib.mineconfiguration.common.value.ConfigMessageList;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import cc.carm.lib.configuration.craft.CraftConfigValue;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageListBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.message.CraftMessageListBuilder;
|
|
||||||
import cc.carm.lib.configuration.craft.data.TextConfig;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
package cc.carm.lib.configuration.craft.value;
|
package cc.carm.lib.mineconfiguration.bukkit.value;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.craft.CraftConfigValue;
|
import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue;
|
||||||
import cc.carm.lib.configuration.craft.source.CraftConfigProvider;
|
import cc.carm.lib.mineconfiguration.bukkit.source.CraftConfigProvider;
|
||||||
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+4
-4
@@ -1,11 +1,11 @@
|
|||||||
package cc.carm.lib.configuration.craft.value;
|
package cc.carm.lib.mineconfiguration.bukkit.value;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.function.ConfigValueParser;
|
import cc.carm.lib.configuration.core.function.ConfigValueParser;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
|
import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
|
||||||
import cc.carm.lib.configuration.craft.CraftConfigValue;
|
import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue;
|
||||||
import cc.carm.lib.configuration.craft.builder.sound.SoundConfigBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.sound.SoundConfigBuilder;
|
||||||
import cc.carm.lib.configuration.craft.data.SoundConfig;
|
import cc.carm.lib.mineconfiguration.bukkit.data.SoundConfig;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
+6
-6
@@ -1,14 +1,14 @@
|
|||||||
package cc.carm.lib.configuration.craft.value;
|
package cc.carm.lib.mineconfiguration.bukkit.value;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue;
|
||||||
|
import cc.carm.lib.mineconfiguration.bukkit.data.TitleConfig;
|
||||||
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import cc.carm.lib.configuration.core.function.ConfigValueParser;
|
import cc.carm.lib.configuration.core.function.ConfigValueParser;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
||||||
import cc.carm.lib.configuration.core.value.type.ConfiguredSection;
|
import cc.carm.lib.configuration.core.value.type.ConfiguredSection;
|
||||||
import cc.carm.lib.configuration.craft.CraftConfigValue;
|
import cc.carm.lib.mineconfiguration.bukkit.builder.title.TitleConfigBuilder;
|
||||||
import cc.carm.lib.configuration.craft.builder.title.TitleConfigBuilder;
|
import cc.carm.lib.mineconfiguration.bukkit.function.TitleSendConsumer;
|
||||||
import cc.carm.lib.configuration.craft.data.TitleConfig;
|
|
||||||
import cc.carm.lib.configuration.craft.function.TitleSendConsumer;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<?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>mineconfiguration-bukkit-parent</artifactId>
|
||||||
|
<groupId>cc.carm.lib</groupId>
|
||||||
|
<version>2.0.0</version>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<properties>
|
||||||
|
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
|
||||||
|
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<artifactId>mineconfiguration-bukkit</artifactId>
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.parent.groupId}</groupId>
|
||||||
|
<artifactId>mineconfiguration-bukkit-base</artifactId>
|
||||||
|
<version>${project.parent.version}</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
</project>
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package cc.carm.lib.configuration;
|
package cc.carm.lib.mineconfiguration.bukkit;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.bukkit.source.BukkitConfigProvider;
|
import cc.carm.lib.mineconfiguration.bukkit.source.BukkitConfigProvider;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
+1
-8
@@ -1,8 +1,6 @@
|
|||||||
package cc.carm.lib.configuration.bukkit.source;
|
package cc.carm.lib.mineconfiguration.bukkit.source;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.ConfigInitializer;
|
import cc.carm.lib.configuration.core.ConfigInitializer;
|
||||||
import cc.carm.lib.configuration.craft.source.CraftConfigProvider;
|
|
||||||
import cc.carm.lib.configuration.craft.source.CraftSectionWrapper;
|
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@@ -36,11 +34,6 @@ public class BukkitConfigProvider extends CraftConfigProvider {
|
|||||||
return CraftSectionWrapper.of(this.configuration);
|
return CraftSectionWrapper.of(this.configuration);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void reload() throws Exception {
|
|
||||||
configuration.load(getFile());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void save() throws Exception {
|
public void save() throws Exception {
|
||||||
configuration.save(getFile());
|
configuration.save(getFile());
|
||||||
+2
-4
@@ -1,4 +1,4 @@
|
|||||||
package cc.carm.lib.configuration.bukkit.source;
|
package cc.carm.lib.mineconfiguration.bukkit.source;
|
||||||
|
|
||||||
import org.bukkit.configuration.ConfigurationSection;
|
import org.bukkit.configuration.ConfigurationSection;
|
||||||
import org.bukkit.configuration.file.FileConfiguration;
|
import org.bukkit.configuration.file.FileConfiguration;
|
||||||
@@ -13,8 +13,6 @@ import java.util.*;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.IntStream;
|
import java.util.stream.IntStream;
|
||||||
|
|
||||||
import static cc.carm.lib.configuration.craft.source.CraftConfigProvider.SEPARATOR;
|
|
||||||
|
|
||||||
public class BukkitYAMLComments {
|
public class BukkitYAMLComments {
|
||||||
|
|
||||||
protected final @NotNull Map<String, List<String>> headerComments = new HashMap<>();
|
protected final @NotNull Map<String, List<String>> headerComments = new HashMap<>();
|
||||||
@@ -91,7 +89,7 @@ public class BukkitYAMLComments {
|
|||||||
|
|
||||||
if (headerComments != null) writer.write(headerComments);
|
if (headerComments != null) writer.write(headerComments);
|
||||||
|
|
||||||
String[] splitFullKey = fullKey.split("[" + SEPARATOR + "]");
|
String[] splitFullKey = fullKey.split("[" + CraftConfigProvider.SEPARATOR + "]");
|
||||||
String trailingKey = splitFullKey[splitFullKey.length - 1];
|
String trailingKey = splitFullKey[splitFullKey.length - 1];
|
||||||
|
|
||||||
if (currentValue instanceof ConfigurationSection) {
|
if (currentValue instanceof ConfigurationSection) {
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
<?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>mineconfiguration-parent</artifactId>
|
||||||
|
<groupId>cc.carm.lib</groupId>
|
||||||
|
<version>2.0.0</version>
|
||||||
|
<relativePath>../../pom.xml</relativePath>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<properties>
|
||||||
|
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
|
||||||
|
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
|
||||||
|
</properties>
|
||||||
|
<artifactId>mineconfiguration-bukkit-parent</artifactId>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
<modules>
|
||||||
|
<module>base</module>
|
||||||
|
<module>general</module>
|
||||||
|
</modules>
|
||||||
|
|
||||||
|
<name>MineConfiguration-Bukkit-Parent</name>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.bukkit</groupId>
|
||||||
|
<artifactId>bukkit</artifactId>
|
||||||
|
<version>1.8.8-R0.1-SNAPSHOT</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!--PlaceholderAPI for general placeholder's support-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>me.clip</groupId>
|
||||||
|
<artifactId>placeholderapi</artifactId>
|
||||||
|
<version>2.11.1</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!--ProtocolLib for general packet's function support-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.comphenix.protocol</groupId>
|
||||||
|
<artifactId>ProtocolLib</artifactId>
|
||||||
|
<version>4.8.0</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
</project>
|
||||||
@@ -5,16 +5,19 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>mineconfiguration-parent</artifactId>
|
<artifactId>mineconfiguration-parent</artifactId>
|
||||||
<groupId>cc.carm.lib</groupId>
|
<groupId>cc.carm.lib</groupId>
|
||||||
<version>1.3.0</version>
|
<version>2.0.0</version>
|
||||||
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
|
||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
|
||||||
</properties>
|
</properties>
|
||||||
<artifactId>mineconfiguration-bungee</artifactId>
|
<artifactId>mineconfiguration-bungee</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<name>MineConfiguration-Bungee</name>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -51,18 +54,6 @@
|
|||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<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>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
+4
-4
@@ -1,8 +1,8 @@
|
|||||||
package cc.carm.lib.configuration.bungee;
|
package cc.carm.lib.mineconfiguration.bungee;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.bungee.builder.BungeeConfigBuilder;
|
import cc.carm.lib.mineconfiguration.bungee.builder.BungeeConfigBuilder;
|
||||||
import cc.carm.lib.configuration.bungee.source.BungeeConfigProvider;
|
import cc.carm.lib.mineconfiguration.bungee.source.BungeeConfigProvider;
|
||||||
import cc.carm.lib.configuration.bungee.source.BungeeSectionWrapper;
|
import cc.carm.lib.mineconfiguration.bungee.source.BungeeSectionWrapper;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
|
import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package cc.carm.lib.configuration;
|
package cc.carm.lib.mineconfiguration.bungee;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.bungee.source.BungeeConfigProvider;
|
import cc.carm.lib.mineconfiguration.bungee.source.BungeeConfigProvider;
|
||||||
import net.md_5.bungee.api.plugin.Plugin;
|
import net.md_5.bungee.api.plugin.Plugin;
|
||||||
import net.md_5.bungee.config.ConfigurationProvider;
|
import net.md_5.bungee.config.ConfigurationProvider;
|
||||||
import net.md_5.bungee.config.JsonConfiguration;
|
import net.md_5.bungee.config.JsonConfiguration;
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package cc.carm.lib.configuration.bungee.builder;
|
package cc.carm.lib.mineconfiguration.bungee.builder;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.bungee.source.BungeeConfigProvider;
|
import cc.carm.lib.mineconfiguration.bungee.source.BungeeConfigProvider;
|
||||||
import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
|
import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
|
||||||
|
|
||||||
public abstract class AbstractBungeeBuilder<T, B extends AbstractBungeeBuilder<T, B>>
|
public abstract class AbstractBungeeBuilder<T, B extends AbstractBungeeBuilder<T, B>>
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package cc.carm.lib.configuration.bungee.builder;
|
package cc.carm.lib.mineconfiguration.bungee.builder;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageBuilder;
|
import cc.carm.lib.mineconfiguration.bungee.builder.message.BungeeMessageBuilder;
|
||||||
import cc.carm.lib.configuration.core.builder.ConfigBuilder;
|
import cc.carm.lib.configuration.core.builder.ConfigBuilder;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
+4
-4
@@ -1,8 +1,8 @@
|
|||||||
package cc.carm.lib.configuration.bungee.builder.message;
|
package cc.carm.lib.mineconfiguration.bungee.builder.message;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.bungee.data.MessageText;
|
import cc.carm.lib.mineconfiguration.bungee.data.MessageText;
|
||||||
import cc.carm.lib.configuration.common.builder.message.MessageConfigBuilder;
|
import cc.carm.lib.mineconfiguration.common.builder.message.MessageConfigBuilder;
|
||||||
import cc.carm.lib.configuration.common.utils.ColorParser;
|
import cc.carm.lib.mineconfiguration.common.utils.ColorParser;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import net.md_5.bungee.api.CommandSender;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+5
-5
@@ -1,9 +1,9 @@
|
|||||||
package cc.carm.lib.configuration.bungee.builder.message;
|
package cc.carm.lib.mineconfiguration.bungee.builder.message;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.bungee.data.MessageText;
|
import cc.carm.lib.mineconfiguration.bungee.data.MessageText;
|
||||||
import cc.carm.lib.configuration.bungee.value.ConfiguredMessageList;
|
import cc.carm.lib.mineconfiguration.bungee.value.ConfiguredMessageList;
|
||||||
import cc.carm.lib.configuration.common.builder.message.MessageListBuilder;
|
import cc.carm.lib.mineconfiguration.common.builder.message.MessageListBuilder;
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import net.md_5.bungee.api.CommandSender;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+5
-5
@@ -1,9 +1,9 @@
|
|||||||
package cc.carm.lib.configuration.bungee.builder.message;
|
package cc.carm.lib.mineconfiguration.bungee.builder.message;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.bungee.data.MessageText;
|
import cc.carm.lib.mineconfiguration.bungee.data.MessageText;
|
||||||
import cc.carm.lib.configuration.bungee.value.ConfiguredMessage;
|
import cc.carm.lib.mineconfiguration.bungee.value.ConfiguredMessage;
|
||||||
import cc.carm.lib.configuration.common.builder.message.MessageValueBuilder;
|
import cc.carm.lib.mineconfiguration.common.builder.message.MessageValueBuilder;
|
||||||
import cc.carm.lib.configuration.common.utils.ParamsUtils;
|
import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import net.md_5.bungee.api.CommandSender;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package cc.carm.lib.configuration.bungee.data;
|
package cc.carm.lib.mineconfiguration.bungee.data;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.common.data.AbstractText;
|
import cc.carm.lib.mineconfiguration.common.data.AbstractText;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import net.md_5.bungee.api.CommandSender;
|
||||||
import org.jetbrains.annotations.Contract;
|
import org.jetbrains.annotations.Contract;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
+31
-7
@@ -1,28 +1,42 @@
|
|||||||
package cc.carm.lib.configuration.bungee.source;
|
package cc.carm.lib.mineconfiguration.bungee.source;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.ConfigInitializer;
|
import cc.carm.lib.configuration.core.ConfigInitializer;
|
||||||
import cc.carm.lib.configuration.core.source.impl.FileConfigProvider;
|
import cc.carm.lib.configuration.core.source.impl.FileConfigProvider;
|
||||||
import net.md_5.bungee.config.Configuration;
|
import net.md_5.bungee.config.Configuration;
|
||||||
import net.md_5.bungee.config.ConfigurationProvider;
|
import net.md_5.bungee.config.ConfigurationProvider;
|
||||||
|
import net.md_5.bungee.config.YamlConfiguration;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.jetbrains.annotations.Unmodifiable;
|
import org.jetbrains.annotations.Unmodifiable;
|
||||||
|
|
||||||
|
import java.io.BufferedWriter;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.StringWriter;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class BungeeConfigProvider extends FileConfigProvider<BungeeSectionWrapper> {
|
public class BungeeConfigProvider extends FileConfigProvider<BungeeSectionWrapper> {
|
||||||
|
|
||||||
|
protected static final char SEPARATOR = '.';
|
||||||
|
|
||||||
protected ConfigurationProvider loader;
|
protected ConfigurationProvider loader;
|
||||||
protected Configuration configuration;
|
protected Configuration configuration;
|
||||||
protected ConfigInitializer<BungeeConfigProvider> initializer;
|
protected ConfigInitializer<BungeeConfigProvider> initializer;
|
||||||
|
|
||||||
public BungeeConfigProvider(@NotNull File file, ConfigurationProvider loader) {
|
protected BungeeYAMLComments comments = new BungeeYAMLComments();
|
||||||
|
|
||||||
|
public BungeeConfigProvider(@NotNull File file, @NotNull ConfigurationProvider loader) {
|
||||||
super(file);
|
super(file);
|
||||||
this.loader = loader;
|
this.loader = loader;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public BungeeConfigProvider(@NotNull File file, @NotNull Class<? extends ConfigurationProvider> providerClass) {
|
||||||
|
this(file, ConfigurationProvider.getProvider(providerClass));
|
||||||
|
}
|
||||||
|
|
||||||
public void initializeConfig() throws IOException {
|
public void initializeConfig() throws IOException {
|
||||||
this.configuration = getLoader().load(file);
|
this.configuration = getLoader().load(file);
|
||||||
this.initializer = new ConfigInitializer<>(this);
|
this.initializer = new ConfigInitializer<>(this);
|
||||||
@@ -34,33 +48,43 @@ public class BungeeConfigProvider extends FileConfigProvider<BungeeSectionWrappe
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void reload() throws Exception {
|
protected void onReload() throws Exception {
|
||||||
this.configuration = getLoader().load(file);
|
this.configuration = getLoader().load(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void save() throws Exception {
|
public void save() throws Exception {
|
||||||
getLoader().save(configuration, file);
|
getLoader().save(configuration, file);
|
||||||
|
if (getLoader() instanceof YamlConfiguration) {
|
||||||
|
StringWriter writer = new StringWriter();
|
||||||
|
this.comments.writeComments(configuration, new BufferedWriter(writer));
|
||||||
|
String value = writer.toString(); // config contents
|
||||||
|
|
||||||
|
Path toUpdatePath = getFile().toPath();
|
||||||
|
if (!value.equals(new String(Files.readAllBytes(toUpdatePath), StandardCharsets.UTF_8))) {
|
||||||
|
Files.write(toUpdatePath, value.getBytes(StandardCharsets.UTF_8));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setHeaderComment(@Nullable String path, @Nullable List<String> comments) {
|
public void setHeaderComment(@Nullable String path, @Nullable List<String> comments) {
|
||||||
|
this.comments.setHeaderComments(path, comments);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setInlineComment(@NotNull String path, @Nullable String comment) {
|
public void setInlineComment(@NotNull String path, @Nullable String comment) {
|
||||||
|
this.comments.setInlineComment(path, comment);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @Nullable @Unmodifiable List<String> getHeaderComment(@Nullable String path) {
|
public @Nullable @Unmodifiable List<String> getHeaderComment(@Nullable String path) {
|
||||||
return null;
|
return this.comments.getHeaderComment(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @Nullable String getInlineComment(@NotNull String path) {
|
public @Nullable String getInlineComment(@NotNull String path) {
|
||||||
return null;
|
return this.comments.getInlineComment(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
+22
-3
@@ -1,4 +1,4 @@
|
|||||||
package cc.carm.lib.configuration.bungee.source;
|
package cc.carm.lib.mineconfiguration.bungee.source;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
|
||||||
import net.md_5.bungee.config.Configuration;
|
import net.md_5.bungee.config.Configuration;
|
||||||
@@ -9,6 +9,8 @@ import org.jetbrains.annotations.Nullable;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import static cc.carm.lib.mineconfiguration.bungee.source.BungeeConfigProvider.SEPARATOR;
|
||||||
|
|
||||||
public class BungeeSectionWrapper implements ConfigurationWrapper {
|
public class BungeeSectionWrapper implements ConfigurationWrapper {
|
||||||
|
|
||||||
private final Configuration section;
|
private final Configuration section;
|
||||||
@@ -22,14 +24,31 @@ public class BungeeSectionWrapper implements ConfigurationWrapper {
|
|||||||
return section == null ? null : new BungeeSectionWrapper(section);
|
return section == null ? null : new BungeeSectionWrapper(section);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected static Set<String> getAllKeys(@NotNull Configuration config) {
|
||||||
|
Set<String> keys = new LinkedHashSet<>();
|
||||||
|
for (String key : config.getKeys()) {
|
||||||
|
keys.add(key);
|
||||||
|
Object value = config.get(key);
|
||||||
|
if (value instanceof Configuration) {
|
||||||
|
getAllKeys((Configuration) value).stream()
|
||||||
|
.map(subKey -> key + SEPARATOR + subKey).forEach(keys::add);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return keys;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NotNull Set<String> getKeys(boolean deep) {
|
public @NotNull Set<String> getKeys(boolean deep) {
|
||||||
return new LinkedHashSet<>(section.getKeys());
|
if (deep) {
|
||||||
|
return new LinkedHashSet<>(getAllKeys(section));
|
||||||
|
} else {
|
||||||
|
return new LinkedHashSet<>(section.getKeys());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NotNull Map<String, Object> getValues(boolean deep) {
|
public @NotNull Map<String, Object> getValues(boolean deep) {
|
||||||
return section.getKeys().stream()
|
return getKeys(deep).stream()
|
||||||
.collect(Collectors.toMap(key -> key, section::get, (a, b) -> b, LinkedHashMap::new));
|
.collect(Collectors.toMap(key -> key, section::get, (a, b) -> b, LinkedHashMap::new));
|
||||||
}
|
}
|
||||||
|
|
||||||
+152
@@ -0,0 +1,152 @@
|
|||||||
|
package cc.carm.lib.mineconfiguration.bungee.source;
|
||||||
|
|
||||||
|
import net.md_5.bungee.config.Configuration;
|
||||||
|
import net.md_5.bungee.config.ConfigurationProvider;
|
||||||
|
import net.md_5.bungee.config.YamlConfiguration;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
import org.jetbrains.annotations.Unmodifiable;
|
||||||
|
|
||||||
|
import java.io.BufferedWriter;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.StringWriter;
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.IntStream;
|
||||||
|
|
||||||
|
import static cc.carm.lib.mineconfiguration.bungee.source.BungeeConfigProvider.SEPARATOR;
|
||||||
|
|
||||||
|
public class BungeeYAMLComments {
|
||||||
|
|
||||||
|
protected final @NotNull Map<String, List<String>> headerComments = new HashMap<>();
|
||||||
|
protected final @NotNull Map<String, String> inlineComments = new HashMap<>();
|
||||||
|
|
||||||
|
protected @NotNull Map<String, List<String>> getHeaderComments() {
|
||||||
|
return headerComments;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected @NotNull Map<String, String> getInlineComments() {
|
||||||
|
return inlineComments;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setHeaderComments(@Nullable String path, @Nullable List<String> comments) {
|
||||||
|
if (comments == null) {
|
||||||
|
getHeaderComments().remove(path);
|
||||||
|
} else {
|
||||||
|
getHeaderComments().put(path, comments);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void setInlineComment(@NotNull String path, @Nullable String comment) {
|
||||||
|
if (comment == null) {
|
||||||
|
getInlineComments().remove(path);
|
||||||
|
} else {
|
||||||
|
getInlineComments().put(path, comment);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Unmodifiable
|
||||||
|
public List<String> getHeaderComment(@Nullable String path) {
|
||||||
|
return Optional.ofNullable(getHeaderComments().get(path)).map(Collections::unmodifiableList).orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public @Nullable String getInlineComment(@NotNull String path) {
|
||||||
|
return getInlineComments().get(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
public @Nullable String buildHeaderComments(@Nullable String path, @NotNull String indents) {
|
||||||
|
List<String> comments = getHeaderComment(path);
|
||||||
|
if (comments == null || comments.size() == 0) return null;
|
||||||
|
|
||||||
|
StringJoiner joiner = new StringJoiner("\n");
|
||||||
|
for (String comment : comments) {
|
||||||
|
if (comment.length() == 0) joiner.add(" ");
|
||||||
|
else joiner.add(indents + "# " + comment);
|
||||||
|
}
|
||||||
|
return joiner + "\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 从一个文件读取配置并写入注释到某个写入器中。
|
||||||
|
* 该方法的部分源代码借鉴自 tchristofferson/ConfigUpdater 项目。
|
||||||
|
*
|
||||||
|
* @param source 源配置文件
|
||||||
|
* @param writer 配置写入器
|
||||||
|
* @throws IOException 当写入发生错误时抛出
|
||||||
|
*/
|
||||||
|
public void writeComments(@NotNull Configuration source, @NotNull BufferedWriter writer) throws IOException {
|
||||||
|
ConfigurationProvider provider = ConfigurationProvider.getProvider(YamlConfiguration.class);
|
||||||
|
Configuration tmp = new Configuration();// 该对象用于临时记录配置内容
|
||||||
|
|
||||||
|
String configHeader = buildHeaderComments(null, "");
|
||||||
|
if (configHeader != null) writer.write(configHeader);
|
||||||
|
|
||||||
|
for (String fullKey : BungeeSectionWrapper.getAllKeys(source)) {
|
||||||
|
Object currentValue = source.get(fullKey);
|
||||||
|
|
||||||
|
String indents = getIndents(fullKey);
|
||||||
|
String headerComments = buildHeaderComments(fullKey, indents);
|
||||||
|
String inlineComment = getInlineComment(fullKey);
|
||||||
|
|
||||||
|
if (headerComments != null) writer.write(headerComments);
|
||||||
|
|
||||||
|
String[] splitFullKey = fullKey.split("[" + SEPARATOR + "]");
|
||||||
|
String trailingKey = splitFullKey[splitFullKey.length - 1];
|
||||||
|
|
||||||
|
if (currentValue instanceof Configuration) {
|
||||||
|
Configuration section = (Configuration) currentValue;
|
||||||
|
writer.write(indents + trailingKey + ":");
|
||||||
|
if (inlineComment != null && inlineComment.length() > 0) {
|
||||||
|
writer.write(" # " + inlineComment);
|
||||||
|
}
|
||||||
|
if (!section.getKeys().isEmpty()) {
|
||||||
|
writer.write("\n");
|
||||||
|
} else {
|
||||||
|
writer.write(" {}\n");
|
||||||
|
if (indents.length() == 0) writer.write("\n");
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
tmp.set(trailingKey, currentValue);
|
||||||
|
StringWriter tmpStr = new StringWriter();
|
||||||
|
provider.save(tmp, tmpStr);
|
||||||
|
String yaml = tmpStr.toString();
|
||||||
|
tmpStr.close();
|
||||||
|
tmp.set(trailingKey, null);
|
||||||
|
|
||||||
|
yaml = yaml.substring(0, yaml.length() - 1);
|
||||||
|
|
||||||
|
if (inlineComment != null && inlineComment.length() > 0) {
|
||||||
|
if (yaml.contains("\n")) {
|
||||||
|
// section为多行内容,需要 InlineComment 加在首行末尾
|
||||||
|
String[] splitLine = yaml.split("\n", 2);
|
||||||
|
yaml = splitLine[0] + " # " + inlineComment + "\n" + splitLine[1];
|
||||||
|
} else {
|
||||||
|
// 其他情况下就直接加载后面就好。
|
||||||
|
yaml += " # " + inlineComment;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
writer.write(indents + yaml.replace("\n", "\n" + indents) + "\n");
|
||||||
|
if (indents.length() == 0) writer.write("\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
writer.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 得到一个键的缩进。
|
||||||
|
* 该方法的源代码来自 tchristofferson/ConfigUpdater 项目。
|
||||||
|
*
|
||||||
|
* @param key 键
|
||||||
|
* @return 该键的缩进文本
|
||||||
|
*/
|
||||||
|
protected static String getIndents(String key) {
|
||||||
|
String[] splitKey = key.split("[" + SEPARATOR + "]");
|
||||||
|
return IntStream.range(1, splitKey.length).mapToObj(i -> " ").collect(Collectors.joining());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+5
-5
@@ -1,9 +1,9 @@
|
|||||||
package cc.carm.lib.configuration.bungee.value;
|
package cc.carm.lib.mineconfiguration.bungee.value;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.bungee.BungeeConfigValue;
|
import cc.carm.lib.mineconfiguration.bungee.BungeeConfigValue;
|
||||||
import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageValueBuilder;
|
import cc.carm.lib.mineconfiguration.bungee.builder.message.BungeeMessageValueBuilder;
|
||||||
import cc.carm.lib.configuration.bungee.data.MessageText;
|
import cc.carm.lib.mineconfiguration.bungee.data.MessageText;
|
||||||
import cc.carm.lib.configuration.common.value.ConfigMessage;
|
import cc.carm.lib.mineconfiguration.common.value.ConfigMessage;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import net.md_5.bungee.api.CommandSender;
|
||||||
import net.md_5.bungee.api.ProxyServer;
|
import net.md_5.bungee.api.ProxyServer;
|
||||||
+5
-5
@@ -1,9 +1,9 @@
|
|||||||
package cc.carm.lib.configuration.bungee.value;
|
package cc.carm.lib.mineconfiguration.bungee.value;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.bungee.BungeeConfigValue;
|
import cc.carm.lib.mineconfiguration.bungee.BungeeConfigValue;
|
||||||
import cc.carm.lib.configuration.bungee.builder.message.BungeeMessageListBuilder;
|
import cc.carm.lib.mineconfiguration.bungee.builder.message.BungeeMessageListBuilder;
|
||||||
import cc.carm.lib.configuration.bungee.data.MessageText;
|
import cc.carm.lib.mineconfiguration.bungee.data.MessageText;
|
||||||
import cc.carm.lib.configuration.common.value.ConfigMessageList;
|
import cc.carm.lib.mineconfiguration.common.value.ConfigMessageList;
|
||||||
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import net.md_5.bungee.api.CommandSender;
|
||||||
import net.md_5.bungee.api.ProxyServer;
|
import net.md_5.bungee.api.ProxyServer;
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
import cc.carm.lib.configuration.core.ConfigurationRoot;
|
||||||
|
import cc.carm.lib.configuration.core.annotation.HeaderComment;
|
||||||
|
import cc.carm.lib.configuration.core.annotation.InlineComment;
|
||||||
|
import cc.carm.lib.configuration.core.source.ConfigurationProvider;
|
||||||
|
import cc.carm.lib.configuration.core.value.ConfigValue;
|
||||||
|
import cc.carm.lib.configuration.core.value.type.ConfiguredList;
|
||||||
|
import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
|
||||||
|
import cc.carm.lib.mineconfiguration.bungee.MineConfiguration;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class ConfigTest {
|
||||||
|
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void test() {
|
||||||
|
File file = new File("target/config.yml");
|
||||||
|
ConfigurationProvider<?> config = MineConfiguration.from(file);
|
||||||
|
config.initialize(Configuration.class);
|
||||||
|
|
||||||
|
try {
|
||||||
|
System.out.println("--------------------------------------------");
|
||||||
|
System.out.println(new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8));
|
||||||
|
System.out.println("--------------------------------------------");
|
||||||
|
} catch (Exception exception) {
|
||||||
|
exception.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@HeaderComment({
|
||||||
|
"MineConfiguration for BungeeCord",
|
||||||
|
"测试实例配置文件", ""
|
||||||
|
})
|
||||||
|
public static class Configuration extends ConfigurationRoot {
|
||||||
|
|
||||||
|
@InlineComment("是否显示DEBUG消息")
|
||||||
|
public static final ConfigValue<Boolean> DEBUG = ConfiguredValue.of(Boolean.class, false);
|
||||||
|
|
||||||
|
@HeaderComment("启动时执行的命令")
|
||||||
|
public static final class START_UP {
|
||||||
|
|
||||||
|
@HeaderComment("延迟执行的时间(单位:秒)")
|
||||||
|
public static final ConfigValue<Integer> DELAY = ConfiguredValue.of(Integer.class, 30);
|
||||||
|
|
||||||
|
@HeaderComment("循环执行的间隔(单位:秒)")
|
||||||
|
public static final ConfigValue<Integer> PERIOD = ConfiguredValue.of(Integer.class, 10);
|
||||||
|
|
||||||
|
@HeaderComment("执行的指令列表")
|
||||||
|
@InlineComment("建议以\"\"包裹")
|
||||||
|
public static final ConfigValue<List<String>> COMMANDS = ConfiguredList.builder(String.class)
|
||||||
|
.fromString().defaults("alert Commands here!").build();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -3,15 +3,17 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>mineconfiguration-parent</artifactId>
|
|
||||||
<groupId>cc.carm.lib</groupId>
|
<groupId>cc.carm.lib</groupId>
|
||||||
<version>1.3.0</version>
|
<artifactId>mineconfiguration-parent</artifactId>
|
||||||
|
<version>2.0.0</version>
|
||||||
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
|
||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<artifactId>mineconfiguration-spigot</artifactId>
|
<artifactId>mineconfiguration-spigot</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
@@ -19,14 +21,7 @@
|
|||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.parent.groupId}</groupId>
|
<groupId>${project.parent.groupId}</groupId>
|
||||||
<artifactId>easyconfiguration-core</artifactId>
|
<artifactId>mineconfiguration-bukkit-base</artifactId>
|
||||||
<version>${easyconfiguration.version}</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>${project.parent.groupId}</groupId>
|
|
||||||
<artifactId>mineconfiguration-craftbukkit</artifactId>
|
|
||||||
<version>${project.parent.version}</version>
|
<version>${project.parent.version}</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
@@ -38,6 +33,8 @@
|
|||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
|
<!--PlaceholderAPI for general placeholder's support-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>me.clip</groupId>
|
<groupId>me.clip</groupId>
|
||||||
<artifactId>placeholderapi</artifactId>
|
<artifactId>placeholderapi</artifactId>
|
||||||
@@ -45,22 +42,18 @@
|
|||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!--ProtocolLib for general packet's function support-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.comphenix.protocol</groupId>
|
||||||
|
<artifactId>ProtocolLib</artifactId>
|
||||||
|
<version>4.8.0</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<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>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package cc.carm.lib.configuration;
|
package cc.carm.lib.mineconfiguration.spigot;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.spigot.source.SpigotConfigProvider;
|
import cc.carm.lib.mineconfiguration.spigot.source.SpigotConfigProvider;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
package cc.carm.lib.configuration.spigot.source;
|
package cc.carm.lib.mineconfiguration.spigot.source;
|
||||||
|
|
||||||
import cc.carm.lib.configuration.core.ConfigInitializer;
|
import cc.carm.lib.configuration.core.ConfigInitializer;
|
||||||
import cc.carm.lib.configuration.craft.source.CraftConfigProvider;
|
import cc.carm.lib.mineconfiguration.bukkit.source.CraftConfigProvider;
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@@ -3,27 +3,26 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<modules>
|
|
||||||
<module>bungee</module>
|
|
||||||
|
|
||||||
<module>craftbukkit</module>
|
|
||||||
<module>bukkit</module>
|
|
||||||
<module>spigot</module>
|
|
||||||
<module>common</module>
|
|
||||||
</modules>
|
|
||||||
<properties>
|
<properties>
|
||||||
<java.version>1.8</java.version>
|
<project.jdk.version>8</project.jdk.version>
|
||||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
<maven.compiler.source>${project.jdk.version}</maven.compiler.source>
|
||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${project.jdk.version}</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
|
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
|
||||||
|
|
||||||
<easyconfiguration.version>3.0.0</easyconfiguration.version>
|
<easyconfiguration.version>3.1.0</easyconfiguration.version>
|
||||||
</properties>
|
</properties>
|
||||||
<groupId>cc.carm.lib</groupId>
|
<groupId>cc.carm.lib</groupId>
|
||||||
<artifactId>mineconfiguration-parent</artifactId>
|
<artifactId>mineconfiguration-parent</artifactId>
|
||||||
<version>1.3.0</version>
|
<version>2.0.0</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
<modules>
|
||||||
|
<module>common</module>
|
||||||
|
|
||||||
|
<module>platform/bungee</module>
|
||||||
|
<module>platform/bukkit</module>
|
||||||
|
<module>platform/spigot</module>
|
||||||
|
</modules>
|
||||||
|
|
||||||
<name>MineConfiguration</name>
|
<name>MineConfiguration</name>
|
||||||
<description>EasyConfiguration for MineCraft.</description>
|
<description>EasyConfiguration for MineCraft.</description>
|
||||||
@@ -48,8 +47,8 @@
|
|||||||
|
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>The MIT License</name>
|
<name>GNU LESSER GENERAL PUBLIC LICENSE</name>
|
||||||
<url>https://opensource.org/licenses/MIT</url>
|
<url>https://www.gnu.org/licenses/lgpl-3.0.html</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
|
|
||||||
@@ -153,6 +152,36 @@
|
|||||||
<goals>deploy</goals>
|
<goals>deploy</goals>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
<version>3.10.1</version>
|
||||||
|
<configuration>
|
||||||
|
<source>${project.jdk.version}</source>
|
||||||
|
<target>${project.jdk.version}</target>
|
||||||
|
<encoding>UTF-8</encoding>
|
||||||
|
<compilerArgument>-parameters</compilerArgument>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<version>3.2.2</version>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
|
<version>3.2.1</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>jar-no-fork</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
@@ -169,7 +198,6 @@
|
|||||||
<charset>UTF-8</charset>
|
<charset>UTF-8</charset>
|
||||||
<docencoding>UTF-8</docencoding>
|
<docencoding>UTF-8</docencoding>
|
||||||
<locale>zh_CN</locale>
|
<locale>zh_CN</locale>
|
||||||
|
|
||||||
<includeDependencySources>true</includeDependencySources>
|
<includeDependencySources>true</includeDependencySources>
|
||||||
<dependencySourceIncludes>
|
<dependencySourceIncludes>
|
||||||
<dependencySourceInclude>cc.carm.lib:*</dependencySourceInclude>
|
<dependencySourceInclude>cc.carm.lib:*</dependencySourceInclude>
|
||||||
@@ -188,38 +216,6 @@
|
|||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>3.10.1</version>
|
|
||||||
<configuration>
|
|
||||||
<source>${java.version}</source>
|
|
||||||
<target>${java.version}</target>
|
|
||||||
<encoding>UTF-8</encoding>
|
|
||||||
<compilerArgument>-parameters</compilerArgument>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<version>3.2.2</version>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
|
||||||
<version>3.2.1</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>jar-no-fork</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
|
|||||||
Reference in New Issue
Block a user