From 02421e2746f128d8a705852e2669208a5c0318d0 Mon Sep 17 00:00:00 2001 From: Vaption Date: Thu, 25 Sep 2025 16:06:38 +0330 Subject: [PATCH 1/2] Migrate to Apollo --- .github/ISSUE_TEMPLATE/bug_report.md | 32 +++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ++ .github/workflows/gradle.yml | 37 +++ .github/workflows/release.yml | 54 ++++ .gitignore | 26 ++ CHANGELOG.md | 0 README.md | 57 +--- build.gradle | 51 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 ++++++++++++++++++ gradlew.bat | 93 +++++++ modIDs.yml | 59 ----- pom.xml | 118 --------- .../java/li/genesis/armstrong/Armstrong.java | 73 ++++++ .../genesis/armstrong}/Locale.java | 13 +- .../armstrong}/commands/LunarCommand.java | 58 ++-- .../armstrong/commands/LunarStaffCommand.java | 85 ++++++ .../armstrong}/hook/PlaceholderAPIHook.java | 15 +- .../armstrong/listeners/LunarListener.java | 32 +++ .../armstrong/listeners/NametagTask.java | 116 ++++++++ .../li/genesis/armstrong/utils/Utils.java | 42 +++ .../xyz/refinedev/lunar/LunarUtility.java | 122 --------- .../lunar/commands/LunarStaffCommand.java | 50 ---- .../lunar/listeners/LunarListener.java | 76 ------ .../lunar/listeners/NametagTask.java | 41 --- .../java/xyz/refinedev/lunar/utils/Utils.java | 54 ---- src/main/resources/config.yml | 136 ++++++---- src/main/resources/plugin.yml | 11 +- 29 files changed, 1056 insertions(+), 670 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/workflows/gradle.yml create mode 100644 .github/workflows/release.yml create mode 100644 .gitignore create mode 100644 CHANGELOG.md create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 modIDs.yml delete mode 100644 pom.xml create mode 100644 src/main/java/li/genesis/armstrong/Armstrong.java rename src/main/java/{xyz/refinedev/lunar => li/genesis/armstrong}/Locale.java (75%) rename src/main/java/{xyz/refinedev/lunar => li/genesis/armstrong}/commands/LunarCommand.java (52%) create mode 100644 src/main/java/li/genesis/armstrong/commands/LunarStaffCommand.java rename src/main/java/{xyz/refinedev/lunar => li/genesis/armstrong}/hook/PlaceholderAPIHook.java (76%) create mode 100644 src/main/java/li/genesis/armstrong/listeners/LunarListener.java create mode 100644 src/main/java/li/genesis/armstrong/listeners/NametagTask.java create mode 100644 src/main/java/li/genesis/armstrong/utils/Utils.java delete mode 100644 src/main/java/xyz/refinedev/lunar/LunarUtility.java delete mode 100644 src/main/java/xyz/refinedev/lunar/commands/LunarStaffCommand.java delete mode 100644 src/main/java/xyz/refinedev/lunar/listeners/LunarListener.java delete mode 100644 src/main/java/xyz/refinedev/lunar/listeners/NametagTask.java delete mode 100644 src/main/java/xyz/refinedev/lunar/utils/Utils.java diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..37654af --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Setup (please complete the following information):** + - OS: [e.g. Windows] + - Version [e.g. v1.0.0] + - Software [e.g. Bukkit] + +**Additional context** +Add any other context about the problem here. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..24473de --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. \ No newline at end of file diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..d6a7e6a --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,37 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push + +jobs: + build: + if: "!contains(github.event.head_commit.message, '--skip')" + + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - uses: actions/checkout@v5 + - name: Set up JDK 21 + uses: actions/setup-java@v5 + with: + java-version: '21' + distribution: 'temurin' + + - name: Grant execute permission to gradlew + run: chmod +x gradlew + # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. + # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md + - name: Setup Gradle + uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 + + - name: Build with Gradle Wrapper + run: ./gradlew shadowJar \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..2321aef --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,54 @@ +name: Build & Release + +on: + push + +permissions: + contents: write + +jobs: + build-and-release: + if: "contains(github.event.head_commit.message, '--release')" + + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v5 + + - name: Set up Java + uses: actions/setup-java@v5 + with: + distribution: 'temurin' + java-version: '21' + + - name: Grant execute permission to gradlew + run: chmod +x gradlew + + - name: Build JAR + run: ./gradlew shadowJar + + + - name: Read version from build.gradle + id: get_version + run: | + VERSION=$(grep "^version *= *'" build.gradle | cut -d"'" -f2) + echo "VERSION=$VERSION" >> $GITHUB_ENV + echo "Using version $VERSION for tag" + + - name: Create tag + run: | + git config user.name "github-actions" + git config user.email "github-actions@github.com" + git tag ${{ env.VERSION }} + git push origin ${{ env.VERSION }} + + - name: Create GitHub Release + uses: softprops/action-gh-release@v2 + with: + name: Armstrong-${{ env.VERSION }} + tag_name: ${{ env.VERSION }} + files: ./build/libs/*.jar + body_path: ./CHANGELOG.md + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e7edf1b --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +.gradle/ +build/ +out/ +classes/ +target/ + +*.launch + +.idea/ +*.iml +*.ipr +*.iws + +.settings/ +.vscode/ +bin/ +.classpath +.project + +*.DS_Store + +run/ + +hs_err_*.log +*.hprof +*.jfr \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..e69de29 diff --git a/README.md b/README.md index 844f356..5720add 100644 --- a/README.md +++ b/README.md @@ -1,56 +1 @@ -
- - - ## LunarUtility - - - -**LunarUtility** is an a simple plugin that utilizes [LunarClient's](https://github.com/LunarClient) [BukkitAPI](https://github.com/LunarClient/BukkitAPI). - -If you find any issues, please report them in our issues tab and don't forget to star the repository! -
- -# Notice (UPDATE REGARDING THE LUNARCLIENT API) -LunarClient have officially released their new API [Apollo](https://github.com/LunarClient/Apollo).\ -They have removed BukkitAPI from their github which is what LunarUtility depends on.\ -We will be updating this soon to utilize Apollo. - -## The Team -+ [Dubai](https://github.com/GamerRealm) | Original Author -+ [Komek](https://github.com/Komeek) | Maintainer -+ [kayalust](https://github.com/kayalust) | Contributor - -## Contact -- [Discord](https://dsc.gg/refine) -- [Mail](mailto:refinedevelopment@gmail.com) -- [Twitter](https://twitter.com/RefineDev) - -## Installing -1. Download the jar from releases -2. Download LunarClient's BukkitAPI jar from here -3. Put both jars in all of your servers -4. Edit the configuration file to your liking. - -## Terms of Use -+ You are not allowed to sell, claim this as your own. Resepect the developer for his contributions and credit them. - -## Pictures -### Nametag -![2022-02-10_11 38 33](https://user-images.githubusercontent.com/42650369/154859444-55ffb81b-06b9-497a-9ec5-6c16906b2b83.png) - -### Kick -![image](https://github.com/RefineDevelopment/LunarUtility/assets/109939794/d3491af0-22bb-4b71-9355-5a9c194dc6ad) - -### Staff Mods -![2021-10-26_11 26 09](https://user-images.githubusercontent.com/42650369/138829302-7aeaad61-6cf4-426f-954a-43ace12a972f.png) -![2021-10-26_11 26 23](https://user-images.githubusercontent.com/42650369/138829317-7a8c6015-e692-4a84-b1d4-395a286454bb.png) - -### Commands -![2021-10-26_11 25 54](https://user-images.githubusercontent.com/42650369/138830339-36b85f2c-5044-4953-b6da-4e67ee30fe84.png) -![2021-10-26_11 27 38](https://user-images.githubusercontent.com/42650369/138829630-3c2fe296-c3b9-4aae-97f6-0f4b70db5f79.png) - -### Waypoints -![2021-10-26_11 24 51](https://user-images.githubusercontent.com/42650369/138829478-606493b4-072c-429b-897a-c54948407b4b.png) - -### Cooldowns -![2021-10-26_11 26 59](https://user-images.githubusercontent.com/42650369/138830407-ce602bdd-9281-4744-9d3d-105af5223f3f.png) +# Armstrong \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..7f65064 --- /dev/null +++ b/build.gradle @@ -0,0 +1,51 @@ +plugins { + id 'java' + id 'com.gradleup.shadow' version '9.1.0' +} + +group = 'li.genesis.armstrong' +version = '1.0' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} + +repositories { + maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' } + maven { url "https://repo.aikar.co/content/groups/aikar/" } + maven { url 'https://repo.extendedclip.com/releases/' } + maven { url 'https://jitpack.io' } + maven { url 'https://repo.lunarclient.dev' } + mavenCentral() +} + +dependencies { + annotationProcessor 'org.projectlombok:lombok:1.18.24' + compileOnly 'org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT' + compileOnly 'org.projectlombok:lombok:1.18.24' + compileOnly 'com.lunarclient:apollo-api:1.2.0' + compileOnly 'com.lunarclient:apollo-extra-adventure4:1.2.0' + compileOnly 'me.clip:placeholderapi:2.11.6' + implementation 'co.aikar:acf-paper:0.5.1-SNAPSHOT' + implementation 'org.bstats:bstats-bukkit:3.1.0' +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +processResources { + filteringCharset = 'UTF-8' + filesMatching('plugin.yml') { + expand(version: project.version) + } +} + +shadowJar { + archiveClassifier.set('') + relocate 'co.aikar.commands', 'li.genesis.aikar.commands' + relocate 'co.aikar.locales', 'li.genesis.aikar.locales' + relocate 'org.bstats', 'li.genesis.bstats' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077 GIT binary patch literal 45457 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 c82=K%QXLKFx%@O{wJjEi6Y56o#$)Bpeg literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2e11132 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..adff685 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/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/HEAD/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 new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@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/modIDs.yml b/modIDs.yml deleted file mode 100644 index 5fc7378..0000000 --- a/modIDs.yml +++ /dev/null @@ -1,59 +0,0 @@ -# LunarClient Mod IDs -# I don't know the IDs for these mods: -# Day Counter, Hit Color, Tab Editor, NameTags, Color Saturation, -# TNT Cooldown, 3D Skins, Pack Display, Chunk Borders, and Better Sounds. -# -# If you know the mod ID for any of these mods or a new mod's ID, please create a PR. - -# 1.7 Visuals - one_seven_visuals -# FPS - fps -# CPS - cps -# Toggle Sneak/Sprint - toggleSneak -# Armor Status - armorstatus -# KeyStrokes - keystrokes -# Coordinates - coo -# Crosshair - crosshair -# Potion Effects - potioneffects -# Direction HUD - directionhud -# Waypoints - waypoints -# Scoreboard - scoreboard -# Potion Counter - potion_counter -# Ping - ping -# Motion Blur - motionbBlur -# Chat - chat -# Scrollable Tooltips - scrollable_tooltips -# UHC Overlay - uhc_overlay -# Cooldowns - cooldowns -# Worldedit CUI - worldedit_cui -# Clock - clock -# StopWatch - stopwatch -# Memory - memory -# Combo - combo -# Reach Dsplay - range -# Time Changer - time_changer -# Server Address - serverAddressMod -# Saturation - saturation -# Item Phsyic - itemPhysic -# Item Tracker - itemTrackerChild -# Shiny Pots - shinyPots -# Block Outline - block_outline -# Screenshot - screenshot -# FOV Mod - fov_mod -# Auto Text Hotkey - textHotKey -# Mumble Link - mumble-link -# Boss Bar - bossbar -# Free Look - freelook -# Nick Hider - nickHider -# Pack Organizer - packorganizer -# Particle Mod - particleMod -# Glint Colorizer - glint_colorizer -# SnapLook - snaplook -# Team Viewer - teamview -# Menu Blur - menu_blur -# Hit Box - hitbox -# Weather Changer - weather_changer -# Lighting - lighting -# Zoom - zoom -# Skyblock Addons - skyblockAddons -# Hypixel Mods - hypixel_mod -# Hypixel Bedwars - hypixel_bedwars diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 8c46138..0000000 --- a/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - 4.0.0 - xyz.refinedev.lunar - LunarUtility - 2.0 - - LunarUtility - - - 1.8 - 1.8 - 1.8 - UTF-8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - - co.aikar.commands - xyz.refinedev.core.acf - - - co.aikar.locales - xyz.refinedev.core.locales - - - - - - package - - shade - - - false - - - - - - - - src/main/resources - true - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - placeholderapi - https://repo.extendedclip.com/content/repositories/placeholderapi/ - - - - jitpack.io - https://jitpack.io - - - - - - - org.spigotmc - spigot-api - 1.8.8-R0.1-SNAPSHOT - - - - org.projectlombok - lombok - 1.18.24 - - - - com.github.LunarClient - BukkitAPI - v1.0.1 - - - - me.clip - placeholderapi - 2.10.9 - provided - - - - co.aikar - acf-paper - 0.5.1-SNAPSHOT - - - \ No newline at end of file diff --git a/src/main/java/li/genesis/armstrong/Armstrong.java b/src/main/java/li/genesis/armstrong/Armstrong.java new file mode 100644 index 0000000..acaba8e --- /dev/null +++ b/src/main/java/li/genesis/armstrong/Armstrong.java @@ -0,0 +1,73 @@ +package li.genesis.armstrong; + +import li.genesis.armstrong.commands.LunarCommand; +import li.genesis.armstrong.commands.LunarStaffCommand; +import li.genesis.armstrong.hook.PlaceholderAPIHook; +import li.genesis.armstrong.listeners.LunarListener; +import li.genesis.armstrong.listeners.NametagTask; + +import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.module.nametag.NametagModule; + +import lombok.Getter; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.event.Listener; +import org.bukkit.plugin.java.JavaPlugin; +import co.aikar.commands.PaperCommandManager; +import org.bstats.bukkit.Metrics; + +@Getter +public class Armstrong extends JavaPlugin implements Listener { + + @Getter + private static Armstrong instance; + + private PaperCommandManager commandManager; + + @Override + public void onEnable() { + if (getServer().getPluginManager().getPlugin("Apollo-Bukkit") == null || !getServer().getPluginManager().getPlugin("Apollo-Bukkit").isEnabled()) { + getServer().getConsoleSender().sendMessage(ChatColor.RED + "[Armstrong] Apollo-Bukkit is missing!"); + getServer().getConsoleSender().sendMessage(ChatColor.RED + "[Armstrong] Get it from https://github.com/LunarClient/Apollo/releases"); + getServer().getPluginManager().disablePlugin(this); + return; + } + + instance = this; + + this.commandManager = new PaperCommandManager(this); + + this.commandManager.registerCommand(new LunarCommand(this)); + this.commandManager.registerCommand(new LunarStaffCommand()); + + this.saveDefaultConfig(); + this.registerApolloModules(); + + getServer().getPluginManager().registerEvents(this, this); + getServer().getPluginManager().registerEvents(new LunarListener(), this); + + getServer().getConsoleSender().sendMessage(ChatColor.GREEN + "[Armstrong] The plugin has been enabled!"); + + if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { + new PlaceholderAPIHook().register(); + getServer().getConsoleSender().sendMessage(ChatColor.GREEN + "[Armstrong] Placeholder API expansion successfully registered."); + } + + new Metrics(this, 27367); + } + + @Override + public void onDisable() { + getServer().getConsoleSender().sendMessage(ChatColor.RED + "[Armstrong] The plugin has been disabled!"); + } + + private void registerApolloModules() { + if (getConfig().getBoolean("NAMETAG.ENABLE")) { + this.reloadConfig(); + Apollo.getModuleManager().getModule(NametagModule.class); + this.getServer().getScheduler().runTaskTimerAsynchronously(this, + new NametagTask(this), 0, Long.parseLong(Locale.LUNAR_TAG_TICKS.messageFormat())); + } + } +} \ No newline at end of file diff --git a/src/main/java/xyz/refinedev/lunar/Locale.java b/src/main/java/li/genesis/armstrong/Locale.java similarity index 75% rename from src/main/java/xyz/refinedev/lunar/Locale.java rename to src/main/java/li/genesis/armstrong/Locale.java index 862ccbd..a6e2fbf 100644 --- a/src/main/java/xyz/refinedev/lunar/Locale.java +++ b/src/main/java/li/genesis/armstrong/Locale.java @@ -1,13 +1,11 @@ -package xyz.refinedev.lunar; +package li.genesis.armstrong; -import xyz.refinedev.lunar.utils.Utils; +import li.genesis.armstrong.utils.Utils; import java.util.List; public enum Locale { - LUNAR_TAG_1("NAMETAG.FIRST"), LUNAR_TAG_TICKS("NAMETAG.TICKS"), - LUNAR_TAG_2("NAMETAG.SECOND.TAG"), LUNAR_KICK_MESSAGE("REQUIRE-LUNAR.MESSAGE"), LUNAR_COMMAND_RELOAD("MESSAGES.MAIN.RELOAD"), LUNAR_COMMAND_PLAYER("MESSAGES.LUNAR-COMMAND.PLAYER"), @@ -19,7 +17,8 @@ public enum Locale { LUNAR_STAFF_COMMAND_DISABLE_PLAYER("MESSAGES.LUNAR-STAFF-COMMAND.DISABLE.PLAYER"), LUNAR_STAFF_COMMAND_DISABLE_TARGET("MESSAGES.LUNAR-STAFF-COMMAND.DISABLE.TARGET"), LUNAR_STAFF_COMMAND_ENABLE_TO_TARGET("MESSAGES.LUNAR-STAFF-COMMAND.ENABLE.TO-TARGET"), - LUNAR_STAFF_COMMAND_DISABLE_TO_TARGET("MESSAGES.LUNAR-STAFF-COMMAND.DISABLE.TO-TARGET"); + LUNAR_STAFF_COMMAND_DISABLE_TO_TARGET("MESSAGES.LUNAR-STAFF-COMMAND.DISABLE.TO-TARGET"), + LUNAR_STAFF_COMMAND_ENABLE_ERROR("MESSAGES.LUNAR-STAFF-COMMAND.ENABLE.ERROR"); private final String path; @@ -28,10 +27,10 @@ public enum Locale { } public String messageFormat() { - return Utils.translate(LunarUtility.getInstance().getConfig().getString(this.path)); + return Utils.translate(Armstrong.getInstance().getConfig().getString(this.path)); } public final List messageFormatList() { - return Utils.translate(LunarUtility.getInstance().getConfig().getStringList(this.path)); + return Utils.translate(Armstrong.getInstance().getConfig().getStringList(this.path)); } } \ No newline at end of file diff --git a/src/main/java/xyz/refinedev/lunar/commands/LunarCommand.java b/src/main/java/li/genesis/armstrong/commands/LunarCommand.java similarity index 52% rename from src/main/java/xyz/refinedev/lunar/commands/LunarCommand.java rename to src/main/java/li/genesis/armstrong/commands/LunarCommand.java index 4c72db2..71c34f2 100644 --- a/src/main/java/xyz/refinedev/lunar/commands/LunarCommand.java +++ b/src/main/java/li/genesis/armstrong/commands/LunarCommand.java @@ -1,74 +1,80 @@ -package xyz.refinedev.lunar.commands; +package li.genesis.armstrong.commands; + +import li.genesis.armstrong.Locale; +import li.genesis.armstrong.Armstrong; +import li.genesis.armstrong.utils.Utils; + +import com.lunarclient.apollo.Apollo; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; import co.aikar.commands.bukkit.contexts.OnlinePlayer; -import com.lunarclient.bukkitapi.LunarClientAPI; + import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import xyz.refinedev.lunar.Locale; -import xyz.refinedev.lunar.LunarUtility; -import xyz.refinedev.lunar.utils.Utils; -import java.io.File; import java.util.stream.Collectors; -@CommandAlias(value = "lunarclient|lc") +@CommandAlias(value = "armstrong|lc") public class LunarCommand extends BaseCommand { @Dependency - private final LunarUtility plugin; + private final Armstrong plugin; - public LunarCommand(LunarUtility plugin) { + public LunarCommand(Armstrong plugin) { this.plugin = plugin; } @Default @Syntax(value = "[Player]") @CommandCompletion(value = "@players") + @CommandPermission("armstrong.players") @Description(value = "View a player's LunarClient status.") public void lunarCommand(Player player, @Optional OnlinePlayer target) { - if (target == null) { player.sendMessage(Utils.parsePapi(player, Locale.LUNAR_COMMAND_PLAYER.messageFormat()) - .replace("", player.getDisplayName()) - .replace("", Utils.checkLC(player))); + .replace("", player.getDisplayName()) + .replace("", Utils.lunarStatus(player))); } else { player.sendMessage(Utils.parsePapi(player, Locale.LUNAR_COMMAND_TARGET.messageFormat()) - .replace("", target.getPlayer().getName()) - .replace("", Utils.checkLC(target.getPlayer()))); + .replace("", target.getPlayer().getName()) + .replace("", Utils.lunarStatus(target.getPlayer()))); } } - @Subcommand(value = "users|players|online") + @Subcommand(value = "users|players|list") + @CommandPermission("armstrong.players") @Description(value = "View a list of players using LunarClient.") public void userCommand(CommandSender sender) { + long totalUsers = Bukkit.getOnlinePlayers().stream() + .filter(p -> Apollo.getPlayerManager().hasSupport(p.getUniqueId())) + .count(); - if (LunarClientAPI.getInstance().getPlayersRunningLunarClient().size() == 0) { + if (totalUsers == 0) { sender.sendMessage(ChatColor.RED + "There are no players online using LunarClient!"); return; } String playerLists = Bukkit.getOnlinePlayers().stream() - .filter(player -> LunarClientAPI.getInstance().isRunningLunarClient(player)) - .map(Player::getName) - .collect(Collectors.joining(Locale.LUNAR_USERS_SEPERATOR.messageFormat())); + .filter(p -> Apollo.getPlayerManager().hasSupport(p.getUniqueId())) + .map(Player::getName) + .collect(Collectors.joining(Locale.LUNAR_USERS_SEPERATOR.messageFormat())); Locale.LUNAR_USERS_MESSAGE.messageFormatList().stream() - .map(message -> message - .replace("", String.valueOf(LunarClientAPI.getInstance().getPlayersRunningLunarClient().size())) - .replace("", playerLists)) - .forEach(sender::sendMessage); + .map(message -> message + .replace("", String.valueOf(totalUsers)) + .replace("", playerLists)) + .forEach(sender::sendMessage); } @Subcommand(value = "reload") - @CommandPermission(value = "lunar.reload") - @Description(value = "Reload the LunarUtility plugin configuration.") + @CommandPermission(value = "armstrong.reload") + @Description(value = "Reload the Armstrong plugin configuration.") public void reloadCommand(CommandSender sender) { try { - plugin.getConfig().load(new File(plugin.getDataFolder(), "config.yml")); + plugin.reloadConfig(); sender.sendMessage(Locale.LUNAR_COMMAND_RELOAD.messageFormat()); } catch (Exception e) { sender.sendMessage(ChatColor.RED + "An error occurred!"); diff --git a/src/main/java/li/genesis/armstrong/commands/LunarStaffCommand.java b/src/main/java/li/genesis/armstrong/commands/LunarStaffCommand.java new file mode 100644 index 0000000..05331f8 --- /dev/null +++ b/src/main/java/li/genesis/armstrong/commands/LunarStaffCommand.java @@ -0,0 +1,85 @@ +package li.genesis.armstrong.commands; + +import li.genesis.armstrong.Locale; +import li.genesis.armstrong.utils.Utils; + +import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.module.staffmod.StaffMod; +import com.lunarclient.apollo.module.staffmod.StaffModModule; +import com.lunarclient.apollo.player.ApolloPlayer; + +import co.aikar.commands.BaseCommand; +import co.aikar.commands.annotation.CommandAlias; +import co.aikar.commands.annotation.CommandPermission; +import co.aikar.commands.annotation.Default; +import co.aikar.commands.annotation.Description; +import co.aikar.commands.annotation.Syntax; +import co.aikar.commands.bukkit.contexts.OnlinePlayer; + +import org.bukkit.entity.Player; + +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; + +@CommandAlias("lunarstaffmode|lsm") +@CommandPermission("armstrong.staff") +public class LunarStaffCommand extends BaseCommand { + + private final StaffModModule staffModModule; + private final Map> enabledMods = new HashMap<>(); + + public LunarStaffCommand() { + this.staffModModule = Apollo.getModuleManager().getModule(StaffModModule.class); + } + + @Default + @Syntax("[Player]") + @Description("Toggle a player's Lunar Client staff mod(s).") + public void toggleStaff(Player sender, @co.aikar.commands.annotation.Optional OnlinePlayer onlinePlayer) { + Player target = (onlinePlayer == null ? sender : onlinePlayer.getPlayer()); + + Optional apolloPlayerOpt = Apollo.getPlayerManager().getPlayer(target.getUniqueId()); + if (!apolloPlayerOpt.isPresent()) { + sender.sendMessage(Utils.parsePapi(sender, Locale.LUNAR_STAFF_COMMAND_ENABLE_ERROR.messageFormat()) + .replace("", target.getName())); + return; + } + ApolloPlayer apolloPlayer = apolloPlayerOpt.get(); + + StaffMod mod = StaffMod.XRAY; + + UUID targetUUID = target.getUniqueId(); + Set modsForTarget = enabledMods.computeIfAbsent(targetUUID, k -> new HashSet<>()); + + if (modsForTarget.contains(mod)) { + staffModModule.disableStaffMods(apolloPlayer, Collections.singletonList(mod)); + modsForTarget.remove(mod); + + if (onlinePlayer == null) { + sender.sendMessage(Utils.parsePapi(sender, Locale.LUNAR_STAFF_COMMAND_DISABLE_PLAYER.messageFormat())); + } else { + sender.sendMessage(Utils.parsePapi(sender, Locale.LUNAR_STAFF_COMMAND_DISABLE_TARGET.messageFormat()) + .replace("", target.getDisplayName())); + target.sendMessage(Utils.parsePapi(target, Locale.LUNAR_STAFF_COMMAND_DISABLE_TO_TARGET.messageFormat()) + .replace("", sender.getDisplayName())); + } + } else { + staffModModule.enableStaffMods(apolloPlayer, Collections.singletonList(mod)); + modsForTarget.add(mod); + + if (onlinePlayer == null) { + sender.sendMessage(Utils.parsePapi(sender, Locale.LUNAR_STAFF_COMMAND_ENABLE_PLAYER.messageFormat())); + } else { + sender.sendMessage(Utils.parsePapi(sender, Locale.LUNAR_STAFF_COMMAND_ENABLE_TARGET.messageFormat()) + .replace("", target.getDisplayName())); + target.sendMessage(Utils.parsePapi(target, Locale.LUNAR_STAFF_COMMAND_ENABLE_TO_TARGET.messageFormat()) + .replace("", sender.getDisplayName())); + } + } + } +} diff --git a/src/main/java/xyz/refinedev/lunar/hook/PlaceholderAPIHook.java b/src/main/java/li/genesis/armstrong/hook/PlaceholderAPIHook.java similarity index 76% rename from src/main/java/xyz/refinedev/lunar/hook/PlaceholderAPIHook.java rename to src/main/java/li/genesis/armstrong/hook/PlaceholderAPIHook.java index ce1d538..ee0b407 100644 --- a/src/main/java/xyz/refinedev/lunar/hook/PlaceholderAPIHook.java +++ b/src/main/java/li/genesis/armstrong/hook/PlaceholderAPIHook.java @@ -1,15 +1,16 @@ -package xyz.refinedev.lunar.hook; +package li.genesis.armstrong.hook; + +import li.genesis.armstrong.utils.Utils; -import me.clip.placeholderapi.expansion.PlaceholderExpansion; -import xyz.refinedev.lunar.utils.Utils; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; +import me.clip.placeholderapi.expansion.PlaceholderExpansion; public class PlaceholderAPIHook extends PlaceholderExpansion { @Override public @NotNull String getIdentifier() { - return "lunar"; + return "armstrong"; } @Override @@ -19,7 +20,7 @@ public boolean persist() { @Override public @NotNull String getAuthor() { - return "RefineDevelopment"; + return "Vaption"; } @Override @@ -30,9 +31,9 @@ public boolean persist() { @Override public String onPlaceholderRequest(Player player, String identifier) { - // %lunar_status% + // %armstrong_status% if (identifier.equalsIgnoreCase("status")) { - return Utils.checkLC(player); + return Utils.lunarStatus(player); } return null; diff --git a/src/main/java/li/genesis/armstrong/listeners/LunarListener.java b/src/main/java/li/genesis/armstrong/listeners/LunarListener.java new file mode 100644 index 0000000..238b471 --- /dev/null +++ b/src/main/java/li/genesis/armstrong/listeners/LunarListener.java @@ -0,0 +1,32 @@ +package li.genesis.armstrong.listeners; + +import li.genesis.armstrong.Locale; +import li.genesis.armstrong.Armstrong; +import li.genesis.armstrong.utils.Utils; + +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; + +public class LunarListener implements Listener { + private final Armstrong plugin; + + public LunarListener() { + this.plugin = Armstrong.getInstance(); + } + + @EventHandler + public void onPlayerJoin(PlayerJoinEvent event) { + Player player = event.getPlayer(); + + Bukkit.getScheduler().runTaskLater(plugin, () -> { + if (plugin.getConfig().getBoolean("REQUIRE-LUNAR.ENABLED")) { + if (!Utils.isOnLunar(player)) { + player.kickPlayer(Locale.LUNAR_KICK_MESSAGE.messageFormat().replace("", "\n")); + } + } + }, 20L); + } +} \ No newline at end of file diff --git a/src/main/java/li/genesis/armstrong/listeners/NametagTask.java b/src/main/java/li/genesis/armstrong/listeners/NametagTask.java new file mode 100644 index 0000000..4118e3e --- /dev/null +++ b/src/main/java/li/genesis/armstrong/listeners/NametagTask.java @@ -0,0 +1,116 @@ +package li.genesis.armstrong.listeners; + +import li.genesis.armstrong.Armstrong; +import li.genesis.armstrong.utils.Utils; + +import com.lunarclient.apollo.Apollo; +import com.lunarclient.apollo.module.nametag.Nametag; +import com.lunarclient.apollo.module.nametag.NametagModule; +import com.lunarclient.apollo.player.ApolloPlayer; + +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; + +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.configuration.ConfigurationSection; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +public class NametagTask implements Runnable { + private final Armstrong plugin; + private final NametagModule nametagModule; + private static final String[] LINE_NAMES = {"FIRST", "SECOND", "THIRD", "FOURTH"}; + + public NametagTask(Armstrong plugin) { + this.plugin = plugin; + this.nametagModule = Apollo.getModuleManager().getModule(NametagModule.class); + } + + @Override + public void run() { + if (nametagModule == null || !plugin.getConfig().getBoolean("NAMETAG.ENABLE", true)) return; + + for (Player target : Bukkit.getOnlinePlayers()) { + if (target.isOnline()) { + updateNametagFor(target); + } + } + } + + public void updateNametagFor(Player target) { + List nametagLines = buildNametagLines(target); + if (nametagLines.isEmpty()) return; + + Nametag nametag = Nametag.builder() + .lines(nametagLines) + .build(); + + for (Player viewer : Bukkit.getOnlinePlayers()) { + if (viewer.isOnline()) { + Optional apolloViewerOpt = Apollo.getPlayerManager().getPlayer(viewer.getUniqueId()); + apolloViewerOpt.ifPresent(apolloViewer -> + nametagModule.overrideNametag(apolloViewer, target.getUniqueId(), nametag) + ); + } + } + } + + private List buildNametagLines(Player target) { + List lines = new ArrayList<>(); + + String lunarStatus = Utils.isOnLunar(target) + ? Utils.translate(plugin.getConfig().getString("OTHER.ENABLED", "&aON&r")) + : Utils.translate(plugin.getConfig().getString("OTHER.DISABLED", "&cOFF&r")); + + for (String lineName : LINE_NAMES) { + ConfigurationSection lineSection = plugin.getConfig().getConfigurationSection("NAMETAG." + lineName); + if (lineSection == null || !lineSection.getBoolean("ENABLE", true)) continue; + + String lineContent = processLine(lineSection, target, lunarStatus); + if (!lineContent.isEmpty()) { + lines.add(LegacyComponentSerializer.legacyAmpersand().deserialize(lineContent)); + } + } + + return lines; + } + + private String processLine(ConfigurationSection lineSection, Player target, String lunarStatus) { + ConfigurationSection tiersSection = lineSection.getConfigurationSection("TIERS"); + if (tiersSection == null) return ""; + + return processTieredLine(tiersSection, target, lunarStatus); + } + + private String processTieredLine(ConfigurationSection tiersSection, Player target, String lunarStatus) { + String chosenTemplate = ""; + int highestWeight = Integer.MIN_VALUE; + + for (String key : tiersSection.getKeys(false)) { + ConfigurationSection tier = tiersSection.getConfigurationSection(key); + if (tier == null) continue; + + String perm = tier.getString("permission", ""); + int weight = tier.getInt("weight", 0); + String format = tier.getString("format", ""); + + if ((perm.isEmpty() || target.hasPermission(perm)) && weight > highestWeight) { + highestWeight = weight; + chosenTemplate = format; + } + } + + return chosenTemplate.isEmpty() ? "" : formatLine(chosenTemplate, target, lunarStatus); + } + + private String formatLine(String format, Player target, String lunarStatus) { + String processed = Utils.parsePapi(target, format); + return Utils.translate(processed) + .replace("", target.getDisplayName()) + .replace("", target.getName()) + .replace("", lunarStatus); + } +} diff --git a/src/main/java/li/genesis/armstrong/utils/Utils.java b/src/main/java/li/genesis/armstrong/utils/Utils.java new file mode 100644 index 0000000..0ccc029 --- /dev/null +++ b/src/main/java/li/genesis/armstrong/utils/Utils.java @@ -0,0 +1,42 @@ +package li.genesis.armstrong.utils; + +import li.genesis.armstrong.Armstrong; + +import com.lunarclient.apollo.Apollo; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; +import me.clip.placeholderapi.PlaceholderAPI; + +import java.util.List; +import java.util.stream.Collectors; + +public class Utils { + + public static String parsePapi(Player player, String text) { + if (text == null) return ""; + if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) { + return PlaceholderAPI.setPlaceholders(player, text); + } + return text; + } + + public static boolean isOnLunar(Player player) { + return Apollo.getPlayerManager().hasSupport(player.getUniqueId()); + } + + public static String lunarStatus(Player player) { + String path = isOnLunar(player) ? "OTHER.ENABLED" : "OTHER.DISABLED"; + return translate(Armstrong.getInstance().getConfig().getString(path, "")); + } + + public static String translate(String text) { + if (text == null) return ""; + return ChatColor.translateAlternateColorCodes('&', text); + } + + public static List translate(List text) { + return text.stream().map(Utils::translate).collect(Collectors.toList()); + } +} \ No newline at end of file diff --git a/src/main/java/xyz/refinedev/lunar/LunarUtility.java b/src/main/java/xyz/refinedev/lunar/LunarUtility.java deleted file mode 100644 index 37d54b1..0000000 --- a/src/main/java/xyz/refinedev/lunar/LunarUtility.java +++ /dev/null @@ -1,122 +0,0 @@ -package xyz.refinedev.lunar; - -import co.aikar.commands.PaperCommandManager; -import com.google.gson.JsonParser; -import com.lunarclient.bukkitapi.LunarClientAPI; -import com.lunarclient.bukkitapi.cooldown.LCCooldown; -import com.lunarclient.bukkitapi.cooldown.LunarClientAPICooldown; -import com.lunarclient.bukkitapi.nethandler.client.LCPacketModSettings; -import com.lunarclient.bukkitapi.nethandler.client.obj.ModSettings; -import com.lunarclient.bukkitapi.nethandler.client.obj.ServerRule; -import com.lunarclient.bukkitapi.object.LCWaypoint; -import com.lunarclient.bukkitapi.serverrule.LunarClientAPIServerRule; -import lombok.Getter; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.plugin.java.JavaPlugin; -import xyz.refinedev.lunar.commands.LunarCommand; -import xyz.refinedev.lunar.commands.LunarStaffCommand; -import xyz.refinedev.lunar.hook.PlaceholderAPIHook; -import xyz.refinedev.lunar.listeners.LunarListener; -import xyz.refinedev.lunar.listeners.NametagTask; -import xyz.refinedev.lunar.utils.Utils; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - - -@Getter -public class LunarUtility extends JavaPlugin { - - @Getter - private static LunarUtility instance; - - private PaperCommandManager commandManager; - private LCPacketModSettings packetModSettings = null; - private final List waypoints = new ArrayList<>(); - - @Override - public void onEnable() { - instance = this; - - this.commandManager = new PaperCommandManager(this); - - this.commandManager.registerCommand(new LunarCommand(this)); - this.commandManager.registerCommand(new LunarStaffCommand()); - - this.saveDefaultConfig(); - this.registerLunar(); - this.loadDisabledMods(); - this.loadWaypoints(); - - getServer().getConsoleSender().sendMessage(ChatColor.GREEN + "LunarUtility 2.0 has been enabled!"); - - if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { - new PlaceholderAPIHook().register(); - getServer().getConsoleSender().sendMessage(ChatColor.GREEN + "Placeholder API expansion successfully registered."); - } - } - - - @Override - public void onDisable() { - getServer().getConsoleSender().sendMessage(ChatColor.RED + "LunarUtility 2.0 has been disabled!"); - } - - private void registerLunar() { - Bukkit.getPluginManager().registerEvents(new LunarListener(this), this); - - if (getConfig().getBoolean("NAMETAG.ENABLE")) { - this.getServer().getScheduler().runTaskTimerAsynchronously(this, new NametagTask(this), 0, Long.parseLong(Locale.LUNAR_TAG_TICKS.messageFormat())); - } - - if (getConfig().getBoolean("COOLDOWN.COMBAT.ENABLE")) { - LunarClientAPICooldown.registerCooldown(new LCCooldown("Combat", getConfig().getInt("COOLDOWN.COMBAT.DELAY"), TimeUnit.SECONDS, Material.getMaterial(getConfig().getString("COOLDOWN.COMBAT.ICON")))); - } - - if (getConfig().getBoolean("COOLDOWN.ENDERPEARL.ENABLE")) { - LunarClientAPICooldown.registerCooldown(new LCCooldown("Enderpearl", getConfig().getInt("COOLDOWN.ENDERPEARL.DELAY"), TimeUnit.SECONDS, Material.getMaterial(getConfig().getString("COOLDOWN.ENDERPEARL.ICON")))); - } - - if (getConfig().getBoolean("COOLDOWN.GAPPLE.ENABLE")) { - LunarClientAPICooldown.registerCooldown(new LCCooldown("Gapple", getConfig().getInt("COOLDOWN.GAPPLE.DELAY"), TimeUnit.SECONDS, Material.getMaterial(getConfig().getString("COOLDOWN.GAPPLE.ICON")))); - } - } - - public void loadWaypoints() { - if (!getConfig().getBoolean("WAYPOINT.ENABLED")) return; - - LunarClientAPIServerRule.setRule(ServerRule.SERVER_HANDLES_WAYPOINTS, true); - - //Original code credit to BukkitImpl - List> maps = getConfig().getMapList("WAYPOINT.WAYPOINTS"); - - maps.stream() - .flatMap(map -> map.entrySet().stream()) - .map(entry -> new JsonParser().parse(String.valueOf(entry.getValue())).getAsJsonObject()) - .map(object -> new LCWaypoint(object.get("name").getAsString(), object.get("x").getAsInt(), object.get("y").getAsInt(), object.get("z").getAsInt(), LunarClientAPI.getInstance().getWorldIdentifier(Bukkit.getWorld(object.get("world").getAsString())), object.get("color").getAsInt(), object.get("forced").getAsBoolean(), object.get("visible").getAsBoolean())) - .forEachOrdered(waypoints::add); - } - - private void loadDisabledMods() { - ModSettings modSettings = new ModSettings(); - - if (getConfig().getBoolean("MODS.DISABLE-ALL-MODS")) { - Utils.getModList().forEach(modName -> modSettings.addModSetting(modName, new ModSettings.ModSetting(false, new HashMap<>()))); - - packetModSettings = new LCPacketModSettings(modSettings); - return; - } - - if (getConfig().getBoolean("MODS.DISABLE-MODS.ENABLED")) { - getConfig().getStringList("MODS.DISABLE-MODS.MODS") - .forEach(modName -> modSettings.addModSetting(modName, new ModSettings.ModSetting(false, new HashMap<>()))); - - packetModSettings = new LCPacketModSettings(modSettings); - } - } -} \ No newline at end of file diff --git a/src/main/java/xyz/refinedev/lunar/commands/LunarStaffCommand.java b/src/main/java/xyz/refinedev/lunar/commands/LunarStaffCommand.java deleted file mode 100644 index 79c068e..0000000 --- a/src/main/java/xyz/refinedev/lunar/commands/LunarStaffCommand.java +++ /dev/null @@ -1,50 +0,0 @@ -package xyz.refinedev.lunar.commands; - -import co.aikar.commands.BaseCommand; -import co.aikar.commands.annotation.*; -import co.aikar.commands.bukkit.contexts.OnlinePlayer; -import com.lunarclient.bukkitapi.LunarClientAPI; -import com.lunarclient.bukkitapi.object.StaffModule; -import org.bukkit.entity.Player; -import xyz.refinedev.lunar.Locale; -import xyz.refinedev.lunar.utils.Utils; - -@CommandAlias(value = "lunarstaffmode|lcstaffmode|lunarstaffmod|lunarstaffmods|lsm") -@CommandPermission(value = "lunar.staff") -public class LunarStaffCommand extends BaseCommand { - - @Default - @Subcommand(value = "enable|add") - @Syntax(value = "[Player]") - @CommandCompletion(value = "@players") - @Description(value = "Enable a player's lunar mods.") - public void enableStaffMods(Player player, @Optional OnlinePlayer onlinePlayer) { - Player target = (onlinePlayer == null ? player : onlinePlayer.getPlayer()); - - LunarClientAPI.getInstance().setStaffModuleState(target, StaffModule.XRAY, true); - - if (onlinePlayer == null) { - player.sendMessage(Utils.parsePapi(player, Locale.LUNAR_STAFF_COMMAND_ENABLE_PLAYER.messageFormat())); - } else { - player.sendMessage(Utils.parsePapi(player, Locale.LUNAR_STAFF_COMMAND_ENABLE_TARGET.messageFormat()).replace("", target.getDisplayName())); - target.sendMessage(Utils.parsePapi(target, Locale.LUNAR_STAFF_COMMAND_ENABLE_TO_TARGET.messageFormat()).replace("", player.getDisplayName())); - } - } - - @Subcommand(value = "disable|remove") - @Syntax(value = "[Player]") - @CommandCompletion(value = "@players") - @Description(value = "Disable a player's lunar mods.") - public void disableStaffMods(Player player, @Optional OnlinePlayer onlinePlayer) { - Player target = (onlinePlayer == null ? player : onlinePlayer.getPlayer()); - - LunarClientAPI.getInstance().setStaffModuleState(target, StaffModule.XRAY, false); - - if (onlinePlayer == null) { - player.sendMessage(Utils.parsePapi(player, Locale.LUNAR_STAFF_COMMAND_DISABLE_PLAYER.messageFormat())); - } else { - player.sendMessage(Utils.parsePapi(player, Locale.LUNAR_STAFF_COMMAND_DISABLE_TARGET.messageFormat()).replace("", target.getDisplayName())); - target.sendMessage(Utils.parsePapi(target, Locale.LUNAR_STAFF_COMMAND_DISABLE_TO_TARGET.messageFormat()).replace("", player.getDisplayName())); - } - } -} \ No newline at end of file diff --git a/src/main/java/xyz/refinedev/lunar/listeners/LunarListener.java b/src/main/java/xyz/refinedev/lunar/listeners/LunarListener.java deleted file mode 100644 index 5ca400a..0000000 --- a/src/main/java/xyz/refinedev/lunar/listeners/LunarListener.java +++ /dev/null @@ -1,76 +0,0 @@ -package xyz.refinedev.lunar.listeners; - -import com.lunarclient.bukkitapi.LunarClientAPI; -import com.lunarclient.bukkitapi.cooldown.LunarClientAPICooldown; -import com.lunarclient.bukkitapi.serverrule.LunarClientAPIServerRule; -import lombok.RequiredArgsConstructor; -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.entity.EnderPearl; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.ProjectileLaunchEvent; -import org.bukkit.event.player.PlayerItemConsumeEvent; -import org.bukkit.event.player.PlayerJoinEvent; -import xyz.refinedev.lunar.Locale; -import xyz.refinedev.lunar.LunarUtility; -import xyz.refinedev.lunar.utils.Utils; - -@RequiredArgsConstructor -public class LunarListener implements Listener { - private final LunarUtility plugin; - - @EventHandler - public void onPlayerJoin(PlayerJoinEvent event) { - Player player = event.getPlayer(); - - //Send disabled mod's packet to player - if (plugin.getPacketModSettings() != null) { - LunarClientAPI.getInstance().sendPacket(event.getPlayer(), plugin.getPacketModSettings()); - } - - if (plugin.getConfig().getBoolean("WAYPOINT.ENABLED")) { - plugin.getWaypoints().forEach(waypoint -> LunarClientAPI.getInstance().sendWaypoint(event.getPlayer(), waypoint)); - LunarClientAPIServerRule.sendServerRule(player); - } - - //After 1 second on join, if the player isn't running lc, kick them - Bukkit.getScheduler().runTaskLater(plugin, () -> { - if (!LunarClientAPI.getInstance().isRunningLunarClient(player) && plugin.getConfig().getBoolean("REQUIRE-LUNAR.ENABLED")) { - player.kickPlayer(Locale.LUNAR_KICK_MESSAGE.messageFormat().replace("", "\n")); - } - }, 20L); - } - - @EventHandler - public void onPlayerDamagePlayer(EntityDamageByEntityEvent event) { - if (!plugin.getConfig().getBoolean("COOLDOWN.COMBAT.ENABLE")) return; - if (event.getEntity().getType() != EntityType.PLAYER) return; - if (event.getDamager().getType() != EntityType.PLAYER) return; - - if (Utils.isCompatible()) { - LunarClientAPICooldown.sendCooldown((Player) event.getEntity(), "Combat"); - LunarClientAPICooldown.sendCooldown((Player) event.getDamager(), "Combat"); - } - } - - @EventHandler - public void onPearlLaunch(ProjectileLaunchEvent event) { - if (!(event.getEntity().getShooter() instanceof Player)) return; - - if (Utils.isCompatible() && event.getEntity() instanceof EnderPearl && plugin.getConfig().getBoolean("COOLDOWN.ENDERPEARL.ENABLE")) { - LunarClientAPICooldown.sendCooldown((Player) event.getEntity().getShooter(), "Enderpearl"); - } - } - - @EventHandler - public void onGappleConsume(PlayerItemConsumeEvent event) { - - if (Utils.isCompatible() && event.getItem().getType().equals(Material.GOLDEN_APPLE) && plugin.getConfig().getBoolean("COOLDOWN.GAPPLE.ENABLE")) { - LunarClientAPICooldown.sendCooldown(event.getPlayer(), "Gapple"); - } - } -} \ No newline at end of file diff --git a/src/main/java/xyz/refinedev/lunar/listeners/NametagTask.java b/src/main/java/xyz/refinedev/lunar/listeners/NametagTask.java deleted file mode 100644 index dc47668..0000000 --- a/src/main/java/xyz/refinedev/lunar/listeners/NametagTask.java +++ /dev/null @@ -1,41 +0,0 @@ -package xyz.refinedev.lunar.listeners; - -import com.lunarclient.bukkitapi.LunarClientAPI; -import lombok.RequiredArgsConstructor; -import xyz.refinedev.lunar.Locale; -import xyz.refinedev.lunar.LunarUtility; -import xyz.refinedev.lunar.utils.Utils; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; - -import java.util.ArrayList; -import java.util.List; - -@RequiredArgsConstructor -public class NametagTask implements Runnable { - private final LunarUtility plugin; - - @Override - public void run() { - Bukkit.getOnlinePlayers().forEach(all -> Bukkit.getOnlinePlayers() - .forEach(player -> LunarClientAPI.getInstance().overrideNametag(all, nametagSetup(all), player))); - } - - private List nametagSetup(Player target) { - List tag = new ArrayList<>(); - String lunar = (LunarClientAPI.getInstance().isRunningLunarClient(target) ? Utils.translate(plugin.getConfig().getString("OTHER.ENABLED")) : Utils.translate(plugin.getConfig().getString("OTHER.DISABLED"))); - - tag.add(Utils.parsePapi(target, Locale.LUNAR_TAG_1.messageFormat()) - .replace("", target.getDisplayName()) - .replace("", target.getName()) - .replace("", lunar)); - - if (plugin.getConfig().getBoolean("NAMETAG.SECOND.ENABLE")) { - tag.add(Utils.parsePapi(target, Locale.LUNAR_TAG_2.messageFormat()) - .replace("", target.getDisplayName()) - .replace("", target.getName()) - .replace("", lunar)); - } - return tag; - } -} \ No newline at end of file diff --git a/src/main/java/xyz/refinedev/lunar/utils/Utils.java b/src/main/java/xyz/refinedev/lunar/utils/Utils.java deleted file mode 100644 index 3ce2194..0000000 --- a/src/main/java/xyz/refinedev/lunar/utils/Utils.java +++ /dev/null @@ -1,54 +0,0 @@ -package xyz.refinedev.lunar.utils; - -import com.lunarclient.bukkitapi.LunarClientAPI; -import me.clip.placeholderapi.PlaceholderAPI; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; -import xyz.refinedev.lunar.LunarUtility; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -public class Utils { - public static String parsePapi(Player player, String text) { - return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null ? PlaceholderAPI.setPlaceholders(player, text) : text; - } - - public static String checkLC(Player player) { - return LunarClientAPI.getInstance().isRunningLunarClient(player) ? translate(LunarUtility.getInstance().getConfig().getString("OTHER.ENABLED")) : translate(LunarUtility.getInstance().getConfig().getString("OTHER.DISABLED")); - } - - public static boolean isCompatible() { - return Bukkit.getServer().getVersion().contains("1.7") || Bukkit.getServer().getVersion().contains("1.8"); - } - - public static String translate(String text) { - return ChatColor.translateAlternateColorCodes('&', text); - } - - public static List translate(List text) { - return text.stream().map(string -> ChatColor.translateAlternateColorCodes('&', string)).collect(Collectors.toList()); - } - - public static List getModList() { - // There is no other way than to list them manually because LunarClientAPI doesn't provide a list of their mod ids - // There are newer mods, but I'm busy so push pr if you find them - - return new ArrayList<>(Arrays.asList( - "one_seven_visuals", "fps", "cps", "skyblockAddons", "toggleSneak", - "hypixel_mod", "armorstatus", "keystrokes", "coords", "crosshair", - "potioneffects", "directionhud", "waypoints", "scoreboard", "potion_counter", - "ping", "motionBlur", "chat", "scrollable_tooltips", "uhc_overlay", - "cooldowns", "worldedit_cui", "clock", "stopwatch", "memory", - "combo", "range", "time_changer", "serverAddressMod", "saturation", - "itemPhysic", "itemTrackerChild", "shinyPots", "block_outline", "screenshot", - "fov_mod", "textHotKey", "mumble-link", "bossbar", "freelook", - "nickHider", "pack_organizer", "hypixel_bedwars", "particleMod", "glint_colorizer", - "snaplook", "teamview", "menu_blur", "hitbox", "hitcolor", - "weather_changer", "lighting", "zoom" - )); - } -} \ No newline at end of file diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index abe4f4f..4512d3f 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,64 +1,101 @@ -######################## -# LunarUtility # -# By RefineDevelopment # -######################## +############################################################################################################### +# # +# Armstrong (aka. LunarUtility) # +# # +# Maintained by Vaption # +# (Originally made by RefineDevelopment) # +# # +############################################################################################################### -#Disabled cooldowns for 1.9+ because of LC API Issue -COOLDOWN: - ENDERPEARL: #Sends cooldown on enderpearl throw - ENABLE: true - ICON: "ENDER_PEARL" - DELAY: 16 - GAPPLE: #Sends cooldown when a gapple is eaten - ENABLE: false - ICON: "GOLDEN_APPLE" - DELAY: 45 - COMBAT: #Sends cooldown when a fight happens | both to the damager and the target - ENABLE: false - ICON: "DIAMOND_SWORD" - DELAY: 30 -#Don't set the cooldown to 0 or else the plugin won't work! -#You have to restart the server whenever you change the delay. +############################################################################################################### +# # +# Set this to true if you want to force LunarClient on your server. # +# People joining with anything else will be kicked from the server. # +# The kick message can be configured below. adds a new line. # +# # +# Color codes are supported (See https://wiki.ess3.net/mc/). # +# # +############################################################################################################### REQUIRE-LUNAR: ENABLED: false - MESSAGE: "&cLunar Client is required to play on the server! &cDownload at &olunarclient.com/download" # adds a new line + MESSAGE: "&cLunar Client is required to play on the server! &cDownload at &olunarclient.com/download" -MODS: - DISABLE-ALL-MODS: false #This list has to be updated always through the plugin (its not auto) - DISABLE-MODS: - ENABLED: false - MODS: - - "skyblockAddons" - -WAYPOINT: - ENABLED: true #If false, it won't load all the waypoints below - WAYPOINTS: - - Spawn: # The same name as the waypoint. - x: 0 - y: 100 - z: 0 - name: "Spawn" - world: "world" - color: 0xFF0000 # MUST be a hexadecimal number of a color - forced: true - visible: true +############################################################################################################### +# # +# In Armstrong, the Nametag module supports a permission-based system (tiers): # +# - You can customize the nametag format based on permissions assigned to players. # +# - Assuming the player has multiple matching permissions, the highest weight has the highest priority. # +# # +# Notes: # +# - Armstrong supports PlaceholderAPI placeholders in nametag formats (if PAPI is installed). # +# - Additionally, you can use , , and placeholders. # +# - You can leave the permission value empty if you want it to apply to all players. # +# - If none of the defined tiers match, the nametag module skips that line for the player. # +# - Armstrong implements four Apollo nametag lines. Adding more manually does not work (for now). # +# # +############################################################################################################### NAMETAG: - ENABLE: true #Needs Restart - TICKS: "40" #1 second = 20 ticks | Every x seconds the nametag should update - FIRST: "&7[ &bLC&7]" + ENABLE: true # Enable the Armstrong Apollo nametag module implementation + TICKS: 40 # Update interval in ticks + FIRST: # The first line of the nametag + ENABLE: true + TIERS: + staff: + permission: "armstrong.nametag.staff" + weight: 100 + format: "&7&o[Staff]" + status: + permission: "armstrong.nametag.status" + weight: 50 + format: "&7[ &bLunarClient&7]" SECOND: ENABLE: true - TAG: "" # use for disguise support + TIERS: + default: + permission: "" + weight: 0 + format: "" + THIRD: + ENABLE: false + TIERS: + vip: + permission: "armstrong.nametag.vip" + weight: 75 + format: "&6[VIP]" + default: + permission: "" + weight: 0 + format: "&7[Player]" + FOURTH: + ENABLE: false + TIERS: + default: + permission: "" + weight: 0 + format: "" + +############################################################################################################### +# # +# The placeholder text that indicates if user is on/off LunarClient # +# This is also used in the %lunar_status% PAPI placeholder, as well as in nametags. # +# # +############################################################################################################### OTHER: - ENABLED: "&aON" - DISABLED: "&cOFF" + ENABLED: "&aON&r" + DISABLED: "&cOFF&r" + +############################################################################################################### +# # +# Messages in the plugin. Can be configured to your liking. # +# # +############################################################################################################### MESSAGES: MAIN: - RELOAD: "&6LunarUtility &ehas been reloaded." + RELOAD: "&6Armstrong &ehas been reloaded." OFFLINE: "&cThat player doesn't exist." LUNAR-COMMAND: PLAYER: "&6You are currently &eLunarClient." @@ -67,7 +104,8 @@ MESSAGES: ENABLE: PLAYER: "&aYou have enabled all LunarClient staff mods." TARGET: "&aYou have enabled all LunarClient staff mods for ." - TO-TARGET: "&aAll LunarClient mods have been enabled for you by ." + TO-TARGET: "&aAll LunarClient staff mods have been enabled for you by ." + ERROR: "&cPlayer is not on LunarClient." DISABLE: PLAYER: "&cYou have disabled your LunarClient staff mods." TARGET: "&6You have disabled &e's &6LunarClient staff mods." @@ -76,6 +114,6 @@ MESSAGES: SEPERATOR: "&7, " MESSAGE: - "&7&m-----------------------" - - "&b&lLunarClient Users &7[/100]" + - "&b&lLunarClient Users &7[]" - "" - "&7&m-----------------------" \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d79aee3..a51c3e3 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,8 +1,9 @@ -name: LunarUtility -main: xyz.refinedev.lunar.LunarUtility +name: Armstrong +main: li.genesis.armstrong.Armstrong authors: + - Vaption - Dubai - RefineDevelopment -depend: [ LunarClient-API ] -softdepend: [ PlaceholderAPI ] -version: ${project.version} \ No newline at end of file +depend: [] +softdepend: [ Apollo-Bukkit, PlaceholderAPI ] +version: ${version} \ No newline at end of file From 45474cf24a5b2e6bb77a64498062612d81ad2afb Mon Sep 17 00:00:00 2001 From: Vaption Date: Thu, 25 Sep 2025 16:18:55 +0330 Subject: [PATCH 2/2] Update README.md --- README.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5720add..bd4f9a3 100644 --- a/README.md +++ b/README.md @@ -1 +1,73 @@ -# Armstrong \ No newline at end of file +

