diff --git a/.github/workflows/prerelease-publish.yml b/.github/workflows/prerelease-publish.yml new file mode 100644 index 0000000..95ac45b --- /dev/null +++ b/.github/workflows/prerelease-publish.yml @@ -0,0 +1,39 @@ +name: Publish + +on: + push: + branches: + - v1.0 + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: write + packages: write + + steps: + - uses: actions/checkout@v3 + - 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 + with: + arguments: build + + - name: Publish to GitHub + uses: Apehum/mc-publish@v1.1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + github-generate-changelog: true + github-prerelease: true + changelog-file: changelog.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4108d7c --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/ +*.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 + +run/ +docker/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..be3b1f8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 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/README.md b/README.md new file mode 100644 index 0000000..bbb71a6 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +# pv-addon-hide-icons + +Simple server-side [Plasmo Voice](https://modrinth.com/mod/plasmo-voice) addon for hiding source icons. +You can configure which type of sources to hide in `pv-addon-hide-icons/config.toml`. + + +> [!WARNING] +> This addon requires [2.1.0-SNAPSHOT](https://github.com/plasmoapp/plasmo-voice/releases/tag/2.1.0-SNAPSHOT) of Plasmo Voice. diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..08f48c9 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,30 @@ +plugins { + kotlin("jvm") version libs.versions.kotlin.get() + alias(libs.plugins.pv.entrypoints) + alias(libs.plugins.pv.kotlin.relocate) + alias(libs.plugins.pv.java.templates) +} + +dependencies { + compileOnly(kotlin("stdlib-jdk8")) + + compileOnly(libs.plasmovoice) +} + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(8)) + +repositories { + mavenCentral() + maven("https://repo.plasmoverse.com/snapshots") + maven("https://repo.plasmoverse.com/releases") +} + +tasks { + jar { + enabled = false + } + + shadowJar { + archiveClassifier.set("") + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..1bc7427 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +group=io.github.apehum.pv.hideicons +version=1.0.0-SNAPSHOT +kotlin.stdlib.default.dependency=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..3ae09a6 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,13 @@ +[versions] +kotlin = "1.9.21" + +plasmovoice = "2.1.0-SNAPSHOT" +pv-gradle-plugin = "1.0.2-SNAPSHOT" + +[libraries] +plasmovoice = { module = "su.plo.voice.api:server", version.ref = "plasmovoice" } + +[plugins] +pv-entrypoints = { id = "su.plo.voice.plugin.entrypoints", version.ref = "pv-gradle-plugin" } +pv-kotlin-relocate = { id = "su.plo.voice.plugin.relocate-kotlin", version.ref = "pv-gradle-plugin" } +pv-java-templates = { id = "su.plo.voice.plugin.java-templates", version.ref = "pv-gradle-plugin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..c1962a7 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..509c4a2 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..aeb74cb --- /dev/null +++ b/gradlew @@ -0,0 +1,245 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || 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 + +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*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=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=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" ) + 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 + + +# 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 $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 \ + "$@" + +# 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 new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@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. +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% 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 new file mode 100644 index 0000000..8e520b5 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,12 @@ +pluginManagement { + repositories { + mavenLocal() + mavenCentral() + gradlePluginPortal() + maven("https://repo.plasmoverse.com/snapshots") + maven("https://repo.plasmoverse.com/releases") + maven("https://jitpack.io/") + } +} + +rootProject.name = "pv-addon-hide-icons" diff --git a/src/main/java-templates/su/plo/voice/hideicons/BuildConstants.java b/src/main/java-templates/su/plo/voice/hideicons/BuildConstants.java new file mode 100644 index 0000000..fda9d2b --- /dev/null +++ b/src/main/java-templates/su/plo/voice/hideicons/BuildConstants.java @@ -0,0 +1,7 @@ +package su.plo.voice.hideicons; + +// The constants are replaced before compilation +public final class BuildConstants { + + public static final String VERSION = "${version}"; +} diff --git a/src/main/kotlin/su/plo/voice/hideicons/AddonConfig.kt b/src/main/kotlin/su/plo/voice/hideicons/AddonConfig.kt new file mode 100644 index 0000000..8b39071 --- /dev/null +++ b/src/main/kotlin/su/plo/voice/hideicons/AddonConfig.kt @@ -0,0 +1,35 @@ +package su.plo.voice.hideicons + +import su.plo.config.Config +import su.plo.config.ConfigField +import su.plo.config.provider.ConfigurationProvider +import su.plo.config.provider.toml.TomlConfiguration +import su.plo.voice.api.server.PlasmoVoiceServer +import java.io.File + +@Config +class AddonConfig { + + @ConfigField + val hideStaticIcons: Boolean = true + + @ConfigField + val hidePlayerIcons: Boolean = true + + @ConfigField + val hideEntityIcons: Boolean = true + + companion object { + + private val toml = ConfigurationProvider.getProvider(TomlConfiguration::class.java) + + fun loadConfig(server: PlasmoVoiceServer): AddonConfig { + + val addonFolder = File(server.minecraftServer.configsFolder, "pv-addon-hide-icons") + val configFile = File(addonFolder, "config.toml") + + return toml.load(AddonConfig::class.java, configFile, false) + .also { toml.save(AddonConfig::class.java, it, configFile) } + } + } +} diff --git a/src/main/kotlin/su/plo/voice/hideicons/HideIconsAddon.kt b/src/main/kotlin/su/plo/voice/hideicons/HideIconsAddon.kt new file mode 100644 index 0000000..b8032e2 --- /dev/null +++ b/src/main/kotlin/su/plo/voice/hideicons/HideIconsAddon.kt @@ -0,0 +1,53 @@ +package su.plo.voice.hideicons + +import su.plo.voice.api.addon.AddonInitializer +import su.plo.voice.api.addon.AddonLoaderScope +import su.plo.voice.api.addon.InjectPlasmoVoice +import su.plo.voice.api.addon.annotation.Addon +import su.plo.voice.api.event.EventSubscribe +import su.plo.voice.api.server.PlasmoVoiceServer +import su.plo.voice.api.server.audio.source.ServerEntitySource +import su.plo.voice.api.server.audio.source.ServerPlayerSource +import su.plo.voice.api.server.audio.source.ServerStaticSource +import su.plo.voice.api.server.event.audio.source.ServerSourceCreatedEvent +import su.plo.voice.api.server.event.config.VoiceServerConfigReloadedEvent + +@Addon( + id = "pv-addon-hide-icons", + version = BuildConstants.VERSION, + authors = ["Apehum"], + scope = AddonLoaderScope.SERVER +) +class HideIconsAddon : AddonInitializer { + + @InjectPlasmoVoice + private lateinit var voiceServer: PlasmoVoiceServer + + private lateinit var config: AddonConfig + + override fun onAddonInitialize() { + loadConfig() + } + + @EventSubscribe + fun onConfigReloaded(event: VoiceServerConfigReloadedEvent) { + loadConfig() + } + + @EventSubscribe + fun onSourceCreated(event: ServerSourceCreatedEvent) { + val source = event.source + + if (config.hideEntityIcons && source is ServerEntitySource) { + source.isIconVisible = false + } else if (config.hideStaticIcons && source is ServerStaticSource) { + source.isIconVisible = false + } else if (config.hideStaticIcons && source is ServerPlayerSource) { + source.isIconVisible = false + } + } + + private fun loadConfig() { + config = AddonConfig.loadConfig(voiceServer) + } +}