Full rewrite

Author: lil-jon-crunk

.github/workflows/build.yml

@@ -16,8 +16,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:
-          distribution: "adopt"
-          java-version: "17"
+          distribution: "temurin"
+          java-version: "21"
 
       - name: Make gradlew executable
         run: chmod +x gradlew
@@ -28,5 +28,8 @@ jobs:
       - name: Archive artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: geyser-voice-artifact
-          path: build/libs/
+          name: geyser-voice-artifacts
+          path: |
+            modules/paper/build/libs/
+            modules/velocity/build/libs/
+            modules/bungeecord/build/libs/

.github/workflows/release.yml

@@ -24,8 +24,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:
-          distribution: "adopt"
-          java-version: "17"
+          distribution: "temurin"
+          java-version: "21"
 
       - name: Make gradlew executable
         run: chmod +x gradlew
@@ -36,8 +36,11 @@ jobs:
       - name: Archive artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: geyser-voice-artifact
-          path: build/libs/
+          name: geyser-voice-artifacts
+          path: |
+            modules/paper/build/libs/
+            modules/velocity/build/libs/
+            modules/bungeecord/build/libs/
 
   publish_release:
     name: Publish release
@@ -54,8 +57,8 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: geyser-voice-artifact
-          path: build/libs/
+          name: geyser-voice-artifacts
+          path: release-artifacts/
 
       - name: Create release
         if: github.event.inputs.status == 'stable'
@@ -64,7 +67,7 @@ jobs:
           prerelease: false
           tag: ${{ github.event.inputs.tag }}
           artifacts: |
-            build/libs/GeyserVoice-*.jar
+            release-artifacts/**/*.jar
         env:
           GITHUB_REPOSITORY: AvionBlock/GeyserVoice
 
@@ -75,7 +78,7 @@ jobs:
           prerelease: true
           tag: ${{ github.event.inputs.tag }}
           artifacts: |
-            build/libs/GeyserVoice-*.jar
+            release-artifacts/**/*.jar
         env:
           GITHUB_REPOSITORY: AvionBlock/GeyserVoice
 
@@ -86,10 +89,10 @@ jobs:
         with:
             name: GeyserVoice ${{ github.event.inputs.tag }}
             project_id: WtPu56Wa
-            loaders: paper, spigot, bukkit, purpur, velocity, bungeecord
+            loaders: paper, purpur, velocity, bungeecord
             game_versions: 1.20.2:1.21.10
             version_number: ${{ github.event.inputs.tag }}
             featured: ${{ github.event.inputs.status == 'stable' }}
             version_type: ${{ github.event.inputs.status == 'stable' && 'release' || 'beta' }}
             files: |
-                ./build/libs/GeyserVoice-*.jar
+                ./release-artifacts/**/*.jar

.gitignore

@@ -236,4 +236,4 @@ nbdist/
 # End of https://www.gitignore.io/api/git,java,maven,eclipse,netbeans,jetbrains+all,visualstudiocode
 
 ### Gradle ###
-.gradle
+.gradle*

README.md

@@ -1,18 +1,26 @@
 ## GeyserVoice - Minecraft Proximity Voice Chat Plugin
 