+ Armstrong logo +

+ +### 🚀 Armstrong +[![Discord](https://img.shields.io/discord/1332991105695875123?logo=discord&label=discord)](https://discord.genesis.li) +[![Latest Release](https://img.shields.io/github/v/release/Vaption/Armstrong.svg)](https://github.com/Vaption/Armstrong/releases) +[![License](https://img.shields.io/github/license/Vaption/Armstrong.svg)](https://github.com/Vaption/Armstrong/blob/master/LICENSE) + +**Armstrong** is a simple plugin that utilizes +[LunarClient](https://lunarclient.com)'s [Apollo API](https://github.com/LunarClient/Apollo). +**Found a bug or have a feature idea?** Use the [issues](https://github.com/Vaption/Armstrong/issues) tab! + +
+ +## ⚖️ Armstrong vs. LunarUtility +Originally the goal was just to migrate the codebase to use Apollo rather than the old BukkitAPI. +During the migration, I noticed that Apollo (on its own) now does some of what this plugin once did. +Therefore, the waypoints & disabled-mods module have been removed from this plugin (now configurable in Apollo). +The cooldown module implementation was also removed, but will come back to it after some higher priority updates! + +## 🙌 Credits +Armstrong is based off of [LunarUtility](https://github.com/RefineDevelopment/LunarUtility). All credit to the original developers! + +👨‍💻 **Contributors** +- 🏙️ [Dubai](https://github.com/GamerRealm) – Original Author +- 🛠️ [Komek](https://github.com/Komeek) – Maintainer +- 💡 [kayalust](https://github.com/kayalust) – Contributor + +## 💬 Contact +- [Discord](https://discord.genesis.li) + +## 📥 Installing +1️⃣ Download the jar from [releases](https://github.com/Vaption/Armstrong/releases) +2️⃣ Download LunarClient's Apollo API jar from [here](https://github.com/LunarClient/Apollo/releases) +3️⃣ Drop **both** jars into all your servers +4️⃣ Edit the configuration files to your liking + +## 📜 Terms of Use +- No selling or claiming this project as your own +- Please respect & credit the developers + +## ✨ Features +
+ 🏷️ Nametag + Enabled by default, configurable in config.yml. + +
+ +
+ 🔒 Require LunarClient + Disabled by default. Enable by setting REQUIRE-LUNAR to true in config.yml. + +
+ +
+ 🛡️ Staff Mods + Requires armstrong.staff permission. Toggle with /lsm <player>. + +
+ +
+ 🌙 Player on Lunar + Requires armstrong.players permission. Check if someone is using LunarClient with /lc <player>. + +
+ +
+ 📋 All Players on Lunar + Requires armstrong.players permission. Get a list of players on LunarClient with /lc players (or list / users). + +