From 3ea176d02a3bea0806d5a60cddfeb1a107d9cde0 Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:17:59 +0200 Subject: [PATCH 01/10] fix 1.20.6 config screen --- src/main/kotlin/dev/nyon/autodrop/config/YaclScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/dev/nyon/autodrop/config/YaclScreen.kt b/src/main/kotlin/dev/nyon/autodrop/config/YaclScreen.kt index bf4711d..d3e5947 100644 --- a/src/main/kotlin/dev/nyon/autodrop/config/YaclScreen.kt +++ b/src/main/kotlin/dev/nyon/autodrop/config/YaclScreen.kt @@ -117,7 +117,7 @@ private fun ConfigCategory.Builder.appendLockedSlotsOptions(): ConfigCategory.Bu group( ListOption.createBuilder().name(Component.literal(archiveName)).description( OptionDescription.createBuilder().text(Component.translatable("menu.autodrop.lockedslots.description")) - .image(/*? if >=1.21 {*/ ResourceLocation.parse("autodrop:image/inventory-slots.png") /*?} else {*/ /*ResourceLocation("autodrop", "image/inventory-slots.png") *//*?}*/, 352, 331).build() + .image(/*? if >=1.20.6 {*/ ResourceLocation.parse("autodrop:image/inventory-slots.png") /*?} else {*/ /*ResourceLocation("autodrop", "image/inventory-slots.png") *//*?}*/, 352, 331).build() ).binding(mutableListOf(), { settings.archives.first { it.name == archiveName }.lockedSlots }, { settings.archives.first { archive -> archive.name == archiveName }.lockedSlots = it.toMutableList() reloadArchiveProperties() From cdd499d427c33f95b400773ef1d30e5d2076db75 Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:18:23 +0200 Subject: [PATCH 02/10] Update build.gradle.kts --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index bcf68a2..fb02655 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ plugins { } val beta: Int? = null // Pattern is '1.0.0-beta1-1.20.6-pre.2' -val featureVersion = "1.7.0${if (beta != null) "-beta$beta" else ""}" +val featureVersion = "1.7.1${if (beta != null) "-beta$beta" else ""}" val mcVersion = property("mcVersion")!!.toString() val mcVersionRange = property("mcVersionRange")!!.toString() version = "$featureVersion-$mcVersion" From af5c337033ef48faef14e7f45e644fa15f30f775 Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Wed, 26 Jun 2024 22:18:46 +0200 Subject: [PATCH 03/10] Update changelog.md --- changelog.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index c60203b..b4e8cb3 100644 --- a/changelog.md +++ b/changelog.md @@ -1,2 +1 @@ -- add support for 1.21 -- fix archive name being only the version \ No newline at end of file +- fix config screen on 1.20.6 \ No newline at end of file From 55bec27a54392ac153f16db4d4b28a6ef0969317 Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Thu, 27 Jun 2024 13:36:15 +0200 Subject: [PATCH 04/10] Update build-commit.yml --- .github/workflows/build-commit.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml index 9733faf..33c4a87 100644 --- a/.github/workflows/build-commit.yml +++ b/.github/workflows/build-commit.yml @@ -38,7 +38,9 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 - name: Build with Gradle - run: ./gradlew buildAllVersions --stacktrace + uses: Wandalen/wretry@master + command: + - ./gradlew buildAllVersions --stacktrace - uses: actions/upload-artifact@v4 with: path: versions/**/build/libs/*.jar From 86cf1ca837fe94857eedb27d3d5a6b6583c7be6f Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Thu, 27 Jun 2024 13:37:54 +0200 Subject: [PATCH 05/10] Update build-commit.yml --- .github/workflows/build-commit.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml index 33c4a87..68d6e9e 100644 --- a/.github/workflows/build-commit.yml +++ b/.github/workflows/build-commit.yml @@ -39,8 +39,9 @@ jobs: uses: gradle/actions/setup-gradle@v3 - name: Build with Gradle uses: Wandalen/wretry@master - command: - - ./gradlew buildAllVersions --stacktrace + with: + command: + - ./gradlew buildAllVersions --stacktrace - uses: actions/upload-artifact@v4 with: path: versions/**/build/libs/*.jar From 72b4ea19881367c9a58ad8d313a39f0d37a3aa0e Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Thu, 27 Jun 2024 13:38:38 +0200 Subject: [PATCH 06/10] Update build-commit.yml --- .github/workflows/build-commit.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml index 68d6e9e..c05dc99 100644 --- a/.github/workflows/build-commit.yml +++ b/.github/workflows/build-commit.yml @@ -40,8 +40,7 @@ jobs: - name: Build with Gradle uses: Wandalen/wretry@master with: - command: - - ./gradlew buildAllVersions --stacktrace + command: ./gradlew buildAllVersions --stacktrace - uses: actions/upload-artifact@v4 with: path: versions/**/build/libs/*.jar From 553ef408ddb4172b57a212fb582b92c48366af21 Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Thu, 27 Jun 2024 13:39:42 +0200 Subject: [PATCH 07/10] Update build-commit.yml --- .github/workflows/build-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml index c05dc99..9fa1b2d 100644 --- a/.github/workflows/build-commit.yml +++ b/.github/workflows/build-commit.yml @@ -38,7 +38,7 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 - name: Build with Gradle - uses: Wandalen/wretry@master + uses: Wandalen/wretry.action@master with: command: ./gradlew buildAllVersions --stacktrace - uses: actions/upload-artifact@v4 From 55ce982ee96fb8c1eb10f0fd74d8f8ac2529b316 Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Thu, 27 Jun 2024 13:45:28 +0200 Subject: [PATCH 08/10] Update YaclScreen.kt --- src/main/kotlin/dev/nyon/autodrop/config/YaclScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/dev/nyon/autodrop/config/YaclScreen.kt b/src/main/kotlin/dev/nyon/autodrop/config/YaclScreen.kt index d3e5947..b6c5579 100644 --- a/src/main/kotlin/dev/nyon/autodrop/config/YaclScreen.kt +++ b/src/main/kotlin/dev/nyon/autodrop/config/YaclScreen.kt @@ -117,7 +117,7 @@ private fun ConfigCategory.Builder.appendLockedSlotsOptions(): ConfigCategory.Bu group( ListOption.createBuilder().name(Component.literal(archiveName)).description( OptionDescription.createBuilder().text(Component.translatable("menu.autodrop.lockedslots.description")) - .image(/*? if >=1.20.6 {*/ ResourceLocation.parse("autodrop:image/inventory-slots.png") /*?} else {*/ /*ResourceLocation("autodrop", "image/inventory-slots.png") *//*?}*/, 352, 331).build() + .image(/*? if >=1.20.6 {*/ ResourceLocation.tryParse("autodrop:image/inventory-slots.png") /*?} else {*/ /*ResourceLocation("autodrop", "image/inventory-slots.png") *//*?}*/, 352, 331).build() ).binding(mutableListOf(), { settings.archives.first { it.name == archiveName }.lockedSlots }, { settings.archives.first { archive -> archive.name == archiveName }.lockedSlots = it.toMutableList() reloadArchiveProperties() From fc34a8fa71b2d3ca230874e429c66b7f91a35cee Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:18:41 +0200 Subject: [PATCH 09/10] Update release.yml --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1a6d755..2b13190 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,6 +20,10 @@ jobs: run: chmod +x gradlew - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 + - name: Build with Gradle + uses: Wandalen/wretry.action@master + with: + command: ./gradlew buildAllVersions --stacktrace - name: Release with Gradle run: ./gradlew releaseAllVersions postUpdate --stacktrace env: From bc93def7b0b44c24f6aa079c4a11a6e1ba48299c Mon Sep 17 00:00:00 2001 From: Anton <79146501+btwonion@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:24:15 +0200 Subject: [PATCH 10/10] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b13190..deb166e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }} DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} - DISCORD_ROLE_ID: ${ secrets.DISCORD_ROLE_ID }} + DISCORD_ROLE_ID: ${{ secrets.DISCORD_ROLE_ID }} NYON_USERNAME: ${{ secrets.NYON_USERNAME }} NYON_PASSWORD: ${{ secrets.NYON_PASSWORD }}