Skip to content

Commit b2cb225

Browse files
timbru31timbru31
committed
feat: adds support for Minecraft 1.19
1 parent a7f3688 commit b2cb225

File tree

12 files changed

+631
-15
lines changed

12 files changed

+631
-15
lines changed

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,9 @@ updates:
125125
interval: daily
126126
registries:
127127
- maven-repository-repo-dustplanet-de
128+
- package-ecosystem: "maven"
129+
directory: "/modules/v1_19_R1"
130+
schedule:
131+
interval: daily
132+
registries:
133+
- maven-repository-repo-dustplanet-de

‎.github/workflows/maven-pr.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
- name: Build Spigot versions with JDK 17
5454
run: |
5555
cd BuildTools
56+
[ -f ~/.m2/repository/org/spigotmc/spigot/1.19-R0.1-SNAPSHOT/spigot-1.19-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.19 --remapped
5657
[ -f ~/.m2/repository/org/spigotmc/spigot/1.18.2-R0.1-SNAPSHOT/spigot-1.18.2-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.18.2 --remapped
5758
[ -f ~/.m2/repository/org/spigotmc/spigot/1.18.1-R0.1-SNAPSHOT/spigot-1.18.1-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.18.1 --remapped
5859

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This Bukkit (compatible with CraftBukkit, Spigot, Paper) plugin adds a way to ob
2727
- Economy addon [SilkSpawnersEcoAddon](https://dev.bukkit.org/projects/silkspawnersecoaddon)
2828
- Shop addon [SilkSpawnersShopAddon](https://spigotmc.org/resources/12028/) (login required, Premium Plugin)
2929
- BossBarAPI support for >= 1.9, otherwise BarAPI can be used
30-
- Support for multiple Minecraft versions, from 1.8 to 1.18.2
30+
- Support for multiple Minecraft versions, from 1.8 to 1.19
3131

3232
_Third party features, all of them can be disabled_
3333

@@ -315,6 +315,7 @@ Unfortunately, I can't give access to https://repo.dustplanet.de/artifactory/pri
315315
mkdir -p BuildTools
316316
cd BuildTools
317317
wget -q https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
318+
java -jar BuildTools.jar --rev 1.19 --remapped
318319
java -jar BuildTools.jar --rev 1.18.2 --remapped
319320
java -jar BuildTools.jar --rev 1.18.1 --remapped
320321
java -jar BuildTools.jar --rev 1.17.1 --remapped

‎modules/API/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
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">
23
<modelVersion>4.0.0</modelVersion>
34
<artifactId>silkspawners-API</artifactId>
45
<packaging>jar</packaging>
@@ -23,7 +24,7 @@
2324
<dependency>
2425
<groupId>org.spigotmc</groupId>
2526
<artifactId>spigot-api</artifactId>
26-
<version>1.18.2-R0.1-SNAPSHOT</version>
27+
<version>1.19-R0.1-SNAPSHOT</version>
2728
</dependency>
2829
</dependencies>
2930

‎modules/SilkSpawners/pom.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
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">
23
<modelVersion>4.0.0</modelVersion>
34
<groupId>de.dustplanet</groupId>
45
<artifactId>silkspawners</artifactId>
@@ -36,17 +37,17 @@
3637
<dependency>
3738
<groupId>org.projectlombok</groupId>
3839
<artifactId>lombok</artifactId>
39-
<version>1.18.22</version>
40+
<version>1.18.24</version>
4041
</dependency>
4142
<dependency>
4243
<groupId>org.spigotmc</groupId>
4344
<artifactId>spigot-api</artifactId>
44-
<version>1.18.2-R0.1-SNAPSHOT</version>
45+
<version>1.19-R0.1-SNAPSHOT</version>
4546
</dependency>
4647
<dependency>
4748
<groupId>com.sk89q</groupId>
4849
<artifactId>worldguard</artifactId>
49-
<version>7.0.6</version>
50+
<version>7.0.7</version>
5051
<exclusions>
5152
<exclusion>
5253
<groupId>*</groupId>
@@ -182,6 +183,11 @@
182183
<artifactId>silkspawners-v1_18_R2</artifactId>
183184
<version>7.3.1-SNAPSHOT</version>
184185
</dependency>
186+
<dependency>
187+
<groupId>de.dustplanet</groupId>
188+
<artifactId>silkspawners-v1_19_R1</artifactId>
189+
<version>7.3.1-SNAPSHOT</version>
190+
</dependency>
185191
<dependency>
186192
<groupId>de.dustplanet</groupId>
187193
<artifactId>silkspawners-API</artifactId>

‎modules/SilkSpawners/src/main/java/de/dustplanet/silkspawners/SilkSpawners.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class SilkSpawners extends JavaPlugin {
5454
private static final int PLUGIN_ID = 35_890;
5555
private static final int BSTATS_PLUGIN_ID = 273;
5656
private static final String[] COMPATIBLE_MINECRAFT_VERSIONS = { "v1_8_R1", "v1_8_R3", "v1_9_R2", "v1_10_R1", "v1_11_R1", "v1_12_R1",
57-
"v1_13_R2", "v1_14_R1", "v1_15_R1", "v1_16_R1", "v1_16_R2", "v1_16_R3", "v1_17_R1", "v1_18_R1", "v1_18_R2" };
57+
"v1_13_R2", "v1_14_R1", "v1_15_R1", "v1_16_R1", "v1_16_R2", "v1_16_R3", "v1_17_R1", "v1_18_R1", "v1_18_R2", "v1_19_R1" };
5858
public CommentedConfiguration config;
5959
public CommentedConfiguration localization;
6060
@Getter

‎modules/v1_17_R1/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
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">
23
<modelVersion>4.0.0</modelVersion>
34
<artifactId>silkspawners-v1_17_R1</artifactId>
45
<packaging>jar</packaging>
@@ -37,7 +38,7 @@
3738
<plugin>
3839
<groupId>net.md-5</groupId>
3940
<artifactId>specialsource-maven-plugin</artifactId>
40-
<version>1.2.3</version>
41+
<version>1.2.4</version>
4142
<executions>
4243
<execution>
4344
<phase>package</phase>

‎modules/v1_18_R1/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
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">
23
<modelVersion>4.0.0</modelVersion>
34
<artifactId>silkspawners-v1_18_R1</artifactId>
45
<packaging>jar</packaging>
@@ -37,7 +38,7 @@
3738
<plugin>
3839
<groupId>net.md-5</groupId>
3940
<artifactId>specialsource-maven-plugin</artifactId>
40-
<version>1.2.3</version>
41+
<version>1.2.4</version>
4142
<executions>
4243
<execution>
4344
<phase>package</phase>

‎modules/v1_18_R2/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<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">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
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">
23
<modelVersion>4.0.0</modelVersion>
34
<artifactId>silkspawners-v1_18_R2</artifactId>
45
<packaging>jar</packaging>
@@ -37,7 +38,7 @@
3738
<plugin>
3839
<groupId>net.md-5</groupId>
3940
<artifactId>specialsource-maven-plugin</artifactId>
40-
<version>1.2.3</version>
41+
<version>1.2.4</version>
4142
<executions>
4243
<execution>
4344
<phase>package</phase>

‎modules/v1_19_R1/pom.xml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>silkspawners-v1_19_R1</artifactId>
5+
<packaging>jar</packaging>
6+
<name>SilkSpawners for v1_19_R1</name>
7+
8+
<parent>
9+
<groupId>de.dustplanet</groupId>
10+
<artifactId>silkspawners-parent</artifactId>
11+
<version>7.3.1-SNAPSHOT</version>
12+
<relativePath>../../</relativePath>
13+
</parent>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.spigotmc</groupId>
18+
<artifactId>spigot</artifactId>
19+
<version>1.19-R0.1-SNAPSHOT</version>
20+
<scope>provided</scope>
21+
<classifier>remapped-mojang</classifier>
22+
<exclusions>
23+
<exclusion>
24+
<groupId>org.spigotmc</groupId>
25+
<artifactId>minecraft-server</artifactId>
26+
</exclusion>
27+
</exclusions>
28+
</dependency>
29+
<dependency>
30+
<groupId>de.dustplanet</groupId>
31+
<artifactId>silkspawners-API</artifactId>
32+
<version>7.3.1-SNAPSHOT</version>
33+
</dependency>
34+
</dependencies>
35+
36+
<build>
37+
<plugins>
38+
<plugin>
39+
<groupId>net.md-5</groupId>
40+
<artifactId>specialsource-maven-plugin</artifactId>
41+
<version>1.2.4</version>
42+
<executions>
43+
<execution>
44+
<phase>package</phase>
45+
<goals>
46+
<goal>remap</goal>
47+
</goals>
48+
<id>remap-mojang</id>
49+
<configuration>
50+
<srgIn>org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
51+
<reverse>true</reverse>
52+
<remappedDependencies>org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
53+
<remappedArtifactAttached>true</remappedArtifactAttached>
54+
<remappedClassifierName>remapped-mojang</remappedClassifierName>
55+
</configuration>
56+
</execution>
57+
<execution>
58+
<phase>package</phase>
59+
<goals>
60+
<goal>remap</goal>
61+
</goals>
62+
<id>remap-spigot</id>
63+
<configuration>
64+
<inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-mojang.jar</inputFile>
65+
<srgIn>org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
66+
<remappedDependencies>org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
67+
</configuration>
68+
</execution>
69+
</executions>
70+
</plugin>
71+
</plugins>
72+
</build>
73+
</project>

0 commit comments

Comments
 (0)