From d3820e0da8e7501acdbffb9f431a5ef47f7f9595 Mon Sep 17 00:00:00 2001 From: Patrick <147879351+WinniePatGG@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:22:59 +0200 Subject: [PATCH] Clear main, point users to version branches --- .gitignore | 5 - README.md | 21 ++ build.gradle.kts | 33 --- gradle.properties | 6 - gradlew | 248 ------------------ gradlew.bat | 93 ------- settings.gradle.kts | 1 - .../voiceChatInteraction/AudioUtils.java | 26 -- .../VoiceChatInteraction.java | 56 ---- .../VoiceChatInteractionCommand.java | 42 --- .../VoiceChatInteractionPlugin.java | 127 --------- .../config/ServerConfig.java | 19 -- src/main/resources/plugin.yml | 17 -- 13 files changed, 21 insertions(+), 673 deletions(-) delete mode 100644 .gitignore create mode 100644 README.md delete mode 100644 build.gradle.kts delete mode 100644 gradle.properties delete mode 100644 gradlew delete mode 100644 gradlew.bat delete mode 100644 settings.gradle.kts delete mode 100644 src/main/java/de/winniepat/voiceChatInteraction/AudioUtils.java delete mode 100644 src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteraction.java delete mode 100644 src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteractionCommand.java delete mode 100644 src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteractionPlugin.java delete mode 100644 src/main/java/de/winniepat/voiceChatInteraction/config/ServerConfig.java delete mode 100644 src/main/resources/plugin.yml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5194f1e..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.gradle -.idea -build -gradle -run diff --git a/README.md b/README.md new file mode 100644 index 0000000..e7bec16 --- /dev/null +++ b/README.md @@ -0,0 +1,21 @@ +# Project Name + +This repository is organized by version. The `main` branch does not contain +active code — please check out the branch that matches the version you need: + +- `version/1.21.11` — for Minecraft 1.21.11 +- `version/26.1.x` — for Minecraft 26.1.x + +## Getting started + +```bash +git checkout version/1.21.11 +``` + +or + +```bash +git checkout version/26.1.x +``` + +See each branch's own README for version-specific setup instructions. \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 76ad161..0000000 --- a/build.gradle.kts +++ /dev/null @@ -1,33 +0,0 @@ -plugins { - id("java-library") - id("xyz.jpenilla.run-paper") version "3.0.2" -} - -repositories { - mavenCentral() - maven("https://repo.papermc.io/repository/maven-public/") - maven("https://maven.maxhenkel.de/repository/public") -} - -dependencies { - compileOnly("io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT") - implementation("de.maxhenkel.voicechat:voicechat-api:2.6.20") -} - -java { - toolchain.languageVersion = JavaLanguageVersion.of(21) -} - -tasks { - runServer { - minecraftVersion("1.21.11") - jvmArgs("-Xms2G", "-Xmx2G", "-Dcom.mojang.eula.agree=true") - } - - processResources { - val props = mapOf("version" to version, "description" to project.description) - filesMatching("plugin.yml") { - expand(props) - } - } -} diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 0ee9990..0000000 --- a/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -group=de.winniepat -version=1.21.11-1.0 -description=ByteNations Plugin -org.gradle.configuration-cache=true -org.gradle.parallel=true -org.gradle.caching=true diff --git a/gradlew b/gradlew deleted file mode 100644 index 0262dcb..0000000 --- a/gradlew +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015 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. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# 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/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/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 - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit - -# 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 - - - -# 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 - if ! command -v java >/dev/null 2>&1 - then - 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 -fi - -# Increase the maximum file descriptors if we can. -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 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - 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" ) - - 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 - - -# 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"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_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" \ - -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# 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 deleted file mode 100644 index c4bdd3a..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,93 +0,0 @@ -@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 -@rem SPDX-License-Identifier: Apache-2.0 -@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=. -@rem This is normally unused -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% 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 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -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 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 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! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/settings.gradle.kts b/settings.gradle.kts deleted file mode 100644 index 59ccb41..0000000 --- a/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "VoiceChatInteraction" diff --git a/src/main/java/de/winniepat/voiceChatInteraction/AudioUtils.java b/src/main/java/de/winniepat/voiceChatInteraction/AudioUtils.java deleted file mode 100644 index 22b1b50..0000000 --- a/src/main/java/de/winniepat/voiceChatInteraction/AudioUtils.java +++ /dev/null @@ -1,26 +0,0 @@ -package de.winniepat.voiceChatInteraction; - -public class AudioUtils { - public static double calculateAudioLevel(short[] samples) { - double rms = 0D; // root mean square (RMS) amplitude - - for (int i = 0; i < samples.length; i++) { - double sample = (double) samples[i] / (double) Short.MAX_VALUE; - rms += sample * sample; - } - - int sampleCount = samples.length / 2; - - rms = (sampleCount == 0) ? 0 : Math.sqrt(rms / sampleCount); - - double db; - - if (rms > 0D) { - db = Math.min(Math.max(20D * Math.log10(rms), -127D), 0D); - } else { - db = -127D; - } - - return db; - } -} diff --git a/src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteraction.java b/src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteraction.java deleted file mode 100644 index 235c3c9..0000000 --- a/src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteraction.java +++ /dev/null @@ -1,56 +0,0 @@ -package de.winniepat.voiceChatInteraction; - -import de.maxhenkel.voicechat.api.BukkitVoicechatService;import de.winniepat.voiceChatInteraction.config.ServerConfig; -import org.bukkit.GameEvent;import org.bukkit.Server;import org.bukkit.configuration.file.FileConfiguration;import org.bukkit.plugin.java.JavaPlugin; -import javax.annotation.Nullable;import java.util.logging.LogManager; -import java.util.logging.Logger; - -public final class VoiceChatInteraction extends JavaPlugin { - - public static final String PLUGIN_ID = "voicechat_interaction"; - public static final Logger LOGGER = LogManager.getLogManager().getLogger(PLUGIN_ID); - public static ServerConfig SERVER_CONFIG; - public static Server SERVER; - public static GameEvent VOICE_GAME_EVENT; - public static VoiceChatInteraction INSTANCE; - - @Nullable - public static VoiceChatInteractionPlugin voicechatPlugin; - - @Override - public void onEnable() { - SERVER = getServer(); - VOICE_GAME_EVENT = GameEvent.PRIME_FUSE; - INSTANCE = this; - - FileConfiguration config = this.getConfig(); - config.addDefault("group_interaction", false); - config.addDefault("whisper_interaction", false); - config.addDefault("sneak_interaction", false); - config.addDefault("minimum_activation_threshold", -50); - config.addDefault("default_interaction_toggle", true); - config.options().copyDefaults(true); - saveConfig(); - - SERVER_CONFIG = new ServerConfig(config); - - BukkitVoicechatService service = getServer().getServicesManager().load(BukkitVoicechatService.class); - if (service != null) { - voicechatPlugin = new VoiceChatInteractionPlugin(); - service.registerPlugin(voicechatPlugin); - getLogger().info("Successfully registered voicechat_interaction plugin"); - } else { - getLogger().info("Failed to register voicechat_interaction plugin"); - } - - this.getCommand("voicechat_interaction").setExecutor(new VoiceChatInteractionCommand()); - } - - @Override - public void onDisable() { - if (voicechatPlugin != null) { - getServer().getServicesManager().unregister(voicechatPlugin); - getLogger().info("Successfully unregistered voicechat_interaction plugin"); - } - } -} diff --git a/src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteractionCommand.java b/src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteractionCommand.java deleted file mode 100644 index eb047d4..0000000 --- a/src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteractionCommand.java +++ /dev/null @@ -1,42 +0,0 @@ -package de.winniepat.voiceChatInteraction; - -import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -public class VoiceChatInteractionCommand implements CommandExecutor { - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - try { - if (sender instanceof Player) { - VoiceChatInteractionPlugin plugin = VoiceChatInteraction.voicechatPlugin; - Player player = (Player) sender; - - if (args.length == 0) { - player.sendMessage("/voicechat_interaction toggle []"); - return true; - } - - if (args[0].equals("toggle")) { - if (args.length >= 2 && player.hasPermission("voicechat_interaction.toggle.others")) { - Player other = Bukkit.getPlayer(args[1]); - plugin.setInteractionToggle(other, !plugin.getInteractionToggle(other)); - player.sendMessage("Interactions toggled to " + plugin.getInteractionToggle(other) + " for " + other.getName()); - other.sendMessage(player.getName() + " toggled your interactions to " + plugin.getInteractionToggle(other)); - } else if (player.hasPermission("voicechat_interaction.toggle")) { - plugin.setInteractionToggle(player, !plugin.getInteractionToggle(player)); - player.sendMessage("Interactions toggled to " + plugin.getInteractionToggle(player) + " for yourself"); - } else { - player.sendMessage("You do not have permission to use that command (voicechat_interaction.toggle)"); - } - } - } - } catch(Exception e) { - e.printStackTrace(); - } - - return true; - } -} \ No newline at end of file diff --git a/src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteractionPlugin.java b/src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteractionPlugin.java deleted file mode 100644 index 3d889a0..0000000 --- a/src/main/java/de/winniepat/voiceChatInteraction/VoiceChatInteractionPlugin.java +++ /dev/null @@ -1,127 +0,0 @@ -package de.winniepat.voiceChatInteraction; - -import de.maxhenkel.voicechat.api.*; -import de.maxhenkel.voicechat.api.events.EventRegistration; -import de.maxhenkel.voicechat.api.events.MicrophonePacketEvent; -import de.maxhenkel.voicechat.api.events.VoicechatServerStartedEvent; -import de.maxhenkel.voicechat.api.opus.OpusDecoder; -import org.bukkit.Bukkit; -import org.bukkit.NamespacedKey; -import org.bukkit.persistence.PersistentDataContainer; -import org.bukkit.persistence.PersistentDataType; - -import javax.annotation.Nullable; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - -public class VoiceChatInteractionPlugin implements VoicechatPlugin { - public static VoicechatApi voicechatApi; - private static ConcurrentHashMap cooldowns; - - @Nullable - public static VoicechatServerApi voicechatServerApi; - - @Nullable - private OpusDecoder decoder; - - @Override - public String getPluginId() { - return VoiceChatInteraction.PLUGIN_ID; - } - - @Override - public void initialize(VoicechatApi api) { - voicechatApi = api; - cooldowns = new ConcurrentHashMap<>(); - } - - @Override - public void registerEvents(EventRegistration registration) { - registration.registerEvent(VoicechatServerStartedEvent.class, this::onServerStarted); - registration.registerEvent(MicrophonePacketEvent.class, this::onMicPacket); - } - - private void onServerStarted(VoicechatServerStartedEvent event) { - voicechatServerApi = event.getVoicechat(); - } - - private void onMicPacket(MicrophonePacketEvent event) { - VoicechatConnection senderConnection = event.getSenderConnection(); - if (senderConnection == null) { - return; - } - - if (event.getPacket().getOpusEncodedData().length <= 0) { - return; - } - - if (!VoiceChatInteraction.SERVER_CONFIG.groupInteraction) { - if (senderConnection.isInGroup()) { - return; - } - } - - if (!VoiceChatInteraction.SERVER_CONFIG.whisperInteraction) { - if (event.getPacket().isWhispering()) { - return; - } - } - - ServerPlayer player = senderConnection.getPlayer(); - if (!(senderConnection.getPlayer().getPlayer() instanceof org.bukkit.entity.Player bukkitPlayer)) { - VoiceChatInteraction.LOGGER.warning("Received microphone packet from non-player"); - return; - } - - if (!VoiceChatInteraction.SERVER_CONFIG.sneakInteraction) { - if (bukkitPlayer.isSneaking()) { - return; - } - } - - if (decoder == null) { - decoder = event.getVoicechat().createDecoder(); - } - - decoder.resetState(); - short[] decoded = decoder.decode(event.getPacket().getOpusEncodedData()); - - if (AudioUtils.calculateAudioLevel(decoded) < VoiceChatInteraction.SERVER_CONFIG.minActivationThreshold) { - return; - } - - bukkitPlayer.getServer().getScheduler().runTask(VoiceChatInteraction.INSTANCE, () -> { - if (activate(player)) { - bukkitPlayer.getWorld().sendGameEvent(null, VoiceChatInteraction.VOICE_GAME_EVENT, bukkitPlayer.getLocation().toVector()); - } - }); - } - - private boolean activate(ServerPlayer player) { - Long lastTimestamp = cooldowns.get(player.getUuid()); - long currentTime = VoiceChatInteraction.SERVER.getPlayer(player.getUuid()).getWorld().getGameTime(); - if ((lastTimestamp == null || currentTime - lastTimestamp > 20L) && getInteractionToggle(Bukkit.getPlayer(player.getUuid()))) { - cooldowns.put(player.getUuid(), currentTime); - return true; - } - return false; - } - - public boolean getInteractionToggle(org.bukkit.entity.Player player) { - PersistentDataContainer data = player.getPersistentDataContainer(); - NamespacedKey key = new NamespacedKey(VoiceChatInteraction.INSTANCE, "interaction_toggle"); - - if (!data.has(key)) { - return VoiceChatInteraction.SERVER_CONFIG.defaultInteractionToggle; - } else { - return data.get(key, PersistentDataType.BYTE) != 0; - } - } - - public void setInteractionToggle(org.bukkit.entity.Player player, Boolean value) { - PersistentDataContainer data = player.getPersistentDataContainer(); - NamespacedKey key = new NamespacedKey(VoiceChatInteraction.INSTANCE, "interaction_toggle"); - - data.set(key, PersistentDataType.BYTE, (byte) (value ? 1 : 0)); - } -} diff --git a/src/main/java/de/winniepat/voiceChatInteraction/config/ServerConfig.java b/src/main/java/de/winniepat/voiceChatInteraction/config/ServerConfig.java deleted file mode 100644 index 207a3ac..0000000 --- a/src/main/java/de/winniepat/voiceChatInteraction/config/ServerConfig.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.winniepat.voiceChatInteraction.config; - -import org.bukkit.configuration.file.FileConfiguration; - -public class ServerConfig { - public boolean groupInteraction; - public boolean whisperInteraction; - public boolean sneakInteraction; - public int minActivationThreshold; - public boolean defaultInteractionToggle; - - public ServerConfig(FileConfiguration config) { - groupInteraction = config.getBoolean("group_interaction"); - whisperInteraction = config.getBoolean("whisper_interaction"); - sneakInteraction = config.getBoolean("sneak_interaction"); - minActivationThreshold = config.getInt("minimum_activation_threshold"); - defaultInteractionToggle = config.getBoolean("default_interaction_toggle"); - } -} \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml deleted file mode 100644 index bdab909..0000000 --- a/src/main/resources/plugin.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: VoiceChatInteraction -description: $description -version: '${version}' - -main: de.winniepat.voiceChatInteraction.VoiceChatInteraction -api-version: '1.21.11' -load: POSTWORLD - -authors: [ WinniePatGG ] -website: https://winniepat.de -depend: [ voicechat ] -commands: - voicechat_interaction: - description: "Manage Voice Chat Interaction settings" - usage: "/voicechat_interaction toggle []" - aliases: [voicechat_interaction] - permission: voicechat_interaction \ No newline at end of file