diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..734e674 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 Plasmo + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..ae16f1c --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,35 @@ +plugins { + id("java") +} + +group = "su.plo" +version = "1.0.0-SNAPSHOT" + +repositories { + mavenCentral() + mavenLocal() + + maven { + url = uri("https://repo.plo.su") + } +} + +dependencies { + compileOnly("com.google.guava:guava:31.1-jre") + compileOnly("org.jetbrains:annotations:23.0.0") + compileOnly("org.projectlombok:lombok:1.18.24") + + compileOnly("su.plo.voice.api:server:2.0.0-SNAPSHOT") + compileOnly("su.plo.config:config:1.0.0") + + annotationProcessor("org.projectlombok:lombok:1.18.24") + annotationProcessor("su.plo.voice.api:server:2.0.0-SNAPSHOT") + annotationProcessor("com.google.guava:guava:31.1-jre") + annotationProcessor("com.google.code.gson:gson:2.9.0") +} + +tasks { + java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..41dfb87 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# 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" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +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" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +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. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..f952499 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,2 @@ +rootProject.name = "pv-addon-whisper" + diff --git a/src/main/java/su/plo/voice/priority/WhisperAddon.java b/src/main/java/su/plo/voice/priority/WhisperAddon.java new file mode 100644 index 0000000..06ad9fe --- /dev/null +++ b/src/main/java/su/plo/voice/priority/WhisperAddon.java @@ -0,0 +1,234 @@ +package su.plo.voice.priority; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; +import org.jetbrains.annotations.NotNull; +import su.plo.config.provider.ConfigurationProvider; +import su.plo.config.provider.toml.TomlConfiguration; +import su.plo.lib.api.MathLib; +import su.plo.lib.api.server.permission.PermissionDefault; +import su.plo.voice.api.addon.annotation.Addon; +import su.plo.voice.api.event.EventPriority; +import su.plo.voice.api.event.EventSubscribe; +import su.plo.voice.api.server.PlasmoVoiceServer; +import su.plo.voice.api.server.audio.capture.ServerActivation; +import su.plo.voice.api.server.audio.line.ServerSourceLine; +import su.plo.voice.api.server.audio.source.ServerPlayerSource; +import su.plo.voice.api.server.event.VoiceServerConfigLoadedEvent; +import su.plo.voice.api.server.event.VoiceServerInitializeEvent; +import su.plo.voice.api.server.event.audio.capture.ServerActivationRegisterEvent; +import su.plo.voice.api.server.event.audio.capture.ServerActivationUnregisterEvent; +import su.plo.voice.api.server.event.audio.source.PlayerSpeakEndEvent; +import su.plo.voice.api.server.event.audio.source.PlayerSpeakEvent; +import su.plo.voice.api.server.event.connection.UdpDisconnectEvent; +import su.plo.voice.api.server.event.player.PlayerActivationDistanceUpdateEvent; +import su.plo.voice.api.server.player.VoicePlayer; +import su.plo.voice.proto.data.audio.capture.VoiceActivation; +import su.plo.voice.proto.data.audio.line.VoiceSourceLine; +import su.plo.voice.proto.packets.tcp.clientbound.SourceAudioEndPacket; +import su.plo.voice.proto.packets.tcp.serverbound.PlayerAudioEndPacket; +import su.plo.voice.proto.packets.udp.clientbound.SourceAudioPacket; +import su.plo.voice.proto.packets.udp.serverbound.PlayerAudioPacket; + +import java.io.File; +import java.io.IOException; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; + +@Addon(id = "whisper", scope = Addon.Scope.SERVER, version = "1.0.0", authors = {"Apehum"}) +public final class WhisperAddon { + + private static final ConfigurationProvider toml = ConfigurationProvider.getProvider(TomlConfiguration.class); + + private static final String ACTIVATION_NAME = "whisper"; + private static final UUID ACTIVATION_ID = VoiceActivation.generateId(ACTIVATION_NAME); + private static final UUID SOURCE_LINE_ID = VoiceSourceLine.generateId(ACTIVATION_NAME); + + private final Set playerWhisperVisualized = Sets.newCopyOnWriteArraySet(); + + private PlasmoVoiceServer voiceServer; + private WhisperConfig config; + + @EventSubscribe + public void onInitialize(@NotNull VoiceServerInitializeEvent event) { + this.voiceServer = event.getServer(); + } + + @EventSubscribe + public void onConfigLoaded(@NotNull VoiceServerConfigLoadedEvent event) { + try { + File addonFolder = new File(voiceServer.getConfigFolder(), "addons"); + File configFile = new File(addonFolder, "whisper.toml"); + + this.config = toml.load(WhisperConfig.class, configFile, false); + toml.save(WhisperConfig.class, config, configFile); + } catch (IOException e) { + throw new IllegalStateException("Failed to load config", e); + } + } + + @EventSubscribe(priority = EventPriority.HIGHEST) + public void onActivationRegister(@NotNull ServerActivationRegisterEvent event) { + if (event.isCancelled()) return; + + ServerActivation activation = event.getActivation(); + if (!activation.getName().equals(ACTIVATION_NAME)) return; + + voiceServer.getMinecraftServer() + .getPermissionsManager() + .register("voice.activation." + activation.getName(), PermissionDefault.TRUE); + } + + @EventSubscribe(priority = EventPriority.HIGHEST) + public void onActivationUnregister(@NotNull ServerActivationUnregisterEvent event) { + if (event.isCancelled()) return; + + ServerActivation activation = event.getActivation(); + if (!activation.getName().equals(ACTIVATION_NAME)) return; + + voiceServer.getMinecraftServer() + .getPermissionsManager() + .unregister("voice.activation." + activation.getName()); + } + + @EventSubscribe(priority = EventPriority.HIGHEST) + public void onProximityRegister(@NotNull ServerActivationRegisterEvent event) { + if (event.isCancelled()) return; + + ServerActivation activation = event.getActivation(); + if (!activation.getName().equals(VoiceActivation.PROXIMITY_NAME)) return; + + // register whisper + voiceServer.getActivationManager().register( + this, + ACTIVATION_NAME, + "activation.plasmovoice.whisper", + "plasmovoice:textures/icons/microphone_whisper.png", + ImmutableList.of(), + 0, + false, + false, + config.getActivationWeight() + ); + + voiceServer.getSourceLineManager().register( + this, + ACTIVATION_NAME, + "activation.plasmovoice.whisper", + "plasmovoice:textures/icons/speaker_whisper.png", + config.getSourceLineWeight() + ); + } + + @EventSubscribe(priority = EventPriority.HIGHEST) + public void onProximityUnregister(@NotNull ServerActivationUnregisterEvent event) { + if (event.isCancelled()) return; + + ServerActivation activation = event.getActivation(); + if (!activation.getName().equals(VoiceActivation.PROXIMITY_NAME)) return; + + // unregister whisper + voiceServer.getActivationManager().unregister(ACTIVATION_NAME); + voiceServer.getSourceLineManager().unregister(ACTIVATION_NAME); + } + + @EventSubscribe(priority = EventPriority.HIGHEST) + public void onProximityDistanceChanged(@NotNull PlayerActivationDistanceUpdateEvent event) { + if (!event.getActivation().getId().equals(VoiceActivation.PROXIMITY_ID)) return; + playerWhisperVisualized.remove(event.getPlayer().getInstance().getUUID()); + } + + @EventSubscribe + public void onClientDisconnect(@NotNull UdpDisconnectEvent event) { + playerWhisperVisualized.remove(event.getConnection().getPlayer().getInstance().getUUID()); + } + + @EventSubscribe + public void onPlayerSpeak(@NotNull PlayerSpeakEvent event) { + VoicePlayer player = event.getPlayer(); + PlayerAudioPacket packet = event.getPacket(); + + if (!player.getInstance().hasPermission("voice.activation." + ACTIVATION_NAME)) return; + + getPlayerSource(player, packet.getActivationId(), packet.isStereo()).ifPresent((source) -> { + short distance = calculateWhisperDistance(source.getPlayer()); + if (distance < 0) return; + + SourceAudioPacket sourcePacket = new SourceAudioPacket( + packet.getSequenceNumber(), + (byte) source.getState(), + packet.getData(), + source.getId(), + distance + ); + source.sendAudioPacket(sourcePacket, distance); + + if (!playerWhisperVisualized.contains(player.getInstance().getUUID())) { + playerWhisperVisualized.add(player.getInstance().getUUID()); + player.visualizeDistance(calculateWhisperDistance(player), config.getVisualizeDistanceHexColor()); + } + }); + } + + @EventSubscribe + public void onPlayerSpeakEnd(@NotNull PlayerSpeakEndEvent event) { + VoicePlayer player = event.getPlayer(); + PlayerAudioEndPacket packet = event.getPacket(); + + if (!player.getInstance().hasPermission("voice.activation." + ACTIVATION_NAME)) return; + + getPlayerSource(player, packet.getActivationId(), true).ifPresent((source) -> { + short distance = calculateWhisperDistance(source.getPlayer()); + if (distance < 0) return; + + SourceAudioEndPacket sourcePacket = new SourceAudioEndPacket(source.getId(), packet.getSequenceNumber()); + source.sendPacket(sourcePacket, distance); + }); + } + + private short calculateWhisperDistance(@NotNull VoicePlayer player) { + Optional proximityActivation = voiceServer.getActivationManager() + .getActivationById(VoiceActivation.PROXIMITY_ID); + if (!proximityActivation.isPresent()) return -1; + + int proximityDistance = player.getActivationDistanceById(VoiceActivation.PROXIMITY_ID); + if (proximityDistance < 0) { + proximityDistance = proximityActivation.get().getDefaultDistance(); + } + if (proximityDistance < 0) return -1; + + return (short) MathLib.clamp( + (int) ((proximityDistance / 100F) * config.getProximityPercent()), + 1, + proximityActivation.get().getMaxDistance() + ); + } + + private Optional getPlayerSource(@NotNull VoicePlayer player, + @NotNull UUID activationId, + boolean isStereo) { + if (!activationId.equals(ACTIVATION_ID)) return Optional.empty(); + + Optional activation = voiceServer.getActivationManager() + .getActivationById(activationId); + if (!activation.isPresent()) return Optional.empty(); + + Optional sourceLine = voiceServer.getSourceLineManager() + .getLineById(SOURCE_LINE_ID); + if (!sourceLine.isPresent()) return Optional.empty(); + + isStereo = isStereo && activation.get().isStereoSupported(); + ServerPlayerSource source = voiceServer.getSourceManager().createPlayerSource( + voiceServer, + player, + sourceLine.get(), + "opus", + isStereo + ); + source.setLine(sourceLine.get()); + source.setStereo(isStereo); + + return Optional.of(source); + } +} diff --git a/src/main/java/su/plo/voice/priority/WhisperConfig.java b/src/main/java/su/plo/voice/priority/WhisperConfig.java new file mode 100644 index 0000000..fb76667 --- /dev/null +++ b/src/main/java/su/plo/voice/priority/WhisperConfig.java @@ -0,0 +1,38 @@ +package su.plo.voice.priority; + +import lombok.Data; +import lombok.NoArgsConstructor; +import su.plo.config.Config; +import su.plo.config.ConfigField; +import su.plo.config.ConfigValidator; + +import java.util.function.Predicate; + +@Config +@Data +public final class WhisperConfig { + + @ConfigField(comment = "Supported values: [1-100]") + @ConfigValidator(value = PercentValidator.class, allowed = "1-100") + private int proximityPercent = 50; + + @ConfigField(path = "activation_weight") + private int activationWeight = 11; + + @ConfigField(path = "sourceline_weight") + private int sourceLineWeight = 11; + + @ConfigField + private int visualizeDistanceHexColor = 0x81ecec; + + @NoArgsConstructor + public static class PercentValidator implements Predicate { + + @Override + public boolean test(Object o) { + if (!(o instanceof Long)) return false; + long port = (long) o; + return port > 0 && port <= 100; + } + } +}