Merge branch 'refs/heads/main' into dev

# Conflicts:
#	gradle.properties

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: build
+name: Java CI with Gradle
 on: [ pull_request, push ]
 
 jobs:
@@ -8,7 +8,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v3
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: publish
+name: Publish to CurseForge and Modrinth
 on: [workflow_dispatch] # Manual trigger
 
 jobs:
@@ -9,7 +9,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v3
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

build.gradle

@@ -9,10 +9,10 @@ import java.util.stream.IntStream
 plugins {
     id "java"
     id "maven-publish"
-    id "org.ajoberstar.grgit" version "5.2.1"
+    id "org.ajoberstar.grgit" version "5.2.2"
     id "com.matthewprenger.cursegradle" version "1.4.0"
     id "com.modrinth.minotaur" version "2.8.7"
-    id "fabric-loom" version "1.5-SNAPSHOT" apply false
+    id "fabric-loom" version "1.6-SNAPSHOT" apply false
     id "com.github.ben-manes.versions" version "0.51.0"
 }
 
@@ -180,7 +180,7 @@ curseforge {
     project {
         id = "391298"
         changelog = changelogMsg
-        releaseType = "alpha"
+        releaseType = "beta" // alpha is hidden by default
 
         mcReleases.forEach { ver -> addGameVersion(ver) }
         if (!rootProject.curseforge_mc_snapshot.isEmpty()) addGameVersion(rootProject.curseforge_mc_snapshot)

gradle.properties

@@ -1,7 +1,7 @@
 # suppress inspection "UnusedProperty" for whole file
 org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication
 
-loader_version=0.15.7
+loader_version=0.15.10
 viaver_version=4.10.0-24w09a-SNAPSHOT
 yaml_version=2.2
 

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

gradlew

@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -200,13 +200,13 @@ fi
 
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -246,4 +246,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -34,7 +34,7 @@ set APP_HOME=%DIRNAME%
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-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
+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.
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-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
+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.
 
 goto fail
 
@@ -89,4 +89,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

src/main/resources/assets/viafabric/config.yml

@@ -11,4 +11,4 @@ hide-button: false
 #
 # This isn't always the address in multiplayer menu; It will use the SRV record pointer when present, Check the game log for the address.
 # Uses https://wiki.vg/Mojang_API#Blocked_Servers format (mc.example.com, *.example.com, 192.168.0.1, 192.168.*)
-client-side-force-disable: ["hypixel.net", "*.hypixel.net", "minemen.club", "*.minemen.club"]
+client-side-force-disable: ["hypixel.net", "*.hypixel.net", "minemen.club", "*.minemen.club", "icantjoinlmfao.club"]

viafabric-mc112/build.gradle.kts

@@ -1,8 +1,8 @@
 dependencies {
     minecraft("com.mojang:minecraft:1.12.2")
-    mappings("net.legacyfabric:yarn:1.12.2+build.535:v2")
+    mappings("net.legacyfabric:yarn:1.12.2+build.541:v2")
 
-    modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.1+1.12.2")
+    modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.3+1.12.2")
 
     // fix newer java
     @Suppress("GradlePackageUpdate", "RedundantSuppression")

viafabric-mc118/build.gradle.kts

@@ -2,7 +2,7 @@ dependencies {
     minecraft("com.mojang:minecraft:1.18.2")
     mappings("net.fabricmc:yarn:1.18.2+build.4:v2")
 
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.76.0+1.18.2")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.77.0+1.18.2")
     modImplementation("com.terraformersmc:modmenu:3.2.5")
 }
 

viafabric-mc119/build.gradle.kts

@@ -2,7 +2,7 @@ dependencies {
     minecraft("com.mojang:minecraft:1.19.4")
     mappings("net.fabricmc:yarn:1.19.4+build.2:v2")
 
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.87.0+1.19.4")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.87.2+1.19.4")
     modImplementation("com.terraformersmc:modmenu:6.3.1")
 }
 

viafabric-mc120/build.gradle.kts

@@ -2,7 +2,7 @@ dependencies {
     minecraft("com.mojang:minecraft:1.20.4")
     mappings("net.fabricmc:yarn:1.20.4+build.3:v2")
 
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.96.1+1.20.4")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.97.0+1.20.4")
     modImplementation("com.terraformersmc:modmenu:9.0.0")
 }
 

viafabric-mc18/build.gradle.kts

@@ -1,8 +1,8 @@
 dependencies {
     minecraft("com.mojang:minecraft:1.8.9")
-    mappings("net.legacyfabric:yarn:1.8.9+build.535:v2")
+    mappings("net.legacyfabric:yarn:1.8.9+build.541:v2")
 
-    modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.1+1.8.9")
+    modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.3+1.8.9")
     modImplementation("io.github.boogiemonster1o1:rewoven-modmenu:1.0.0+1.8.9") {
         isTransitive = false
     }