commit 34399377a124491e8125b82503e38b1b9f88833c Author: Kalle Struik Date: Mon Oct 25 14:54:58 2021 +0200 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7c9cf9c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/build/ +/.gradle/ diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..659bf43 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..9d1a244 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..7c82d64 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..ea05b59 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/DArena.main.iml b/.idea/modules/DArena.main.iml new file mode 100644 index 0000000..0fd33be --- /dev/null +++ b/.idea/modules/DArena.main.iml @@ -0,0 +1,12 @@ + + + + + + + PAPER + + + + + \ 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/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..966adb9 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,44 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("jvm") version "1.5.10" + id("com.github.johnrengelman.shadow") version "7.1.0" +} + +group = "nl.kallestruik" +version = "2.0" + +repositories { + mavenCentral() + mavenLocal() + + maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.aikar.co/content/groups/aikar/") +} + +dependencies { + implementation("co.aikar:acf-paper:0.5.0-SNAPSHOT") + compileOnly("com.destroystokyo.paper:paper:1.16.5-R0.1-SNAPSHOT") + compileOnly(kotlin("stdlib-jdk8")) +} + +tasks.compileJava { + options.compilerArgs.add("-parameters") +} + +tasks.shadowJar { + relocate("co.aikar.commands", "nl.kallestruik.darena.acf") + relocate("co.aikar.locales", "nl.kallestruik.darena.locales") +} + +tasks.build { + dependsOn(tasks.shadowJar) +} + +tasks.processResources { + expand("version" to project.version) +} + +tasks.withType() { + kotlinOptions.jvmTarget = "13" +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..7fc6f1f --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 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..69a9715 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..744e882 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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 "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +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..5764f2c --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,3 @@ + +rootProject.name = "DArena" + diff --git a/src/main/kotlin/nl/kallestruik/darena/DArena.kt b/src/main/kotlin/nl/kallestruik/darena/DArena.kt new file mode 100644 index 0000000..9e3e411 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/DArena.kt @@ -0,0 +1,44 @@ +package nl.kallestruik.darena + +import nl.kallestruik.darena.managers.ConfigManager +import nl.kallestruik.darena.managers.PointsManager +import nl.kallestruik.darena.managers.TeamManager +import org.bukkit.plugin.java.JavaPlugin +import java.io.File + +class DArena: JavaPlugin() { + private lateinit var configManager: ConfigManager + private lateinit var pointsManager: PointsManager + private lateinit var teamManager: TeamManager + + + //TODO: + // Thinking: + // - Datastructures for arenas + // - Datastructures for teams (Everyone is always in a team even when solo) + // - How will points work for teams/individuals + // - Teams are always the same during one event + // - Teams on the leaderboard + // - Rotate teams each new game as an option + // Programing: + // - Loading arenas from config files + // - Commands to interact with the plugin + // - Custom world creation for arenas + // - Basic arena mechanics + // - Points system + // - Advanced arena mechanics (Special items like fireballs) + + override fun onEnable() { + configManager = ConfigManager(File(dataFolder, "config.yml")) + configManager.load() + + teamManager = TeamManager(File(dataFolder, "teams.yml")) + teamManager.load() + pointsManager = PointsManager(teamManager, File(dataFolder, "points.yml")) + + } + + override fun onDisable() { + + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/arenas/Arena.kt b/src/main/kotlin/nl/kallestruik/darena/arenas/Arena.kt new file mode 100644 index 0000000..07cf631 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/arenas/Arena.kt @@ -0,0 +1,51 @@ +package nl.kallestruik.darena.arenas + +import nl.kallestruik.darena.arenas.world.ArenaWorld +import nl.kallestruik.darena.util.ArenaUtil + +class Arena( + private val config: ArenaConfig, + private val world: ArenaWorld, + private val arenaUtil: ArenaUtil, +) { + private lateinit var session: ArenaSession + // Simple stuff done: 0.001474s + // createArena start: 0.0001026s + // Loaded schematic: 0.000162s + // Created new world: 3.122034s + // Loaded world: 0.0075989s + // Placed arena: 2.3205267s + // Fixed light: 4.2093585s + // createArena done: 0.0002953 + // Countdown done: 5.0126158 + // Fully done: 0.0982557 + + fun start() { + // Create a new session + session = ArenaSession() + // Add all participants and spectators + session.participants.addAll(arenaUtil.getPossibleParticipants()); + session.spectators.addAll(arenaUtil.getPossibleSpectators()); + // Reset the world + world.reset() + // Place all spectators in the arena + session.spectators.forEach { + config.spectatorSpawn.spawn(world, it) + } + + // Randomize spawns + session.spawns.addAll(config.spawns) + session.spawns.shuffle() + + // Spawn all the players + session.participants.forEachIndexed { index, player -> + //TODO: Freeze players in place (for in arena countdown) (if countdown is 0 dont freeze them) + session.spawns[index % session.spawns.size].spawn(world, player) + } + //TODO: + } + + fun reset() { + world.reset() + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/arenas/ArenaConfig.kt b/src/main/kotlin/nl/kallestruik/darena/arenas/ArenaConfig.kt new file mode 100644 index 0000000..51f95aa --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/arenas/ArenaConfig.kt @@ -0,0 +1,29 @@ +package nl.kallestruik.darena.arenas + +import nl.kallestruik.darena.util.ConfigHelper +import java.io.File + +data class ArenaConfig( + var name: String = "[Missing name]", + var spawns: List = emptyList(), + var spectatorSpawn: ArenaSpawn = ArenaSpawn("default", 0.0, 100.0, 0.0, 0.0F, 0.0F), +) { + + companion object { + fun load(file: File): ArenaConfig { + val config = ConfigHelper.getOrCreateConfig(file, "template/arena.yml") + val arenaConfig = ArenaConfig() + + if (config.contains("name")) + arenaConfig.name = config.getString("name")!! + + if (config.contains("spawns")) + arenaConfig.spawns = ArenaSpawn.loadList(config.getConfigurationSection("spawns")!!) + + if (config.contains("spectatorSpawn")) + arenaConfig.spectatorSpawn = ArenaSpawn.load(config.getConfigurationSection("spectatorSpawn")!!) + + return arenaConfig + } + } +} diff --git a/src/main/kotlin/nl/kallestruik/darena/arenas/ArenaSession.kt b/src/main/kotlin/nl/kallestruik/darena/arenas/ArenaSession.kt new file mode 100644 index 0000000..953a559 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/arenas/ArenaSession.kt @@ -0,0 +1,11 @@ +package nl.kallestruik.darena.arenas + +import org.bukkit.entity.Player + +data class ArenaSession( + val participants: MutableList = ArrayList(), + val spectators: MutableList = ArrayList(), + val completedObjective: MutableList = ArrayList(), + val deaths: MutableList = ArrayList(), + val spawns: MutableList = ArrayList(), +) \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/arenas/ArenaSpawn.kt b/src/main/kotlin/nl/kallestruik/darena/arenas/ArenaSpawn.kt new file mode 100644 index 0000000..f88b91e --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/arenas/ArenaSpawn.kt @@ -0,0 +1,42 @@ +package nl.kallestruik.darena.arenas + +import nl.kallestruik.darena.arenas.world.ArenaWorld +import org.bukkit.Location +import org.bukkit.configuration.ConfigurationSection +import org.bukkit.entity.Player + +data class ArenaSpawn( + val label: String, + val x: Double, + val y: Double, + val z: Double, + val yaw: Float, + val pitch: Float, +) { + fun spawn(world: ArenaWorld, player: Player) { + player.teleport(Location(world.world, x, y, z, yaw, pitch)) + } + + companion object { + fun loadList(section: ConfigurationSection): List { + val list = mutableListOf() + + for (key in section.getKeys(false)) { + list.add(load(section.getConfigurationSection(key)!!)) + } + + return list + } + + fun load(section: ConfigurationSection): ArenaSpawn { + return ArenaSpawn( + section.name, + section.getDouble("x"), + section.getDouble("y"), + section.getDouble("z"), + section.getDouble("yaw").toFloat(), + section.getDouble("pitch").toFloat() + ) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaChunkGenerator.kt b/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaChunkGenerator.kt new file mode 100644 index 0000000..4d6148b --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaChunkGenerator.kt @@ -0,0 +1,11 @@ +package nl.kallestruik.darena.arenas.world + +import org.bukkit.World +import org.bukkit.generator.ChunkGenerator +import java.util.* + +class ArenaChunkGenerator: ChunkGenerator() { + override fun generateChunkData(world: World, random: Random, x: Int, z: Int, biome: BiomeGrid): ChunkData { + return createChunkData(world) + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaWorld.kt b/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaWorld.kt new file mode 100644 index 0000000..b314fe8 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaWorld.kt @@ -0,0 +1,79 @@ +package nl.kallestruik.darena.arenas.world + +import nl.kallestruik.darena.exceptions.ArenaWorldCreationException +import nl.kallestruik.darena.exceptions.ArenaWorldLoadException +import nl.kallestruik.darena.exceptions.ArenaWorldSaveException +import org.bukkit.Bukkit +import org.bukkit.World +import org.bukkit.plugin.java.JavaPlugin +import java.nio.file.Files +import java.nio.file.Path + + +class ArenaWorld( + val config: ArenaWorldConfig, + val plugin: JavaPlugin +) { + var world: World + + init { + load() + world = Bukkit.createWorld(ArenaWorldCreator(config.name)) + ?: throw ArenaWorldCreationException("Exception while creating bukkit world for arena \"${config.name}\".") + } + @Throws(ArenaWorldLoadException::class) + fun reset() { + //TODO: Teleport everyone out. + load() + } + + @Throws(ArenaWorldSaveException::class) + fun save() { + try { + val savePath = Path.of(plugin.dataFolder.path, "worlds", config.name) + Files.walk(savePath).use { walk -> + walk.sorted(Comparator.reverseOrder()).forEach { path -> + Files.delete(path) + } + } + + Files.walk(world.worldFolder.toPath()).use { walk -> + walk.forEach { source -> + val destination = Path.of( + savePath.toString(), source.toString() + .substring(world.worldFolder.path.length) + ) + + Files.copy(source, destination) + } + } + } catch (e: Exception) { + throw ArenaWorldSaveException("There was an issue saving the world for arena \"${config.name}\" to a safe location!", e) + } + } + + @Throws(ArenaWorldLoadException::class) + private fun load() { + try { + val loadPath = Path.of(plugin.dataFolder.path, "worlds", config.name) + Files.walk(world.worldFolder.toPath()).use { walk -> + walk.sorted(Comparator.reverseOrder()).forEach { path -> + Files.delete(path) + } + } + + Files.walk(loadPath).use { walk -> + walk.forEach { source -> + val destination = Path.of( + world.worldFolder.path, source.toString() + .substring(loadPath.toString().length) + ) + + Files.copy(source, destination) + } + } + } catch (e: Exception) { + throw ArenaWorldLoadException("There was an issue load the world for arena \"${config.name}\"!", e) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaWorldConfig.kt b/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaWorldConfig.kt new file mode 100644 index 0000000..9ef3dcd --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaWorldConfig.kt @@ -0,0 +1,5 @@ +package nl.kallestruik.darena.arenas.world + +data class ArenaWorldConfig( + val name: String, +) \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaWorldCreator.kt b/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaWorldCreator.kt new file mode 100644 index 0000000..b0ef32d --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/arenas/world/ArenaWorldCreator.kt @@ -0,0 +1,16 @@ +package nl.kallestruik.darena.arenas.world + +import org.bukkit.WorldCreator +import org.bukkit.generator.ChunkGenerator + +class ArenaWorldCreator( + name: String +): WorldCreator(name) { + private var generator: ChunkGenerator = ArenaChunkGenerator() + + override fun generator(): ChunkGenerator { + return generator + } + + +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/exceptions/ArenaWorldCreationException.kt b/src/main/kotlin/nl/kallestruik/darena/exceptions/ArenaWorldCreationException.kt new file mode 100644 index 0000000..92f6861 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/exceptions/ArenaWorldCreationException.kt @@ -0,0 +1,6 @@ +package nl.kallestruik.darena.exceptions + +class ArenaWorldCreationException( + message: String? = null, + cause: Throwable? = null +): Exception(message, cause) \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/exceptions/ArenaWorldLoadException.kt b/src/main/kotlin/nl/kallestruik/darena/exceptions/ArenaWorldLoadException.kt new file mode 100644 index 0000000..a77ef59 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/exceptions/ArenaWorldLoadException.kt @@ -0,0 +1,6 @@ +package nl.kallestruik.darena.exceptions + +class ArenaWorldLoadException( + message: String? = null, + cause: Throwable? = null +): Exception(message, cause) \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/exceptions/ArenaWorldSaveException.kt b/src/main/kotlin/nl/kallestruik/darena/exceptions/ArenaWorldSaveException.kt new file mode 100644 index 0000000..8d584e5 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/exceptions/ArenaWorldSaveException.kt @@ -0,0 +1,6 @@ +package nl.kallestruik.darena.exceptions + +class ArenaWorldSaveException( + message: String? = null, + cause: Throwable? = null +): Exception(message, cause) \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/exceptions/TeamExistsException.kt b/src/main/kotlin/nl/kallestruik/darena/exceptions/TeamExistsException.kt new file mode 100644 index 0000000..fb416f1 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/exceptions/TeamExistsException.kt @@ -0,0 +1,6 @@ +package nl.kallestruik.darena.exceptions + +class TeamExistsException( + message: String? = null, + cause: Throwable? = null +): Exception(message, cause) \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/exceptions/TeamNotFoundException.kt b/src/main/kotlin/nl/kallestruik/darena/exceptions/TeamNotFoundException.kt new file mode 100644 index 0000000..6bf8c93 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/exceptions/TeamNotFoundException.kt @@ -0,0 +1,6 @@ +package nl.kallestruik.darena.exceptions + +class TeamNotFoundException( + message: String? = null, + cause: Throwable? = null +): Exception(message, cause) \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/managers/ArenaManager.kt b/src/main/kotlin/nl/kallestruik/darena/managers/ArenaManager.kt new file mode 100644 index 0000000..c5a59ea --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/managers/ArenaManager.kt @@ -0,0 +1,7 @@ +package nl.kallestruik.darena.managers + +import nl.kallestruik.darena.arenas.Arena + +class ArenaManager { + private val arenas: MutableList = ArrayList() +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/managers/ConfigManager.kt b/src/main/kotlin/nl/kallestruik/darena/managers/ConfigManager.kt new file mode 100644 index 0000000..022a711 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/managers/ConfigManager.kt @@ -0,0 +1,12 @@ +package nl.kallestruik.darena.managers + +import java.io.File + +class ConfigManager( + val configFile: File +) { + + fun load() { + //TODO: Load config + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/managers/PointsManager.kt b/src/main/kotlin/nl/kallestruik/darena/managers/PointsManager.kt new file mode 100644 index 0000000..62b732c --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/managers/PointsManager.kt @@ -0,0 +1,43 @@ +package nl.kallestruik.darena.managers + +import nl.kallestruik.darena.exceptions.TeamNotFoundException +import nl.kallestruik.darena.types.Team +import java.io.File +import java.util.* +import kotlin.collections.HashMap + +class PointsManager( + val teamManager: TeamManager, + val pointsFile: File +) { + private val points: MutableMap = HashMap() + + fun load() { + //TODO: Load points from file. + } + + @Throws(TeamNotFoundException::class) + fun givePointsToPlayer(uuid: UUID, amount: Int, reason: String) { + val team = teamManager.getTeamForPlayer(uuid) + + givePointsToTeam(team, amount, reason) + } + + fun givePointsToTeam(team: Team, amount: Int, reason: String) { + points[team] = (points[team]?: 0) + amount + //TODO: Send message with reason to team members (and everyone else?) + } + + @Throws(TeamNotFoundException::class) + fun getPointsForPlayer(uuid: UUID): Int { + val team = teamManager.getTeamForPlayer(uuid) + + return getPointsForTeam(team) + } + + fun getPointsForTeam(team: Team): Int { + return points[team] ?: 0 + } + + +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/managers/TeamManager.kt b/src/main/kotlin/nl/kallestruik/darena/managers/TeamManager.kt new file mode 100644 index 0000000..eccd6f4 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/managers/TeamManager.kt @@ -0,0 +1,61 @@ +package nl.kallestruik.darena.managers + +import net.kyori.adventure.text.format.TextColor +import nl.kallestruik.darena.exceptions.TeamExistsException +import nl.kallestruik.darena.exceptions.TeamNotFoundException +import nl.kallestruik.darena.types.Team +import java.io.File +import java.util.* +import kotlin.collections.ArrayList +import kotlin.collections.HashMap + +class TeamManager( + val teamsFile: File +) { + private val teams: MutableMap = HashMap() + private val teamMembers: MutableMap> = HashMap() + private val teamForPlayer: MutableMap = HashMap() + + fun load() { + //TODO: Load teams from file + } + + @Throws(TeamExistsException::class) + fun createTeam(teamName: String) { + if (teams.containsKey(teamName)) + throw TeamExistsException("The team $teamName already exists!") + + teams[teamName] = Team(teamName) + } + + @Throws(TeamNotFoundException::class) + fun setTeamColor(teamName: String, color: TextColor) { + val team = getTeamByName(teamName) + + team.color = color + } + + @Throws(TeamNotFoundException::class) + fun addPlayerToTeam(teamName: String, uuid: UUID) { + val team = getTeamByName(teamName) + + teamMembers.getOrPut(team) { ArrayList() }.add(uuid) + teamForPlayer[uuid] = team + } + + @Throws(TeamNotFoundException::class) + fun getTeamForPlayer(uuid: UUID): Team { + return teamForPlayer[uuid] ?: throw TeamNotFoundException("Player with uuid $uuid is not part of a team!") + } + + @Throws(TeamNotFoundException::class) + fun getTeamByName(teamName: String): Team { + return teams[teamName] ?: throw TeamNotFoundException("Team with name $teamName does not exist!") + } + + @Throws(TeamNotFoundException::class) + fun getTeamMembers(teamName: String): List { + val team = getTeamByName(teamName) + return teamMembers[team] ?: return emptyList() + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/types/Team.kt b/src/main/kotlin/nl/kallestruik/darena/types/Team.kt new file mode 100644 index 0000000..fd193f5 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/types/Team.kt @@ -0,0 +1,8 @@ +package nl.kallestruik.darena.types + +import net.kyori.adventure.text.format.TextColor + +data class Team( + val name: String, + var color: TextColor = TextColor.color(0xFFFFFF) +) \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/util/ArenaUtil.kt b/src/main/kotlin/nl/kallestruik/darena/util/ArenaUtil.kt new file mode 100644 index 0000000..1ffa4ac --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/util/ArenaUtil.kt @@ -0,0 +1,16 @@ +package nl.kallestruik.darena.util + +import org.bukkit.Bukkit +import org.bukkit.GameMode +import org.bukkit.entity.Player + +class ArenaUtil { + + fun getPossibleParticipants(): List { + return Bukkit.getOnlinePlayers().filter { it.gameMode == GameMode.SURVIVAL } + } + + fun getPossibleSpectators(): List { + return Bukkit.getOnlinePlayers().filter { it.gameMode == GameMode.SPECTATOR } + } +} \ No newline at end of file diff --git a/src/main/kotlin/nl/kallestruik/darena/util/ConfigHelper.kt b/src/main/kotlin/nl/kallestruik/darena/util/ConfigHelper.kt new file mode 100644 index 0000000..41079a3 --- /dev/null +++ b/src/main/kotlin/nl/kallestruik/darena/util/ConfigHelper.kt @@ -0,0 +1,37 @@ +package nl.kallestruik.darena.util + +import org.bukkit.configuration.file.YamlConfiguration +import java.io.* + +object ConfigHelper { + + fun getOrCreateConfig(file: File, template: String): YamlConfiguration { + if (!file.parentFile.exists()) + file.parentFile.mkdirs() + if (!file.exists()) + createConfig(file, template) + + val config = YamlConfiguration() + config.load(file) + return config + } + + private fun createConfig(file: File, template: String) { + try { + ConfigHelper.javaClass.getResourceAsStream("/$template").use { stream -> + FileOutputStream(file).use { resStreamOut -> + if (stream == null) { + throw IOException("Cannot get resource \"$template\" from Jar file.") + } + var readBytes: Int + val buffer = ByteArray(4096) + while (stream.read(buffer).also { readBytes = it } > 0) { + resStreamOut.write(buffer, 0, readBytes) + } + } + } + } catch (e: IOException) { + e.printStackTrace() + } + } +} \ 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..61b8cb5 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,7 @@ +name: DArena +version: ${version} +main: nl.kallestruik.darena.DArena +api-version: 1.16 +depend: + - "DLib" +commands: [] \ No newline at end of file diff --git a/src/main/resources/template/arena.yml b/src/main/resources/template/arena.yml new file mode 100644 index 0000000..d569c27 --- /dev/null +++ b/src/main/resources/template/arena.yml @@ -0,0 +1,34 @@ +# Arena configuration file. +# Example config: +#name: "Arena name" +#spawns: +# label1: +# x: 0 +# y: 100 +# z: 0 +# yaw: 0 +# pitch: 0 +# label2: +# x: 10 +# y: 100 +# z: 0 +# yaw: 0 +# pitch: 0 +# label3: +# x: 10 +# y: 100 +# z: 10 +# yaw: 0 +# pitch: 0 +# label4: +# x: 0 +# y: 100 +# z: 10 +# yaw: 0 +# pitch: 0 +#specatorSpawn: +# x: 0 +# y: 150 +# z: 0 +# yaw: 0 +# pitch: 0 \ No newline at end of file diff --git a/src/main/resources/template/config.yml b/src/main/resources/template/config.yml new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/template/points.yml b/src/main/resources/template/points.yml new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/template/teams.yml b/src/main/resources/template/teams.yml new file mode 100644 index 0000000..e69de29