Plexus/Module-NickMiniMessage
1
0
Fork 0
mirror of https://github.com/plexusorg/Module-NickMiniMessage.git synced 2024-10-18 03:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

try and fix it

Browse Source
This commit is contained in:
Telesphoreo 2024-06-15 19:20:24 -05:00
parent 4f5cb1874e
commit fd673f24fe
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

17
gradlew vendored
View File

@ -83,7 +83,8 @@ done
# This is normally unused # This is normally unused
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045 # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #( '' | soft) :;; #(
*) *)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045 # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac esac
@ -201,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # 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"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command; # Collect all arguments for the java command:
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# shell script including quotes and variable substitutions, so put them in # and any embedded shellness will be escaped.
# double quotes to make sure that they get re-expanded; and # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# * put everything else in single quotes, so that it's not re-expanded. # treated as '${Hostname}' itself on the command line.
set -- \ set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \ "-Dorg.gradle.appname=$APP_BASE_NAME" \

10
src/main/java/dev/plex/module/nickmm/command/NickMMCommand.java
View File

@ -8,8 +8,10 @@ import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.source.RequiredCommandSource; import dev.plex.command.source.RequiredCommandSource;
import dev.plex.module.nickmm.NickMiniMessageModule; import dev.plex.module.nickmm.NickMiniMessageModule;
import dev.plex.util.minimessage.SafeMiniMessage; import dev.plex.util.minimessage.SafeMiniMessage;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
@ -46,18 +48,18 @@ public class NickMMCommand extends PlexCommand
if (plain.length() > NickMiniMessageModule.getEssentials().getSettings().getMaxNickLength() if (plain.length() > NickMiniMessageModule.getEssentials().getSettings().getMaxNickLength()
&& !commandSender.hasPermission("plex.nickmm.ignore_length_limit")) && !commandSender.hasPermission("plex.nickmm.ignore_length_limit"))
{ {
return legacyComponent.deserialize(I18n.tlLiteral("nickTooLong")); return mmString(I18n.tlLiteral("nickTooLong"));
} }
if (!commandSender.hasPermission("plex.nickmm.ignore_matching")) if (!commandSender.hasPermission("plex.nickmm.ignore_matching"))
{ {
for (final User user : NickMiniMessageModule.getEssentials().getOnlineUsers()) for (final User user : NickMiniMessageModule.getEssentials().getOnlineUsers())
{ {
final String name = user.getNickname() != null ? plainText.serialize(legacyComponent.deserialize(user.getNickname())) : user.getName(); final String name = user.getNickname() != null ? plainText.serialize(mmString(user.getNickname())) : user.getName();
if (name.equalsIgnoreCase(plain) && !user.getUUID().equals(player.getUniqueId())) if (name.equalsIgnoreCase(plain) && !user.getUUID().equals(player.getUniqueId()))
{ {
return legacyComponent.deserialize(I18n.tlLiteral("nickInUse")); return mmString(I18n.tlLiteral("nickInUse"));
} }
} }
} }
@ -65,7 +67,7 @@ public class NickMMCommand extends PlexCommand
final String legacy = legacyComponent.serialize(nick); final String legacy = legacyComponent.serialize(nick);
NickMiniMessageModule.getEssentials().getUser(player).setNickname(legacy); NickMiniMessageModule.getEssentials().getUser(player).setNickname(legacy);
return legacyComponent.deserialize(I18n.tlLiteral("nickSet", legacy)); return mmString(I18n.tlLiteral("nickSet", legacy));
} }
@Override @Override