-GeyserVoice is a Java plugin designed to enhance the multiplayer gaming experience on Minecraft servers by integrating the [VoiceCraft](https://github.com/SineVector241/VoiceCraft-MCBE_Proximity_Chat/) Proximity Chat application. The plugin facilitates cross-platform communication, allowing players on both Java and Bedrock editions to seamlessly engage in proximity-based voice conversations.
+GeyserVoice is a Java-side bridge for VoiceCraft built around `McApi TCP`. It now ships dedicated runtimes for `Paper`, `Velocity`, and `BungeeCord`, with direct Paper mode and proxy-relay mode for multi-server networks.
 
 ### Features
 
-- Cross-Platform Communication:
-  GeyserVoice bridges the gap between Minecraft Java Edition and Bedrock Edition, enabling players on different platforms to communicate through the VoiceCraft Proximity Chat system.
-
-- Immersive Proximity Chat:
-  Experience a more immersive and realistic gameplay environment with proximity-based voice chat. Engage in conversations with nearby players, enhancing teamwork and coordination.
+- `McApi TCP` transport only for VoiceCraft communication
+- managed VoiceCraft runtime download/startup on direct Paper servers
+- proxy relay mode for `Velocity` and `BungeeCord`
+- server-side positioning updates from each Paper backend through the proxy
 
 ### How It Works
 
-Installation: Simply install the GeyserVoice plugin on your Minecraft Java server. Make sure to follow the setup instructions to integrate it seamlessly with the VoiceCraft Proximity Chat application.
+Direct Paper mode:
+- install GeyserVoice on the Paper server
+- let the plugin download/start VoiceCraft locally if desired
+- the Paper plugin connects to VoiceCraft over `McApi TCP`
+
+Proxy mode:
+- install GeyserVoice on each Paper backend and on the proxy
+- enable `config.server-behind-proxy: true` on the Paper backends
+- the proxy plugin owns the VoiceCraft connection
+- backend Paper servers stream player snapshots to the proxy through plugin messages
 
 ### Getting Started
 
@@ -26,6 +34,8 @@ We welcome contributions from the community to improve and expand the functional
 
 GeyserVoice is licensed under the MIT License. Feel free to use, modify, and distribute the plugin in accordance with the terms of the license.
 
-### Proxy server support
+### Status
 
-GeyserVoice also supports usage with Velocity and Bungeecord networks. Just install the .jar on your proxy server and on your paper server(s). Be sure to edit the config of the paper server(s) to set `server-behind-proxy` to `true` and then reload using `voice reload`. P.s. You don't need to set the server address, port and keys on the paper server(s), this is only needed on the proxy server.
+Current supported runtime paths:
+- `Paper -> McApi TCP -> VoiceCraft`
+- `Paper -> Proxy relay -> McApi TCP -> VoiceCraft`

build.gradle

@@ -1,111 +1,67 @@
 plugins {
-    id 'java'
-    id 'io.github.goooler.shadow' version '8.1.8'
-    id 'net.kyori.blossom' version '2.1.0'
+    id 'base'
 }
 
-group = 'io.greitan'
-version = project.hasProperty('VERSION') ? project.VERSION : 'UNKNOWN'
-description = "Plugin that adds support for using VoiceCraft on Java servers."
+group = 'team.avion'
+version = project.hasProperty('VERSION') ? project.VERSION : '0.1.0-SNAPSHOT'
+description = 'Plugin that adds support for using VoiceCraft on Java servers.'
 
-repositories {
-    mavenCentral()
-    maven {
-        name = "CodeMC"
-        url = uri("https://repo.codemc.io/repository/maven-public/")
-    }
-    maven {
-        name = "PaperMC"
-        url = "https://repo.papermc.io/repository/maven-public/"
-    }
-    maven {
-        name = "PlaceholderAPI"
-        url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/'
-    }
-    maven {
-        name = "Jitpack"
-        url = 'https://jitpack.io'
-    }
-    maven {
-        name = "Bungeecord"
-        url 'https://oss.sonatype.org/content/repositories/snapshots'
-    }
+ext {
+    pluginName = 'GeyserVoice'
+    pluginUrl = 'https://geyservoice.avion.team'
+    pluginAuthor = 'lil-jon-crunk'
+    javaTarget = JavaVersion.VERSION_21
+    voiceCraft = [
+        githubRepository   : 'AvionBlock/VoiceCraft',
+        release            : 'latest',
+        installDirectory   : 'voicecraft-runtime',
+        executableBaseName : 'VoiceCraft.Server',
+        protocolMajor      : 1,
+        protocolMinor      : 6,
+        protocolPatch      : 0
+    ]
 }
 
-dependencies {
-    compileOnly 'dev.folia:folia-api:1.20.2-R0.1-SNAPSHOT'
-    compileOnly 'io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT'
-    compileOnly 'com.velocitypowered:velocity-api:3.3.0-SNAPSHOT'
-    annotationProcessor 'com.velocitypowered:velocity-api:3.3.0-SNAPSHOT'
-    compileOnly 'net.md-5:bungeecord-api:1.20-R0.2'
-    
-    compileOnly 'me.clip:placeholderapi:2.11.6'
-    compileOnly 'org.projectlombok:lombok:1.18.30'
-    annotationProcessor 'org.projectlombok:lombok:1.18.30'
-    
-    implementation('com.fasterxml.jackson.core:jackson-databind:2.15.2')
-    implementation('com.fasterxml.jackson.core:jackson-core:2.15.2')
-    implementation("com.github.simplix-softworks:simplixstorage:3.2.3")
-}
+allprojects {
+    group = rootProject.group
+    version = rootProject.version
 
-sourceSets {
-    main {
-        blossom {
-            javaSources {
-                property("name", "GeyserVoice")
-                property("version", version.toString())
-                property("description", description)
-                property("url", "https://uninode.de")
-            }
-            resources {
-                property("name", "GeyserVoice")
-                property("version", version.toString())
-                property("description", description)
-                property("url", "https://uninode.de")
-            }
+    repositories {
+        mavenCentral()
+        maven {
+            name = "PaperMC"
+            url = uri("https://repo.papermc.io/repository/maven-public/")
+        }
+        maven {
+            name = "PlaceholderAPI"
+            url = uri("https://repo.extendedclip.com/releases/")
+        }
+        maven {
+            name = "Bungeecord"
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots")
         }
     }
 }
 
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
-
-tasks.withType(Javadoc) {
-    options.encoding = 'UTF-8'
-    options.charSet = 'UTF-8'
-}
+subprojects {
+    apply plugin: 'java-library'
 
-tasks.withType(Test) {
-    systemProperty 'file.encoding', 'UTF-8'
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
+    java {
+        sourceCompatibility = rootProject.ext.javaTarget
+        targetCompatibility = rootProject.ext.javaTarget
+        withSourcesJar()
+    }
 
-shadowJar {
-    archiveClassifier.set('all')
-    relocate 'com.tcoded.folialib', 'io.greitan.avion.folialib' 
-}
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = 'UTF-8'
+    }
 
-task deleteUnusableJar(type: Delete) {
-    doLast {
-        file("build/libs").listFiles().each { File file ->
-            if (file.name.endsWith(".jar") && !file.name.contains("-all")) {
-                file.delete()
-            }
-        }
+    tasks.withType(Javadoc).configureEach {
+        options.encoding = 'UTF-8'
+        options.charSet = 'UTF-8'
     }
-}
 
-task copyToTestServer(type: Copy) {
-    from shadowJar
-    into "D:\\JavaTest\\plugins"
+    tasks.withType(Test).configureEach {
+        systemProperty 'file.encoding', 'UTF-8'
+    }
 }
-copyToTestServer.dependsOn shadowJar
-
-build.finalizedBy shadowJar
-shadowJar.finalizedBy deleteUnusableJar
-if (project.hasProperty('DEV')) shadowJar.finalizedBy copyToTestServer

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME