diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..a12d8d3 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,22 @@ +# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + ignore: + - dependency-name: "*" + update-types: [ "version-update:semver-patch" ] + + commit-message: + prefix: ci + labels: [ "skip changelog" ] + + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "weekly" + ignore: + - dependency-name: "org.spigotmc:spigot-api" # We want to stay on 1.18 for the base version + versions: [ "< 1.19" ] diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml new file mode 100644 index 0000000..9176b00 --- /dev/null +++ b/.github/workflows/gradle-build.yml @@ -0,0 +1,39 @@ +name: Gradle Build Verification + +on: + pull_request: + branches: [ master ] + push: + branches: [ master ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v4 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Build with Gradle + run: ./gradlew clean build + + - name: Run tests + run: ./gradlew test \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c37caf --- /dev/null +++ b/.gitignore @@ -0,0 +1,118 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/README.md b/README.md index df6b7d1..4d5413b 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,12 @@ The Softban plugin implements the following punishments based on the softban lev 1. **Increased Damage Taken**: Players take 10% more damage per softban level. 2. **Decreased Damage Dealt**: Players deal 10% less damage per softban level. 3. **Reduced Movement Speed**: Player's velocity is reduced by 10% per softban level. +4. **Resource Gathering Penalty**: Chance to not drop items when breaking blocks. +5. **XP Gain Reduction**: Reduces XP gained from activities. +6. **Hunger Depletion**: Increases the rate of hunger depletion. +7. **Item Durability Loss**: Increases damage to items when used. +8. **Inventory Restrictions**: Blocks a number of inventory slots with barrier blocks. +9. **Night Vision Impairment**: Applies blindness effect when sneaking. These punishments scale with the softban level, becoming more severe as the level increases. @@ -66,7 +72,6 @@ This will cause Steve to take 30% more damage, deal 30% less damage, and move 30 /softban remove Steve ``` - ## Permissions - `softban.admin`: Allows use of all softban commands diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..d215ad1 --- /dev/null +++ b/build.gradle @@ -0,0 +1,47 @@ +plugins { + id 'java' +} + +repositories { + mavenCentral() + maven { + name = "papermc-repo" + url = "https://repo.papermc.io/repository/maven-public/" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/groups/public/" + } +} + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT") +} + +def targetJavaVersion = 17 +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + sourceCompatibility = javaVersion + targetCompatibility = javaVersion + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' + options.compilerArgs += ["-Xlint:deprecation", "-Xlint:-options"] + + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + options.release.set(targetJavaVersion) + } +} + +processResources { + def props = [version: version] + inputs.properties props + filteringCharset 'UTF-8' + filesMatching('plugin.yml') { + expand(project.properties) + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5526f1e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +name=softban +description=Softban +version=1.0.0 +group=org.avarion.softban diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 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..9355b41 --- /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-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..b740cf1 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + 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" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, 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" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 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 + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..8bc5963 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'softban' diff --git a/src/main/java/org/avarion/softban/Softban.java b/src/main/java/org/avarion/softban/Softban.java new file mode 100644 index 0000000..43b6024 --- /dev/null +++ b/src/main/java/org/avarion/softban/Softban.java @@ -0,0 +1,50 @@ +package org.avarion.softban; + +import org.bukkit.NamespacedKey; +import org.bukkit.entity.Player; +import org.bukkit.persistence.PersistentDataContainer; +import org.bukkit.persistence.PersistentDataType; +import org.bukkit.plugin.java.JavaPlugin; + +public final class Softban extends JavaPlugin { + public static Softban plugin; + private NamespacedKey softBanLevelKey; + private SoftbanDb db; + + static NamespacedKey getKey() { + return plugin.softBanLevelKey; + } + + static SoftbanDb getDb() { + return plugin.db; + } + + @Override + public void onEnable() { + plugin = this; + + softBanLevelKey = new NamespacedKey(this, "softBanLevel"); + db = new SoftbanDb(); + + new SoftbanCommand(); + new SoftbanEvents(); + } + + public boolean handleOnlinePlayer(Player player, Integer level) { + if (player==null || level==null) { + return false; + } + + PersistentDataContainer container = player.getPersistentDataContainer(); + container.set(softBanLevelKey, PersistentDataType.INTEGER, level); + + db.remove(player.getName()); + + return true; + } + + public boolean handleOfflinePlayer(String username, int level) { + db.put(username, level); + return true; + } +} diff --git a/src/main/java/org/avarion/softban/SoftbanCommand.java b/src/main/java/org/avarion/softban/SoftbanCommand.java new file mode 100644 index 0000000..3e4b213 --- /dev/null +++ b/src/main/java/org/avarion/softban/SoftbanCommand.java @@ -0,0 +1,165 @@ +package org.avarion.softban; + +import net.md_5.bungee.api.chat.ClickEvent; +import net.md_5.bungee.api.chat.TextComponent; +import org.bukkit.Bukkit; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.command.PluginCommand; +import org.bukkit.command.TabExecutor; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +import java.util.*; + +public class SoftbanCommand implements TabExecutor { + private final Map confirmationMap = new HashMap<>(); + + SoftbanCommand() { + registerMyself(); + } + + private void registerMyself() { + PluginCommand cmd = Softban.plugin.getCommand("softban"); + if (cmd==null) { + throw new RuntimeException("softban command not found"); + } + + cmd.setExecutor(this); + cmd.setTabCompleter(this); + } + + @SuppressWarnings("BooleanMethodIsAlwaysInverted") + private boolean isEnabled(CommandSender player) { + return Softban.plugin!=null && Softban.plugin.isEnabled() && (player.isOp() || player.hasPermission("softban.admin")); + } + + private int parseLevel(final String sLevel) throws IllegalArgumentException { + int level = Integer.parseInt(sLevel); + if (level < 1 || level > 5) { + throw new IllegalArgumentException("Level must be between 1 and 5"); + } + return level; + } + + @Override + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String @NotNull [] args) { + if (!isEnabled(sender)) { + return false; + } + + if (args.length < 2) { + return false; + } + + String subCommand = args[0].toLowerCase(); + String username = args[1]; + + return switch (subCommand) { + case "set" -> { + if (args.length!=3) { + yield false; + } + yield handleSetCommand(sender, username, args[2]); + } + case "remove" -> handleRemoveCommand(sender, username); + default -> false; + }; + } + + private boolean handleSetCommand(CommandSender sender, String username, String sLevel) { + int level; + try { + level = parseLevel(sLevel); + } catch (IllegalArgumentException e) { + sender.sendMessage("Invalid level. Use a number between 1 and 5."); + return false; + } + + Player onlinePlayer = Bukkit.getPlayer(username); + if (onlinePlayer!=null) { + return Softban.plugin.handleOnlinePlayer(onlinePlayer, level); + } + + handleOfflinePlayerSet(sender, username, level); + return true; + } + + private void handleOfflinePlayerSet(@NotNull CommandSender sender, String username, int level) { + String confirmationKey = sender.getName() + ":" + username + ":set:" + level; + + if (confirmationMap.containsKey(confirmationKey) && System.currentTimeMillis() - confirmationMap.get(confirmationKey) < 15000) { + confirmationMap.remove(confirmationKey); + if (Softban.plugin.handleOfflinePlayer(username, level)) { + sender.sendMessage("Soft ban level set to " + level + " for offline player " + username); + } + } + else { + confirmationMap.put(confirmationKey, System.currentTimeMillis()); + sendConfirmationMessage(sender, "/softban set " + username + " " + level, + "Confirm setting soft ban level " + level + " for offline player " + username + ); + } + } + + private boolean handleRemoveCommand(CommandSender sender, String username) { + Player onlinePlayer = Bukkit.getPlayer(username); + if (onlinePlayer!=null) { + return Softban.plugin.handleOnlinePlayer(onlinePlayer, 0); + } + + handleOfflinePlayerRemove(sender, username); + return true; + } + + private void handleOfflinePlayerRemove(@NotNull CommandSender sender, String username) { + String confirmationKey = sender.getName() + ":" + username + ":remove"; + if (confirmationMap.containsKey(confirmationKey) && System.currentTimeMillis() - confirmationMap.get(confirmationKey) < 15000) { + confirmationMap.remove(confirmationKey); + if (Softban.plugin.handleOfflinePlayer(username, 0)) { + sender.sendMessage("Soft ban removed for offline player " + username); + } + } + else { + confirmationMap.put(confirmationKey, System.currentTimeMillis()); + sendConfirmationMessage(sender, "/softban remove " + username, "Confirm removing soft ban for offline player " + username); + } + } + + @SuppressWarnings("deprecation") + private void sendConfirmationMessage(CommandSender sender, String command, String message) { + if (sender instanceof Player player) { + TextComponent component = new TextComponent(message + " (Click to confirm)"); + component.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command)); + player.spigot().sendMessage(component); + } + else { + sender.sendMessage(message + " (Run the command again within 15 seconds to confirm)"); + } + } + + @Override + public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String @NotNull [] args) { + if (!isEnabled(sender)) { + return null; + } + + List completions = new ArrayList<>(); + if (args.length==1) { + completions.addAll(Arrays.asList("set", "remove")); + } + else if (args.length==2) { + for (Player player : Bukkit.getOnlinePlayers()) { + if (player.getName().toLowerCase().startsWith(args[1].toLowerCase())) { + completions.add(player.getName()); + } + } + } + else if (args.length==3 && args[0].equalsIgnoreCase("set")) { + for (int i = 1; i <= 5; i++) { + completions.add(String.valueOf(i)); + } + } + return completions; + } +} \ No newline at end of file diff --git a/src/main/java/org/avarion/softban/SoftbanDb.java b/src/main/java/org/avarion/softban/SoftbanDb.java new file mode 100644 index 0000000..91c0d9c --- /dev/null +++ b/src/main/java/org/avarion/softban/SoftbanDb.java @@ -0,0 +1,83 @@ +package org.avarion.softban; + +import org.bukkit.configuration.file.YamlConfiguration; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class SoftbanDb { + private final Map softBanLevels = new HashMap<>(); + private final File fileName; + + SoftbanDb() { + this.fileName = new File(Softban.plugin.getDataFolder(), "offline_users.yml"); + + load_previous(); + } + + private void load_previous() { + if (!fileName.exists()) { + return; + } + + final YamlConfiguration config = YamlConfiguration.loadConfiguration(fileName); + final List> usersList = config.getMapList("users"); + + for (Map userMap : usersList) { + for (Map.Entry entry : userMap.entrySet()) { + try { + final String username = entry.getKey().toString().trim(); + final int level = Integer.parseInt(entry.getValue().toString().trim()); + + if (level < 1 || level > 5) { + Softban.plugin.getLogger().warning("Invalid level for user: " + username); + } + else { + softBanLevels.put(username, level); + } + } catch (IllegalArgumentException e) { + Softban.plugin.getLogger().severe("Invalid data format for user: " + entry.getKey() + " with value: " + entry.getValue()); + } + } + } + } + + private void save() { + final YamlConfiguration config = new YamlConfiguration(); + + List> users = config.getMapList("users"); + for (Map.Entry entry : softBanLevels.entrySet()) { + final Map userMap = new HashMap<>(); + userMap.put(entry.getKey(), entry.getValue()); + users.add(userMap); + } + + try { + config.save(fileName); + } catch (IOException e) { + Softban.plugin.getLogger().severe("Failed to save offline users.yml: " + e.getMessage()); + } + } + + public void put(@NotNull final String userName, int level) { + softBanLevels.put(userName, level); + save(); + } + + public void remove(@NotNull final String userName) { + softBanLevels.remove(userName); + } + + public boolean contains(@NotNull final String userName) { + return softBanLevels.containsKey(userName); + } + + public @Nullable Integer get(@NotNull final String userName) { + return softBanLevels.get(userName); + } +} diff --git a/src/main/java/org/avarion/softban/SoftbanEvents.java b/src/main/java/org/avarion/softban/SoftbanEvents.java new file mode 100644 index 0000000..8116f17 --- /dev/null +++ b/src/main/java/org/avarion/softban/SoftbanEvents.java @@ -0,0 +1,139 @@ +package org.avarion.softban; + +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.FoodLevelChangeEvent; +import org.bukkit.event.inventory.InventoryOpenEvent; +import org.bukkit.event.player.*; +import org.bukkit.inventory.ItemStack; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; +import org.bukkit.util.Vector; +import org.jetbrains.annotations.NotNull; + +import java.util.HashMap; +import java.util.Map; +import java.util.Random; + +public class SoftbanEvents implements Listener { + private final Random random = new Random(); + private final Map chatCooldowns = new HashMap<>(); + + SoftbanEvents() { + Softban.plugin.getServer().getPluginManager().registerEvents(this, Softban.plugin); + } + + @EventHandler + public void onPlayerJoin(@NotNull PlayerJoinEvent event) { + Player player = event.getPlayer(); + if (Softban.getDb().contains(player.getName())) { + Softban.plugin.handleOnlinePlayer(player, Softban.getDb().get(player.getName())); + } + } + + @EventHandler + public void onEntityDamage(@NotNull EntityDamageEvent event) { + if (event.getEntity() instanceof Player player) { + int level = Utils.getSoftbanLevel(player); + if (level > 0) { + event.setDamage(event.getDamage() * (1 + 0.1 * level)); + } + } + } + + @EventHandler + public void onEntityDamageByEntity(@NotNull EntityDamageByEntityEvent event) { + if (event.getDamager() instanceof Player player) { + int level = Utils.getSoftbanLevel(player); + if (level > 0) { + event.setDamage(event.getDamage() * (1 - 0.1 * level)); + } + } + } + + @EventHandler + public void onPlayerMove(@NotNull PlayerMoveEvent event) { + Player player = event.getPlayer(); + int level = Utils.getSoftbanLevel(player); + if (level > 0) { + Vector velocity = player.getVelocity(); + velocity.multiply(1 - 0.1 * level); + player.setVelocity(velocity); +/* + if (random.nextDouble() < 0.001 * level) { + int radius = 100 * level; + int x = player.getLocation().getBlockX() + random.nextInt(radius * 2) - radius; + int z = player.getLocation().getBlockZ() + random.nextInt(radius * 2) - radius; + int y = player.getWorld().getHighestBlockYAt(x, z); + player.teleport(new Location(player.getWorld(), x, y, z)); + player.sendMessage("You've been randomly teleported!"); + } + */ + } + } + + @EventHandler + public void onBlockBreak(@NotNull BlockBreakEvent event) { + Player player = event.getPlayer(); + int level = Utils.getSoftbanLevel(player); + if (level > 0 && random.nextDouble() < 0.1 * level) { + event.setDropItems(false); + } + } + + @EventHandler + public void onPlayerExpChange(@NotNull PlayerExpChangeEvent event) { + Player player = event.getPlayer(); + int level = Utils.getSoftbanLevel(player); + if (level > 0) { + int newAmount = (int) (event.getAmount() * (1 - 0.1 * level)); + event.setAmount(Math.max(newAmount, 1)); + } + } + + @EventHandler + public void onFoodLevelChange(@NotNull FoodLevelChangeEvent event) { + if (event.getEntity() instanceof Player player) { + int level = Utils.getSoftbanLevel(player); + if (level > 0 && event.getFoodLevel() < player.getFoodLevel()) { + event.setFoodLevel(event.getFoodLevel() - level); + } + } + } + + @EventHandler + public void onPlayerItemDamage(@NotNull PlayerItemDamageEvent event) { + Player player = event.getPlayer(); + int level = Utils.getSoftbanLevel(player); + if (level > 0) { + event.setDamage(event.getDamage() + level); + } + } + + @EventHandler + public void onInventoryOpen(@NotNull InventoryOpenEvent event) { + if (event.getPlayer() instanceof Player player) { + int level = Utils.getSoftbanLevel(player); + if (level > 0) { + int slotsToBlock = level * 2; + for (int i = 0; i < slotsToBlock && i < player.getInventory().getSize(); i++) { + player.getInventory().setItem(i, new ItemStack(Material.BARRIER)); + } + } + } + } + + @EventHandler + public void onPlayerToggleSneak(@NotNull PlayerToggleSneakEvent event) { + Player player = event.getPlayer(); + int level = Utils.getSoftbanLevel(player); + if (level > 0 && event.isSneaking()) { + player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 100 * level, level - 1)); + } + } +} \ No newline at end of file diff --git a/src/main/java/org/avarion/softban/Utils.java b/src/main/java/org/avarion/softban/Utils.java new file mode 100644 index 0000000..75bd19f --- /dev/null +++ b/src/main/java/org/avarion/softban/Utils.java @@ -0,0 +1,15 @@ +package org.avarion.softban; + +import org.bukkit.entity.Player; +import org.bukkit.persistence.PersistentDataContainer; +import org.bukkit.persistence.PersistentDataType; +import org.jetbrains.annotations.NotNull; + +class Utils { + static int getSoftbanLevel(@NotNull Player player) { + PersistentDataContainer container = player.getPersistentDataContainer(); + Integer level = container.get(Softban.getKey(), PersistentDataType.INTEGER); + return level!=null ? level:0; + } + +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..f98ea7a --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,12 @@ +name: ${project.name} +version: '${project.version}' +main: ${group}.Softban +api-version: '1.18' + +commands: + softban: + aliases: + - sb + description: soft ban someone + usage: /softban [1-5] + permission: softban.admin