diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..5cfe089 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,18 @@ +name: Gradle + +on: [ push ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 17 + cache: gradle + - name: Build with Gradle + run: chmod a+x gradlew && ./gradlew build --no-daemon \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9ee36ae --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +/.idea/ +*.iml +/target/ + +# OS +.DS_Store +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Gradle +/build/ +/.gradle/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a451ea7 --- /dev/null +++ b/build.gradle @@ -0,0 +1,51 @@ +plugins { + id "java" + id "maven-publish" +} + +repositories { + maven { + url = uri("https://papermc.io/repo/repository/maven-public/") + } + + maven { + url = uri("https://nexus.telesphoreo.me/repository/plex") + } + + mavenCentral() +} + +dependencies { + compileOnly "org.projectlombok:lombok:1.18.22" + annotationProcessor "org.projectlombok:lombok:1.18.22" + compileOnly "io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT" + compileOnly "dev.plex:Plex:0.8" + implementation "LibsDisguises:parent:10.0.27-SNAPSHOT" + +} + +group = "dev.plex" +version = "1.0" +description = "LibsDisguises" + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(17)) +} + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +tasks { + javadoc { + options.memberLevel = JavadocMemberLevel.PRIVATE + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..00e33ed --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e07581b --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'Module-LibsDisguises' + diff --git a/src/main/java/dev/plex/LibsDisguises.java b/src/main/java/dev/plex/LibsDisguises.java new file mode 100644 index 0000000..1ec4c54 --- /dev/null +++ b/src/main/java/dev/plex/LibsDisguises.java @@ -0,0 +1,26 @@ +package dev.plex; + +import dev.plex.command.DisguiseToggleCMD; +import dev.plex.command.UndisguiseAllCMD; +import dev.plex.listener.DisguiseListener; +import dev.plex.module.PlexModule; + +public class LibsDisguises extends PlexModule +{ + public static boolean enabled = true; + DisguiseListener disguiseListener; + @Override + public void enable() + { + registerCommand(new DisguiseToggleCMD()); + registerCommand(new UndisguiseAllCMD()); + registerListener(new DisguiseListener()); + disguiseListener = new DisguiseListener(); + disguiseListener.getCommands(); + } + + @Override + public void disable() + { + } +} diff --git a/src/main/java/dev/plex/command/DisguiseToggleCMD.java b/src/main/java/dev/plex/command/DisguiseToggleCMD.java new file mode 100644 index 0000000..2d5289d --- /dev/null +++ b/src/main/java/dev/plex/command/DisguiseToggleCMD.java @@ -0,0 +1,30 @@ +package dev.plex.command; + +import dev.plex.LibsDisguises; +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.listener.UndisguiseEvent; +import dev.plex.rank.enums.Rank; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +@CommandParameters(name = "disguisetoggle", description = "Toggle LibsDisguises", aliases = "dtoggle") +@CommandPermissions(level = Rank.ADMIN, permission = "plex.libsdisguises.disguisetoggle") +public class DisguiseToggleCMD extends PlexCommand +{ + @Override + protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] strings) + { + LibsDisguises.enabled = !LibsDisguises.enabled; + if (!LibsDisguises.enabled) + { + Bukkit.getServer().getPluginManager().callEvent(new UndisguiseEvent(true)); + } + return Component.text(commandSender.getName() + " - " + (LibsDisguises.enabled ? "Enabling LibsDisguises" : "Disabling LibsDisguises")).color((LibsDisguises.enabled ? NamedTextColor.AQUA : NamedTextColor.RED)); + } +} diff --git a/src/main/java/dev/plex/command/UndisguiseAllCMD.java b/src/main/java/dev/plex/command/UndisguiseAllCMD.java new file mode 100644 index 0000000..6a3bc0d --- /dev/null +++ b/src/main/java/dev/plex/command/UndisguiseAllCMD.java @@ -0,0 +1,34 @@ +package dev.plex.command; + +import dev.plex.command.annotation.CommandParameters; +import dev.plex.command.annotation.CommandPermissions; +import dev.plex.listener.UndisguiseEvent; +import dev.plex.rank.enums.Rank; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +@CommandParameters(name = "undisguiseall", usage = "/ [-a]", description = "Undisguise all players", aliases = "undisall,uall") +@CommandPermissions(level = Rank.ADMIN, permission = "plex.libsdisguises.undisguiseall") +public class UndisguiseAllCMD extends PlexCommand +{ + @Override + protected Component execute(@NotNull CommandSender sender, @Nullable Player player, @NotNull String[] args) + { + if (args.length == 0) + { + Bukkit.getServer().getPluginManager().callEvent(new UndisguiseEvent(false)); + return Component.text(sender.getName() + " - Undisguising all non-admins").color(NamedTextColor.RED); + } + else if (args[0].equalsIgnoreCase("-a")) + { + Bukkit.getServer().getPluginManager().callEvent(new UndisguiseEvent(true)); + return Component.text(sender.getName() + " - Undisguising all players").color(NamedTextColor.RED); + } + return usage(); + } +} diff --git a/src/main/java/dev/plex/listener/DisguiseListener.java b/src/main/java/dev/plex/listener/DisguiseListener.java new file mode 100644 index 0000000..f369166 --- /dev/null +++ b/src/main/java/dev/plex/listener/DisguiseListener.java @@ -0,0 +1,81 @@ +package dev.plex.listener; + +import dev.plex.LibsDisguises; +import dev.plex.cache.DataUtils; +import dev.plex.player.PlexPlayer; +import dev.plex.util.PlexLog; +import java.util.ArrayList; +import java.util.List; +import me.libraryaddict.disguise.DisguiseAPI; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.command.PluginCommandYamlParser; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.plugin.Plugin; + +public class DisguiseListener extends PlexListener +{ + final List commands = new ArrayList<>(); + + @EventHandler + public void onDisguiseToggle(UndisguiseEvent event) + { + for (Player player : Bukkit.getOnlinePlayers()) + { + if (event.isUndisguiseAdmins()) + { + DisguiseAPI.undisguiseToAll(player); + } + else + { + PlexPlayer plexPlayer = DataUtils.getPlayer(player.getUniqueId()); + if (!plugin.getRankManager().isAdmin(plexPlayer)) + { + DisguiseAPI.undisguiseToAll(player); + } + } + } + } + + @EventHandler(priority = EventPriority.HIGHEST) + public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) + { + String message = event.getMessage(); + // Don't check the arguments + message = message.replaceAll("\\s.*", "").replaceFirst("/", ""); + if (!LibsDisguises.enabled) + { + for (Command command : commands) + { + for (String commandAliases : command.getAliases()) + { + if (message.equalsIgnoreCase(command.getName()) || message.equalsIgnoreCase(commandAliases)) + { + event.getPlayer().sendMessage(Component.text("LibsDisguises is currently disabled.").color(NamedTextColor.RED)); + event.setCancelled(true); + break; + } + } + } + } + } + + public List getCommands() + { + for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) + { + if (plugin.getName().equals("LibsDisguises")) + { + List commandList = PluginCommandYamlParser.parse(plugin); + commands.addAll(commandList); + } + } + PlexLog.log("Successfully fetched all LibsDisguises commands!"); + return commands; + } +} diff --git a/src/main/java/dev/plex/listener/UndisguiseEvent.java b/src/main/java/dev/plex/listener/UndisguiseEvent.java new file mode 100644 index 0000000..f17cb89 --- /dev/null +++ b/src/main/java/dev/plex/listener/UndisguiseEvent.java @@ -0,0 +1,32 @@ +package dev.plex.listener; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +/** + * Event that is run when all players are undisguised + */ +@EqualsAndHashCode(callSuper = false) +@Data +public class UndisguiseEvent extends Event +{ + private static final HandlerList handlers = new HandlerList(); + + /** + * Determines if admins should be undisguised or not + */ + private final boolean undisguiseAdmins; + + public static HandlerList getHandlerList() + { + return handlers; + } + + @Override + public HandlerList getHandlers() + { + return handlers; + } +} \ No newline at end of file diff --git a/src/main/resources/module.yml b/src/main/resources/module.yml new file mode 100644 index 0000000..1b2d7c5 --- /dev/null +++ b/src/main/resources/module.yml @@ -0,0 +1,4 @@ +name: LibsDisguises +main: dev.plex.LibsDisguises +description: Control LibsDisguises with Plex +version: 1.0 \ No newline at end of file