diff --git a/.github/dependencies.sha256 b/.github/dependencies.sha256 index 27b438f..ad7d7ac 100644 --- a/.github/dependencies.sha256 +++ b/.github/dependencies.sha256 @@ -2,5 +2,4 @@ 2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 libs/json-simple-1.1.jar c84700df5942fd969d3e8c2f1ad2c3ebeb17987ef88b426408d1306e49c4aada libs/MMOItems-6.10.jar 660ff2a6ec86bc8d7779948cf65c1637e271a16e1ef812d6a273f4a5c5eec73c libs/MythicLib-1.7.jar -b7156eab567772f9fdac0bf696b209111790c3f69149ab9a742e3dd030ec4b10 libs/spigot-api.jar 0116d714822b6f0cfebfe833a5df2e4754797b637d0fe709afb762c56da463a3 libs/ItemsAdder_3.5.0-r2.jar diff --git a/.github/scripts/prepare-release.sh b/.github/scripts/prepare-release.sh index cc68d66..d98ebe0 100755 --- a/.github/scripts/prepare-release.sh +++ b/.github/scripts/prepare-release.sh @@ -7,6 +7,5 @@ curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer 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" 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" 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" -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" 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" sha256sum --check .github/dependencies.sha256 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3093b48..bc8044f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-java@v6 with: distribution: temurin - java-version: '25' + java-version: '21' - name: Install shared plugin dependencies uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@7afa185bee605908a99ac55288ed27a3babbad62 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0eda311..d5d4079 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: contents: write uses: ./.github/workflows/maven-release.yml with: - java-version: '25' + java-version: '21' # Exact path, not a glob. {version} is replaced with the tag without v. artifact-path: target/advancedcrafting-{version}.jar secrets: diff --git a/pom.xml b/pom.xml index ac21b49..941fd4d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,10 +11,17 @@ 1.1.0 2026-09-22T00:00:00Z - 25 + 21 UTF-8 + + + spigot-snapshots + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + local @@ -45,11 +52,11 @@ ${project.basedir}/libs/MythicLib-1.7.jar - local + org.spigotmc spigot-api - 1.21.8 - system - ${project.basedir}/libs/spigot-api.jar + 1.21.10-R0.1-SNAPSHOT + provided + me.plugins diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 56208fc..48dccdb 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ main: net.tfminecraft.AdvancedCrafting.AdvancedCrafting -api-version: 1.20 +api-version: '1.21.10' name: AdvancedCrafting version: ${project.version} author: Drefvelin @@ -17,4 +17,4 @@ commands: permissions: advancedcrafting.admin: description: AdvancedCrafting admin commands - default: op \ No newline at end of file + default: op