feat: 1.21 support

(cherry picked from commit 8deeb92)

.github/workflows/prerelease-publish.yml

@@ -23,6 +23,7 @@ jobs:
           8
           16
           17
+          21
 
     - name: Build with Gradle
       uses: gradle/gradle-build-action@v2
@@ -35,4 +36,7 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         github-generate-changelog: true
         github-prerelease: true
+
         changelog-file: changelog.md
+        files-primary: build/libs/!(*-@(dev|sources|javadoc)).jar
+        files-secondary: ""

.github/workflows/publish.yml

@@ -15,14 +15,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
         distribution: temurin
         java-version: |
           8
           16
           17
+          21
 
     - name: Build with Gradle
       uses: gradle/gradle-build-action@v2
@@ -32,13 +33,16 @@ jobs:
     - name: Publish to Modrinth
       uses: Apehum/[email protected]
       with:
-        modrinth-id: 4iTfB0AP
-        modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+        name: 'pv-addon-replaymod'
+        split-releases: true
+        files-primary: build/libs/*.jar
+        version-resolver: 'exact'
 
-        files-primary: build/libs/!(*-@(dev|sources|javadoc)).jar
-        files-secondary: ""
+        changelog-file: client/changelog.md
 
-        changelog-file: changelog.md
+        modrinth-unfeature-mode: 'subset'
+        modrinth-id: 4iTfB0AP
+        modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
 
     - name: Publish to GitHub
       uses: Apehum/[email protected]

build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    kotlin("jvm") version libs.versions.kotlin.get()
+    id("com.github.johnrengelman.shadow") version libs.versions.shadow.get() apply false
+    id("gg.essential.multi-version.root") apply false
+    alias(libs.plugins.idea.ext)
+}
+
+tasks.jar {
+    enabled = false
+}

common/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    alias(libs.plugins.pv.java.templates)
+}
+
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(8))

gradle.properties

@@ -1,27 +1,4 @@
-org.gradle.jvmargs=-Xmx4G
-
-java_version=8
-
-minecraft_dependency=>=1.16
-minecraft_version=1.19.2
-loader_version=0.14.10
-
-fabric_version=0.70.0+1.19.2
+version=2.1.0
 
-pv_dependency=2.1.0-0
-pv_version=2.1.0-SNAPSHOT
-
-replaymod_dependency=1.16.4-2.6.9
-
-mod_name=Replay Voice Chat
-mod_version=1.16+-2.1.0
-addon_version=2.1.0
-maven_group=su.plo.replayvoicechat
-archives_base_name=pv-addon-replaymod
-
-minecraft_display_version=1.16+
-release_type=beta
-curse_id=605799
-curse_supported_versions=1.16,1.16.1,1.16.2.1.16.3,1.16.4,1.16.5,1.17,1.17.1,1.18,1.18.1,1.18.2,Java 8, Java 11,Java 16,Java 17,Java 18
-modrinth_id=yI6ANuOK
-modrinth_supported_version=1.16,1.16.1,1.16.2.1.16.3,1.16.4,1.16.5,1.17,1.17.1,1.18,1.18.1,1.18.2
+org.gradle.jvmargs=-Xmx4G
+kotlin.stdlib.default.dependency=false

gradle/libs.versions.toml

@@ -0,0 +1,16 @@
+[versions]
+kotlin = "1.9.23"
+shadow = "8.1.1"
+
+plasmovoice = "2.1.0-SNAPSHOT"
+pv-gradle-plugin = "1.0.2-SNAPSHOT"
+lombok = "1.18.30"
+idea-ext = "1.1.8"
+
+[libraries]
+plasmovoice = { module = "su.plo.voice.api:client", version.ref = "plasmovoice" }
+lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
+
+[plugins]
+pv-java-templates = { id = "su.plo.voice.plugin.java-templates", version.ref = "pv-gradle-plugin" }
+idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "idea-ext" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

readme.md

@@ -27,5 +27,4 @@ Both Fabric and Forge are supported. The same add-on file works on both platform
 ## Credits
 
 - [Replay Voice Chat](https://github.com/henkelmax/replay-voice-chat)
-- [Sonic](https://github.com/waywardgeek/sonic)
 - [ReplayMod](https://github.com/ReplayMod/ReplayMod)