From 57de87e1f4c2b05cce9fa8d57d5d2585c29e176b Mon Sep 17 00:00:00 2001 From: Tim Brust <github@timbrust.de> Date: Wed, 18 Sep 2024 23:01:39 +0700 Subject: [PATCH] build: use 1.21.1 over 1.21 --- .github/workflows/maven-pr.yml | 2 +- README.md | 4 ++-- modules/API/pom.xml | 2 +- modules/SilkSpawners/pom.xml | 2 +- modules/v1_21_R1/pom.xml | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/maven-pr.yml b/.github/workflows/maven-pr.yml index d088de68..70eadecd 100644 --- a/.github/workflows/maven-pr.yml +++ b/.github/workflows/maven-pr.yml @@ -87,7 +87,7 @@ jobs: run: | cd BuildTools [ -f ~/.m2/repository/org/spigotmc/spigot/1.20.6-R0.1-SNAPSHOT/spigot-1.20.6-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.20.6 --remapped - [ -f ~/.m2/repository/org/spigotmc/spigot/1.21-R0.1-SNAPSHOT/spigot-1.21-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.21 --remapped + [ -f ~/.m2/repository/org/spigotmc/spigot/1.21.1-R0.1-SNAPSHOT/spigot-1.21.1-R0.1-SNAPSHOT-remapped-mojang.jar ] || java -jar BuildTools.jar --rev 1.21.1 --remapped - name: Build with Maven run: mvn -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" "-Dhttps.protocols=TLSv1.2" -DskipTests=true "-Dmaven.javadoc.skip=true" -B clean package diff --git a/README.md b/README.md index d90deb28..265ba4e2 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ This Bukkit (compatible with CraftBukkit, Spigot, Paper) plugin adds a way to ob - Shop addon [SilkSpawnersShopAddon](https://spigotmc.org/resources/12028/) (login required, Premium Plugin) - BossBarAPI support for >= 1.9, otherwise BarAPI can be used - Mimic support -- Support for multiple Minecraft versions, from 1.8.8 to 1.21 (with exlusion of 1.9 and 1.10) +- Support for multiple Minecraft versions, from 1.8.8 to 1.21.1 (with exlusion of 1.9 and 1.10) _Third party features, all of them can be disabled_ @@ -319,7 +319,7 @@ Unfortunately, I can't give access to https://repo.dustplanet.de/artifactory/pri mkdir -p BuildTools cd BuildTools wget -q https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -java -jar BuildTools.jar --rev 1.21 --remapped +java -jar BuildTools.jar --rev 1.21.1 --remapped java -jar BuildTools.jar --rev 1.20.6 --remapped java -jar BuildTools.jar --rev 1.20.4 --remapped java -jar BuildTools.jar --rev 1.20.2 --remapped diff --git a/modules/API/pom.xml b/modules/API/pom.xml index 3f336f0f..ddf8e1c0 100644 --- a/modules/API/pom.xml +++ b/modules/API/pom.xml @@ -23,7 +23,7 @@ <dependency> <groupId>org.spigotmc</groupId> <artifactId>spigot-api</artifactId> - <version>1.21-R0.1-SNAPSHOT</version> + <version>1.21.1-R0.1-SNAPSHOT</version> </dependency> </dependencies> diff --git a/modules/SilkSpawners/pom.xml b/modules/SilkSpawners/pom.xml index 819b9bfe..522dd1b2 100644 --- a/modules/SilkSpawners/pom.xml +++ b/modules/SilkSpawners/pom.xml @@ -41,7 +41,7 @@ <dependency> <groupId>org.spigotmc</groupId> <artifactId>spigot-api</artifactId> - <version>1.21-R0.1-SNAPSHOT</version> + <version>1.21.1-R0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>com.sk89q</groupId> diff --git a/modules/v1_21_R1/pom.xml b/modules/v1_21_R1/pom.xml index 40172912..9f825183 100644 --- a/modules/v1_21_R1/pom.xml +++ b/modules/v1_21_R1/pom.xml @@ -15,7 +15,7 @@ <dependency> <groupId>org.spigotmc</groupId> <artifactId>spigot</artifactId> - <version>1.21-R0.1-SNAPSHOT</version> + <version>1.21.1-R0.1-SNAPSHOT</version> <scope>provided</scope> <classifier>remapped-mojang</classifier> <exclusions> @@ -46,9 +46,9 @@ </goals> <id>remap-mojang</id> <configuration> - <srgIn>org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:txt:maps-mojang</srgIn> + <srgIn>org.spigotmc:minecraft-server:1.21.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn> <reverse>true</reverse> - <remappedDependencies>org.spigotmc:spigot:1.21-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies> + <remappedDependencies>org.spigotmc:spigot:1.21.1-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies> <remappedArtifactAttached>true</remappedArtifactAttached> <remappedClassifierName>remapped-mojang</remappedClassifierName> </configuration>