Made default flag length (30d by default)
This commit is contained in:
parent
53611b6c04
commit
b91c9418fb
269
gradlew
vendored
269
gradlew
vendored
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env sh
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
# 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.
|
||||
|
|
@ -17,67 +17,101 @@
|
|||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
#
|
||||
# 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
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
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
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
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"
|
||||
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
|
||||
;;
|
||||
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
|
||||
|
|
@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|||
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"
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
|
@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
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
|
||||
|
|
@ -106,80 +140,95 @@ location of your Java installation."
|
|||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
case $i in
|
||||
0) set -- ;;
|
||||
1) set -- "$args0" ;;
|
||||
2) set -- "$args0" "$args1" ;;
|
||||
3) set -- "$args0" "$args1" "$args2" ;;
|
||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
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
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
# 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.
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
# 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" "$@"
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ import org.bukkit.scheduler.BukkitRunnable;
|
|||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
|
@ -83,7 +85,7 @@ public class CommandFlagList extends SubCommand {
|
|||
res.addAll(Bukkit.getOnlinePlayers().stream()
|
||||
.map(Player::getName)
|
||||
.filter(name -> args[1].isEmpty() || name.toLowerCase().startsWith(args[1].toLowerCase()))
|
||||
.collect(Collectors.toList()));
|
||||
.toList());
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
@ -111,11 +113,17 @@ public class CommandFlagList extends SubCommand {
|
|||
Placeholder.unparsed("flag_amount", String.valueOf(resultSet.getString("total_flags")))
|
||||
)));
|
||||
}
|
||||
long expireTime = TimeUnit.SECONDS.toMinutes(resultSet.getInt("expire_time"));
|
||||
long timeFlagged = TimeUnit.SECONDS.toMinutes(resultSet.getInt("time_flagged"));
|
||||
long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
|
||||
int convertedExpireTime = (int) expireTime - (int) currentTime;
|
||||
int convertedFlaggedTime = (int) currentTime - (int) timeFlagged;
|
||||
int dbExpireTime = resultSet.getInt("expire_time");
|
||||
Instant expireTime = dbExpireTime == 0 ? Instant.MIN : Instant.ofEpochSecond(dbExpireTime);
|
||||
// long expireTime = TimeUnit.SECONDS.toMinutes(resultSet.getInt("expire_time"));
|
||||
Instant timeFlagged = Instant.ofEpochSecond(resultSet.getInt("time_flagged"));
|
||||
// long timeFlagged = TimeUnit.SECONDS.toMinutes(resultSet.getInt("time_flagged"));
|
||||
Instant currentTime = Instant.now();
|
||||
// long currentTime = TimeUnit.SECONDS.toMinutes(System.currentTimeMillis() / 1000L);
|
||||
Duration convertedExpireTime = Duration.between(currentTime, expireTime);
|
||||
// int convertedExpireTime = (int) expireTime - (int) currentTime;
|
||||
Duration convertedFlaggedTime = Duration.between(currentTime, timeFlagged);
|
||||
// int convertedFlaggedTime = (int) currentTime - (int) timeFlagged;
|
||||
String id = String.valueOf(resultSet.getInt("id"));
|
||||
TagResolver templates = TagResolver.resolver(Placeholder.unparsed("player", targetPlayer.getName()),
|
||||
Placeholder.unparsed("flag", resultSet.getString("reason")),
|
||||
|
|
@ -132,7 +140,7 @@ public class CommandFlagList extends SubCommand {
|
|||
"<hover:show_text:\"Click to remove this flag\">" +
|
||||
"<click:run_command:/flag remove " + id + " " + targetPlayer.getName() + ">" +
|
||||
"[<red>✖</red>]</click></hover></white>");
|
||||
if (convertedExpireTime < 0 && expireTime != 0L) //Not active
|
||||
if (convertedExpireTime.isNegative() && !expireTime.equals(Instant.MIN)) //Not active
|
||||
str = str.replaceAll("<active>", Config.EXPIRED_FLAGS);
|
||||
else //Active
|
||||
str = str.replaceAll("<active>", Config.ACTIVE_FLAGS);
|
||||
|
|
|
|||
|
|
@ -17,9 +17,12 @@ import org.bukkit.OfflinePlayer;
|
|||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class CommandFlagPlayer extends SubCommand {
|
||||
|
|
@ -44,6 +47,10 @@ public class CommandFlagPlayer extends SubCommand {
|
|||
}
|
||||
|
||||
if (args[1].equals("*")) {
|
||||
if (!commandSender.hasPermission(getPermission() + ".variable-time")) {
|
||||
commandSender.sendMiniMessage(Config.VARIABLE_LENGTH_NOT_ALLOWED, null);
|
||||
return true;
|
||||
}
|
||||
permFlag(commandSender, args, target);
|
||||
} else {
|
||||
tempFlag(commandSender, args, target);
|
||||
|
|
@ -83,29 +90,28 @@ public class CommandFlagPlayer extends SubCommand {
|
|||
}
|
||||
|
||||
private void tempFlag(CommandSender commandSender, String[] args, OfflinePlayer target) {
|
||||
if (args[1].length() < 2) {
|
||||
commandSender.sendMiniMessage(Config.INVALID_TIME_ARGUMENT, TagResolver.resolver(Placeholder.unparsed("arg", args[1])));
|
||||
Optional<Duration> flagDurationIfExists = getFlagDurationIfExists(args[1]);
|
||||
Instant expireTime = Instant.now();
|
||||
int firstArg = 2;
|
||||
Duration flagDuration;
|
||||
if (flagDurationIfExists.isPresent() && !commandSender.hasPermission(getPermission() + ".variable-time")) {
|
||||
commandSender.sendMiniMessage(Config.VARIABLE_LENGTH_NOT_ALLOWED, null);
|
||||
return;
|
||||
}
|
||||
|
||||
String time = args[1].substring(0, args[1].length() - 1);
|
||||
String letter = args[1].substring(args[1].length() - 1);
|
||||
String[] validTimes = new String[]{"d", "h", "m"};
|
||||
if (!time.matches("[1-9][0-9]{0,8}") || !Arrays.asList(validTimes).contains(letter)) {
|
||||
commandSender.sendMiniMessage(Config.INVALID_TIME_ARGUMENT, TagResolver.resolver(Placeholder.unparsed("arg", args[1])));
|
||||
return;
|
||||
if (flagDurationIfExists.isEmpty()) {
|
||||
firstArg = 1;
|
||||
flagDuration = Duration.ofDays(Config.DEFAULT_FLAG_LENGTH_DAYS);
|
||||
} else {
|
||||
flagDuration = flagDurationIfExists.get();
|
||||
}
|
||||
expireTime = expireTime.plusSeconds(flagDuration.toSeconds());
|
||||
String reason = String.join(" ", Arrays.copyOfRange(args, firstArg, args.length));
|
||||
|
||||
int number = Integer.parseInt(time);
|
||||
int timeInMin = this.convertTimeToMinutes(number, letter);
|
||||
long currentTime = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis());
|
||||
int conTime = (int) currentTime + timeInMin;
|
||||
String reason = String.join(" ", Arrays.copyOfRange(args, 2, args.length));
|
||||
|
||||
Instant finalExpireTime = expireTime;
|
||||
new BukkitRunnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Database.addFlag(target.getUniqueId(), (int) TimeUnit.MINUTES.toSeconds(conTime), reason, commandSender.getName(), Utilities.convertTime(timeInMin));
|
||||
Database.addFlag(target.getUniqueId(), finalExpireTime, reason, commandSender.getName(), Utilities.convertTime(flagDuration));
|
||||
}
|
||||
}.runTask(LiteFlags.getInstance());
|
||||
|
||||
|
|
@ -116,7 +122,7 @@ public class CommandFlagPlayer extends SubCommand {
|
|||
Component message = MiniMessage.miniMessage().deserialize(Config.FLAGGED_PLAYER, TagResolver.resolver(List.of(
|
||||
Placeholder.unparsed("staff", commandSender.getName()),
|
||||
Placeholder.unparsed("player", target.getName() == null ? target.getUniqueId().toString() : target.getName()),
|
||||
Placeholder.unparsed("flag_length", Utilities.convertTime(timeInMin)),
|
||||
Placeholder.unparsed("flag_length", Utilities.convertTime(flagDuration)),
|
||||
Placeholder.unparsed("reason", reason)
|
||||
)));
|
||||
|
||||
|
|
@ -125,11 +131,36 @@ public class CommandFlagPlayer extends SubCommand {
|
|||
.forEach(player -> player.sendMessage(message));
|
||||
}
|
||||
|
||||
public int convertTimeToMinutes(int number, String dhm) {
|
||||
if (dhm.equalsIgnoreCase("d")) {
|
||||
return 1440 * number;
|
||||
} else {
|
||||
return dhm.equalsIgnoreCase("h") ? 60 * number : number;
|
||||
Optional<Duration> getFlagDurationIfExists(String timeArg) {
|
||||
if (timeArg.length() < 2) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
String time = timeArg.substring(0, timeArg.length() - 1);
|
||||
String letter = timeArg.substring(timeArg.length() - 1);
|
||||
String[] validTimes = new String[]{"d", "h", "m"};
|
||||
if (!time.matches("[1-9][0-9]{0,8}") || !Arrays.asList(validTimes).contains(letter)) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
int number = Integer.parseInt(time);
|
||||
return convertTimeToExpireTime(number, letter);
|
||||
}
|
||||
|
||||
public Optional<Duration> convertTimeToExpireTime(int number, String dhm) {
|
||||
switch (dhm.toLowerCase()) {
|
||||
case "d" -> {
|
||||
return Optional.of(Duration.ofDays(number));
|
||||
}
|
||||
case "h" -> {
|
||||
return Optional.of(Duration.ofHours(number));
|
||||
}
|
||||
case "m" -> {
|
||||
return Optional.of(Duration.ofMinutes(number));
|
||||
}
|
||||
default -> {
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -141,7 +172,7 @@ public class CommandFlagPlayer extends SubCommand {
|
|||
@Override
|
||||
public List<String> getTabComplete(CommandSender commandSender, String[] args) {
|
||||
ArrayList<String> res = new ArrayList<>();
|
||||
if (args.length == 2)
|
||||
if (args.length == 2 && commandSender.hasPermission(getPermission() + ".variable-time"))
|
||||
for (int i = 1; i <= 9; i++) {
|
||||
if (args[1].isEmpty() || args[1].startsWith(String.valueOf(i)))
|
||||
res.add(i + "d");
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ public final class Config extends AbstractConfig {
|
|||
public static String FLAG_CONFIRM = "<white>Are you sure you want to remove the flag <flag_reason> from " +
|
||||
"<yellow><target_name></yellow>'s flag history? " +
|
||||
"<hover:show_text:\"Click to confirm\"><click:run_command:\"/flag remove <id> <target_name> -c\">[<green>Confirm</green>]</click></hover></white>";
|
||||
public static String VARIABLE_LENGTH_NOT_ALLOWED = "<red>You do not have permission to set a flag at a custom length</red>";
|
||||
private static void loadMessages() {
|
||||
ALERT_ACTIVE_FLAGS = config.getString("messages.alert-active-flags", ALERT_ACTIVE_FLAGS);
|
||||
PLAYER_FLAGS_HEADER = config.getString("messages.player-flags-header", PLAYER_FLAGS_HEADER);
|
||||
|
|
@ -79,6 +80,7 @@ public final class Config extends AbstractConfig {
|
|||
NO_FLAG_FOUND = config.getString("messages.no-flag-found", NO_FLAG_FOUND);
|
||||
INVALID_TIME_ARGUMENT = config.getString("messages.invalid-time-argument", INVALID_TIME_ARGUMENT);
|
||||
FLAG_CONFIRM = config.getString("messages.flag-confirm", FLAG_CONFIRM);
|
||||
VARIABLE_LENGTH_NOT_ALLOWED = config.getString("messages.variable-length-not-allowed", VARIABLE_LENGTH_NOT_ALLOWED);
|
||||
}
|
||||
|
||||
public static String HELP_MESSAGE_WRAPPER = "<gold>LiteFlags help:\n<commands></gold>";
|
||||
|
|
@ -121,6 +123,7 @@ public final class Config extends AbstractConfig {
|
|||
public static String TIME_FORMAT = "Days";
|
||||
public static String AUTH_MESSAGE_COMMAND = "cmi titlemessage <player> -keep:80 &7You need to authenticate! <nl>&7Type &6<code> &7in chat to authenticate. (CaSe SeNsiTiVe)";
|
||||
public static String AUTH_SUCCESS_COMMAND = "lp user <player> permission settemp <permission> true <expire_time>";
|
||||
public static int DEFAULT_FLAG_LENGTH_DAYS = 30;
|
||||
private static void loadSettings() {
|
||||
MAX_ACTIVE_FLAGS = config.getInt("settings.max-active-flags", MAX_ACTIVE_FLAGS);
|
||||
MAX_FLAGS_LISTED = config.getInt("settings.max-flags-listed", MAX_FLAGS_LISTED);
|
||||
|
|
@ -130,6 +133,7 @@ public final class Config extends AbstractConfig {
|
|||
TIME_FORMAT = config.getString("settings.time-format", TIME_FORMAT);
|
||||
AUTH_MESSAGE_COMMAND = config.getString("settings.auth-message-command", AUTH_MESSAGE_COMMAND);
|
||||
AUTH_SUCCESS_COMMAND = config.getString("settings.auth-success-command", AUTH_SUCCESS_COMMAND);
|
||||
DEFAULT_FLAG_LENGTH_DAYS = config.getInt("settings.default-flag-length-days", DEFAULT_FLAG_LENGTH_DAYS);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@ import java.sql.PreparedStatement;
|
|||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
import java.time.Instant;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class Database {
|
||||
public static void createTables() {
|
||||
|
|
@ -43,6 +45,26 @@ public class Database {
|
|||
|
||||
}
|
||||
|
||||
public static void addFlag(UUID uuid, Instant expireTime, String reason, String flaggedBy, String flagLength) {
|
||||
int timeFlagged = (int) TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis());
|
||||
String sql = "INSERT INTO player_flags (uuid, expire_time, reason, flagged_by, time_flagged, flag_length) VALUES (?, ?, ?, ?, ?, ?)";
|
||||
|
||||
try {
|
||||
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
|
||||
|
||||
statement.setString(1, uuid.toString());
|
||||
statement.setLong(2, expireTime.getEpochSecond());
|
||||
statement.setString(3, reason);
|
||||
statement.setString(4, flaggedBy);
|
||||
statement.setInt(5, timeFlagged);
|
||||
statement.setString(6, flagLength);
|
||||
statement.execute();
|
||||
} catch (SQLException var21) {
|
||||
var21.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static boolean removeFlag(UUID uuid, int id) {
|
||||
String sql = "DELETE FROM player_flags WHERE uuid = ? AND id = ?";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,19 @@
|
|||
package com.liteflags.util;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.time.Duration;
|
||||
|
||||
public class Utilities {
|
||||
public static String convertTime(int time) {
|
||||
int days = (int) TimeUnit.MINUTES.toDays(time);
|
||||
int hours = (int) (TimeUnit.MINUTES.toHours(time) - TimeUnit.DAYS.toHours(days));
|
||||
int minutes = (int) (TimeUnit.MINUTES.toMinutes(time) - TimeUnit.HOURS.toMinutes(hours) - TimeUnit.DAYS.toMinutes(days));
|
||||
public static String convertTime(Duration time) {
|
||||
int days = Math.abs((int) time.toDaysPart());
|
||||
int hours = Math.abs(time.toHoursPart());
|
||||
int minutes = Math.abs(time.toMinutesPart());
|
||||
|
||||
String timeString = formatTime(days, " day");
|
||||
timeString += (timeString.length() == 0 ? "" : (hours == 0 ? "" : ", ")) + formatTime(hours, " hour");
|
||||
timeString += (timeString.length() == 0 ? "" : (minutes == 0 ? "" : ", ")) + formatTime(minutes, " minute");
|
||||
|
||||
if (timeString.length() == 0) timeString = "0 minutes";
|
||||
if (timeString.length() == 0)
|
||||
timeString = "0 minutes";
|
||||
|
||||
return timeString;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user