From 4e7c7b18b7f43d6b424161e4f29cfd052a781dce Mon Sep 17 00:00:00 2001 From: Eli Orona Date: Tue, 30 Jul 2024 20:13:38 -0700 Subject: [PATCH] Update build scripts to improve compile times --- .github/workflows/gradle.yml | 4 ++-- .github/workflows/publish.yml | 2 +- build.gradle | 2 +- gradle/libs.versions.toml | 3 ++- src/main/resources/quilt.mod.json | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index edb12e5..bed0c7c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -36,11 +36,11 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | ${{ runner.os }}-gradle- - - name: setup jdk 17 + - name: setup jdk 21 uses: actions/setup-java@v3 with: distribution: temurin - java-version: 17 + java-version: 21 - name: build run: ./gradlew build --no-daemon - name: capture build artifacts diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 200e03a..902136a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 17 + java-version: 21 - name: Build and publish with Gradle run: ./gradlew modrinth publish env: diff --git a/build.gradle b/build.gradle index 02f1431..ab3e94a 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ dependencies { } */ modImplementation libs.quilt.loader - modImplementation libs.quilted.fabric.api + modImplementation libs.quilted.fabric.api.resource.loader } processResources { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c8cc6de..c83394b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,8 @@ quilted_fabric_api = "11.0.0-alpha.3+0.100.7-1.21" minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_mappings" } quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" } -quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" } + +quilted_fabric_api_resource_loader = { module = "org.quiltmc.quilted-fabric-api:fabric-resource-loader-v0", version.ref = "quilted_fabric_api" } [plugins] quilt_loom = { id = "org.quiltmc.loom", version = "1.7+" } diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json index d4a9464..e0cc4aa 100644 --- a/src/main/resources/quilt.mod.json +++ b/src/main/resources/quilt.mod.json @@ -9,6 +9,7 @@ "description": "Renders solar system planets in Minecraft's skybox at night.", "contributors": { "woodiertexas": "Author", + "OroArmor": "Contributor", "gayasslily": "Planet Artist", "crackers0106": "Planet Artist" }, @@ -27,12 +28,11 @@ "versions": ">=0.26.0" }, { - "id": "quilted_fabric_api", - "versions": ">=5.0.0-" + "id": "quilted_fabric_resource_loader_v0" }, { "id": "minecraft", - "versions": ">=1.19.3" + "versions": ">=1.21" } ] },