diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..ca79ca5 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b05f565..d23c47c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -26,13 +26,13 @@ jobs: name: Build with gradle steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: temurin - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -41,10 +41,11 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | ${{ runner.os }}-gradle- - - name: Grant execute permission for gradlew - run: chmod +x gradlew + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 - name: Build with Gradle run: ./gradlew build --no-daemon - - uses: actions/upload-artifact@v3 + - name: Upload built mod JAR + uses: actions/upload-artifact@v4 with: path: build/libs/*.jar diff --git a/.github/workflows/wrapper-validation.yml b/.github/workflows/wrapper-validation.yml new file mode 100644 index 0000000..7ba9c86 --- /dev/null +++ b/.github/workflows/wrapper-validation.yml @@ -0,0 +1,11 @@ +name: Validate Gradle Wrapper + +on: [ push, pull_request ] + +jobs: + validation: + name: "Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: gradle/actions/wrapper-validation@v4 diff --git a/build.gradle.kts b/build.gradle.kts index 6aad950..495db58 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "dev.isxander" -version = "1.3.0" +version = "1.4.0" repositories { mavenCentral() @@ -97,10 +97,15 @@ if (modrinthId.isNotEmpty()) { versionNumber.set("${project.version}") versionType.set("release") uploadFile.set(tasks["remapJar"]) - gameVersions.set(listOf("1.20.1", "1.20.2")) + gameVersions.set(listOf("1.21", "1.21.1")) loaders.set(listOf("fabric", "quilt")) changelog.set(changelogText) syncBodyFrom.set(file("README.md").readText()) + dependencies { + required.project("fabric-api") + required.project("yacl") + optional.project("modmenu") + } } tasks.getByName("modrinth") { @@ -119,11 +124,17 @@ if (hasProperty("curseforge.token") && curseforgeId.isNotEmpty()) { id = curseforgeId releaseType = "release" - addGameVersion("1.20.1") - addGameVersion("1.20.2") + addGameVersion("1.21") + addGameVersion("1.21.1") addGameVersion("Fabric") addGameVersion("Quilt") - addGameVersion("Java 17") + addGameVersion("Java 21") + + relations(closureOf { + requiredDependency("fabric-api") + requiredDependency("yacl") + optionalDependency("modmenu") + }) changelog = changelogText changelogType = "markdown" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52045e6..7fc8df2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -loom = "1.7.+" +loom = "1.8.+" minotaur = "2.8.+" cursegradle = "2.+" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5b52b7d..c7bbdb0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -28,7 +28,7 @@ ], "depends": { "fabricloader": ">=0.15.11", - "minecraft": "~1.21", + "minecraft": ["1.21", "1.21.1"], "java": ">=21", "fabric-api": "*", "yet_another_config_lib_v3": ">=3.5.0+1.21"