commit 03744182cb7163124db89aa7916450b58e0de6c0 Author: rory Date: Sun Aug 4 02:52:31 2024 +1200 Floor and commands 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/build.gradle b/build.gradle new file mode 100644 index 0000000..6306100 --- /dev/null +++ b/build.gradle @@ -0,0 +1,49 @@ +plugins { + id 'java' +} + +group = 'com.pobnellion' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() + maven { + name = "spigotmc-repo" + url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/groups/public/" + } +} + +dependencies { + compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT") +} + +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/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..a441313 --- /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.8-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..edccbb2 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'floorGame' diff --git a/src/main/java/com/pobnellion/floorGame/FloorGame.java b/src/main/java/com/pobnellion/floorGame/FloorGame.java new file mode 100644 index 0000000..1062001 --- /dev/null +++ b/src/main/java/com/pobnellion/floorGame/FloorGame.java @@ -0,0 +1,59 @@ +package com.pobnellion.floorGame; + +import com.pobnellion.floorGame.command.CommandFloorGame; +import com.pobnellion.floorGame.game.GameConfig; +import com.pobnellion.floorGame.game.GameInstance; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.plugin.java.JavaPlugin; + +import javax.annotation.Nullable; + +public final class FloorGame extends JavaPlugin { + @Nullable + private static GameInstance gameInstance; + + public static FileConfiguration config; + private static FloorGame instance; + + @Override + public void onEnable() { + saveDefaultConfig(); + instance = this; + config = this.getConfig(); + + // Register commands + this.getCommand("floorgame").setExecutor(new CommandFloorGame()); + } + + @Override + public void onDisable() { + // Plugin shutdown logic + } + + public static boolean StartGame() { + if (gameInstance == null) { + gameInstance = new GameInstance(GameConfig.LoadFromFile()); + return true; + } + + return false; + } + + public static boolean StopGame() { + if (gameInstance != null) { + gameInstance.Stop(); + gameInstance = null; + return true; + } + + return false; + } + + public static void SaveConfig() { + instance.saveConfig(); + } + + public static FloorGame GetInstance() { + return instance; + } +} diff --git a/src/main/java/com/pobnellion/floorGame/command/CommandFloorGame.java b/src/main/java/com/pobnellion/floorGame/command/CommandFloorGame.java new file mode 100644 index 0000000..c919165 --- /dev/null +++ b/src/main/java/com/pobnellion/floorGame/command/CommandFloorGame.java @@ -0,0 +1,214 @@ +package com.pobnellion.floorGame.command; + +import com.pobnellion.floorGame.FloorGame; +import com.pobnellion.floorGame.game.GameConfig; +import org.bukkit.ChatColor; +import org.bukkit.Location; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class CommandFloorGame implements CommandExecutor { + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if (args.length == 0) + return false; + + switch (args[0]) { + case "start" -> Start(sender); + case "stop" -> Stop(sender); + case "config" -> Config(sender, args); + default -> sender.sendMessage(ChatColor.RED + "Usage: /floorgame < start | stop |config >"); + } + + // TODO: tab completer + + return true; + } + + private void Start(CommandSender sender) { + if (!FloorGame.StartGame()) + sender.sendMessage(ChatColor.RED + "There is already a game running"); + } + + private void Stop(CommandSender sender) { + if (!FloorGame.StopGame()) + sender.sendMessage(ChatColor.RED + "No game is currently running"); + } + + private void Config(CommandSender sender, String[] args) { + var config = GameConfig.LoadFromFile(); + + if (args.length == 1) { + sender.sendMessage(ChatColor.AQUA + "Floor game config:"); + sender.sendMessage(ChatColor.YELLOW + "Player join area: " + ChatColor.WHITE + PrintArea(config.getPlayerJoinArea())); + sender.sendMessage(ChatColor.YELLOW + "Spectator join area: " + ChatColor.WHITE + PrintArea(config.getSpectatorJoinArea())); + sender.sendMessage(ChatColor.YELLOW + "World: " + ChatColor.WHITE + config.getFloorCenter().getWorld()); + sender.sendMessage(ChatColor.YELLOW + "Post game TP location: " + ChatColor.WHITE + PrintBlockLocation(config.getPostGameTpLocation())); + sender.sendMessage(ChatColor.YELLOW + "Floor center: " + ChatColor.WHITE + PrintBlockLocation(config.getFloorCenter())); + sender.sendMessage(ChatColor.YELLOW + "Tile size: " + ChatColor.WHITE + config.getTileSize()); + sender.sendMessage(ChatColor.YELLOW + "Grid size: " + ChatColor.WHITE + config.getGridSize()); + sender.sendMessage(ChatColor.YELLOW + "Fail limit: " + ChatColor.WHITE + config.getFailLimit()); + sender.sendMessage(ChatColor.YELLOW + "Players have knockback stick: " + ChatColor.WHITE + config.playersHaveKnockbackStick()); + sender.sendMessage(ChatColor.YELLOW + "Players have fishing rod: " + ChatColor.WHITE + config.playersHaveFishingRod()); + sender.sendMessage(ChatColor.YELLOW + "Spectators can mess with players: " + ChatColor.WHITE + config.spectatorsCanMessWithPlayers()); + return; + } + + if (args.length == 2) { + switch (args[1]) { + case "playerJoinArea" -> sender.sendMessage(PrintArea(config.getPlayerJoinArea())); + case "spectatorJoinArea" -> sender.sendMessage(PrintArea(config.getSpectatorJoinArea())); + case "postGameTpLocation" -> sender.sendMessage(PrintBlockLocation(config.getPostGameTpLocation())); + case "floorCenter" -> sender.sendMessage(PrintBlockLocation(config.getFloorCenter())); + case "tileSize" -> sender.sendMessage(Integer.toString(config.getTileSize())); + case "gridSize" -> sender.sendMessage(Integer.toString(config.getGridSize())); + case "failLimit" -> sender.sendMessage(Integer.toString(config.getFailLimit())); + case "playersHaveKnockbackStick" -> sender.sendMessage(Boolean.toString(config.playersHaveKnockbackStick())); + case "playersHaveFishingRod" -> sender.sendMessage(Boolean.toString(config.playersHaveFishingRod())); + case "spectatorsCanMessWithPlayers" -> sender.sendMessage(Boolean.toString(config.spectatorsCanMessWithPlayers())); + } + return; + } + + switch (args[1]) { + case "playerJoinArea", "spectatorJoinArea" -> SetArea(sender, args, config); + case "postGameTpLocation", "floorCenter" -> SetLocation(sender, args, config); + case "tileSize", "gridSize", "failLimit" -> SetInt(sender, args, config); + case "playersHaveKnockbackStick", "playersHaveFishingRod", "spectatorsCanMessWithPlayers" -> SetBoolean(sender, args, config); + } + } + + private void SetArea(CommandSender sender, String[] args, GameConfig config) { + if (args.length != 8) { + sender.sendMessage("Invalid number of arguments"); + return; + } + + if (!(sender instanceof Player)) { + sender.sendMessage(ChatColor.RED + "Command must be run by a player"); + return; + } + + var world = ((Player) sender).getWorld(); + + try { + var x1 = Integer.parseInt(args[2]); + var y1 = Integer.parseInt(args[3]); + var z1 = Integer.parseInt(args[4]); + var x2 = Integer.parseInt(args[5]); + var y2 = Integer.parseInt(args[6]); + var z2 = Integer.parseInt(args[7]); + + var l1 = new Location(world, x1, y1, z1); + var l2 = new Location(world, x2, y2, z2); + + switch (args[1]) { + case "playerJoinArea" -> { + config.setPlayerJoinArea(l1, l2); + sender.sendMessage(ChatColor.YELLOW + "Player join area set to " + PrintArea(config.getPlayerJoinArea())); + } + case "spectatorJoinArea" -> { + config.setSpectatorJoinArea(l1, l2); + sender.sendMessage(ChatColor.YELLOW + "Spectator join area set to " + PrintArea(config.getSpectatorJoinArea())); + } + } + + } + catch (NumberFormatException e) { + sender.sendMessage(ChatColor.RED + "Could not parse int value: " + e.getMessage()); + } + } + + private void SetLocation(CommandSender sender, String[] args, GameConfig config) { + if (args.length != 5) { + sender.sendMessage("Invalid number of arguments"); + return; + } + + if (!(sender instanceof Player)) { + sender.sendMessage(ChatColor.RED + "Command must be run by a player"); + return; + } + + var world = ((Player) sender).getWorld(); + + try { + var x = Integer.parseInt(args[2]); + var y = Integer.parseInt(args[3]); + var z = Integer.parseInt(args[4]); + + switch (args[1]) { + case "postGameTpLocation" -> { + config.setPostGameTpLocation(new Location(world, x, y, z)); + sender.sendMessage(ChatColor.YELLOW + "Post game TP location set to " + PrintBlockLocation(config.getPostGameTpLocation())); + } + case "floorCenter" -> { + config.setFloorCenter(new Location(world, x, y, z)); + sender.sendMessage(ChatColor.YELLOW + "Floor center set to " + PrintBlockLocation(config.getFloorCenter())); + } + } + } + catch (NumberFormatException e) { + sender.sendMessage(ChatColor.RED + "Could not parse int value: " + e.getMessage()); + } + } + + private void SetInt(CommandSender sender, String[] args, GameConfig config) { + try { + var value = Integer.parseInt(args[2]); + + switch (args[1]) { + case "tileSize" -> { + config.setTileSize(value); + sender.sendMessage(ChatColor.YELLOW + "Tile size set to " + config.getTileSize()); + } + case "gridSize" -> { + config.setGridSize(value); + sender.sendMessage(ChatColor.YELLOW + "Grid size set to " + config.getGridSize()); + } + case "failLimit" -> { + config.setFailLimit(value); + sender.sendMessage(ChatColor.YELLOW + "Fail limit set to " + config.getFailLimit()); + } + } + } + catch (NumberFormatException e) { + sender.sendMessage(ChatColor.RED + "Could not parse int value " + args[2]); + } + } + + private void SetBoolean(CommandSender sender, String[] args, GameConfig config) { + if (!args[2].equalsIgnoreCase("true") && !args[2].equalsIgnoreCase("false")) { + sender.sendMessage(ChatColor.RED + "Could not parse bool value " + args[2]); + return; + } + + var value = Boolean.parseBoolean(args[2]); + + switch (args[1]) { + case "playersHaveKnockbackStick" -> { + config.setPlayersHaveKnockbackStick(value); + sender.sendMessage(ChatColor.YELLOW + "Players have knockback stick set to " + config.playersHaveKnockbackStick()); + } + case "playersHaveFishingRod" -> { + config.setPlayersHaveFishingRod(value); + sender.sendMessage(ChatColor.YELLOW + "Players have fishing rod set to " + config.playersHaveFishingRod()); + } + case "spectatorsCanMessWithPlayers" -> { + config.setSpectatorsCanMessWithPlayers(value); + sender.sendMessage(ChatColor.YELLOW + "Spectators can mess with players set to " + config.spectatorsCanMessWithPlayers()); + } + } + } + + private String PrintBlockLocation(Location location) { + return location.getBlockX() + ", " + location.getBlockY() + ", " + location.getBlockZ(); + } + + private String PrintArea(Location[] location) { + return "[" + PrintBlockLocation(location[0]) + "] - [" + PrintBlockLocation(location[1]) + "]"; + } +} diff --git a/src/main/java/com/pobnellion/floorGame/game/Floor.java b/src/main/java/com/pobnellion/floorGame/game/Floor.java new file mode 100644 index 0000000..1f03f93 --- /dev/null +++ b/src/main/java/com/pobnellion/floorGame/game/Floor.java @@ -0,0 +1,69 @@ +package com.pobnellion.floorGame.game; + +import org.bukkit.Location; +import org.bukkit.Material; + +import java.util.HashSet; +import java.util.Random; + +public class Floor { + private final Location xzCorner; + public int tileSize; + public int gridSize; + public Material[] colours; + private final Material[][] colourGrid; + + public Floor(Location center, int tileSize, int gridSize, Material[] availableColours) { + this.xzCorner = center.subtract(tileSize * gridSize * 0.5, 0, tileSize * gridSize * 0.5); + this.tileSize = tileSize; + this.gridSize = gridSize; + + // Randomize floor colours + colourGrid = new Material[gridSize][gridSize]; + var random = new Random(); + var colourSet = new HashSet(); + + for (int row = 0; row < gridSize; row++) { + for (int col = 0; col < gridSize; col++) { + var colour = availableColours[random.nextInt(availableColours.length)]; + colourGrid[row][col] = colour; + colourSet.add(colour); + } + } + + colours = colourSet.toArray(new Material[0]); + } + + public void Reset() { + for (int row = 0; row < gridSize; row++) { + for (int col = 0; col < gridSize; col++) { + FillTile(xzCorner.clone().add(row * tileSize, 0, col * tileSize), colourGrid[row][col]); + } + } + } + + public void Clear() { + for (int row = 0; row < gridSize * tileSize; row++) { + for (int col = 0; col < gridSize * tileSize; col++) { + xzCorner.clone().add(row, 0, col).getBlock().setType(Material.AIR); + } + } + } + + public void SoloTile(Material material) { + for (int row = 0; row < gridSize; row++) { + for (int col = 0; col < gridSize; col++) { + if (colourGrid[row][col] != material) + FillTile(xzCorner.clone().add(row * tileSize, 0, col * tileSize), Material.AIR); + } + } + } + + private void FillTile(Location location, Material material) { + for (int row = 0; row < tileSize; row++) { + for (int col = 0; col < tileSize; col++) { + location.clone().add(row, 0, col).getBlock().setType(material); + } + } + } +} diff --git a/src/main/java/com/pobnellion/floorGame/game/GameConfig.java b/src/main/java/com/pobnellion/floorGame/game/GameConfig.java new file mode 100644 index 0000000..2437218 --- /dev/null +++ b/src/main/java/com/pobnellion/floorGame/game/GameConfig.java @@ -0,0 +1,184 @@ +package com.pobnellion.floorGame.game; + +import com.pobnellion.floorGame.FloorGame; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; + +import java.util.*; +import java.util.logging.Level; + +public class GameConfig { + private int tileSize; + private int gridSize; + private int failLimit; + private boolean playersHaveKnockbackStick; + private boolean playersHaveFishingRod; + private boolean spectatorsCanMessWithPlayers; + private static final Map availableColours = new HashMap<>(); + private Location postGameTpLocation; + private Location floorCenter; + private final Location[] playerJoinArea = new Location[2]; + private final Location[] spectatorJoinArea= new Location[2]; + + public static GameConfig LoadFromFile() { + var config = new GameConfig(); + config.setTileSize(FloorGame.config.getInt("tileSize")); + config.setGridSize(FloorGame.config.getInt("gridSize")); + config.setFailLimit(FloorGame.config.getInt("failLimit")); + config.setPlayersHaveKnockbackStick(FloorGame.config.getBoolean("playersHaveKnockbackStick")); + config.setPlayersHaveFishingRod(FloorGame.config.getBoolean("playersHaveFishingRod")); + config.setSpectatorsCanMessWithPlayers(FloorGame.config.getBoolean("spectatorsCanMessWithPlayers")); + + var world = Bukkit.getWorld(FloorGame.config.getString("world")); + var playerJoinArea = FloorGame.config.getStringList("playerJoinArea"); + var spectatorJoinArea = FloorGame.config.getStringList("spectatorJoinArea"); + + config.setPostGameTpLocation(ParseLocation(world, FloorGame.config.getString("postGameTpLocation"))); + config.setFloorCenter(ParseLocation(world, FloorGame.config.getString("floorCenter"))); + config.getPlayerJoinArea()[0] = ParseLocation(world, playerJoinArea.get(0)); + config.getPlayerJoinArea()[1] = ParseLocation(world, playerJoinArea.get(1)); + config.getSpectatorJoinArea()[0] = ParseLocation(world, spectatorJoinArea.get(0)); + config.getSpectatorJoinArea()[1] = ParseLocation(world, spectatorJoinArea.get(1)); + + var coloursSection = FloorGame.config.getConfigurationSection("availableColours"); + + if (coloursSection == null) + throw new NullPointerException("availableColours section not present in config"); + + for (String colour : coloursSection.getKeys(false)){ + var material = Material.getMaterial(coloursSection.getString(colour)); + availableColours.put(colour, material); + } + return config; + } + + private static Location ParseLocation(World world, String locationString) { + var coords = locationString.split(", "); + if (coords.length != 3) { + Bukkit.getLogger().log(Level.SEVERE, "Could not parse location " + locationString); + return new Location(world, 0, 0, 0); + } + + var x = Double.parseDouble(coords[0]); + var y = Double.parseDouble(coords[1]); + var z = Double.parseDouble(coords[2]); + + return new Location(world, x, y, z); + } + + public int getTileSize() { + return tileSize; + } + + public void setTileSize(int tileSize) { + this.tileSize = tileSize; + FloorGame.config.set("tileSize", tileSize); + FloorGame.SaveConfig(); + } + + public int getGridSize() { + return gridSize; + } + + public void setGridSize(int gridSize) { + this.gridSize = gridSize; + FloorGame.config.set("gridSize", gridSize); + FloorGame.SaveConfig(); + } + + public int getFailLimit() { + return failLimit; + } + + public void setFailLimit(int failLimit) { + this.failLimit = failLimit; + FloorGame.config.set("failLimit", failLimit); + FloorGame.SaveConfig(); + } + + public boolean playersHaveKnockbackStick() { + return playersHaveKnockbackStick; + } + + public void setPlayersHaveKnockbackStick(boolean playersHaveKnockbackStick) { + this.playersHaveKnockbackStick = playersHaveKnockbackStick; + FloorGame.config.set("playersHaveKnockbackStick", playersHaveKnockbackStick); + FloorGame.SaveConfig(); + } + + public boolean playersHaveFishingRod() { + return playersHaveFishingRod; + } + + public void setPlayersHaveFishingRod(boolean playersHaveFishingRod) { + this.playersHaveFishingRod = playersHaveFishingRod; + FloorGame.config.set("playersHaveFishingRod", playersHaveFishingRod); + FloorGame.SaveConfig(); + } + + public boolean spectatorsCanMessWithPlayers() { + return spectatorsCanMessWithPlayers; + } + + public void setSpectatorsCanMessWithPlayers(boolean spectatorsCanMessWithPlayers) { + this.spectatorsCanMessWithPlayers = spectatorsCanMessWithPlayers; + FloorGame.config.set("spectatorsCanMessWithPlayers", spectatorsCanMessWithPlayers); + FloorGame.SaveConfig(); + } + + public Map getColourMap() { + return availableColours; + } + + public Material[] getAvailableColours() { + return availableColours.values().toArray(new Material[0]); + } + + public Location getFloorCenter() { + return floorCenter; + } + + public void setFloorCenter(Location floorCenter) { + this.floorCenter = floorCenter; + FloorGame.config.set("floorCenter", FormatBlockLocation(floorCenter)); + FloorGame.SaveConfig(); + } + + public Location[] getPlayerJoinArea() { + return playerJoinArea; + } + + public void setPlayerJoinArea(Location l1, Location l2) { + playerJoinArea[0] = l1; + playerJoinArea[1] = l2; + FloorGame.config.set("playerJoinArea", playerJoinArea); + FloorGame.SaveConfig(); + } + + public Location[] getSpectatorJoinArea() { + return spectatorJoinArea; + } + + public void setSpectatorJoinArea(Location l1, Location l2) { + spectatorJoinArea[0] = l1; + spectatorJoinArea[1] = l2; + FloorGame.config.set("spectatorJoinArea", spectatorJoinArea); + FloorGame.SaveConfig(); + } + + public Location getPostGameTpLocation() { + return postGameTpLocation; + } + + public void setPostGameTpLocation(Location postGameTpLocation) { + this.postGameTpLocation = postGameTpLocation; + FloorGame.config.set("postGameTpLocation", FormatBlockLocation(postGameTpLocation)); + FloorGame.SaveConfig(); + } + + private String FormatBlockLocation(Location location) { + return location.getBlockX() + ", " + location.getBlockY() + ", " + location.getBlockZ(); + } +} diff --git a/src/main/java/com/pobnellion/floorGame/game/GameInstance.java b/src/main/java/com/pobnellion/floorGame/game/GameInstance.java new file mode 100644 index 0000000..97ecacd --- /dev/null +++ b/src/main/java/com/pobnellion/floorGame/game/GameInstance.java @@ -0,0 +1,68 @@ +package com.pobnellion.floorGame.game; + +import com.pobnellion.floorGame.FloorGame; +import org.bukkit.Location; +import org.bukkit.entity.Player; +import org.bukkit.scheduler.BukkitRunnable; + +import java.util.ArrayList; +import java.util.Random; + +public class GameInstance { + private final Floor floor; + private final ArrayList players = new ArrayList<>(); + private final ArrayList spectators = new ArrayList<>(); + private final GameConfig config; + + public GameInstance(GameConfig config) { + floor = new Floor(config.getFloorCenter(), config.getGridSize(), config.getTileSize(), config.getAvailableColours()); + floor.Reset(); + this.config = config; + + var world = config.getFloorCenter().getWorld(); + + if (world == null) + throw new NullPointerException("floorCenter world is not set"); + + world.getPlayers().forEach(player -> { + if (IsInBounds(player.getLocation(), config.getPlayerJoinArea()[0], config.getPlayerJoinArea()[1])) + players.add(player); + else if (IsInBounds(player.getLocation(), config.getSpectatorJoinArea()[0], config.getSpectatorJoinArea()[1])) + spectators.add(player); + }); + + new BukkitRunnable() { + public void run() { + GameLoopTask(); + } + }.runTaskTimerAsynchronously(FloorGame.GetInstance(), 0, 10_000); + } + + private void GameLoopTask() { + var rand = new Random(); + var colour = floor.colours[rand.nextInt(floor.colours.length)]; + floor.SoloTile(colour); + + new BukkitRunnable() { + public void run() { + floor.Reset(); + } + }.runTaskLater(FloorGame.GetInstance(), 1000); + } + + public void Stop() { + floor.Clear(); + + players.forEach(player -> player.teleport(config.getPostGameTpLocation())); + spectators.forEach(player -> player.teleport(config.getPostGameTpLocation())); + } + + private boolean IsInBounds(Location location, Location bounds1, Location bounds2) { + return location.getX() > Math.min(bounds1.getX(), bounds2.getX()) + && location.getX() < Math.max(bounds1.getX(), bounds2.getX()) + && location.getY() > Math.min(bounds1.getY(), bounds2.getY()) + && location.getY() < Math.max(bounds1.getY(), bounds2.getY()) + && location.getZ() > Math.min(bounds1.getZ(), bounds2.getZ()) + && location.getZ() < Math.max(bounds1.getZ(), bounds2.getZ()); + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..25e6705 --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,28 @@ +availableColours: + red: RED_CONCRETE + orange: ORANGE_CONCRETE + yellow: YELLOW_CONCRETE + green: LIME_CONCRETE + blue: LIGHT_BLUE_CONCRETE + magenta: MAGENTA_CONCRETE + pink: PINK_CONCRETE + purple: PURPLE_CONCRETE + white: WHITE_CONCRETE + +playerJoinArea: + - 0, 0, 0 + - 0, 0, 0 + +spectatorJoinArea: + - 0, 0, 0 + - 0, 0, 0 + +postGameTpLocation: 0, 0, 0 +floorCenter: 0, 0, 0 +world: none +tileSize: 3 +gridSize: 5 +failLimit: 10 +playersHaveKnockbackStick: false +playersHaveFishingRod: false +spectatorsCanMessWithPlayers: false diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..2f44009 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,10 @@ +name: floorGame +version: '1.0-SNAPSHOT' +main: com.pobnellion.floorGame.FloorGame +api-version: '1.21' + +commands: + floorgame: + description: "Floor game setup and play" + usage: /floorgame + permission: floorGame.admin