commit 9cd55f0a181aa23f4c906ff3d3df159c55e4a935 Author: Teriuihi Date: Sat May 17 20:22:03 2025 +0200 Initial Hunger Games project with configuration system Set up the Hunger Games plugin foundation, including configuration management classes for main settings, messages, and game-specific options. Added Gradle build setup, dependency management, and a TODO list for planned features. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..14746e7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..32cf4db --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..e969ea0 --- /dev/null +++ b/TODO.md @@ -0,0 +1,73 @@ +# Hunger Games + +## Game flow +- The players spawn in a circle. +- They cannot move until the game starts. +- They start moving and looting chests and killing other players +- WorldBorder shrinks until it is 1 block wide or only one player is left +- When one player is left they are announced as the winner +- The world gets manually reset or rolled back (not part of this plugin) +--- + +## TODO +- [ ] Commands + - [ ] Reload configs + - [ ] Start game + - [ ] End game (early) + - [ ] Add player to active game + - [ ] Remove player from active game + - [ ] List remaining players +- [ ] Config + - [ ] Bypass permission for auto joining the event + - [ ] Configure items that can spawn in chests, the amounts and the enchants, and the names + - [ ] Configure WorldBorder start size and shrink interval +- [ ] Spawn players in a circle around the center +- [ ] Prevent movement until the game starts +- [ ] Loot + - [ ] Only generate loot once per chest per round + - [ ] Only generate loot in chests not placed by players + - [ ] Track chests placed by players to accomplish this + - [ ] Temporary power ups + - [ ] See nearby players (glow) + - [ ] Speed + - [ ] t.b.d +- [ ] End game when one player is alive +- [ ] WorldBorder + - [ ] Shrink WorldBorder based on configured game time + - [ ] Don't go smaller than 1, when it hits 1 wait 10 seconds and make the game a draw + - [ ] Announce when the border shrinks and to what size it goes + - [ ] Shrink slowly +- [ ] Prizes + - [ ] Track kills, wins and time alive + - [ ] Give everyone who joins a permission for participating + - [ ] Assign permission to winners +- [ ] Scoreboard + - [ ] Show time remaining + - [ ] Show players remaining +- [ ] Database + - [ ] Track player stats in MariaDB database (per round) + - [ ] Kills + - [ ] Deaths + - [ ] Wins + - [ ] Position they died in + - [ ] Time alive +--- + +## Priority +1. Working game + - Players spawn in circle + - Players can loot chests + - WorldBorder can shrink + - There can be a winner +2. Prizes + - Participation is tracked (permission) + - Wins are tracked (permission) +3. Power ups + - Lootable items/potions that give effects +4. Stats + - Stats are tracked in database +5. Scoreboard + - Game progression is shown on scoreboard + +## Rules +- No teaming diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..3380f95 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,28 @@ +plugins { + id("java") +} + +group = "com.alttd.hunger_games" +version = "1.0-SNAPSHOT" + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) +} + +dependencies { + testImplementation(platform("org.junit:junit-bom:5.10.0")) + testImplementation("org.junit.jupiter:junit-jupiter") + + compileOnly("org.projectlombok:lombok:1.18.32") + annotationProcessor("org.projectlombok:lombok:1.18.32") + + //Paper + compileOnly("io.papermc.paper:paper-api:1.20-R0.1-20230613.000034-20") + + //WorldBorder API + compileOnly("com.github.yannicklamprecht:worldborderapi:1.210.0:dev") +} + +tasks.test { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 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..0dd842f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat May 17 19:36:10 CEST 2025 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 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..107acd3 --- /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.kts b/settings.gradle.kts new file mode 100644 index 0000000..1db3457 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,23 @@ +rootProject.name = "HungerGames" + +dependencyResolutionManagement { + repositories { + mavenLocal() + mavenCentral() + maven { // WorldBorderAPI + name = "eldonexus" + url = uri("https://eldonexus.de/repository/maven-releases/") + } + maven { // Paper + name = "papermc" + url = uri("https://repo.papermc.io/repository/maven-public/") + } + } + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) +} + +pluginManagement { + repositories { + gradlePluginPortal() + } +} diff --git a/src/main/java/com/alttd/hunger_games/Main.java b/src/main/java/com/alttd/hunger_games/Main.java new file mode 100644 index 0000000..a1f4a2e --- /dev/null +++ b/src/main/java/com/alttd/hunger_games/Main.java @@ -0,0 +1,65 @@ +package com.alttd.hunger_games; + +import com.alttd.hunger_games.commands.CommandManager; +import com.alttd.hunger_games.config.Config; +import com.alttd.hunger_games.config.GameConfig; +import com.alttd.hunger_games.config.Messages; +import com.github.yannicklamprecht.worldborder.api.WorldBorderApi; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.Bukkit; +import org.bukkit.GameRule; +import org.bukkit.World; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.RegisteredServiceProvider; +import org.bukkit.plugin.java.JavaPlugin; + +@Slf4j +public class Main extends JavaPlugin { + + @Override + public void onEnable() { + log.info("HungerGames starting"); + + reloadConfigs(); + WorldBorderApi worldBorderApi = worldBorder(); + //TODO pass worldBorderApi where it is needed + new CommandManager(this); + //Ensuring immediate respawn is on in all worlds + enableImmediateRespawn(); + registerEvents(); + } + + public void reloadConfigs() { + Config.reload(this); + Messages.reload(this); + GameConfig.reload(this); + } + + private WorldBorderApi worldBorder() { + RegisteredServiceProvider worldBorderApiRegisteredServiceProvider = getServer().getServicesManager().getRegistration(WorldBorderApi.class); + + if (worldBorderApiRegisteredServiceProvider == null) { + log.error("WorldBorder API not found, disabling plugin"); + getServer().getPluginManager().disablePlugin(this); + return null; + } + + return worldBorderApiRegisteredServiceProvider.getProvider(); + } + + private void enableImmediateRespawn() { + log.info("Enabling immediate respawn for {}.", GameConfig.GAME.WORLD); + World world = Bukkit.getWorld(GameConfig.GAME.WORLD); + if (world != null) { + world.setGameRule(GameRule.DO_IMMEDIATE_RESPAWN, true); + } else { + log.error("No valid flag world defined, unable to modify game rules"); + } + } + + private void registerEvents() { + PluginManager pluginManager = getServer().getPluginManager(); +// pluginManager.registerEvents(new ChestOpenEvent(), this); + } + +} diff --git a/src/main/java/com/alttd/hunger_games/commands/CommandManager.java b/src/main/java/com/alttd/hunger_games/commands/CommandManager.java new file mode 100644 index 0000000..2d32b46 --- /dev/null +++ b/src/main/java/com/alttd/hunger_games/commands/CommandManager.java @@ -0,0 +1,121 @@ +package com.alttd.hunger_games.commands; + +import com.alttd.hunger_games.Main; +import com.alttd.hunger_games.commands.subcommands.Reload; +import com.alttd.hunger_games.config.Messages; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; +import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; +import org.bukkit.command.*; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +@Getter +@Slf4j +public class CommandManager implements CommandExecutor, TabExecutor { + private final List subCommands; + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + + public CommandManager(Main main) { + PluginCommand command = main.getCommand("hg"); + if (command == null) { + subCommands = null; + log.error("Unable to find hunger games command."); + return; + } + command.setExecutor(this); + command.setTabCompleter(this); + + subCommands = Arrays.asList( + new Reload(main) + ); + } + + @Override + public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String cmd, @NotNull String[] args) { + if (args.length == 0) { + commandSender.sendRichMessage(Messages.HELP.HELP_MESSAGE_WRAPPER.replaceAll("", subCommands.stream() + .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission())) + .map(SubCommand::getHelpMessage) + .collect(Collectors.joining("\n")))); + return true; + } + + SubCommand subCommand = getSubCommand(args[0]); + if (subCommand == null) + return false; + + if (!commandSender.hasPermission(subCommand.getPermission())) { + Component component = miniMessage.deserialize( + Messages.GENERIC.NO_PERMISSION, + Placeholder.parsed("permission", subCommand.getPermission())); + commandSender.sendMessage(component); + return true; + } + + int failedPos = subCommand.onCommand(commandSender, args); + if (failedPos > 0) { + commandSender.sendRichMessage(String.format("%s", + getHoverText(command.getName(), args, failedPos), + subCommand.getHelpMessage())); + } else if (failedPos < 0) { + commandSender.sendRichMessage(subCommand.getHelpMessage()); + } + return true; + } + + private String getHoverText(String commandName, String[] args, int failedPos) { + StringBuilder hoverText = new StringBuilder(); + + hoverText.append("/").append(commandName); + for (int i = 0; i < failedPos; i++) { + hoverText.append(" ").append(args[i]); + } + hoverText.append(""); + + if (failedPos < args.length) { + hoverText.append(" ").append(args[failedPos]).append(""); + } + + for (int i = failedPos + 1; i < args.length; i++) { + hoverText.append(" ").append(args[i]).append(""); + } + + return hoverText.toString(); + } + + @Override + public @Nullable List onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String cmd, @NotNull String[] args) { + List res = new ArrayList<>(); + + if (args.length <= 1) { + res.addAll(subCommands.stream() + .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission())) + .map(SubCommand::getName) + .filter(name -> args.length == 0 || name.startsWith(args[0])) + .toList() + ); + } else { + SubCommand subCommand = getSubCommand(args[0]); + if (subCommand != null && commandSender.hasPermission(subCommand.getPermission())) + res.addAll(subCommand.getTabComplete(commandSender, args).stream() + .filter(str -> str.toLowerCase().startsWith(args[args.length - 1].toLowerCase())) + .toList()); + } + return res; + } + + private SubCommand getSubCommand(String cmdName) { + return subCommands.stream() + .filter(subCommand -> subCommand.getName().equals(cmdName)) + .findFirst() + .orElse(null); + } +} diff --git a/src/main/java/com/alttd/hunger_games/commands/SubCommand.java b/src/main/java/com/alttd/hunger_games/commands/SubCommand.java new file mode 100644 index 0000000..b629fb6 --- /dev/null +++ b/src/main/java/com/alttd/hunger_games/commands/SubCommand.java @@ -0,0 +1,25 @@ +package com.alttd.hunger_games.commands; + +import org.bukkit.command.CommandSender; + +import java.util.List; + +public abstract class SubCommand { + + public SubCommand() {} + + //A return value other than 0 means the command failed + // If the value is more than 0 it should be the position in the array of the argument it failed on + // If the value is less than 0 it means something else failed (like the amount of arguments) + public abstract int onCommand(CommandSender commandSender, String[] args); + + public abstract String getName(); + + public String getPermission() { + return "ctf." + getName(); + } + + public abstract List getTabComplete(CommandSender commandSender, String[] args); + + public abstract String getHelpMessage(); +} diff --git a/src/main/java/com/alttd/hunger_games/commands/subcommands/Reload.java b/src/main/java/com/alttd/hunger_games/commands/subcommands/Reload.java new file mode 100644 index 0000000..8ce5a42 --- /dev/null +++ b/src/main/java/com/alttd/hunger_games/commands/subcommands/Reload.java @@ -0,0 +1,36 @@ +package com.alttd.hunger_games.commands.subcommands; + +import com.alttd.hunger_games.Main; +import com.alttd.hunger_games.commands.SubCommand; +import lombok.AllArgsConstructor; +import org.bukkit.command.CommandSender; + +import java.util.List; + +@AllArgsConstructor +public class Reload extends SubCommand { + + private final Main main; + + @Override + public int onCommand(CommandSender commandSender, String[] args) { + main.reloadConfigs(); + commandSender.sendRichMessage("Reloaded the configuration files"); + return 0; + } + + @Override + public String getName() { + return "reload"; + } + + @Override + public List getTabComplete(CommandSender commandSender, String[] args) { + return List.of(); + } + + @Override + public String getHelpMessage() { + return Messages.HELP.RELOAD; + } +} diff --git a/src/main/java/com/alttd/hunger_games/config/AbstractConfig.java b/src/main/java/com/alttd/hunger_games/config/AbstractConfig.java new file mode 100644 index 0000000..1f1524f --- /dev/null +++ b/src/main/java/com/alttd/hunger_games/config/AbstractConfig.java @@ -0,0 +1,154 @@ +package com.alttd.hunger_games.config; + +import com.alttd.hunger_games.Main; +import com.google.common.collect.ImmutableMap; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.InvalidConfigurationException; +import org.bukkit.configuration.file.YamlConfiguration; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Slf4j +@SuppressWarnings({"unused", "SameParameterValue"}) +abstract class AbstractConfig { + File file; + YamlConfiguration yaml; + + AbstractConfig(Main main, String filename) { + init(new File(main.getDataFolder(), filename), filename); + } + + AbstractConfig(File file, String filename) { + init(new File(file.getPath() + File.separator + filename), filename); + } + + private void init(File file, String filename) { + this.file = file; + this.yaml = new YamlConfiguration(); + try { + yaml.load(file); + } catch (IOException ignore) { + } catch (InvalidConfigurationException ex) { + log.error("Could not load {}, please correct your syntax errors", filename, ex); + throw new RuntimeException(ex); + } + yaml.options().copyDefaults(true); + } + + void readConfig(Class clazz, Object instance) { + for (Class declaredClass : clazz.getDeclaredClasses()) { + for (Method method : declaredClass.getDeclaredMethods()) { + if (!Modifier.isPrivate(method.getModifiers())) { + continue; + } + if (method.getParameterTypes().length != 0 || method.getReturnType() != Void.TYPE) { + continue; + } + try { + method.setAccessible(true); + method.invoke(instance); + } catch (InvocationTargetException ex) { + throw new RuntimeException(ex.getCause()); + } catch (Exception ex) { + log.error("Error invoking {}.", method, ex); + } + } + } + + save(); + } + + private void save() { + try { + yaml.save(file); + } catch (IOException ex) { + log.error("Could not save {}.", file.toString(), ex); + } + } + + void set(String prefix, String path, Object val) { + path = prefix + path; + yaml.addDefault(path, val); + yaml.set(path, val); + save(); + } + + String getString(String prefix, String path, String def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getString(path, yaml.getString(path)); + } + + boolean getBoolean(String prefix, String path, boolean def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getBoolean(path, yaml.getBoolean(path)); + } + + int getInt(String prefix, String path, int def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getInt(path, yaml.getInt(path)); + } + + public long getLong(String prefix, String path, long def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getLong(path, yaml.getLong(path)); + } + + double getDouble(String prefix, String path, double def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getDouble(path, yaml.getDouble(path)); + } + + List getList(String prefix, String path, T def) { + path = prefix + path; + yaml.addDefault(path, def); + List list = yaml.getList(path, yaml.getList(path)); + return list == null ? null : list.stream().map(Object::toString).collect(Collectors.toList()); + } + + List getStringList(String prefix, String path, List def) { + path = prefix + path; + yaml.addDefault(path, def); + return yaml.getStringList(path); + } + + @NonNull + Map getMap(String prefix, @NonNull String path, final @Nullable Map def) { + path = prefix + path; + final ImmutableMap.Builder builder = ImmutableMap.builder(); + if (def != null && yaml.getConfigurationSection(path) == null) { + yaml.addDefault(path, def.isEmpty() ? new HashMap<>() : def); + return def; + } + final ConfigurationSection section = yaml.getConfigurationSection(path); + if (section != null) { + for (String key : section.getKeys(false)) { + @SuppressWarnings("unchecked") + final T val = (T) section.get(key); + if (val != null) { + builder.put(key, val); + } + } + } + return builder.build(); + } + + ConfigurationSection getConfigurationSection(String path) { + return yaml.getConfigurationSection(path); + } +} diff --git a/src/main/java/com/alttd/hunger_games/config/Config.java b/src/main/java/com/alttd/hunger_games/config/Config.java new file mode 100644 index 0000000..3250ecd --- /dev/null +++ b/src/main/java/com/alttd/hunger_games/config/Config.java @@ -0,0 +1,76 @@ +package com.alttd.hunger_games.config; + +import com.alttd.hunger_games.Main; +import lombok.extern.slf4j.Slf4j; + +import java.util.logging.Level; + +@Slf4j +public class Config extends AbstractConfig{ + + static Config config; + private final Main main; + + Config(Main main) { + super(main, "config.yml"); + this.main = main; + } + + public static void reload(Main main) { + log.info("Reloading config"); + config = new Config(main); + config.readConfig(Config.class, null); + } + + @SuppressWarnings("unused") + public static class SETTINGS { + private static final String prefix = "settings."; + + @SuppressWarnings("unused") + private static void load() { + if (config.getBoolean(prefix, "debug", false)) { + config.main.getLogger().setLevel(Level.FINE); + } else if (config.getBoolean(prefix, "warnings", true)) { + config.main.getLogger().setLevel(Level.WARNING); + } else { + config.main.getLogger().setLevel(Level.INFO); + } + log.debug("Debug logging is enabled"); + log.warn("Warning logging is enabled"); + log.info("Info logging is enabled"); + } + } + + @SuppressWarnings("unused") + public static class DISCORD { + private static final String prefix = "discord."; + + public static long PLAYER_SERVER_ID = 0L; + + @SuppressWarnings("unused") + private static void load() { + PLAYER_SERVER_ID = config.getLong(prefix, "player-server-id", PLAYER_SERVER_ID); + } + } + + + @SuppressWarnings("unused") + public static class DISCORD_DATABASE { + private static final String prefix = "discord-database."; + + public static String HOST = "localhost"; + public static int PORT = 3306; + public static String DATABASE = "discordLink"; + public static String USERNAME = "username"; + public static String PASSWORD = "password"; + + @SuppressWarnings("unused") + private static void load() { + HOST = config.getString(prefix, "host", HOST); + DATABASE = config.getString(prefix, "database", DATABASE); + PORT = config.getInt(prefix, "port", PORT); + USERNAME = config.getString(prefix, "username", USERNAME); + PASSWORD = config.getString(prefix, "password", PASSWORD); + } + } +} diff --git a/src/main/java/com/alttd/hunger_games/config/GameConfig.java b/src/main/java/com/alttd/hunger_games/config/GameConfig.java new file mode 100644 index 0000000..6ffce40 --- /dev/null +++ b/src/main/java/com/alttd/hunger_games/config/GameConfig.java @@ -0,0 +1,32 @@ +package com.alttd.hunger_games.config; + +import com.alttd.hunger_games.Main; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class GameConfig extends AbstractConfig { + + static GameConfig config; + + GameConfig(Main main) { + super(main, "game-config.yml"); + } + + public static void reload(Main main) { + log.info("Reloading config"); + config = new GameConfig(main); + config.readConfig(GameConfig.class, null); + } + + public static class GAME { + private static final String prefix = "game."; + + public static String WORLD = "world"; + + @SuppressWarnings("unused") + private static void load() { + WORLD = config.getString(prefix, "world", WORLD); + } + } + +} diff --git a/src/main/java/com/alttd/hunger_games/config/Messages.java b/src/main/java/com/alttd/hunger_games/config/Messages.java new file mode 100644 index 0000000..b9f3a63 --- /dev/null +++ b/src/main/java/com/alttd/hunger_games/config/Messages.java @@ -0,0 +1,48 @@ +package com.alttd.hunger_games.config; + +import com.alttd.hunger_games.Main; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class Messages extends AbstractConfig { + static Messages config; + + Messages(Main main) { + super(main, "messages.yml"); + } + + public static void reload(Main main) { + log.info("Reloading messages config"); + config = new Messages(main); + config.readConfig(Messages.class, null); + } + + public static class HELP { + private static final String prefix = "help."; + + public static String HELP_MESSAGE_WRAPPER = "Main help:\n"; + public static String HELP_MESSAGE = "Show this menu: /hg help"; + + @SuppressWarnings("unused") + private static void load() { + HELP_MESSAGE_WRAPPER = config.getString(prefix, "help-wrapper", HELP_MESSAGE_WRAPPER); + HELP_MESSAGE = config.getString(prefix, "help", HELP_MESSAGE); + } + } + + public static class GENERIC { + private static final String prefix = "generic."; + + public static String NO_PERMISSION = "'>You don't have permission for this command"; + public static String PLAYER_ONLY = "This command can only be executed as a player"; + public static String PLAYER_NOT_FOUND = "Unable to find online player "; + + @SuppressWarnings("unused") + private static void load() { + NO_PERMISSION = config.getString(prefix, "no-permission", NO_PERMISSION); + PLAYER_ONLY = config.getString(prefix, "player-only", PLAYER_ONLY); + PLAYER_NOT_FOUND = config.getString(prefix, "player-only", PLAYER_NOT_FOUND); + } + } + +} diff --git a/src/main/java/com/alttd/hunger_games/config/WorldBorderSettings.java b/src/main/java/com/alttd/hunger_games/config/WorldBorderSettings.java new file mode 100644 index 0000000..f409ee1 --- /dev/null +++ b/src/main/java/com/alttd/hunger_games/config/WorldBorderSettings.java @@ -0,0 +1,4 @@ +package com.alttd.hunger_games.config; + +public record WorldBorderSettings(WorldBorderType type, double size) { +} diff --git a/src/main/java/com/alttd/hunger_games/config/WorldBorderType.java b/src/main/java/com/alttd/hunger_games/config/WorldBorderType.java new file mode 100644 index 0000000..fca39e9 --- /dev/null +++ b/src/main/java/com/alttd/hunger_games/config/WorldBorderType.java @@ -0,0 +1,6 @@ +package com.alttd.hunger_games.config; + +public enum WorldBorderType { + FLAG, + PLAYER +}