Skip to content

Commit 9f6c73d

Browse files
authored
build: unify Java 21 and Minecraft 1.21.10 (#1)
1 parent dbffa3d commit 9f6c73d

6 files changed

Lines changed: 16 additions & 11 deletions

File tree

‎.github/dependencies.sha256‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 libs/json-simple-1.1.jar
33
c84700df5942fd969d3e8c2f1ad2c3ebeb17987ef88b426408d1306e49c4aada libs/MMOItems-6.10.jar
44
660ff2a6ec86bc8d7779948cf65c1637e271a16e1ef812d6a273f4a5c5eec73c libs/MythicLib-1.7.jar
5-
b7156eab567772f9fdac0bf696b209111790c3f69149ab9a742e3dd030ec4b10 libs/spigot-api.jar
65
0116d714822b6f0cfebfe833a5df2e4754797b637d0fe709afb762c56da463a3 libs/ItemsAdder_3.5.0-r2.jar

‎.github/scripts/prepare-release.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer
77
curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/2d9484f4c649/json-simple-1.1.jar?ref=$ref" > "libs/json-simple-1.1.jar"
88
curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/c84700df5942/MMOItems-6.10.jar?ref=$ref" > "libs/MMOItems-6.10.jar"
99
curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/660ff2a6ec86/MythicLib-1.7.jar?ref=$ref" > "libs/MythicLib-1.7.jar"
10-
curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/b7156eab5677/spigot-api.jar?ref=$ref" > "libs/spigot-api.jar"
1110
curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/0116d714822b/ItemsAdder_3.5.0-r2.jar?ref=$ref" > "libs/ItemsAdder_3.5.0-r2.jar"
1211
sha256sum --check .github/dependencies.sha256

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/setup-java@v6
2121
with:
2222
distribution: temurin
23-
java-version: '25'
23+
java-version: '21'
2424
- name: Install shared plugin dependencies
2525
uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@7afa185bee605908a99ac55288ed27a3babbad62
2626
with:

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
contents: write
1414
uses: ./.github/workflows/maven-release.yml
1515
with:
16-
java-version: '25'
16+
java-version: '21'
1717
# Exact path, not a glob. {version} is replaced with the tag without v.
1818
artifact-path: target/advancedcrafting-{version}.jar
1919
secrets:

‎pom.xml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,17 @@
1111
<properties>
1212
<tlibs.version>1.1.0</tlibs.version>
1313
<project.build.outputTimestamp>2026-09-22T00:00:00Z</project.build.outputTimestamp>
14-
<maven.compiler.release>25</maven.compiler.release>
14+
<maven.compiler.release>21</maven.compiler.release>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
</properties>
1717

18+
<repositories>
19+
<repository>
20+
<id>spigot-snapshots</id>
21+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
22+
</repository>
23+
</repositories>
24+
1825
<dependencies>
1926
<dependency>
2027
<groupId>local</groupId>
@@ -45,11 +52,11 @@
4552
<systemPath>${project.basedir}/libs/MythicLib-1.7.jar</systemPath>
4653
</dependency>
4754
<dependency>
48-
<groupId>local</groupId>
55+
<groupId>org.spigotmc</groupId>
4956
<artifactId>spigot-api</artifactId>
50-
<version>1.21.8</version>
51-
<scope>system</scope>
52-
<systemPath>${project.basedir}/libs/spigot-api.jar</systemPath>
57+
<version>1.21.10-R0.1-SNAPSHOT</version>
58+
<scope>provided</scope>
59+
5360
</dependency>
5461
<dependency>
5562
<groupId>me.plugins</groupId>

‎src/main/resources/plugin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
main: net.tfminecraft.AdvancedCrafting.AdvancedCrafting
2-
api-version: 1.20
2+
api-version: '1.21.10'
33
name: AdvancedCrafting
44
version: ${project.version}
55
author: Drefvelin
@@ -17,4 +17,4 @@ commands:
1717
permissions:
1818
advancedcrafting.admin:
1919
description: AdvancedCrafting admin commands
20-
default: op
20+
default: op

0 commit comments

Comments
 (0)