From 6c4c4f2fcddd7a9398b99d8e7fc283418de9785f Mon Sep 17 00:00:00 2001 From: Vermeil <120065660+VermeilChan@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:24:20 +0100 Subject: [PATCH 1/6] Updated foojay-toolchains --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 05f4f1e..774020c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,7 +19,7 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version("0.6.0") + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") } From c829bfa159e553721670425209da4cc653449d89 Mon Sep 17 00:00:00 2001 From: Vermeil <120065660+VermeilChan@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:25:03 +0100 Subject: [PATCH 2/6] Bump Gradle To 8.7 --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..b82aa23 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.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail From 61498d6a7c7c39f7074be18f3f83dd0942e747c2 Mon Sep 17 00:00:00 2001 From: Vermeil <120065660+VermeilChan@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:27:14 +0100 Subject: [PATCH 3/6] Updated Mixin To 0.8.5, DevAuth To 1.2.0 --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7451e88..6e2981a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,13 +74,13 @@ dependencies { forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9") // If you don't want mixins, remove these lines - shadowImpl("org.spongepowered:mixin:0.7.11-SNAPSHOT") { + shadowImpl("org.spongepowered:mixin:0.8.5-SNAPSHOT") { isTransitive = false } annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT") // If you don't want to log in with your real minecraft account, remove this line - runtimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.2") + runtimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.2.0") } From 7b1432a9e92147072d5cd15731a64c9e147367ec Mon Sep 17 00:00:00 2001 From: Vermeil <120065660+VermeilChan@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:29:01 +0100 Subject: [PATCH 4/6] Updated setup-java To 4.2.1, setup-gradle To 3.3.0, upload-artifact To 4.3.1 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1e773f..3451d30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,19 +11,19 @@ jobs: uses: actions/checkout@v4.1.1 - name: Setup Java - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4.2.1 with: distribution: temurin java-version: 17 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Execute Gradle build run: ./gradlew build - name: Upload built mod JAR - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4.3.1 with: name: mod-jar path: build/libs/*.jar From e9cd57e68e1249718ae5e7db5cf3bee19eefe590 Mon Sep 17 00:00:00 2001 From: Vermeil <120065660+VermeilChan@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:29:25 +0100 Subject: [PATCH 5/6] Updated wrapper-validation 3.3.0 --- .github/workflows/gradle-wrapper-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 12213d2..dff61d0 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -7,4 +7,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4.1.1 - - uses: gradle/wrapper-validation-action@v2.0.0 \ No newline at end of file + - uses: gradle/actions/wrapper-validation@v3.3.0 \ No newline at end of file From f8a1ef5f59deb93afc9ba9403ca29db583aa1337 Mon Sep 17 00:00:00 2001 From: Vermeil <120065660+VermeilChan@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:39:32 +0100 Subject: [PATCH 6/6] I don't think I cooked :( --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6e2981a..2932749 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,10 +74,10 @@ dependencies { forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9") // If you don't want mixins, remove these lines - shadowImpl("org.spongepowered:mixin:0.8.5-SNAPSHOT") { + shadowImpl("org.spongepowered:mixin:0.8.5") { isTransitive = false } - annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT") + annotationProcessor("org.spongepowered:mixin:0.8.5") // If you don't want to log in with your real minecraft account, remove this line runtimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.2.0")