Skip to content

Commit 7d3f487

Browse files
authored
Merge branch 'baicaizhale:master' into master
2 parents 29d5a83 + e972eb6 commit 7d3f487

File tree

7 files changed

+25
-157
lines changed

7 files changed

+25
-157
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
12
# User-specific stuff
3+
24
*.iml
35
*.ipr
46
*.iws
@@ -111,3 +113,5 @@ buildNumber.properties
111113

112114
# Common working directory
113115
run/
116+
.vscode
117+
.vscode/settings.json

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"java.jdt.ls.java.home": "C:\\Users\\Administrator\\.jdks\\jbr-17.0.14",
2+
"java.jdt.ls.java.home": "C:\\Users\\baicaizhale\\.jdks\\jdk-17.0.14",
33
"java.configuration.runtimes": [
44
{
55
"name": "JavaSE-17",
6-
"path": "C:\\Users\\Administrator\\.jdks\\jbr-17.0.14",
6+
"path": "C:\\Users\\baicaizhale\\.jdks\\jdk-17.0.14",
77
"default": true
88
}
99
],

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# CDKer
22

33
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
4-
[![Spigot](https://img.shields.io/badge/Spigot-1.13--1.21-orange.svg)](https://www.spigotmc.org/)
54
[![Java](https://img.shields.io/badge/Java-17%2B-red.svg)](https://adoptium.net/)
65

76
CDKer 是一个功能强大的Minecraft服务器插件,用于管理和分发兑换码(CDK)。它允许服务器管理员创建可兑换的代码,玩家可以使用这些代码获得奖励,如物品、金钱或其他游戏内福利。
@@ -233,7 +232,7 @@ cdk:
233232

234233
构建步骤:
235234
```bash
236-
git clone https://github.com/your-username/CDKer.git
235+
git clone https://github.com/baicaizhale/CDKer.git
237236
cd CDKer
238237
mvn clean package
239238
```

pom.xml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@
66

77
<groupId>org.baicaizhale</groupId>
88
<artifactId>CDKer</artifactId>
9-
<version>1.0.0</version>
9+
<version>SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>CDKer</name>
1313
<description>A powerful CDK management plugin for Spigot servers</description>
1414

15-
<properties>
16-
<java.version>17</java.version>
17-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
</properties>
15+
<properties>
16+
<java.version>17</java.version>
17+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
<lombok.version>1.18.30</lombok.version>
19+
</properties>
1920

2021
<build>
2122
<defaultGoal>clean package</defaultGoal>
@@ -27,6 +28,14 @@
2728
<configuration>
2829
<source>${java.version}</source>
2930
<target>${java.version}</target>
31+
<release>${java.version}</release>
32+
<annotationProcessorPaths>
33+
<path>
34+
<groupId>org.projectlombok</groupId>
35+
<artifactId>lombok</artifactId>
36+
<version>${lombok.version}</version>
37+
</path>
38+
</annotationProcessorPaths>
3039
</configuration>
3140
</plugin>
3241
<plugin>
@@ -67,7 +76,7 @@
6776
<dependency>
6877
<groupId>org.spigotmc</groupId>
6978
<artifactId>spigot-api</artifactId>
70-
<version>1.20.4-R0.1-SNAPSHOT</version>
79+
<version>[1.18-R0.1,1.21-R0.1]</version>
7180
<scope>provided</scope>
7281
</dependency>
7382

@@ -96,7 +105,7 @@
96105
<dependency>
97106
<groupId>org.projectlombok</groupId>
98107
<artifactId>lombok</artifactId>
99-
<version>1.18.30</version>
108+
<version>1.18.32</version>
100109
<scope>provided</scope>
101110
</dependency>
102111
</dependencies>

src/main/resources/lang/lang_cn.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

src/main/resources/lang/lang_en.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

src/main/resources/plugin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: CDKer
2-
version: '1.0.0'
2+
version: '6.0.1'
33
main: org.baicaizhale.cDKer.CDKer
4-
api-version: '1.13'
4+
api-version: '1.18'
55
description: A powerful CDK management plugin for Spigot servers
66
authors: [baicaizhale]
77

0 commit comments

Comments
 (0)