From 5e50e0c860a4996c551992478f0397985da2dd5a Mon Sep 17 00:00:00 2001 From: Patrick <147879351+WinniePatGG@users.noreply.github.com> Date: Fri, 1 May 2026 19:22:43 +0200 Subject: [PATCH] first commit --- .gitignore | 5 + build.gradle | 55 ++++ gradle.properties | 0 gradlew | 249 ++++++++++++++++++ gradlew.bat | 92 +++++++ settings.gradle | 1 + .../de/winniepat/fallSMPPvP/FallSMPPvP.java | 26 ++ .../commands/FallSMPPvpCommands.java | 37 +++ .../fallSMPPvP/listeners/KillListener.java | 99 +++++++ src/main/resources/config.yml | 13 + src/main/resources/plugin.yml | 17 ++ 11 files changed, 594 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/de/winniepat/fallSMPPvP/FallSMPPvP.java create mode 100644 src/main/java/de/winniepat/fallSMPPvP/commands/FallSMPPvpCommands.java create mode 100644 src/main/java/de/winniepat/fallSMPPvP/listeners/KillListener.java create mode 100644 src/main/resources/config.yml create mode 100644 src/main/resources/plugin.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5f9436c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.gradle +.idea +build +gradle +run \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..d744900 --- /dev/null +++ b/build.gradle @@ -0,0 +1,55 @@ +plugins { + id 'java' + id("xyz.jpenilla.run-paper") version "2.3.1" +} + +group = 'de.winniepat' +version = '1.0' + +repositories { + mavenCentral() + maven { + name = "papermc-repo" + url = "https://repo.papermc.io/repository/maven-public/" + } +} + +dependencies { + compileOnly("io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT") +} + +tasks { + runServer { + // Configure the Minecraft version for our task. + // This is the only required configuration besides applying the plugin. + // Your plugin's jar (or shadowJar if present) will be used automatically. + minecraftVersion("1.21.11") + } +} + +def targetJavaVersion = 21 +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' + + 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 props + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..e69de29 diff --git a/gradlew b/gradlew new file mode 100644 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..ccfa49e --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'FallSMP-PvP' diff --git a/src/main/java/de/winniepat/fallSMPPvP/FallSMPPvP.java b/src/main/java/de/winniepat/fallSMPPvP/FallSMPPvP.java new file mode 100644 index 0000000..b57a960 --- /dev/null +++ b/src/main/java/de/winniepat/fallSMPPvP/FallSMPPvP.java @@ -0,0 +1,26 @@ +package de.winniepat.fallSMPPvP; + +import de.winniepat.fallSMPPvP.commands.FallSMPPvpCommands; +import de.winniepat.fallSMPPvP.listeners.KillListener; +import org.bukkit.plugin.java.JavaPlugin; + +import java.util.Objects; + +public final class FallSMPPvP extends JavaPlugin { + + @Override + public void onEnable() { + saveDefaultConfig(); + + getServer().getPluginManager().registerEvents(new KillListener(this), this); + + Objects.requireNonNull(getCommand("fallsmppvp")).setExecutor(new FallSMPPvpCommands(this)); + + getLogger().info("FallSMP-PvP has been enabled!"); + } + + @Override + public void onDisable() { + getLogger().info("FallSMP-PvP has been disabled!"); + } +} diff --git a/src/main/java/de/winniepat/fallSMPPvP/commands/FallSMPPvpCommands.java b/src/main/java/de/winniepat/fallSMPPvP/commands/FallSMPPvpCommands.java new file mode 100644 index 0000000..9ba16b7 --- /dev/null +++ b/src/main/java/de/winniepat/fallSMPPvP/commands/FallSMPPvpCommands.java @@ -0,0 +1,37 @@ +package de.winniepat.fallSMPPvP.commands; + +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.plugin.java.JavaPlugin; +import org.jspecify.annotations.NonNull; + +public class FallSMPPvpCommands implements CommandExecutor { + + private final JavaPlugin plugin; + + public FallSMPPvpCommands(JavaPlugin plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(@NonNull CommandSender sender, @NonNull Command command, @NonNull String label, String[] args) { + + if (args.length == 1 && args[0].equalsIgnoreCase("reload")) { + + if (!sender.hasPermission("fallsmppvp.admin")) { + sender.sendMessage(ChatColor.RED + "You don't have permission."); + return true; + } + + plugin.reloadConfig(); + + sender.sendMessage(ChatColor.GREEN + "Plugin config reloaded."); + return true; + } + + sender.sendMessage(ChatColor.GRAY + "Usage: /" + label + " reload"); + return true; + } +} \ No newline at end of file diff --git a/src/main/java/de/winniepat/fallSMPPvP/listeners/KillListener.java b/src/main/java/de/winniepat/fallSMPPvP/listeners/KillListener.java new file mode 100644 index 0000000..132b9ef --- /dev/null +++ b/src/main/java/de/winniepat/fallSMPPvP/listeners/KillListener.java @@ -0,0 +1,99 @@ +package de.winniepat.fallSMPPvP.listeners; + +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; +import org.bukkit.Bukkit; +import org.bukkit.attribute.Attribute; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.plugin.java.JavaPlugin; + +public class KillListener implements Listener { + + private final JavaPlugin plugin; + private final MiniMessage miniMessage = MiniMessage.miniMessage(); + private final LegacyComponentSerializer legacySerializer = LegacyComponentSerializer.legacyAmpersand(); + + public KillListener(JavaPlugin plugin) { + this.plugin = plugin; + } + + @EventHandler + public void onPlayerDeath(PlayerDeathEvent event) { + Player victim = event.getEntity(); + Player killer = resolveKiller(event, victim); + String killerName = killer != null ? killer.getName() : "Unbekannt"; + + event.deathMessage(Component.empty()); + + boolean broadcast = plugin.getConfig().getBoolean("broadcast"); + + if (killer != null) { + String template = plugin.getConfig().getString("kill-message", "%victim% wurde von %killer% gekillt!"); + String parsedTemplate = template + .replace("%victim%", victim.getName()) + .replace("%killer%", killerName); + + if (broadcast) { + Bukkit.broadcast(parseMessage(parsedTemplate)); + } + + if (plugin.getConfig().getBoolean("heal.enabled")) { + double amount = plugin.getConfig().getDouble("heal.amount"); + double maxHealth = getMaxHealth(killer); + + if (amount == -1) { + killer.setHealth(maxHealth); + } else { + double newHealth = Math.min(killer.getHealth() + amount, maxHealth); + killer.setHealth(newHealth); + } + } + } else { + String template = plugin.getConfig().getString("natural-death-message", "%victim% ist gestorben."); + String parsedTemplate = template + .replace("%victim%", victim.getName()) + .replace("%killer%", killerName); + + if (broadcast) { + Bukkit.broadcast(parseMessage(parsedTemplate)); + } + } + } + + private Player resolveKiller(PlayerDeathEvent event, Player victim) { + Player killer = victim.getKiller(); + if (killer != null) { + return killer; + } + + if (event.getDamageSource().getCausingEntity() instanceof Player causingPlayer) { + return causingPlayer; + } + + return null; + } + + private double getMaxHealth(Player player) { + if (player.getAttribute(Attribute.MAX_HEALTH) != null) { + return player.getAttribute(Attribute.MAX_HEALTH).getValue(); + } + + return 20.0D; + } + + private Component parseMessage(String message) { + if (message == null || message.isBlank()) { + return Component.empty(); + } + + if (message.contains("<") && message.contains(">")) { + return miniMessage.deserialize(message); + } + + return legacySerializer.deserialize(message); + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..40fb90b --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,13 @@ +# Placeholder: +# %victim% - Spieler, der gekillt wurde +# %killer% - Spieler, der getoetet hat +# Unterstützt MiniMessage (, , ...) und Legacy-Farbcodes (&c, &7, ...) +kill-message: "&c%victim% &7was slain by &6%killer%" +natural-death-message: "%victim% ist gestorben." +broadcast: true + +heal: + enabled: true + amount: -1 +# -1 ist komplett voll +# Sonst ist 1 ein halbes Herz \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..5d88a8f --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,17 @@ +name: FallSMP-PvP +version: '1.0' +main: de.winniepat.fallSMPPvP.FallSMPPvP +api-version: '1.21' +authors: [ WinniePatGG ] +website: https://winniepat.de + +commands: + fallsmppvp: + description: main command + usage: /fallsmppvp + permission: fallsmp.admin + +permissions: + fallsmp.admin: + description: Allows access to all FallSMP-PvP commands + default: op \ No newline at end of file