1.20.2, Dependency updates, JDK level correction. (#272)

* 1.20.2-rc2, Dependency updates, JDK level correction. * Clarify what SDKMAN will deploy. * Improve second-liner for jitpack comment. * Modrinth does not have 1.20.2-rc2 yet. * Set viaversion dependency to 4.8.0 in fabric.mod.json. 1.20.2 will not work with ViaVersion 4.6.0 - 4.7.1-SNAPSHOT, therefore this part is needed at some point. * 1.20.2-rc2 -> 1.20.2. * We use mclo.gs now, not paste.gg.
2024-11-21 11:35:16 +01:00 · 2023-09-21 19:57:20 +02:00 · 2023-09-21 19:57:20 +02:00 · 0259407fc2
commit 0259407fc2
parent 957b62620c
27 changed files with 53 additions and 51 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -23,7 +23,7 @@ body:
    attributes:
      label: Console Error
      description: |
-        If you encounter warnings/errors in your console, **paste them with https://paste.gg/ and put the paste link here**.
+        If you encounter warnings/errors in your console, **paste them with https://mclo.gs/ and put the paste link here**.
        If the error is small/less than 10 lines, you may put it directly into this field.
        Please use Not Enough Crashes if possible, making the stacktrace easier to understand.
      value: |
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -6,7 +6,7 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Validate Gradle Wrapper
        uses: gradle/wrapper-validation-action@v1
      - name: Set up JDK 17
@ -14,6 +14,7 @@ jobs:
        with:
         distribution: 'temurin'
         java-version: 17
+         check-latest: true
      - name: Cache Dependencies
        uses: actions/cache@v3
        with:
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@ -7,7 +7,7 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Validate Gradle Wrapper
        uses: gradle/wrapper-validation-action@v1
      - name: Set up JDK 17
@ -15,6 +15,7 @@ jobs:
        with:
         distribution: 'temurin'
         java-version: 17
+         check-latest: true
      - name: Build and Publish
        env:
          CURSEFORGE_API_KEY: ${{ secrets.CREEPER_CF }}
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@

 Allows the connection to/from different Minecraft versions on your Minecraft client/server (LAN worlds too)

-This mod can be installed on 1.8.9, 1.14.4, 1.15.2, 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.1 with Fabric Loader.
+This mod can be installed on 1.8.9, 1.14.4, 1.15.2, 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.2 with Fabric Loader.

 ## Dependencies

@ -53,7 +53,7 @@ registry synchronization (fabric-registry-sync mod).
 | 1.17.1 client | ✓     | ✓     | ✓           | ✓      | ✓      | ✓      | ⟲      | ⟲ | ⟲ |
 | 1.18.2 client | ✓     | ✓     | ✓           | ✓      | ✓      | ✓      | ✓      | ⟲ | ⟲ |
 | 1.19.4 client | ✓     | ✓     | ✓           | ✓      | ✓      | ✓      | ✓      | ✓ | ⟲ |
-| 1.20.1 client | ✓     | ✓     | ✓           | ✓      | ✓      | ✓      | ✓      | ✓ | ✓ |
+| 1.20.2 client | ✓     | ✓     | ✓           | ✓      | ✓      | ✓      | ✓      | ✓ | ✓ |

 ✓ = [ViaVersion](https://viaversion.com) ⟲ = [ViaBackwards](https://viaversion.com/backwards) ⏪
 = [ViaRewind](https://viaversion.com/rewind)
--- a/build.gradle
+++ b/build.gradle
@ -11,9 +11,9 @@ plugins {
    id "maven-publish"
    id "org.ajoberstar.grgit" version "5.2.0"
    id "com.matthewprenger.cursegradle" version "1.4.0"
-    id "com.modrinth.minotaur" version "2.8.1"
+    id "com.modrinth.minotaur" version "2.8.4"
    id "fabric-loom" version "1.2-SNAPSHOT" apply false
-    id "com.github.ben-manes.versions" version "0.47.0"
+    id "com.github.ben-manes.versions" version "0.48.0"
 }

 def ENV = System.getenv()
--- a/gradle.properties
+++ b/gradle.properties
@ -1,13 +1,12 @@
 # suppress inspection "UnusedProperty" for whole file
-# rip my ram
 org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication

-loader_version=0.14.21
-viaver_version=4.8.0-1.20.2-rc2-SNAPSHOT
-yaml_version=2.0
+loader_version=0.14.22
+viaver_version=4.8.0
+yaml_version=2.2

-publish_mc_versions=1.20.1, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.8.9
+publish_mc_versions=1.20.2, 1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.8.9
 # example: 1.19.1-rc1. Can be a blank value
-modrinth_mc_snapshot=1.20.2-rc2
+modrinth_mc_snapshot=
 # example: 1.19-Snapshot. Can be a blank value
-curseforge_mc_snapshot=1.20.2-Snapshot
+curseforge_mc_snapshot=
--- a/18
+++ b/18
@ -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=SC3045
+        # shellcheck disable=SC2039,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=SC3045
+        # shellcheck disable=SC2039,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='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'

-# 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.
+# 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.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
@ -246,4 +246,4 @@ eval "set -- $(
        tr '\n' ' '
    )" '"$@"'

-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/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="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"

@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@ -89,4 +89,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

-:omega
+:omega
--- a/jitpack.yml
+++ b/jitpack.yml
@ -1,5 +1,6 @@
+# Deploys the latest stable JDK available and sets it to default without having to manually specify it here,
+# Which includes using temurin as the distribution.
 before_install:
   - curl -s "https://get.sdkman.io" | bash
   - source ~/.sdkman/bin/sdkman-init.sh
-   - sdk install java 17.0.8.1-tem
-   - sdk use java 17.0.8.1-tem
+   - sdk install java
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@ -17,5 +17,5 @@ include("viafabric-mc119")
 include("viafabric-mc120")

 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
 }
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@ -13,8 +13,8 @@
  },
  "depends": {
    "fabricloader": ">=0.14.0",
-    "minecraft": ["1.8.9", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.2-rc.2"],
-    "viaversion": ">=4.6.0"
+    "minecraft": ["1.8.9", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.2"],
+    "viaversion": ">=4.8.0"
  },
  "breaks": {
    "viafabricplus": "*"
--- a/viafabric-mc118/src/main/resources/mixins.viafabric118.address.json
+++ b/viafabric-mc118/src/main/resources/mixins.viafabric118.address.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc118.mixin.address",
  "mixins": [
  ],
--- a/viafabric-mc118/src/main/resources/mixins.viafabric118.debug.json
+++ b/viafabric-mc118/src/main/resources/mixins.viafabric118.debug.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc118.mixin.debug",
  "mixins": [
  ],
--- a/viafabric-mc118/src/main/resources/mixins.viafabric118.gui.json
+++ b/viafabric-mc118/src/main/resources/mixins.viafabric118.gui.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc118.mixin.gui",
  "mixins": [
  ],
--- a/viafabric-mc118/src/main/resources/mixins.viafabric118.pipeline.json
+++ b/viafabric-mc118/src/main/resources/mixins.viafabric118.pipeline.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc118.mixin.pipeline",
  "mixins": [
    "MixinClientConnection",
--- a/viafabric-mc119/build.gradle.kts
+++ b/viafabric-mc119/build.gradle.kts
@ -2,8 +2,8 @@ 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.83.0+1.19.4")
-    modImplementation("com.terraformersmc:modmenu:6.2.3")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.87.0+1.19.4")
+    modImplementation("com.terraformersmc:modmenu:6.3.1")
 }

 tasks.compileJava {
--- a/viafabric-mc119/src/main/resources/mixins.viafabric119.address.json
+++ b/viafabric-mc119/src/main/resources/mixins.viafabric119.address.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc119.mixin.address",
  "mixins": [
  ],
--- a/viafabric-mc119/src/main/resources/mixins.viafabric119.debug.json
+++ b/viafabric-mc119/src/main/resources/mixins.viafabric119.debug.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc119.mixin.debug",
  "mixins": [
  ],
--- a/viafabric-mc119/src/main/resources/mixins.viafabric119.gui.json
+++ b/viafabric-mc119/src/main/resources/mixins.viafabric119.gui.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc119.mixin.gui",
  "mixins": [
  ],
--- a/viafabric-mc119/src/main/resources/mixins.viafabric119.pipeline.json
+++ b/viafabric-mc119/src/main/resources/mixins.viafabric119.pipeline.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc119.mixin.pipeline",
  "mixins": [
    "MixinClientConnection",
--- a/viafabric-mc120/build.gradle.kts
+++ b/viafabric-mc120/build.gradle.kts
@ -1,9 +1,9 @@
 dependencies {
-    minecraft("com.mojang:minecraft:1.20.2-rc1")
-    mappings("net.fabricmc:yarn:1.20.2-rc1+build.3:v2")
+    minecraft("com.mojang:minecraft:1.20.2")
+    mappings("net.fabricmc:yarn:1.20.2+build.1:v2")

-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.86.1+1.20.1")
-    modImplementation("com.terraformersmc:modmenu:7.2.1")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.89.0+1.20.2")
+    modImplementation("com.terraformersmc:modmenu:8.0.0-beta.2")
 }

 tasks.compileJava {
--- a/viafabric-mc120/src/main/resources/fabric.mod.json
+++ b/viafabric-mc120/src/main/resources/fabric.mod.json
@ -40,7 +40,7 @@
  },
  "depends": {
    "fabric-resource-loader-v0": "*",
-    "minecraft": ["1.20.2-rc.2"],
+    "minecraft": ["1.20.2"],
    "viafabric": "*"
  },
  "recommends": {
--- a/viafabric-mc120/src/main/resources/mixins.viafabric120.address.json
+++ b/viafabric-mc120/src/main/resources/mixins.viafabric120.address.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc120.mixin.address",
  "mixins": [
  ],
--- a/viafabric-mc120/src/main/resources/mixins.viafabric120.debug.json
+++ b/viafabric-mc120/src/main/resources/mixins.viafabric120.debug.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc120.mixin.debug",
  "mixins": [
  ],
--- a/viafabric-mc120/src/main/resources/mixins.viafabric120.gui.json
+++ b/viafabric-mc120/src/main/resources/mixins.viafabric120.gui.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc120.mixin.gui",
  "mixins": [
  ],
--- a/viafabric-mc120/src/main/resources/mixins.viafabric120.pipeline.json
+++ b/viafabric-mc120/src/main/resources/mixins.viafabric120.pipeline.json
@ -1,6 +1,6 @@
 {
  "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "package": "com.viaversion.fabric.mc120.mixin.pipeline",
  "mixins": [
    "MixinClientConnection",
--- a/viafabric-mc18/build.gradle.kts
+++ b/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.458:v2")
+    mappings("net.legacyfabric:yarn:1.8.9+build.532:v2")

-    modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.0+1.8.9")
+    modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.1+1.8.9")
    modImplementation("io.github.boogiemonster1o1:rewoven-modmenu:1.0.0+1.8.9") {
        isTransitive = false
    }