Skip to content

Commit 2698520

Browse files
DerEchtePilzDerEchtePilz
committed
Introduce common modules to not include config classes in API modules
1 parent 0e0d2d5 commit 2698520

File tree

14 files changed

+145
-20
lines changed

14 files changed

+145
-20
lines changed

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-common/pom.xml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>dev.jorel</groupId>
9+
<artifactId>commandapi-bukkit</artifactId>
10+
<version>9.6.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>commandapi-bukkit-plugin-common</artifactId>
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-compiler-plugin</artifactId>
20+
<configuration>
21+
<compilerArgs>
22+
<arg>-Xlint</arg>
23+
</compilerArgs>
24+
</configuration>
25+
</plugin>
26+
<plugin>
27+
<groupId>org.jacoco</groupId>
28+
<artifactId>jacoco-maven-plugin</artifactId>
29+
<executions>
30+
<!-- to avoid bugs in some situations -->
31+
<execution>
32+
<id>default-prepare-agent</id>
33+
<goals>
34+
<goal>prepare-agent</goal>
35+
</goals>
36+
</execution>
37+
<!-- create report during maven verify phase -->
38+
<execution>
39+
<id>report</id>
40+
<phase>verify</phase>
41+
<goals>
42+
<goal>report</goal>
43+
</goals>
44+
</execution>
45+
</executions>
46+
</plugin>
47+
</plugins>
48+
</build>
49+
50+
<repositories>
51+
<repository>
52+
<id>papermc-repo</id>
53+
<url>https://repo.papermc.io/repository/maven-public/</url>
54+
</repository>
55+
<repository>
56+
<id>sonatype</id>
57+
<url>https://oss.sonatype.org/content/groups/public/</url>
58+
</repository>
59+
</repositories>
60+
61+
<dependencies>
62+
<dependency>
63+
<groupId>io.papermc.paper</groupId>
64+
<artifactId>paper-api</artifactId>
65+
<version>1.21.1-R0.1-SNAPSHOT</version>
66+
<scope>provided</scope>
67+
</dependency>
68+
<dependency>
69+
<groupId>dev.jorel</groupId>
70+
<artifactId>commandapi-plugin</artifactId>
71+
<version>${project.version}</version>
72+
</dependency>
73+
</dependencies>
74+
</project>

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/config/BukkitConfigurationAdapter.java renamed to commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-common/src/main/java/dev/jorel/commandapi/config/BukkitConfigurationAdapter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import org.bukkit.configuration.ConfigurationSection;
44
import org.bukkit.configuration.InvalidConfigurationException;
55
import org.bukkit.configuration.file.YamlConfiguration;
6-
import org.jetbrains.annotations.ApiStatus;
76

87
import java.io.File;
98
import java.util.ArrayList;
@@ -14,7 +13,6 @@
1413
import java.util.Set;
1514
import java.util.logging.Logger;
1615

17-
@ApiStatus.Internal
1816
public record BukkitConfigurationAdapter(YamlConfiguration config) implements ConfigurationAdapter<YamlConfiguration> {
1917

2018
public static BukkitConfigurationAdapter createDummyInstance() {

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/config/DefaultBukkitConfig.java renamed to commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-common/src/main/java/dev/jorel/commandapi/config/DefaultBukkitConfig.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package dev.jorel.commandapi.config;
22

3-
import org.jetbrains.annotations.ApiStatus;
4-
53
import java.util.ArrayList;
64
import java.util.LinkedHashMap;
75
import java.util.List;
86
import java.util.Map;
97

10-
@ApiStatus.Internal
118
public class DefaultBukkitConfig extends DefaultConfig {
129

1310
public static final CommentedConfigOption<Boolean> USE_LATEST_NMS_VERSION = new CommentedConfigOption<>(

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin-mojang-mapped/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@
8585
<version>${paper.version}</version>
8686
<scope>provided</scope>
8787
</dependency>
88+
<dependency>
89+
<groupId>dev.jorel</groupId>
90+
<artifactId>commandapi-bukkit-plugin-common</artifactId>
91+
<version>${project.version}</version>
92+
</dependency>
8893
</dependencies>
8994

9095
<build>

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@
7878
<version>${paper.version}</version>
7979
<scope>provided</scope>
8080
</dependency>
81+
<dependency>
82+
<groupId>dev.jorel</groupId>
83+
<artifactId>commandapi-bukkit-plugin-common</artifactId>
84+
<version>${project.version}</version>
85+
</dependency>
8186
</dependencies>
8287

8388
<build>

‎commandapi-platforms/commandapi-bukkit/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<module>commandapi-bukkit-vh</module>
2525
<module>commandapi-bukkit-mojang-mapped</module>
2626

27+
<!-- Common Bukkit plugin classes -->
28+
<module>commandapi-bukkit-plugin-common</module>
29+
2730
<!-- Outputs -->
2831
<module>commandapi-bukkit-plugin</module>
2932
<module>commandapi-bukkit-shade</module>

‎commandapi-platforms/commandapi-velocity/commandapi-velocity-plugin/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
<version>${project.version}</version>
4141
<scope>compile</scope>
4242
</dependency>
43+
<dependency>
44+
<groupId>dev.jorel</groupId>
45+
<artifactId>commandapi-plugin</artifactId>
46+
<version>${project.version}</version>
47+
</dependency>
4348
</dependencies>
4449

4550
<build>

‎commandapi-plugin/pom.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>dev.jorel</groupId>
9+
<artifactId>commandapi</artifactId>
10+
<version>9.6.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>commandapi-plugin</artifactId>
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.apache.maven.plugins</groupId>
19+
<artifactId>maven-compiler-plugin</artifactId>
20+
<configuration>
21+
<compilerArgs>
22+
<arg>-Xlint</arg>
23+
</compilerArgs>
24+
</configuration>
25+
</plugin>
26+
<plugin>
27+
<groupId>org.jacoco</groupId>
28+
<artifactId>jacoco-maven-plugin</artifactId>
29+
<executions>
30+
<!-- to avoid bugs in some situations -->
31+
<execution>
32+
<id>default-prepare-agent</id>
33+
<goals>
34+
<goal>prepare-agent</goal>
35+
</goals>
36+
</execution>
37+
<!-- create report during maven verify phase -->
38+
<execution>
39+
<id>report</id>
40+
<phase>verify</phase>
41+
<goals>
42+
<goal>report</goal>
43+
</goals>
44+
</execution>
45+
</executions>
46+
</plugin>
47+
</plugins>
48+
</build>
49+
50+
</project>

commandapi-core/src/main/java/dev/jorel/commandapi/config/CommentedConfigOption.java renamed to commandapi-plugin/src/main/java/dev/jorel/commandapi/config/CommentedConfigOption.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
package dev.jorel.commandapi.config;
22

3-
import org.jetbrains.annotations.ApiStatus;
4-
5-
@ApiStatus.Internal
63
public record CommentedConfigOption<T>(String[] comment, T option) {
74
}

commandapi-core/src/main/java/dev/jorel/commandapi/config/CommentedSection.java renamed to commandapi-plugin/src/main/java/dev/jorel/commandapi/config/CommentedSection.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
package dev.jorel.commandapi.config;
22

3-
import org.jetbrains.annotations.ApiStatus;
4-
5-
@ApiStatus.Internal
63
public record CommentedSection(String[] comment) {
74
}

0 commit comments

Comments
 (0)