Compare commits
No commits in common. 'master' and 'v0.12-beta' have entirely different histories.
master
...
v0.12-beta
@ -1,38 +0,0 @@
|
|||||||
---
|
|
||||||
name: Bug report
|
|
||||||
about: Create a report to help us improve
|
|
||||||
title: "[BUG]"
|
|
||||||
labels: bug
|
|
||||||
assignees: Trivernis
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Describe the bug**
|
|
||||||
A clear and concise description of what the bug is.
|
|
||||||
|
|
||||||
**To Reproduce**
|
|
||||||
Steps to reproduce the behavior:
|
|
||||||
1. Go to '...'
|
|
||||||
2. Click on '....'
|
|
||||||
3. Scroll down to '....'
|
|
||||||
4. See error
|
|
||||||
|
|
||||||
**Expected behavior**
|
|
||||||
A clear and concise description of what you expected to happen.
|
|
||||||
|
|
||||||
**Screenshots**
|
|
||||||
If applicable, add screenshots to help explain your problem.
|
|
||||||
|
|
||||||
**Logfile**
|
|
||||||
Please add a logfile as either a file attachment or a link to something like pastebin.
|
|
||||||
For crashes please also add the crashlog file.
|
|
||||||
|
|
||||||
**Server (please complete the following information):**
|
|
||||||
- OS: [e.g. Ubuntu 20]
|
|
||||||
- Specs [e.g. Intel Xeon E5-2680, 8GB Ram]
|
|
||||||
- Java Version [e.g. Java 1.12]
|
|
||||||
- Minecraft Server Version [e.g. Paper 1.15.2 #176](PLEASE PROVIDE THE EXACT VERSION OF THE /version COMMAND, NOT JUST spigot 1.16.1!)
|
|
||||||
- Plugin Version [e.g. 0.15]
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context about the problem here.
|
|
@ -1,20 +0,0 @@
|
|||||||
---
|
|
||||||
name: Feature request
|
|
||||||
about: Suggest an idea for this project
|
|
||||||
title: "[FEATURE]"
|
|
||||||
labels: enhancement
|
|
||||||
assignees: Trivernis
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Is your feature request related to a problem? Please describe.**
|
|
||||||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
|
||||||
|
|
||||||
**Describe the solution you'd like**
|
|
||||||
A clear and concise description of what you want to happen.
|
|
||||||
|
|
||||||
**Describe alternatives you've considered**
|
|
||||||
A clear and concise description of any alternative solutions or features you've considered.
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context or screenshots about the feature request here.
|
|
@ -1,16 +0,0 @@
|
|||||||
---
|
|
||||||
name: Question
|
|
||||||
about: Ask a question about this project
|
|
||||||
title: "[QUESTION]"
|
|
||||||
labels: question
|
|
||||||
assignees: Trivernis
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Question**
|
|
||||||
|
|
||||||
A clear and concise question that wasn't asked yet.
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
|
|
||||||
Add any other context or screenshots that are needed to understand the question here.
|
|
@ -1,19 +0,0 @@
|
|||||||
# Number of days of inactivity before an issue becomes stale
|
|
||||||
daysUntilStale: 14
|
|
||||||
# Number of days of inactivity before a stale issue is closed
|
|
||||||
daysUntilClose: 7
|
|
||||||
# Issues with these labels will never be considered stale
|
|
||||||
exemptLabels:
|
|
||||||
- pinned
|
|
||||||
- security
|
|
||||||
- enhancement
|
|
||||||
- bug
|
|
||||||
# Label to use when marking an issue as stale
|
|
||||||
staleLabel: wontfix
|
|
||||||
# Comment to post when marking an issue as stale. Set to `false` to disable
|
|
||||||
markComment: >
|
|
||||||
This issue has been automatically marked as stale because it has not had
|
|
||||||
recent activity. It will be closed if no further activity occurs. Thank you
|
|
||||||
for your contributions.
|
|
||||||
# Comment to post when closing a stale issue. Set to `false` to disable
|
|
||||||
closeComment: false
|
|
@ -1,42 +0,0 @@
|
|||||||
name: Gradle Build
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
push:
|
|
||||||
branches: [ main, develop, actions ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ main, develop, actions ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
shadowJar:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Setup Java
|
|
||||||
uses: actions/setup-java@v1
|
|
||||||
with:
|
|
||||||
java-version: 1.8
|
|
||||||
|
|
||||||
- name: Cache build data
|
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.gradle/caches
|
|
||||||
~/.gradle/wrapper
|
|
||||||
key: ${{ runner.os }}-gradle-${{ hashFiles('build.gradle') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-gradle-
|
|
||||||
|
|
||||||
- name: Build Jar
|
|
||||||
run: chmod +x gradlew && ./gradlew shadowJar
|
|
||||||
|
|
||||||
- name: Upload artifacts
|
|
||||||
uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: chunkmaster
|
|
||||||
path: build/libs/chunkmaster-*.jar
|
|
||||||
|
|
||||||
- name: Cleanup Gradle Cache
|
|
||||||
run: |
|
|
||||||
rm -f ~/.gradle/caches/modules-2/modules-2.lock
|
|
||||||
rm -f ~/.gradle/caches/modules-2/gc.properties
|
|
@ -1,36 +0,0 @@
|
|||||||
name: Gradle Unit Tests
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
push:
|
|
||||||
branches: [ main, develop, actions, feature/unit-tests ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ main, develop, actions, feature/unit-tests ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Setup Java
|
|
||||||
uses: actions/setup-java@v1
|
|
||||||
with:
|
|
||||||
java-version: 1.8
|
|
||||||
|
|
||||||
- name: Cache build data
|
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.gradle/caches
|
|
||||||
~/.gradle/wrapper
|
|
||||||
key: ${{ runner.os }}-gradle-${{ hashFiles('build.gradle') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-gradle-
|
|
||||||
|
|
||||||
- name: Test
|
|
||||||
run: chmod +x gradlew && ./gradlew test
|
|
||||||
|
|
||||||
- name: Cleanup Gradle Cache
|
|
||||||
run: |
|
|
||||||
rm -f ~/.gradle/caches/modules-2/modules-2.lock
|
|
||||||
rm -f ~/.gradle/caches/modules-2/gc.properties
|
|
@ -1,4 +1,6 @@
|
|||||||
|
gradle
|
||||||
.gradle
|
.gradle
|
||||||
.idea
|
.idea
|
||||||
build
|
build
|
||||||
out
|
out
|
||||||
|
gradlew*
|
@ -1,2 +1 @@
|
|||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
PLUGIN_VERSION=1.4.2
|
|
Binary file not shown.
@ -1,5 +0,0 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
@ -1,185 +0,0 @@
|
|||||||
#!/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
|
|
||||||
;;
|
|
||||||
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" "$@"
|
|
@ -1,89 +0,0 @@
|
|||||||
@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
|
|
@ -1,44 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.commands
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.Chunkmaster
|
|
||||||
import net.trivernis.chunkmaster.lib.Subcommand
|
|
||||||
import org.bukkit.command.Command
|
|
||||||
import org.bukkit.command.CommandSender
|
|
||||||
|
|
||||||
class CmdCompleted(private val plugin: Chunkmaster) : Subcommand {
|
|
||||||
override val name = "completed"
|
|
||||||
|
|
||||||
override fun execute(sender: CommandSender, args: List<String>): Boolean {
|
|
||||||
plugin.sqliteManager.completedGenerationTasks.getCompletedTasks().thenAccept { tasks ->
|
|
||||||
val worlds = tasks.map { it.world }.toHashSet()
|
|
||||||
var response = "\n" + plugin.langManager.getLocalized("COMPLETED_TASKS_HEADER") + "\n\n"
|
|
||||||
|
|
||||||
for (world in worlds) {
|
|
||||||
response += plugin.langManager.getLocalized("COMPLETED_WORLD_HEADER", world) + "\n"
|
|
||||||
|
|
||||||
for (task in tasks.filter { it.world == world }) {
|
|
||||||
response += plugin.langManager.getLocalized(
|
|
||||||
"COMPLETED_TASK_ENTRY",
|
|
||||||
task.id,
|
|
||||||
task.radius,
|
|
||||||
task.center.x,
|
|
||||||
task.center.z,
|
|
||||||
task.shape
|
|
||||||
) + "\n"
|
|
||||||
}
|
|
||||||
response += "\n"
|
|
||||||
}
|
|
||||||
sender.sendMessage(response)
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onTabComplete(
|
|
||||||
sender: CommandSender,
|
|
||||||
command: Command,
|
|
||||||
alias: String,
|
|
||||||
args: List<String>
|
|
||||||
): MutableList<String> {
|
|
||||||
return mutableListOf()
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,68 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.commands
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.Chunkmaster
|
|
||||||
import net.trivernis.chunkmaster.lib.Subcommand
|
|
||||||
import org.bukkit.command.Command
|
|
||||||
import org.bukkit.command.CommandSender
|
|
||||||
import org.bukkit.entity.Player
|
|
||||||
|
|
||||||
class CmdGetCenter(private val chunkmaster: Chunkmaster) : Subcommand {
|
|
||||||
override val name = "getCenter"
|
|
||||||
|
|
||||||
override fun onTabComplete(
|
|
||||||
sender: CommandSender,
|
|
||||||
command: Command,
|
|
||||||
alias: String,
|
|
||||||
args: List<String>
|
|
||||||
): MutableList<String> {
|
|
||||||
if (args.size == 1) {
|
|
||||||
return sender.server.worlds.filter { it.name.indexOf(args[0]) == 0 }
|
|
||||||
.map { it.name }.toMutableList()
|
|
||||||
}
|
|
||||||
return emptyList<String>().toMutableList()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun execute(sender: CommandSender, args: List<String>): Boolean {
|
|
||||||
val worldName: String = if (sender is Player) {
|
|
||||||
if (args.isNotEmpty()) {
|
|
||||||
args[0]
|
|
||||||
} else {
|
|
||||||
sender.world.name
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (args.isEmpty()) {
|
|
||||||
sender.sendMessage(chunkmaster.langManager.getLocalized("WORLD_NAME_REQUIRED"))
|
|
||||||
return false
|
|
||||||
} else {
|
|
||||||
args[0]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
sendCenterInfo(sender, worldName)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sends the center information
|
|
||||||
*/
|
|
||||||
private fun sendCenterInfo(sender: CommandSender, worldName: String) {
|
|
||||||
chunkmaster.generationManager.worldProperties.getWorldCenter(worldName).thenAccept { worldCenter ->
|
|
||||||
var center = worldCenter
|
|
||||||
if (center == null) {
|
|
||||||
val world = sender.server.worlds.find { it.name == worldName }
|
|
||||||
if (world == null) {
|
|
||||||
sender.sendMessage(chunkmaster.langManager.getLocalized("WORLD_NOT_FOUND", worldName))
|
|
||||||
return@thenAccept
|
|
||||||
}
|
|
||||||
center = Pair(world.spawnLocation.chunk.x, world.spawnLocation.chunk.z)
|
|
||||||
}
|
|
||||||
sender.sendMessage(
|
|
||||||
chunkmaster.langManager.getLocalized(
|
|
||||||
"CENTER_INFO",
|
|
||||||
worldName,
|
|
||||||
center.first,
|
|
||||||
center.second
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,94 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.commands
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.Chunkmaster
|
|
||||||
import net.trivernis.chunkmaster.lib.Subcommand
|
|
||||||
import org.bukkit.command.Command
|
|
||||||
import org.bukkit.command.CommandSender
|
|
||||||
import org.bukkit.entity.Player
|
|
||||||
|
|
||||||
class CmdSetCenter(private val chunkmaster: Chunkmaster) : Subcommand {
|
|
||||||
override val name = "setCenter"
|
|
||||||
|
|
||||||
override fun onTabComplete(
|
|
||||||
sender: CommandSender,
|
|
||||||
command: Command,
|
|
||||||
alias: String,
|
|
||||||
args: List<String>
|
|
||||||
): MutableList<String> {
|
|
||||||
if (args.size == 1) {
|
|
||||||
if (args[0].toIntOrNull() == null) {
|
|
||||||
return sender.server.worlds.filter { it.name.indexOf(args[0]) == 0 }
|
|
||||||
.map { it.name }.toMutableList()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return emptyList<String>().toMutableList()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun execute(sender: CommandSender, args: List<String>): Boolean {
|
|
||||||
val world: String
|
|
||||||
val centerX: Int
|
|
||||||
val centerZ: Int
|
|
||||||
|
|
||||||
if (sender is Player) {
|
|
||||||
when {
|
|
||||||
args.isEmpty() -> {
|
|
||||||
world = sender.world.name
|
|
||||||
centerX = sender.location.chunk.x
|
|
||||||
centerZ = sender.location.chunk.z
|
|
||||||
}
|
|
||||||
args.size == 1 -> {
|
|
||||||
world = args[0]
|
|
||||||
centerX = sender.location.chunk.x
|
|
||||||
centerZ = sender.location.chunk.z
|
|
||||||
}
|
|
||||||
args.size == 2 -> {
|
|
||||||
world = sender.world.name
|
|
||||||
if (args[0].toIntOrNull() == null || args[1].toIntOrNull() == null) {
|
|
||||||
sender.sendMessage(chunkmaster.langManager.getLocalized("COORD_INVALID", args[0], args[1]))
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
centerX = args[0].toInt()
|
|
||||||
centerZ = args[1].toInt()
|
|
||||||
}
|
|
||||||
else -> {
|
|
||||||
if (!validateThreeArgs(sender, args)) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
world = args[0]
|
|
||||||
centerX = args[1].toInt()
|
|
||||||
centerZ = args[2].toInt()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (args.size < 3) {
|
|
||||||
sender.sendMessage(chunkmaster.langManager.getLocalized("TOO_FEW_ARGUMENTS"))
|
|
||||||
return false
|
|
||||||
} else {
|
|
||||||
if (!validateThreeArgs(sender, args)) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
world = args[0]
|
|
||||||
centerX = args[1].toInt()
|
|
||||||
centerZ = args[2].toInt()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
chunkmaster.generationManager.worldProperties.setWorldCenter(world, Pair(centerX, centerZ))
|
|
||||||
sender.sendMessage(chunkmaster.langManager.getLocalized("CENTER_UPDATED", world, centerX, centerZ))
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Validates the command values with three arguments
|
|
||||||
*/
|
|
||||||
private fun validateThreeArgs(sender: CommandSender, args: List<String>): Boolean {
|
|
||||||
return if (sender.server.worlds.none { it.name == args[0] }) {
|
|
||||||
sender.sendMessage(chunkmaster.langManager.getLocalized("WORLD_NOT_FOUND", args[0]))
|
|
||||||
false
|
|
||||||
} else if (args[1].toIntOrNull() == null || args[2].toIntOrNull() == null) {
|
|
||||||
sender.sendMessage(chunkmaster.langManager.getLocalized("COORD_INVALID", args[1], args[2]))
|
|
||||||
false
|
|
||||||
} else {
|
|
||||||
true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,83 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.commands
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.Chunkmaster
|
|
||||||
import net.trivernis.chunkmaster.lib.Subcommand
|
|
||||||
import org.bukkit.World
|
|
||||||
import org.bukkit.command.Command
|
|
||||||
import org.bukkit.command.CommandSender
|
|
||||||
|
|
||||||
class CmdStats(private val chunkmaster: Chunkmaster) : Subcommand {
|
|
||||||
override val name = "stats"
|
|
||||||
|
|
||||||
override fun onTabComplete(
|
|
||||||
sender: CommandSender,
|
|
||||||
command: Command,
|
|
||||||
alias: String,
|
|
||||||
args: List<String>
|
|
||||||
): MutableList<String> {
|
|
||||||
return sender.server.worlds.map { it.name }.toMutableList()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun execute(sender: CommandSender, args: List<String>): Boolean {
|
|
||||||
if (args.isNotEmpty()) {
|
|
||||||
val world = sender.server.getWorld(args[0])
|
|
||||||
if (world == null) {
|
|
||||||
sender.sendMessage(
|
|
||||||
chunkmaster.langManager.getLocalized("STATS_HEADER") + "\n" +
|
|
||||||
chunkmaster.langManager.getLocalized("WORLD_NOT_FOUND", args[0])
|
|
||||||
)
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
sender.sendMessage(getWorldStatsMessage(sender, world))
|
|
||||||
} else {
|
|
||||||
sender.sendMessage(getServerStatsMessage(sender))
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun getWorldStatsMessage(sender: CommandSender, world: World): String {
|
|
||||||
return """
|
|
||||||
${chunkmaster.langManager.getLocalized("STATS_WORLD_NAME", world.name)}
|
|
||||||
${chunkmaster.langManager.getLocalized("STATS_ENTITY_COUNT", world.entities.size)}
|
|
||||||
${chunkmaster.langManager.getLocalized("STATS_LOADED_CHUNKS", world.loadedChunks.size)}
|
|
||||||
${
|
|
||||||
chunkmaster.langManager.getLocalized(
|
|
||||||
"STATS_GENERATING",
|
|
||||||
chunkmaster.generationManager.tasks.find { it.generationTask.world == world } != null)
|
|
||||||
}
|
|
||||||
""".trimIndent()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun getServerStatsMessage(sender: CommandSender): String {
|
|
||||||
val runtime = Runtime.getRuntime()
|
|
||||||
val memUsed = runtime.maxMemory() - runtime.freeMemory()
|
|
||||||
var message = "\n" + """
|
|
||||||
${chunkmaster.langManager.getLocalized("STATS_HEADER")}
|
|
||||||
|
|
||||||
${chunkmaster.langManager.getLocalized("STATS_SERVER")}
|
|
||||||
${chunkmaster.langManager.getLocalized("STATS_SERVER_VERSION", sender.server.version)}
|
|
||||||
${chunkmaster.langManager.getLocalized("STATS_PLUGIN_VERSION", chunkmaster.description.version)}
|
|
||||||
${
|
|
||||||
chunkmaster.langManager.getLocalized(
|
|
||||||
"STATS_MEMORY",
|
|
||||||
memUsed / 1000000,
|
|
||||||
runtime.maxMemory() / 1000000,
|
|
||||||
(memUsed.toFloat() / runtime.maxMemory().toFloat()) * 100
|
|
||||||
)
|
|
||||||
}
|
|
||||||
${chunkmaster.langManager.getLocalized("STATS_CORES", runtime.availableProcessors())}
|
|
||||||
|
|
||||||
${
|
|
||||||
chunkmaster.langManager.getLocalized(
|
|
||||||
"STATS_PLUGIN_LOADED_CHUNKS",
|
|
||||||
chunkmaster.generationManager.loadedChunkCount
|
|
||||||
)
|
|
||||||
}
|
|
||||||
""".trimIndent()
|
|
||||||
for (world in sender.server.worlds) {
|
|
||||||
message += "\n\n" + getWorldStatsMessage(sender, world)
|
|
||||||
}
|
|
||||||
return message
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,92 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Better argument parser for command arguments
|
|
||||||
*/
|
|
||||||
class ArgParser {
|
|
||||||
private var input = ""
|
|
||||||
private var position = 0
|
|
||||||
private var currentChar = ' '
|
|
||||||
private var escaped = false
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Parses arguments from a string and respects quotes
|
|
||||||
*/
|
|
||||||
fun parseArguments(arguments: String): List<String> {
|
|
||||||
if (arguments.isEmpty()) {
|
|
||||||
return emptyList()
|
|
||||||
}
|
|
||||||
|
|
||||||
input = arguments
|
|
||||||
position = 0
|
|
||||||
currentChar = input[position]
|
|
||||||
escaped = false
|
|
||||||
val args = ArrayList<String>()
|
|
||||||
var arg = ""
|
|
||||||
|
|
||||||
while (!endReached()) {
|
|
||||||
nextCharacter()
|
|
||||||
|
|
||||||
if (currentChar == '\\' && !escaped) {
|
|
||||||
escaped = true
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if (currentChar.isWhitespace() && !escaped) {
|
|
||||||
if (arg.isNotBlank()) {
|
|
||||||
args.add(arg)
|
|
||||||
}
|
|
||||||
arg = ""
|
|
||||||
} else if (currentChar == '"' && !escaped) {
|
|
||||||
if (arg.isNotBlank()) {
|
|
||||||
args.add(arg)
|
|
||||||
}
|
|
||||||
arg = parseString()
|
|
||||||
if (arg.isNotBlank()) {
|
|
||||||
args.add(arg)
|
|
||||||
}
|
|
||||||
arg = ""
|
|
||||||
} else {
|
|
||||||
arg += currentChar
|
|
||||||
}
|
|
||||||
escaped = false
|
|
||||||
}
|
|
||||||
if (arg.isNotBlank()) {
|
|
||||||
args.add(arg)
|
|
||||||
}
|
|
||||||
return args
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Parses an enquoted string
|
|
||||||
*/
|
|
||||||
private fun parseString(): String {
|
|
||||||
var output = ""
|
|
||||||
|
|
||||||
while (!endReached()) {
|
|
||||||
nextCharacter()
|
|
||||||
|
|
||||||
if (currentChar == '\\') {
|
|
||||||
escaped = !escaped
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if (currentChar == '"' && !escaped) {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
output += currentChar
|
|
||||||
escaped = false
|
|
||||||
}
|
|
||||||
return output
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun nextCharacter() {
|
|
||||||
if (!endReached()) {
|
|
||||||
currentChar = input[position++]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun endReached(): Boolean {
|
|
||||||
return position >= input.length
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,74 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.Chunkmaster
|
|
||||||
import java.io.*
|
|
||||||
import java.util.*
|
|
||||||
|
|
||||||
class LanguageManager(private val plugin: Chunkmaster) {
|
|
||||||
private val langProps = Properties()
|
|
||||||
private val languageFolder = "${plugin.dataFolder.absolutePath}/i18n"
|
|
||||||
private var langFileLoaded = false
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads the default properties file and then the language specific ones.
|
|
||||||
* If no lang-specific file is found in the plugins directory under i18n an attempt is made to
|
|
||||||
* load the file from inside the jar in i18n.
|
|
||||||
*/
|
|
||||||
fun loadProperties() {
|
|
||||||
val language = plugin.config.getString("language")
|
|
||||||
val langFile = "$languageFolder/$language.i18n.properties"
|
|
||||||
val file = File(langFile)
|
|
||||||
val loader = Thread.currentThread().contextClassLoader
|
|
||||||
val defaultStream = this.javaClass.getResourceAsStream("/i18n/DEFAULT.i18n.properties")
|
|
||||||
|
|
||||||
if (defaultStream != null) {
|
|
||||||
langProps.load(getReaderForProperties(defaultStream))
|
|
||||||
defaultStream.close()
|
|
||||||
} else {
|
|
||||||
plugin.logger.severe("Couldn't load default language properties.")
|
|
||||||
}
|
|
||||||
|
|
||||||
if (file.exists()) {
|
|
||||||
try {
|
|
||||||
val inputStream = loader.getResourceAsStream(langFile)
|
|
||||||
if (inputStream != null) {
|
|
||||||
langProps.load(getReaderForProperties(inputStream))
|
|
||||||
langFileLoaded = true
|
|
||||||
inputStream.close()
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
plugin.logger.warning("Language file $langFile could not be loaded!")
|
|
||||||
plugin.logger.fine(e.toString())
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
val inputStream = this.javaClass.getResourceAsStream("/i18n/$language.i18n.properties")
|
|
||||||
if (inputStream != null) {
|
|
||||||
langProps.load(getReaderForProperties(inputStream))
|
|
||||||
langFileLoaded = true
|
|
||||||
inputStream.close()
|
|
||||||
} else {
|
|
||||||
plugin.logger.warning("Language File $langFile could not be found!")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a localized message with replacements
|
|
||||||
*/
|
|
||||||
fun getLocalized(key: String, vararg replacements: Any): String {
|
|
||||||
try {
|
|
||||||
val localizedString = langProps.getProperty(key)
|
|
||||||
return String.format(localizedString, *replacements)
|
|
||||||
} catch (e: NullPointerException) {
|
|
||||||
plugin.logger.severe("Failed to get localized entry for $key")
|
|
||||||
throw e
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reads a properties file as utf-8 and returns a string reader for the contents
|
|
||||||
*/
|
|
||||||
private fun getReaderForProperties(stream: InputStream): Reader {
|
|
||||||
return BufferedReader(InputStreamReader(stream, "UTF-8"))
|
|
||||||
}
|
|
||||||
}
|
|
@ -0,0 +1,64 @@
|
|||||||
|
package net.trivernis.chunkmaster.lib
|
||||||
|
|
||||||
|
import kotlin.math.abs
|
||||||
|
|
||||||
|
class Spiral(private val center: Pair<Int, Int>, start: Pair<Int, Int>) {
|
||||||
|
private var currentPos = start
|
||||||
|
private var direction = 0
|
||||||
|
var count = 0
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the next value in the spiral
|
||||||
|
*/
|
||||||
|
fun next(): Pair<Int, Int> {
|
||||||
|
if (count == 0 && currentPos != center) {
|
||||||
|
// simulate the spiral to get the correct direction
|
||||||
|
// TODO: Improve performance of this workaround (replace it with acutal stuff)
|
||||||
|
val simSpiral = Spiral(center, center)
|
||||||
|
while (simSpiral.next() != currentPos);
|
||||||
|
direction = simSpiral.direction
|
||||||
|
count = simSpiral.count
|
||||||
|
}
|
||||||
|
if (count == 1) { // because of the center behaviour
|
||||||
|
count ++
|
||||||
|
return currentPos
|
||||||
|
}
|
||||||
|
if (currentPos == center) { // the center has to be handled exclusively
|
||||||
|
currentPos = Pair(center.first, center.second + 1)
|
||||||
|
count ++
|
||||||
|
return center
|
||||||
|
} else {
|
||||||
|
val distances = getDistances(center, currentPos)
|
||||||
|
if (abs(distances.first) == abs(distances.second)) {
|
||||||
|
direction = (direction + 1)%5
|
||||||
|
}
|
||||||
|
}
|
||||||
|
when(direction) {
|
||||||
|
0 -> {
|
||||||
|
currentPos = Pair(currentPos.first + 1, currentPos.second)
|
||||||
|
}
|
||||||
|
1 -> {
|
||||||
|
currentPos = Pair(currentPos.first, currentPos.second - 1)
|
||||||
|
}
|
||||||
|
2 -> {
|
||||||
|
currentPos = Pair(currentPos.first - 1, currentPos.second)
|
||||||
|
}
|
||||||
|
3 -> {
|
||||||
|
currentPos = Pair(currentPos.first, currentPos.second + 1)
|
||||||
|
}
|
||||||
|
4 -> {
|
||||||
|
currentPos = Pair(currentPos.first, currentPos.second + 1)
|
||||||
|
direction = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
count ++
|
||||||
|
return currentPos
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the distances between 2 coordinates
|
||||||
|
*/
|
||||||
|
private fun getDistances(pos1: Pair<Int, Int>, pos2: Pair<Int, Int>): Pair<Int, Int> {
|
||||||
|
return Pair(pos2.first - pos1.first, pos2.second - pos1.second)
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,79 @@
|
|||||||
|
package net.trivernis.chunkmaster.lib
|
||||||
|
|
||||||
|
import net.trivernis.chunkmaster.Chunkmaster
|
||||||
|
import java.lang.Exception
|
||||||
|
import java.sql.Connection
|
||||||
|
|
||||||
|
class SqlUpdateManager(private val connnection: Connection, private val chunkmaster: Chunkmaster) {
|
||||||
|
private val tables = listOf(
|
||||||
|
Pair(
|
||||||
|
"generation_tasks",
|
||||||
|
listOf(
|
||||||
|
Pair("id", "integer PRIMARY KEY AUTOINCREMENT"),
|
||||||
|
Pair("center_x", "integer NOT NULL DEFAULT 0"),
|
||||||
|
Pair("center_z", "integer NOT NULL DEFAULT 0"),
|
||||||
|
Pair("last_x", "integer NOT NULL DEFAULT 0"),
|
||||||
|
Pair("last_z", "integer NOT NULL DEFAULT 0"),
|
||||||
|
Pair("world", "text UNIQUE NOT NULL DEFAULT 'world'"),
|
||||||
|
Pair("stop_after", "integer DEFAULT -1")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
private val needUpdate = HashSet<Pair<String, Pair<String, String>>>()
|
||||||
|
private val needCreation = HashSet<String>()
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks which tables need an update or creation.
|
||||||
|
*/
|
||||||
|
fun checkUpdate() {
|
||||||
|
val meta = connnection.metaData
|
||||||
|
|
||||||
|
for (table in tables) {
|
||||||
|
val resTables = meta.getTables(null, null, table.first, null)
|
||||||
|
|
||||||
|
if (resTables.next()) { // table exists
|
||||||
|
for (column in table.second) {
|
||||||
|
val resColumn = meta.getColumns(null, null, table.first, column.first)
|
||||||
|
if (!resColumn.next()) {
|
||||||
|
needUpdate.add(Pair(table.first, column))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
needCreation.add(table.first)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates or updates tables that needed an update.
|
||||||
|
*/
|
||||||
|
fun performUpdate() {
|
||||||
|
for (table in needCreation) {
|
||||||
|
try {
|
||||||
|
var tableDef = "CREATE TABLE IF NOT EXISTS $table ("
|
||||||
|
|
||||||
|
for (column in tables.find{it.first == table}!!.second) {
|
||||||
|
tableDef += "${column.first} ${column.second},"
|
||||||
|
}
|
||||||
|
tableDef = tableDef.substringBeforeLast(",") + ");"
|
||||||
|
chunkmaster.logger.info("Creating table $table with definition $tableDef")
|
||||||
|
val stmt = connnection.prepareStatement(tableDef)
|
||||||
|
stmt.execute()
|
||||||
|
stmt.close()
|
||||||
|
} catch (err: Exception) {
|
||||||
|
chunkmaster.logger.severe("Error creating table $table.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (table in needUpdate) {
|
||||||
|
val updateSql = "ALTER TABLE ${table.first} ADD COLUMN ${table.second.first} ${table.second.second}"
|
||||||
|
try {
|
||||||
|
val stmt = connnection.prepareStatement(updateSql)
|
||||||
|
stmt.execute()
|
||||||
|
stmt.close()
|
||||||
|
chunkmaster.logger.info("Updated table ${table.first} with sql $updateSql")
|
||||||
|
} catch (e: Exception) {
|
||||||
|
chunkmaster.logger.severe("Failed to update table ${table.first} with sql $updateSql")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,11 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.database
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.lib.generation.ChunkCoordinates
|
|
||||||
|
|
||||||
data class CompletedGenerationTask(
|
|
||||||
val id: Int,
|
|
||||||
val world: String,
|
|
||||||
val radius: Int,
|
|
||||||
val center: ChunkCoordinates,
|
|
||||||
val shape: String
|
|
||||||
)
|
|
@ -1,80 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.database
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.lib.generation.ChunkCoordinates
|
|
||||||
import java.sql.ResultSet
|
|
||||||
import java.util.concurrent.CompletableFuture
|
|
||||||
|
|
||||||
class CompletedGenerationTasks(private val sqliteManager: SqliteManager) {
|
|
||||||
/**
|
|
||||||
* Returns the list of all completed tasks
|
|
||||||
*/
|
|
||||||
fun getCompletedTasks(): CompletableFuture<List<CompletedGenerationTask>> {
|
|
||||||
val completableFuture = CompletableFuture<List<CompletedGenerationTask>>()
|
|
||||||
|
|
||||||
sqliteManager.executeStatement("SELECT * FROM completed_generation_tasks", HashMap()) { res ->
|
|
||||||
val tasks = ArrayList<CompletedGenerationTask>()
|
|
||||||
|
|
||||||
while (res!!.next()) {
|
|
||||||
tasks.add(mapSqlResponseToWrapperObject(res))
|
|
||||||
}
|
|
||||||
completableFuture.complete(tasks)
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a list of completed tasks for a world
|
|
||||||
*/
|
|
||||||
fun getCompletedTasksForWorld(world: String): CompletableFuture<List<CompletedGenerationTask>> {
|
|
||||||
val completableFuture = CompletableFuture<List<CompletedGenerationTask>>()
|
|
||||||
|
|
||||||
sqliteManager.executeStatement(
|
|
||||||
"SELECT * FROM completed_generation_tasks WHERE world = ?",
|
|
||||||
hashMapOf(1 to world)
|
|
||||||
) { res ->
|
|
||||||
val tasks = ArrayList<CompletedGenerationTask>()
|
|
||||||
|
|
||||||
while (res!!.next()) {
|
|
||||||
tasks.add(mapSqlResponseToWrapperObject(res))
|
|
||||||
}
|
|
||||||
completableFuture.complete(tasks)
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun mapSqlResponseToWrapperObject(res: ResultSet): CompletedGenerationTask {
|
|
||||||
val id = res.getInt("id")
|
|
||||||
val world = res.getString("world")
|
|
||||||
val center = ChunkCoordinates(res.getInt("center_x"), res.getInt("center_z"))
|
|
||||||
val radius = res.getInt("completed_radius")
|
|
||||||
val shape = res.getString("shape")
|
|
||||||
return CompletedGenerationTask(id, world, radius, center, shape)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a completed task
|
|
||||||
*/
|
|
||||||
fun addCompletedTask(
|
|
||||||
id: Int,
|
|
||||||
world: String,
|
|
||||||
radius: Int,
|
|
||||||
center: ChunkCoordinates,
|
|
||||||
shape: String
|
|
||||||
): CompletableFuture<Void> {
|
|
||||||
val completableFuture = CompletableFuture<Void>()
|
|
||||||
sqliteManager.executeStatement(
|
|
||||||
"INSERT INTO completed_generation_tasks (id, world, completed_radius, center_x, center_z, shape) VALUES (?, ?, ?, ?, ?, ?)",
|
|
||||||
hashMapOf(
|
|
||||||
1 to id,
|
|
||||||
2 to world,
|
|
||||||
3 to radius,
|
|
||||||
4 to center.x,
|
|
||||||
5 to center.z,
|
|
||||||
6 to shape,
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
completableFuture.complete(null)
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,14 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.database
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.lib.generation.ChunkCoordinates
|
|
||||||
import net.trivernis.chunkmaster.lib.generation.TaskState
|
|
||||||
|
|
||||||
data class GenerationTaskData(
|
|
||||||
val id: Int,
|
|
||||||
val world: String,
|
|
||||||
val radius: Int,
|
|
||||||
val shape: String,
|
|
||||||
val state: TaskState,
|
|
||||||
val center: ChunkCoordinates,
|
|
||||||
val last: ChunkCoordinates
|
|
||||||
)
|
|
@ -1,104 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.database
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.lib.generation.ChunkCoordinates
|
|
||||||
import net.trivernis.chunkmaster.lib.generation.TaskState
|
|
||||||
import java.util.concurrent.CompletableFuture
|
|
||||||
|
|
||||||
class GenerationTasks(private val sqliteManager: SqliteManager) {
|
|
||||||
/**
|
|
||||||
* Returns all stored generation tasks
|
|
||||||
*/
|
|
||||||
fun getGenerationTasks(): CompletableFuture<List<GenerationTaskData>> {
|
|
||||||
val completableFuture = CompletableFuture<List<GenerationTaskData>>()
|
|
||||||
|
|
||||||
sqliteManager.executeStatement("SELECT * FROM generation_tasks", HashMap()) { res ->
|
|
||||||
val tasks = ArrayList<GenerationTaskData>()
|
|
||||||
|
|
||||||
while (res!!.next()) {
|
|
||||||
val id = res.getInt("id")
|
|
||||||
val world = res.getString("world")
|
|
||||||
val center = ChunkCoordinates(res.getInt("center_x"), res.getInt("center_z"))
|
|
||||||
val last = ChunkCoordinates(res.getInt("last_x"), res.getInt("last_z"))
|
|
||||||
val radius = res.getInt("radius")
|
|
||||||
val shape = res.getString("shape")
|
|
||||||
val state = stringToState(res.getString("state"))
|
|
||||||
val taskData = GenerationTaskData(id, world, radius, shape, state, center, last)
|
|
||||||
if (tasks.find { it.id == id } == null) {
|
|
||||||
tasks.add(taskData)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
completableFuture.complete(tasks)
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a generation task to the database
|
|
||||||
*/
|
|
||||||
fun addGenerationTask(world: String, center: ChunkCoordinates, radius: Int, shape: String): CompletableFuture<Int> {
|
|
||||||
val completableFuture = CompletableFuture<Int>()
|
|
||||||
sqliteManager.executeStatement(
|
|
||||||
"""
|
|
||||||
INSERT INTO generation_tasks (center_x, center_z, last_x, last_z, world, radius, shape)
|
|
||||||
values (?, ?, ?, ?, ?, ?, ?)""",
|
|
||||||
hashMapOf(
|
|
||||||
1 to center.x,
|
|
||||||
2 to center.z,
|
|
||||||
3 to center.x,
|
|
||||||
4 to center.z,
|
|
||||||
5 to world,
|
|
||||||
6 to radius,
|
|
||||||
7 to shape
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
sqliteManager.executeStatement(
|
|
||||||
"""
|
|
||||||
SELECT id FROM generation_tasks ORDER BY id DESC LIMIT 1
|
|
||||||
""".trimIndent(), HashMap()
|
|
||||||
) {
|
|
||||||
it!!.next()
|
|
||||||
completableFuture.complete(it.getInt("id"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deletes a generationTask from the database
|
|
||||||
*/
|
|
||||||
fun deleteGenerationTask(id: Int): CompletableFuture<Void> {
|
|
||||||
val completableFuture = CompletableFuture<Void>()
|
|
||||||
sqliteManager.executeStatement("DELETE FROM generation_tasks WHERE id = ?;", hashMapOf(1 to id)) {
|
|
||||||
completableFuture.complete(null)
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
fun updateGenerationTask(id: Int, last: ChunkCoordinates, state: TaskState): CompletableFuture<Void> {
|
|
||||||
val completableFuture = CompletableFuture<Void>()
|
|
||||||
sqliteManager.executeStatement(
|
|
||||||
"""
|
|
||||||
UPDATE generation_tasks SET last_x = ?, last_z = ?, state = ?
|
|
||||||
WHERE id = ?
|
|
||||||
""".trimIndent(),
|
|
||||||
hashMapOf(1 to last.x, 2 to last.z, 3 to state.toString(), 4 to id)
|
|
||||||
) {
|
|
||||||
completableFuture.complete(null)
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts a string into a task state
|
|
||||||
*/
|
|
||||||
private fun stringToState(stringState: String): TaskState {
|
|
||||||
TaskState.valueOf(stringState)
|
|
||||||
return when (stringState) {
|
|
||||||
"GENERATING" -> TaskState.GENERATING
|
|
||||||
"VALIDATING" -> TaskState.VALIDATING
|
|
||||||
"PAUSING" -> TaskState.PAUSING
|
|
||||||
"CORRECTING" -> TaskState.CORRECTING
|
|
||||||
else -> TaskState.GENERATING
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,84 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.database
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.lib.generation.ChunkCoordinates
|
|
||||||
import java.util.concurrent.CompletableFuture
|
|
||||||
import kotlin.math.ceil
|
|
||||||
|
|
||||||
class PendingChunks(private val sqliteManager: SqliteManager) {
|
|
||||||
|
|
||||||
private val insertionCount = 300
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a list of pending chunks for a taskId
|
|
||||||
*/
|
|
||||||
fun getPendingChunks(taskId: Int): CompletableFuture<List<ChunkCoordinates>> {
|
|
||||||
val completableFuture = CompletableFuture<List<ChunkCoordinates>>()
|
|
||||||
sqliteManager.executeStatement("SELECT * FROM pending_chunks WHERE task_id = ?", hashMapOf(1 to taskId)) {
|
|
||||||
val pendingChunks = ArrayList<ChunkCoordinates>()
|
|
||||||
while (it!!.next()) {
|
|
||||||
pendingChunks.add(ChunkCoordinates(it.getInt("chunk_x"), it.getInt("chunk_z")))
|
|
||||||
}
|
|
||||||
completableFuture.complete(pendingChunks)
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clears all pending chunks of a task
|
|
||||||
*/
|
|
||||||
fun clearPendingChunks(taskId: Int): CompletableFuture<Void> {
|
|
||||||
val completableFuture = CompletableFuture<Void>()
|
|
||||||
sqliteManager.executeStatement("DELETE FROM pending_chunks WHERE task_id = ?", hashMapOf(1 to taskId)) {
|
|
||||||
completableFuture.complete(null)
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
fun addPendingChunks(taskId: Int, pendingChunks: List<ChunkCoordinates>): CompletableFuture<Void> {
|
|
||||||
val futures = ArrayList<CompletableFuture<Void>>()
|
|
||||||
val statementCount = ceil(pendingChunks.size.toDouble() / insertionCount).toInt()
|
|
||||||
|
|
||||||
for (i in 0 until statementCount) {
|
|
||||||
futures.add(
|
|
||||||
insertPendingChunks(
|
|
||||||
taskId,
|
|
||||||
pendingChunks.subList(
|
|
||||||
i * insertionCount,
|
|
||||||
((i * insertionCount) + insertionCount).coerceAtMost(pendingChunks.size)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (futures.size > 0) {
|
|
||||||
return CompletableFuture.allOf(*futures.toTypedArray())
|
|
||||||
} else {
|
|
||||||
return CompletableFuture.supplyAsync { null }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds pending chunks for a taskid
|
|
||||||
*/
|
|
||||||
private fun insertPendingChunks(taskId: Int, pendingChunks: List<ChunkCoordinates>): CompletableFuture<Void> {
|
|
||||||
val completableFuture = CompletableFuture<Void>()
|
|
||||||
if (pendingChunks.isEmpty()) {
|
|
||||||
completableFuture.complete(null)
|
|
||||||
} else {
|
|
||||||
var sql = "INSERT INTO pending_chunks (task_id, chunk_x, chunk_z) VALUES"
|
|
||||||
var index = 1
|
|
||||||
val valueMap = HashMap<Int, Any>()
|
|
||||||
|
|
||||||
for (coordinates in pendingChunks) {
|
|
||||||
sql += "(?, ?, ?),"
|
|
||||||
valueMap[index++] = taskId
|
|
||||||
valueMap[index++] = coordinates.x
|
|
||||||
valueMap[index++] = coordinates.z
|
|
||||||
}
|
|
||||||
sqliteManager.executeStatement(sql.removeSuffix(","), valueMap) {
|
|
||||||
completableFuture.complete(null)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,201 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.database
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.Chunkmaster
|
|
||||||
import org.apache.commons.lang.exception.ExceptionUtils
|
|
||||||
import java.sql.Connection
|
|
||||||
import java.sql.DriverManager
|
|
||||||
import java.sql.ResultSet
|
|
||||||
|
|
||||||
class SqliteManager(private val chunkmaster: Chunkmaster) {
|
|
||||||
private val tables = listOf(
|
|
||||||
Pair(
|
|
||||||
"generation_tasks",
|
|
||||||
listOf(
|
|
||||||
Pair("id", "integer PRIMARY KEY AUTOINCREMENT"),
|
|
||||||
Pair("center_x", "integer NOT NULL DEFAULT 0"),
|
|
||||||
Pair("center_z", "integer NOT NULL DEFAULT 0"),
|
|
||||||
Pair("last_x", "integer NOT NULL DEFAULT 0"),
|
|
||||||
Pair("last_z", "integer NOT NULL DEFAULT 0"),
|
|
||||||
Pair("world", "text UNIQUE NOT NULL DEFAULT 'world'"),
|
|
||||||
Pair("radius", "integer DEFAULT -1"),
|
|
||||||
Pair("shape", "text NOT NULL DEFAULT 'square'"),
|
|
||||||
Pair("state", "text NOT NULL DEFAULT 'GENERATING'")
|
|
||||||
)
|
|
||||||
),
|
|
||||||
Pair(
|
|
||||||
"world_properties",
|
|
||||||
listOf(
|
|
||||||
Pair("name", "text PRIMARY KEY"),
|
|
||||||
Pair("center_x", "integer NOT NULL DEFAULT 0"),
|
|
||||||
Pair("center_z", "integer NOT NULL DEFAULT 0")
|
|
||||||
)
|
|
||||||
),
|
|
||||||
Pair(
|
|
||||||
"pending_chunks",
|
|
||||||
listOf(
|
|
||||||
Pair("id", "integer PRIMARY KEY AUTOINCREMENT"),
|
|
||||||
Pair("task_id", "integer NOT NULL"),
|
|
||||||
Pair("chunk_x", "integer NOT NULL"),
|
|
||||||
Pair("chunk_z", "integer NOT NULL")
|
|
||||||
)
|
|
||||||
),
|
|
||||||
Pair(
|
|
||||||
"completed_generation_tasks",
|
|
||||||
listOf(
|
|
||||||
Pair("id", "integer PRIMARY KEY"),
|
|
||||||
Pair("world", "text NOT NULL"),
|
|
||||||
Pair("completed_radius", "integer NOT NULL"),
|
|
||||||
Pair("center_x", "integer NOT NULL"),
|
|
||||||
Pair("center_z", "integer NOT NULL"),
|
|
||||||
Pair("shape", "text NOT NULL")
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
private val needUpdate = HashSet<Pair<String, Pair<String, String>>>()
|
|
||||||
private val needCreation = HashSet<String>()
|
|
||||||
private var connection: Connection? = null
|
|
||||||
private var activeTasks = 0
|
|
||||||
|
|
||||||
val worldProperties = WorldProperties(this)
|
|
||||||
val pendingChunks = PendingChunks(this)
|
|
||||||
val generationTasks = GenerationTasks(this)
|
|
||||||
val completedGenerationTasks = CompletedGenerationTasks(this)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the connection to the database
|
|
||||||
*/
|
|
||||||
fun getConnection(): Connection? {
|
|
||||||
if (this.connection != null) {
|
|
||||||
return this.connection
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
Class.forName("org.sqlite.JDBC")
|
|
||||||
this.connection = DriverManager.getConnection(
|
|
||||||
"jdbc:sqlite:${chunkmaster.dataFolder.absolutePath}/" +
|
|
||||||
"${chunkmaster.config.getString("database.filename")}"
|
|
||||||
)
|
|
||||||
return this.connection
|
|
||||||
} catch (e: Exception) {
|
|
||||||
chunkmaster.logger.severe(chunkmaster.langManager.getLocalized("DATABASE_CONNECTION_ERROR"))
|
|
||||||
chunkmaster.logger.severe(e.message)
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks for and performs an update
|
|
||||||
*/
|
|
||||||
fun init() {
|
|
||||||
this.checkUpdate()
|
|
||||||
this.performUpdate()
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks which tables need an update or creation.
|
|
||||||
*/
|
|
||||||
private fun checkUpdate() {
|
|
||||||
val meta = getConnection()!!.metaData
|
|
||||||
|
|
||||||
for (table in tables) {
|
|
||||||
val resTables = meta.getTables(null, null, table.first, null)
|
|
||||||
|
|
||||||
if (resTables.next()) { // table exists
|
|
||||||
for (column in table.second) {
|
|
||||||
val resColumn = meta.getColumns(null, null, table.first, column.first)
|
|
||||||
if (!resColumn.next()) {
|
|
||||||
needUpdate.add(Pair(table.first, column))
|
|
||||||
}
|
|
||||||
resColumn.close()
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
needCreation.add(table.first)
|
|
||||||
}
|
|
||||||
resTables.close()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Executes a sql statement on the database.
|
|
||||||
*/
|
|
||||||
fun executeStatement(sql: String, values: HashMap<Int, Any>, callback: ((ResultSet?) -> Unit)?) {
|
|
||||||
val connection = getConnection()
|
|
||||||
activeTasks++
|
|
||||||
if (connection != null) {
|
|
||||||
try {
|
|
||||||
//println("'$sql' with values $values")
|
|
||||||
val statement = connection.prepareStatement(sql)
|
|
||||||
for (parameterValue in values) {
|
|
||||||
statement.setObject(parameterValue.key, parameterValue.value)
|
|
||||||
}
|
|
||||||
statement.execute()
|
|
||||||
val res: ResultSet? = statement.resultSet
|
|
||||||
if (callback != null) {
|
|
||||||
callback(res)
|
|
||||||
}
|
|
||||||
statement.close()
|
|
||||||
} catch (e: Exception) {
|
|
||||||
chunkmaster.logger.severe(chunkmaster.langManager.getLocalized("SQL_ERROR", e.toString()))
|
|
||||||
chunkmaster.logger.info(ExceptionUtils.getStackTrace(e))
|
|
||||||
} finally {
|
|
||||||
activeTasks--
|
|
||||||
if (activeTasks == 0) {
|
|
||||||
connection.close()
|
|
||||||
this.connection = null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
chunkmaster.logger.severe(chunkmaster.langManager.getLocalized("NO_DATABASE_CONNECTION"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates or updates tables that needed an update.
|
|
||||||
*/
|
|
||||||
private fun performUpdate() {
|
|
||||||
for (table in needCreation) {
|
|
||||||
try {
|
|
||||||
var tableDef = "CREATE TABLE IF NOT EXISTS $table ("
|
|
||||||
|
|
||||||
for (column in tables.find { it.first == table }!!.second) {
|
|
||||||
tableDef += "${column.first} ${column.second},"
|
|
||||||
}
|
|
||||||
tableDef = tableDef.substringBeforeLast(",") + ");"
|
|
||||||
chunkmaster.logger.finest(
|
|
||||||
chunkmaster.langManager.getLocalized(
|
|
||||||
"CREATE_TABLE_DEFINITION",
|
|
||||||
table,
|
|
||||||
tableDef
|
|
||||||
)
|
|
||||||
)
|
|
||||||
executeStatement(tableDef, HashMap(), null)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
chunkmaster.logger.severe(chunkmaster.langManager.getLocalized("TABLE_CREATE_ERROR", table))
|
|
||||||
chunkmaster.logger.severe(e.message)
|
|
||||||
chunkmaster.logger.info(ExceptionUtils.getStackTrace(e))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (table in needUpdate) {
|
|
||||||
val updateSql = "ALTER TABLE ${table.first} ADD COLUMN ${table.second.first} ${table.second.second}"
|
|
||||||
try {
|
|
||||||
executeStatement(updateSql, HashMap(), null)
|
|
||||||
chunkmaster.logger.finest(
|
|
||||||
chunkmaster.langManager.getLocalized(
|
|
||||||
"UPDATE_TABLE_DEFINITION",
|
|
||||||
table.first,
|
|
||||||
updateSql
|
|
||||||
)
|
|
||||||
)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
chunkmaster.logger.severe(
|
|
||||||
chunkmaster.langManager.getLocalized(
|
|
||||||
"UPDATE_TABLE_FAILED",
|
|
||||||
table.first,
|
|
||||||
updateSql
|
|
||||||
)
|
|
||||||
)
|
|
||||||
chunkmaster.logger.severe(e.message)
|
|
||||||
chunkmaster.logger.info(ExceptionUtils.getStackTrace(e))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,83 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.database
|
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture
|
|
||||||
|
|
||||||
class WorldProperties(private val sqliteManager: SqliteManager) {
|
|
||||||
|
|
||||||
private val properties = HashMap<String, Pair<Int, Int>>()
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the world center for one world
|
|
||||||
*/
|
|
||||||
fun getWorldCenter(worldName: String): CompletableFuture<Pair<Int, Int>?> {
|
|
||||||
val completableFuture = CompletableFuture<Pair<Int, Int>?>()
|
|
||||||
|
|
||||||
if (properties[worldName] != null) {
|
|
||||||
completableFuture.complete(properties[worldName])
|
|
||||||
} else {
|
|
||||||
sqliteManager.executeStatement("SELECT * FROM world_properties WHERE name = ?", hashMapOf(1 to worldName)) {
|
|
||||||
if (it != null && it.next()) {
|
|
||||||
completableFuture.complete(Pair(it.getInt("center_x"), it.getInt("center_z")))
|
|
||||||
} else {
|
|
||||||
completableFuture.complete(null)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates the center of a world
|
|
||||||
*/
|
|
||||||
fun setWorldCenter(worldName: String, center: Pair<Int, Int>): CompletableFuture<Void> {
|
|
||||||
val completableFuture = CompletableFuture<Void>()
|
|
||||||
|
|
||||||
getWorldCenter(worldName).thenAccept {
|
|
||||||
if (it != null) {
|
|
||||||
updateWorldProperties(worldName, center).thenAccept { completableFuture.complete(null) }
|
|
||||||
} else {
|
|
||||||
insertWorldProperties(worldName, center).thenAccept { completableFuture.complete(null) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates an entry in the world properties
|
|
||||||
*/
|
|
||||||
private fun updateWorldProperties(worldName: String, center: Pair<Int, Int>): CompletableFuture<Void> {
|
|
||||||
val completableFuture = CompletableFuture<Void>()
|
|
||||||
sqliteManager.executeStatement(
|
|
||||||
"UPDATE world_properties SET center_x = ?, center_z = ? WHERE name = ?",
|
|
||||||
hashMapOf(
|
|
||||||
1 to center.first,
|
|
||||||
2 to center.second,
|
|
||||||
3 to worldName
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
properties[worldName] = center
|
|
||||||
completableFuture.complete(null)
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Inserts into the world properties
|
|
||||||
*/
|
|
||||||
private fun insertWorldProperties(worldName: String, center: Pair<Int, Int>): CompletableFuture<Void> {
|
|
||||||
val completableFuture = CompletableFuture<Void>()
|
|
||||||
sqliteManager.executeStatement(
|
|
||||||
"INSERT INTO world_properties (name, center_x, center_z) VALUES (?, ?, ?)",
|
|
||||||
hashMapOf(
|
|
||||||
1 to worldName,
|
|
||||||
2 to center.first,
|
|
||||||
3 to center.second
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
properties[worldName] = center
|
|
||||||
completableFuture.complete(null)
|
|
||||||
}
|
|
||||||
return completableFuture
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,30 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.dynmap
|
|
||||||
|
|
||||||
import org.dynmap.DynmapAPI
|
|
||||||
|
|
||||||
class DynmapApiWrapper(private val dynmapAPI: DynmapAPI) {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a marker set by name
|
|
||||||
*/
|
|
||||||
fun getMarkerSet(name: String): ExtendedMarkerSet? {
|
|
||||||
val set = dynmapAPI.markerAPI?.getMarkerSet(name)
|
|
||||||
return if (set != null) {
|
|
||||||
ExtendedMarkerSet(set)
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getCreateMarkerSet(id: String, name: String): ExtendedMarkerSet? {
|
|
||||||
var set = dynmapAPI.markerAPI?.getMarkerSet(id)
|
|
||||||
if (set == null) {
|
|
||||||
set = dynmapAPI.markerAPI?.createMarkerSet(id, name, null, true)
|
|
||||||
}
|
|
||||||
return if (set != null) {
|
|
||||||
ExtendedMarkerSet(set)
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,108 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.dynmap
|
|
||||||
|
|
||||||
import org.bukkit.Location
|
|
||||||
import org.dynmap.markers.AreaMarker
|
|
||||||
import org.dynmap.markers.MarkerSet
|
|
||||||
import org.dynmap.markers.PolyLineMarker
|
|
||||||
|
|
||||||
class ExtendedMarkerSet(private val markerSet: MarkerSet) {
|
|
||||||
/**
|
|
||||||
* Creates or updates an area marker depending on if it exists
|
|
||||||
* @param id - the unique id of the area marker
|
|
||||||
* @param label - the label that is displayed when clicking on the marker
|
|
||||||
* @param l1 - the top left corner
|
|
||||||
* @param l2 - the bottom right corner
|
|
||||||
*/
|
|
||||||
fun creUpdateAreMarker(id: String, label: String, l1: Location, l2: Location, style: MarkerStyle?): AreaMarker {
|
|
||||||
var marker = markerSet.findAreaMarker(id)
|
|
||||||
|
|
||||||
if (marker != null) {
|
|
||||||
marker.setCornerLocations(
|
|
||||||
doubleArrayOf(l1.x, l2.x),
|
|
||||||
doubleArrayOf(l1.z, l2.z)
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
marker = markerSet.createAreaMarker(
|
|
||||||
id,
|
|
||||||
label,
|
|
||||||
false,
|
|
||||||
l1.world.name,
|
|
||||||
doubleArrayOf(l1.x, l2.x),
|
|
||||||
doubleArrayOf(l1.z, l2.z),
|
|
||||||
true
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (style != null) {
|
|
||||||
marker.boostFlag = style.boostFlag
|
|
||||||
if (style.lineStyle != null) {
|
|
||||||
marker.setLineStyle(style.lineStyle.weight, style.lineStyle.opacity, style.lineStyle.color)
|
|
||||||
}
|
|
||||||
if (style.fillStyle != null) {
|
|
||||||
marker.setFillStyle(style.fillStyle.opacity, style.fillStyle.color)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return marker
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
fun creUpdatePolyLineMarker(
|
|
||||||
id: String,
|
|
||||||
label: String,
|
|
||||||
edges: List<Location>,
|
|
||||||
style: MarkerStyle?
|
|
||||||
): PolyLineMarker? {
|
|
||||||
var marker = markerSet.findPolyLineMarker(id)
|
|
||||||
val xList = edges.map { it.x }
|
|
||||||
val yList = edges.map { it.y }
|
|
||||||
val zList = edges.map { it.z }
|
|
||||||
if (marker != null) {
|
|
||||||
marker.setCornerLocations(xList.toDoubleArray(), yList.toDoubleArray(), zList.toDoubleArray())
|
|
||||||
} else {
|
|
||||||
marker = markerSet.createPolyLineMarker(
|
|
||||||
id,
|
|
||||||
label,
|
|
||||||
false,
|
|
||||||
edges.first().world.name,
|
|
||||||
xList.toDoubleArray(),
|
|
||||||
yList.toDoubleArray(),
|
|
||||||
zList.toDoubleArray(),
|
|
||||||
true
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (style != null) {
|
|
||||||
if (style.lineStyle != null) {
|
|
||||||
marker.setLineStyle(style.lineStyle.weight, style.lineStyle.opacity, style.lineStyle.color)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return marker
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the area marker for an id
|
|
||||||
* @param id - the id of the marker
|
|
||||||
*/
|
|
||||||
fun findAreaMarker(id: String): AreaMarker? {
|
|
||||||
return markerSet.findAreaMarker(id)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the polylinemarker for an id
|
|
||||||
*/
|
|
||||||
fun findPolyLineMarker(id: String): PolyLineMarker? {
|
|
||||||
return markerSet.findPolyLineMarker(id)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deletes an area marker
|
|
||||||
* @param id - the id of the marker
|
|
||||||
*/
|
|
||||||
fun deleteAreaMarker(id: String) {
|
|
||||||
val marker = this.findAreaMarker(id)
|
|
||||||
marker?.deleteMarker()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun deletePolyLineMarker(id: String) {
|
|
||||||
val marker = this.findPolyLineMarker(id)
|
|
||||||
marker?.deleteMarker()
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,3 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.dynmap
|
|
||||||
|
|
||||||
data class FillStyle(val opacity: Double, val color: Int)
|
|
@ -1,3 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.dynmap
|
|
||||||
|
|
||||||
data class LineStyle(val weight: Int, val opacity: Double, val color: Int)
|
|
@ -1,10 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.dynmap
|
|
||||||
|
|
||||||
import org.dynmap.markers.MarkerIcon
|
|
||||||
|
|
||||||
data class MarkerStyle(
|
|
||||||
val icon: MarkerIcon?,
|
|
||||||
val lineStyle: LineStyle?,
|
|
||||||
val fillStyle: FillStyle?,
|
|
||||||
val boostFlag: Boolean = false
|
|
||||||
)
|
|
@ -1,57 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.generation
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.Chunkmaster
|
|
||||||
import org.bukkit.Chunk
|
|
||||||
import java.util.*
|
|
||||||
import java.util.concurrent.locks.ReentrantReadWriteLock
|
|
||||||
|
|
||||||
class ChunkUnloader(private val plugin: Chunkmaster) : Runnable {
|
|
||||||
private val maxLoadedChunks = plugin.config.getInt("generation.max-loaded-chunks")
|
|
||||||
private val lock = ReentrantReadWriteLock()
|
|
||||||
private var unloadingQueue = Vector<Chunk>(maxLoadedChunks)
|
|
||||||
val isFull: Boolean
|
|
||||||
get() {
|
|
||||||
return pendingSize == maxLoadedChunks
|
|
||||||
}
|
|
||||||
|
|
||||||
val pendingSize: Int
|
|
||||||
get() {
|
|
||||||
lock.readLock().lock()
|
|
||||||
val size = unloadingQueue.size
|
|
||||||
lock.readLock().unlock()
|
|
||||||
return size
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unloads all chunks in the unloading queue with each run
|
|
||||||
*/
|
|
||||||
override fun run() {
|
|
||||||
lock.writeLock().lock()
|
|
||||||
try {
|
|
||||||
val chunkToUnload = unloadingQueue.toHashSet()
|
|
||||||
|
|
||||||
for (chunk in chunkToUnload) {
|
|
||||||
try {
|
|
||||||
chunk.unload(true)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
plugin.logger.severe(e.toString())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unloadingQueue.clear()
|
|
||||||
} finally {
|
|
||||||
lock.writeLock().unlock()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds a chunk to unload to the queue
|
|
||||||
*/
|
|
||||||
fun add(chunk: Chunk) {
|
|
||||||
lock.writeLock().lockInterruptibly()
|
|
||||||
try {
|
|
||||||
unloadingQueue.add(chunk)
|
|
||||||
} finally {
|
|
||||||
lock.writeLock().unlock()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,145 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.generation
|
|
||||||
|
|
||||||
import io.papermc.lib.PaperLib
|
|
||||||
import net.trivernis.chunkmaster.Chunkmaster
|
|
||||||
import net.trivernis.chunkmaster.lib.shapes.Shape
|
|
||||||
import org.bukkit.World
|
|
||||||
import java.util.concurrent.ArrayBlockingQueue
|
|
||||||
|
|
||||||
class DefaultGenerationTask(
|
|
||||||
private val plugin: Chunkmaster,
|
|
||||||
unloader: ChunkUnloader,
|
|
||||||
world: World,
|
|
||||||
startChunk: ChunkCoordinates,
|
|
||||||
override val radius: Int = -1,
|
|
||||||
shape: Shape,
|
|
||||||
missingChunks: HashSet<ChunkCoordinates>,
|
|
||||||
state: TaskState
|
|
||||||
) : GenerationTask(plugin, world, unloader, startChunk, shape, missingChunks, state) {
|
|
||||||
|
|
||||||
private val maxPendingChunks = plugin.config.getInt("generation.max-pending-chunks")
|
|
||||||
val pendingChunks = ArrayBlockingQueue<PendingChunkEntry>(maxPendingChunks)
|
|
||||||
|
|
||||||
override var count = 0
|
|
||||||
override var endReached: Boolean = false
|
|
||||||
|
|
||||||
init {
|
|
||||||
updateGenerationAreaMarker()
|
|
||||||
count = shape.count
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Runs the generation task. Every Iteration the next chunks will be generated if
|
|
||||||
* they haven't been generated already
|
|
||||||
* After a configured number of chunks chunks have been generated, they will all be unloaded and saved.
|
|
||||||
*/
|
|
||||||
override fun generate() {
|
|
||||||
generateMissing()
|
|
||||||
seekGenerated()
|
|
||||||
generateUntilBorder()
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Validates that all chunks have been generated or generates missing ones
|
|
||||||
*/
|
|
||||||
override fun validate() {
|
|
||||||
this.shape.reset()
|
|
||||||
val missedChunks = HashSet<ChunkCoordinates>()
|
|
||||||
|
|
||||||
while (!cancelRun && !borderReached()) {
|
|
||||||
val chunkCoordinates = nextChunkCoordinates
|
|
||||||
triggerDynmapRender(chunkCoordinates)
|
|
||||||
if (!PaperLib.isChunkGenerated(world, chunkCoordinates.x, chunkCoordinates.z)) {
|
|
||||||
missedChunks.add(chunkCoordinates)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.missingChunks.addAll(missedChunks)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generates chunks that are missing
|
|
||||||
*/
|
|
||||||
override fun generateMissing() {
|
|
||||||
val missing = this.missingChunks.toHashSet()
|
|
||||||
this.count = 0
|
|
||||||
|
|
||||||
while (missing.size > 0 && !cancelRun) {
|
|
||||||
if (plugin.mspt < msptThreshold && !unloader.isFull) {
|
|
||||||
val chunk = missing.first()
|
|
||||||
missing.remove(chunk)
|
|
||||||
this.requestGeneration(chunk)
|
|
||||||
this.count++
|
|
||||||
} else {
|
|
||||||
Thread.sleep(50L)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!cancelRun) {
|
|
||||||
this.joinPending()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Seeks until it encounters a chunk that hasn't been generated yet
|
|
||||||
*/
|
|
||||||
private fun seekGenerated() {
|
|
||||||
do {
|
|
||||||
lastChunkCoords = nextChunkCoordinates
|
|
||||||
count = shape.count
|
|
||||||
} while (PaperLib.isChunkGenerated(world, lastChunkCoords.x, lastChunkCoords.z) && !borderReached())
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generates the world until it encounters the worlds border
|
|
||||||
*/
|
|
||||||
private fun generateUntilBorder() {
|
|
||||||
var chunkCoordinates: ChunkCoordinates
|
|
||||||
|
|
||||||
while (!cancelRun && !borderReached()) {
|
|
||||||
if (plugin.mspt < msptThreshold && !unloader.isFull) {
|
|
||||||
chunkCoordinates = nextChunkCoordinates
|
|
||||||
requestGeneration(chunkCoordinates)
|
|
||||||
|
|
||||||
lastChunkCoords = chunkCoordinates
|
|
||||||
count = shape.count
|
|
||||||
} else {
|
|
||||||
Thread.sleep(50L)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!cancelRun) {
|
|
||||||
joinPending()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun joinPending() {
|
|
||||||
while (!this.pendingChunks.isEmpty()) {
|
|
||||||
Thread.sleep(msptThreshold)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request the generation of a chunk
|
|
||||||
*/
|
|
||||||
private fun requestGeneration(chunkCoordinates: ChunkCoordinates) {
|
|
||||||
if (!PaperLib.isChunkGenerated(world, chunkCoordinates.x, chunkCoordinates.z) || PaperLib.isSpigot()) {
|
|
||||||
val pendingChunkEntry = PendingChunkEntry(
|
|
||||||
chunkCoordinates,
|
|
||||||
PaperLib.getChunkAtAsync(world, chunkCoordinates.x, chunkCoordinates.z, true)
|
|
||||||
)
|
|
||||||
this.pendingChunks.put(pendingChunkEntry)
|
|
||||||
pendingChunkEntry.chunk.thenAccept {
|
|
||||||
this.unloader.add(it)
|
|
||||||
this.pendingChunks.remove(pendingChunkEntry)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cancels the generation task.
|
|
||||||
* This unloads all chunks that were generated but not unloaded yet.
|
|
||||||
*/
|
|
||||||
override fun cancel() {
|
|
||||||
this.cancelRun = true
|
|
||||||
this.pendingChunks.forEach { it.chunk.cancel(false) }
|
|
||||||
updateGenerationAreaMarker(true)
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,144 +1,64 @@
|
|||||||
package net.trivernis.chunkmaster.lib.generation
|
package net.trivernis.chunkmaster.lib.generation
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.Chunkmaster
|
import net.trivernis.chunkmaster.Chunkmaster
|
||||||
import net.trivernis.chunkmaster.lib.dynmap.*
|
import net.trivernis.chunkmaster.lib.Spiral
|
||||||
import net.trivernis.chunkmaster.lib.shapes.Shape
|
import org.bukkit.Chunk
|
||||||
import org.bukkit.World
|
import org.bukkit.World
|
||||||
import kotlin.math.ceil
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Interface for generation tasks.
|
* Interface for generation tasks.
|
||||||
*/
|
*/
|
||||||
abstract class GenerationTask(
|
abstract class GenerationTask(plugin: Chunkmaster, centerChunk: ChunkCoordinates, startChunk: ChunkCoordinates) :
|
||||||
plugin: Chunkmaster,
|
|
||||||
val world: World,
|
|
||||||
protected val unloader: ChunkUnloader,
|
|
||||||
val startChunk: ChunkCoordinates,
|
|
||||||
val shape: Shape,
|
|
||||||
val missingChunks: HashSet<ChunkCoordinates>,
|
|
||||||
var state: TaskState
|
|
||||||
) :
|
|
||||||
Runnable {
|
Runnable {
|
||||||
|
|
||||||
abstract val radius: Int
|
abstract val stopAfter: Int
|
||||||
abstract var count: Int
|
abstract val world: World
|
||||||
abstract var endReached: Boolean
|
abstract val count: Int
|
||||||
var isRunning: Boolean = false
|
abstract val endReached: Boolean
|
||||||
|
|
||||||
var lastChunkCoords = ChunkCoordinates(startChunk.x, startChunk.z)
|
protected val spiral: Spiral =
|
||||||
protected set
|
Spiral(Pair(centerChunk.x, centerChunk.z), Pair(startChunk.x, startChunk.z))
|
||||||
|
protected val loadedChunks: HashSet<Chunk> = HashSet()
|
||||||
|
protected var lastChunkCoords = ChunkCoordinates(startChunk.x, startChunk.z)
|
||||||
|
protected val chunkSkips = plugin.config.getInt("generation.chunk-skips-per-step")
|
||||||
protected val msptThreshold = plugin.config.getLong("generation.mspt-pause-threshold")
|
protected val msptThreshold = plugin.config.getLong("generation.mspt-pause-threshold")
|
||||||
protected var cancelRun: Boolean = false
|
protected val maxLoadedChunks = plugin.config.getInt("generation.max-loaded-chunks")
|
||||||
|
protected val chunksPerStep = plugin.config.getInt("generation.chunks-per-step")
|
||||||
|
|
||||||
private var endReachedCallback: ((GenerationTask) -> Unit)? = null
|
protected var endReachedCallback: (() -> Unit)? = null
|
||||||
|
private set
|
||||||
|
|
||||||
private val dynmapIntegration = plugin.config.getBoolean("dynmap")
|
abstract override fun run()
|
||||||
private val dynmap = plugin.dynmapApi
|
|
||||||
private val markerSet: ExtendedMarkerSet? = if (dynmap != null) {
|
|
||||||
DynmapApiWrapper(dynmap).getCreateMarkerSet("chunkmaster", "Chunkmaster")
|
|
||||||
} else {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
private val markerAreaStyle = MarkerStyle(null, LineStyle(2, 1.0, 0x0022FF), FillStyle(.0, 0))
|
|
||||||
private val markerAreaId = "chunkmaster_genarea_${world.name}"
|
|
||||||
private val markerAreaName = "Chunkmaster Generation Area (${ceil(shape.total()).toInt()} chunks)"
|
|
||||||
private val ignoreWorldborder = plugin.config.getBoolean("generation.ignore-worldborder")
|
|
||||||
|
|
||||||
abstract fun generate()
|
|
||||||
abstract fun validate()
|
|
||||||
abstract fun generateMissing()
|
|
||||||
abstract fun cancel()
|
abstract fun cancel()
|
||||||
|
|
||||||
override fun run() {
|
|
||||||
isRunning = true
|
|
||||||
try {
|
|
||||||
when (state) {
|
|
||||||
TaskState.GENERATING -> {
|
|
||||||
this.generate()
|
|
||||||
if (!cancelRun) {
|
|
||||||
this.state = TaskState.VALIDATING
|
|
||||||
this.validate()
|
|
||||||
}
|
|
||||||
if (!cancelRun) {
|
|
||||||
this.state = TaskState.CORRECTING
|
|
||||||
this.generateMissing()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
TaskState.VALIDATING -> {
|
|
||||||
this.validate()
|
|
||||||
if (!cancelRun) {
|
|
||||||
this.state = TaskState.CORRECTING
|
|
||||||
this.generateMissing()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
TaskState.CORRECTING -> {
|
|
||||||
this.generateMissing()
|
|
||||||
}
|
|
||||||
else -> {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!cancelRun && this.borderReached()) {
|
|
||||||
this.setEndReached()
|
|
||||||
}
|
|
||||||
} catch (e: InterruptedException) {
|
|
||||||
}
|
|
||||||
isRunning = false
|
|
||||||
}
|
|
||||||
|
|
||||||
val nextChunkCoordinates: ChunkCoordinates
|
val nextChunkCoordinates: ChunkCoordinates
|
||||||
get() {
|
get() {
|
||||||
val nextChunkCoords = shape.next()
|
val nextChunkCoords = spiral.next()
|
||||||
return ChunkCoordinates(nextChunkCoords.first, nextChunkCoords.second)
|
return ChunkCoordinates(nextChunkCoords.first, nextChunkCoords.second)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
val lastChunk: Chunk
|
||||||
* Checks if the World border or the maximum chunk setting for the task is reached.
|
get() {
|
||||||
*/
|
return world.getChunkAt(lastChunkCoords.x, lastChunkCoords.z)
|
||||||
protected fun borderReached(): Boolean {
|
|
||||||
return (!world.worldBorder.isInside(lastChunkCoords.getCenterLocation(world)) && !ignoreWorldborder)
|
|
||||||
|| shape.endReached()
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Updates the dynmap marker for the generation radius
|
|
||||||
*/
|
|
||||||
protected fun updateGenerationAreaMarker(clear: Boolean = false) {
|
|
||||||
if (clear) {
|
|
||||||
markerSet?.deletePolyLineMarker(markerAreaId)
|
|
||||||
} else if (dynmapIntegration && radius > 0) {
|
|
||||||
markerSet?.creUpdatePolyLineMarker(
|
|
||||||
markerAreaId,
|
|
||||||
markerAreaName,
|
|
||||||
this.shape.getShapeEdgeLocations()
|
|
||||||
.map { ChunkCoordinates(it.first, it.second).getCenterLocation(this.world) },
|
|
||||||
markerAreaStyle
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
protected fun triggerDynmapRender(chunkCoordinates: ChunkCoordinates) {
|
val nextChunk: Chunk
|
||||||
if (dynmapIntegration) {
|
get() {
|
||||||
dynmap?.triggerRenderOfVolume(
|
val next = nextChunkCoordinates
|
||||||
world.getBlockAt(chunkCoordinates.x * 16, 0, chunkCoordinates.z * 16).location,
|
return world.getChunkAt(next.x, next.z)
|
||||||
world.getBlockAt((chunkCoordinates.x * 16) + 16, 255, (chunkCoordinates.z * 16) + 16).location
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles the invocation of the end reached callback and additional logic
|
* Checks if the World border or the maximum chunk setting for the task is reached.
|
||||||
*/
|
*/
|
||||||
private fun setEndReached() {
|
protected fun borderReached(): Boolean {
|
||||||
endReached = true
|
return !world.worldBorder.isInside(lastChunkCoords.getCenterLocation(world)) || (stopAfter in 1..count)
|
||||||
count = shape.count
|
|
||||||
updateGenerationAreaMarker(true)
|
|
||||||
endReachedCallback?.invoke(this)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers end reached callback
|
* Registers end reached callback
|
||||||
*/
|
*/
|
||||||
fun onEndReached(cb: (GenerationTask) -> Unit) {
|
fun onEndReached(cb: () -> Unit) {
|
||||||
endReachedCallback = cb
|
endReachedCallback = cb
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -0,0 +1,117 @@
|
|||||||
|
package net.trivernis.chunkmaster.lib.generation
|
||||||
|
|
||||||
|
import net.trivernis.chunkmaster.Chunkmaster
|
||||||
|
import org.bukkit.Chunk
|
||||||
|
import org.bukkit.World
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
import io.papermc.lib.PaperLib
|
||||||
|
|
||||||
|
class GenerationTaskPaper(
|
||||||
|
private val plugin: Chunkmaster, override val world: World,
|
||||||
|
centerChunk: ChunkCoordinates, private val startChunk: ChunkCoordinates,
|
||||||
|
override val stopAfter: Int = -1
|
||||||
|
) : GenerationTask(plugin, centerChunk, startChunk) {
|
||||||
|
|
||||||
|
private val maxPendingChunks = plugin.config.getInt("generation.max-pending-chunks")
|
||||||
|
|
||||||
|
private val pendingChunks = HashSet<CompletableFuture<Chunk>>()
|
||||||
|
|
||||||
|
override var count = 0
|
||||||
|
private set
|
||||||
|
override var endReached: Boolean = false
|
||||||
|
private set
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Runs the generation task. Every Iteration the next chunk will be generated if
|
||||||
|
* it hasn't been generated already.
|
||||||
|
* After 10 chunks have been generated, they will all be unloaded and saved.
|
||||||
|
*/
|
||||||
|
override fun run() {
|
||||||
|
if (plugin.mspt < msptThreshold) { // pause when tps < 2
|
||||||
|
if (loadedChunks.size > maxLoadedChunks) {
|
||||||
|
for (chunk in loadedChunks) {
|
||||||
|
if (chunk.isLoaded) {
|
||||||
|
chunk.unload(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
loadedChunks.clear()
|
||||||
|
} else if (pendingChunks.size < maxPendingChunks) { // if more than 10 chunks are pending, wait.
|
||||||
|
if (borderReached()) {
|
||||||
|
endReached = true
|
||||||
|
endReachedCallback?.invoke()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var chunk = nextChunkCoordinates
|
||||||
|
for (i in 1 until chunkSkips) {
|
||||||
|
if (PaperLib.isChunkGenerated(world, chunk.x, chunk.z)) {
|
||||||
|
chunk = nextChunkCoordinates
|
||||||
|
} else {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!PaperLib.isChunkGenerated(world, chunk.x, chunk.z)) {
|
||||||
|
for (i in 0 until minOf(chunksPerStep, (stopAfter - count) - 1)) {
|
||||||
|
if (!PaperLib.isChunkGenerated(world, chunk.x, chunk.z)) {
|
||||||
|
pendingChunks.add(PaperLib.getChunkAtAsync(world, chunk.x, chunk.z, true))
|
||||||
|
}
|
||||||
|
chunk = nextChunkCoordinates
|
||||||
|
}
|
||||||
|
if (!PaperLib.isChunkGenerated(world, chunk.x, chunk.z)) {
|
||||||
|
pendingChunks.add(PaperLib.getChunkAtAsync(world, chunk.x, chunk.z, true))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lastChunkCoords = chunk
|
||||||
|
count = spiral.count // set the count to the more accurate spiral count
|
||||||
|
}
|
||||||
|
}
|
||||||
|
checkChunksLoaded()
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cancels the generation task.
|
||||||
|
* This unloads all chunks that were generated but not unloaded yet.
|
||||||
|
*/
|
||||||
|
override fun cancel() {
|
||||||
|
unloadAllChunks()
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cancels all pending chunks and unloads all loaded chunks.
|
||||||
|
*/
|
||||||
|
fun unloadAllChunks() {
|
||||||
|
for (pendingChunk in pendingChunks) {
|
||||||
|
if (pendingChunk.isDone) {
|
||||||
|
loadedChunks.add(pendingChunk.get())
|
||||||
|
} else {
|
||||||
|
pendingChunk.cancel(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pendingChunks.clear()
|
||||||
|
if (loadedChunks.isNotEmpty()) {
|
||||||
|
lastChunkCoords = ChunkCoordinates(loadedChunks.last().x, loadedChunks.last().z)
|
||||||
|
}
|
||||||
|
for (chunk in loadedChunks) {
|
||||||
|
if (chunk.isLoaded) {
|
||||||
|
chunk.unload(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if some chunks have been loaded and adds them to the loaded chunk set.
|
||||||
|
*/
|
||||||
|
private fun checkChunksLoaded() {
|
||||||
|
val completedEntrys = HashSet<CompletableFuture<Chunk>>()
|
||||||
|
for (pendingChunk in pendingChunks) {
|
||||||
|
if (pendingChunk.isDone) {
|
||||||
|
completedEntrys.add(pendingChunk)
|
||||||
|
loadedChunks.add(pendingChunk.get())
|
||||||
|
} else if (pendingChunk.isCompletedExceptionally || pendingChunk.isCancelled) {
|
||||||
|
completedEntrys.add(pendingChunk)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pendingChunks.removeAll(completedEntrys)
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,70 @@
|
|||||||
|
package net.trivernis.chunkmaster.lib.generation
|
||||||
|
|
||||||
|
import net.trivernis.chunkmaster.Chunkmaster
|
||||||
|
import org.bukkit.Chunk
|
||||||
|
import org.bukkit.World
|
||||||
|
|
||||||
|
class GenerationTaskSpigot(
|
||||||
|
private val plugin: Chunkmaster, override val world: World,
|
||||||
|
centerChunk: ChunkCoordinates, private val startChunk: ChunkCoordinates,
|
||||||
|
override val stopAfter: Int = -1
|
||||||
|
) : GenerationTask(plugin, centerChunk, startChunk) {
|
||||||
|
|
||||||
|
|
||||||
|
override var count = 0
|
||||||
|
private set
|
||||||
|
override var endReached: Boolean = false
|
||||||
|
private set
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Runs the generation task. Every Iteration the next chunk will be generated if
|
||||||
|
* it hasn't been generated already.
|
||||||
|
* After 10 chunks have been generated, they will all be unloaded and saved.
|
||||||
|
*/
|
||||||
|
override fun run() {
|
||||||
|
if (plugin.mspt < msptThreshold) { // pause when tps < 2
|
||||||
|
if (loadedChunks.size > maxLoadedChunks) {
|
||||||
|
for (chunk in loadedChunks) {
|
||||||
|
if (chunk.isLoaded) {
|
||||||
|
chunk.unload(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
loadedChunks.clear()
|
||||||
|
} else {
|
||||||
|
if (borderReached()) {
|
||||||
|
endReached = true
|
||||||
|
endReachedCallback?.invoke()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var chunk = nextChunkCoordinates
|
||||||
|
|
||||||
|
if (!world.isChunkGenerated(chunk.x, chunk.z)) {
|
||||||
|
for (i in 0 until minOf(chunksPerStep, stopAfter - count)) {
|
||||||
|
val chunkInstance = world.getChunkAt(chunk.x, chunk.z)
|
||||||
|
chunkInstance.load(true)
|
||||||
|
loadedChunks.add(chunkInstance)
|
||||||
|
chunk = nextChunkCoordinates
|
||||||
|
}
|
||||||
|
val chunkInstance = world.getChunkAt(chunk.x, chunk.z)
|
||||||
|
chunkInstance.load(true)
|
||||||
|
loadedChunks.add(chunkInstance)
|
||||||
|
}
|
||||||
|
lastChunkCoords = chunk
|
||||||
|
count = spiral.count // set the count to the more accurate spiral count
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cancels the generation task.
|
||||||
|
* This unloads all chunks that were generated but not unloaded yet.
|
||||||
|
*/
|
||||||
|
override fun cancel() {
|
||||||
|
for (chunk in loadedChunks) {
|
||||||
|
if (chunk.isLoaded) {
|
||||||
|
chunk.unload(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,10 @@
|
|||||||
|
package net.trivernis.chunkmaster.lib.generation
|
||||||
|
|
||||||
|
class PausedTaskEntry(
|
||||||
|
override val id: Int,
|
||||||
|
override val generationTask: GenerationTask
|
||||||
|
) : TaskEntry {
|
||||||
|
override fun cancel() {
|
||||||
|
generationTask.cancel()
|
||||||
|
}
|
||||||
|
}
|
@ -1,9 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.generation
|
|
||||||
|
|
||||||
import org.bukkit.Chunk
|
|
||||||
import java.util.concurrent.CompletableFuture
|
|
||||||
|
|
||||||
class PendingChunkEntry(val coordinates: ChunkCoordinates, val chunk: CompletableFuture<Chunk>) {
|
|
||||||
val isDone: Boolean
|
|
||||||
get() = chunk.isDone
|
|
||||||
}
|
|
@ -0,0 +1,37 @@
|
|||||||
|
package net.trivernis.chunkmaster.lib.generation
|
||||||
|
|
||||||
|
import org.bukkit.scheduler.BukkitTask
|
||||||
|
|
||||||
|
class RunningTaskEntry(
|
||||||
|
override val id: Int,
|
||||||
|
val task: BukkitTask,
|
||||||
|
override val generationTask: GenerationTask
|
||||||
|
) : TaskEntry {
|
||||||
|
|
||||||
|
private var lastProgress: Pair<Long, Int>? = null
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the generation Speed
|
||||||
|
*/
|
||||||
|
val generationSpeed: Double?
|
||||||
|
get() {
|
||||||
|
var generationSpeed: Double? = null
|
||||||
|
if (lastProgress != null) {
|
||||||
|
val chunkDiff = generationTask.count - lastProgress!!.second
|
||||||
|
val timeDiff = (System.currentTimeMillis() - lastProgress!!.first).toDouble()/1000
|
||||||
|
generationSpeed = chunkDiff.toDouble()/timeDiff
|
||||||
|
}
|
||||||
|
lastProgress = Pair(System.currentTimeMillis(), generationTask.count)
|
||||||
|
return generationSpeed
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
lastProgress = Pair(System.currentTimeMillis(), generationTask.count)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
override fun cancel() {
|
||||||
|
task.cancel()
|
||||||
|
generationTask.cancel()
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,13 @@
|
|||||||
|
package net.trivernis.chunkmaster.lib.generation
|
||||||
|
|
||||||
|
import org.bukkit.scheduler.BukkitTask
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generic task entry
|
||||||
|
*/
|
||||||
|
interface TaskEntry {
|
||||||
|
val id: Int
|
||||||
|
val generationTask: GenerationTask
|
||||||
|
|
||||||
|
fun cancel()
|
||||||
|
}
|
@ -1,24 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.generation
|
|
||||||
|
|
||||||
enum class TaskState {
|
|
||||||
GENERATING {
|
|
||||||
override fun toString(): String {
|
|
||||||
return "GENERATING"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
VALIDATING {
|
|
||||||
override fun toString(): String {
|
|
||||||
return "VALIDATING"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
CORRECTING {
|
|
||||||
override fun toString(): String {
|
|
||||||
return "CORRECTING"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
PAUSING {
|
|
||||||
override fun toString(): String {
|
|
||||||
return "PAUSING"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
@ -1,8 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.generation.taskentry
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.lib.generation.GenerationTask
|
|
||||||
|
|
||||||
class PausedTaskEntry(
|
|
||||||
override val id: Int,
|
|
||||||
override val generationTask: GenerationTask
|
|
||||||
) : TaskEntry
|
|
@ -1,71 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.generation.taskentry
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.lib.generation.GenerationTask
|
|
||||||
|
|
||||||
class RunningTaskEntry(
|
|
||||||
override val id: Int,
|
|
||||||
override val generationTask: GenerationTask
|
|
||||||
) : TaskEntry {
|
|
||||||
|
|
||||||
private var lastProgress: Pair<Long, Double>? = null
|
|
||||||
private var lastChunkCount: Pair<Long, Int>? = null
|
|
||||||
private var thread = Thread(generationTask)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the generation Speed
|
|
||||||
*/
|
|
||||||
val generationSpeed: Pair<Double?, Double?>
|
|
||||||
get() {
|
|
||||||
var generationSpeed: Double? = null
|
|
||||||
var chunkGenerationSpeed: Double? = null
|
|
||||||
val progress =
|
|
||||||
generationTask.shape.progress(if (generationTask.radius < 0) (generationTask.world.worldBorder.size / 32).toInt() else null)
|
|
||||||
if (lastProgress != null) {
|
|
||||||
val progressDiff = progress - lastProgress!!.second
|
|
||||||
val timeDiff = (System.currentTimeMillis() - lastProgress!!.first).toDouble() / 1000
|
|
||||||
generationSpeed = progressDiff / timeDiff
|
|
||||||
}
|
|
||||||
if (lastChunkCount != null) {
|
|
||||||
val chunkDiff = generationTask.count - lastChunkCount!!.second
|
|
||||||
val timeDiff = (System.currentTimeMillis() - lastChunkCount!!.first).toDouble() / 1000
|
|
||||||
chunkGenerationSpeed = chunkDiff / timeDiff
|
|
||||||
}
|
|
||||||
lastProgress = Pair(System.currentTimeMillis(), progress)
|
|
||||||
lastChunkCount = Pair(System.currentTimeMillis(), generationTask.count)
|
|
||||||
return Pair(generationSpeed, chunkGenerationSpeed)
|
|
||||||
}
|
|
||||||
|
|
||||||
init {
|
|
||||||
lastProgress = Pair(System.currentTimeMillis(), generationTask.shape.progress(null))
|
|
||||||
lastChunkCount = Pair(System.currentTimeMillis(), generationTask.count)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun start() {
|
|
||||||
thread.start()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun cancel(timeout: Long): Boolean {
|
|
||||||
if (generationTask.isRunning) {
|
|
||||||
generationTask.cancel()
|
|
||||||
thread.interrupt()
|
|
||||||
}
|
|
||||||
return try {
|
|
||||||
joinThread(timeout)
|
|
||||||
} catch (e: InterruptedException) {
|
|
||||||
true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun joinThread(timeout: Long): Boolean {
|
|
||||||
var threadStopped = false
|
|
||||||
|
|
||||||
for (i in 0..100) {
|
|
||||||
if (!thread.isAlive || !generationTask.isRunning) {
|
|
||||||
threadStopped = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
Thread.sleep(timeout / 100)
|
|
||||||
}
|
|
||||||
return threadStopped
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.generation.taskentry
|
|
||||||
|
|
||||||
import net.trivernis.chunkmaster.lib.generation.GenerationTask
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generic task entry
|
|
||||||
*/
|
|
||||||
interface TaskEntry {
|
|
||||||
val id: Int
|
|
||||||
val generationTask: GenerationTask
|
|
||||||
}
|
|
@ -1,148 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.shapes
|
|
||||||
|
|
||||||
import java.util.*
|
|
||||||
import kotlin.collections.ArrayList
|
|
||||||
import kotlin.collections.HashSet
|
|
||||||
import kotlin.math.PI
|
|
||||||
import kotlin.math.pow
|
|
||||||
|
|
||||||
class Circle(center: Pair<Int, Int>, start: Pair<Int, Int>, radius: Int) : Shape(center, start, radius) {
|
|
||||||
private var r = 0
|
|
||||||
private var coords = Stack<Pair<Int, Int>>()
|
|
||||||
private var previousCoords = HashSet<Pair<Int, Int>>()
|
|
||||||
|
|
||||||
override fun endReached(): Boolean {
|
|
||||||
if ((radius + 1) in 1..r) return true
|
|
||||||
return radius > 0 && coords.isEmpty() && r >= radius
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun total(): Double {
|
|
||||||
return (PI * radius.toFloat().pow(2))
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun progress(maxRadius: Int?): Double {
|
|
||||||
// TODO: Radius inner progress
|
|
||||||
return if (maxRadius != null) {
|
|
||||||
(count / (PI * maxRadius.toFloat().pow(2))).coerceAtMost(1.0)
|
|
||||||
} else {
|
|
||||||
(count / (PI * radius.toFloat().pow(2))).coerceAtMost(1.0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun currentRadius(): Int {
|
|
||||||
return r
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the edge locations of the shape to be used
|
|
||||||
* with dynmap markers
|
|
||||||
*/
|
|
||||||
override fun getShapeEdgeLocations(): List<Pair<Int, Int>> {
|
|
||||||
val locations = this.getCircleCoordinates(this.radius)
|
|
||||||
locations.add(locations.first())
|
|
||||||
return locations.map { Pair(it.first + center.first, it.second + center.second) }
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the next coordinate of the circle until the end is reached
|
|
||||||
*/
|
|
||||||
override fun next(): Pair<Int, Int> {
|
|
||||||
if (endReached()) {
|
|
||||||
return currentPos
|
|
||||||
}
|
|
||||||
|
|
||||||
if (count == 0 && currentPos != center) {
|
|
||||||
val tmpCircle = Circle(center, center, radius)
|
|
||||||
while (tmpCircle.next() != currentPos && !tmpCircle.endReached());
|
|
||||||
this.count = tmpCircle.count
|
|
||||||
this.r = tmpCircle.r
|
|
||||||
}
|
|
||||||
|
|
||||||
if (count == 0) {
|
|
||||||
count++
|
|
||||||
return center
|
|
||||||
}
|
|
||||||
|
|
||||||
if (coords.isEmpty()) {
|
|
||||||
r++
|
|
||||||
val tmpCoords = HashSet<Pair<Int, Int>>()
|
|
||||||
tmpCoords.addAll(getCircleCoordinates((r * 2) - 1).map { Pair(it.first / 2, it.second / 2) })
|
|
||||||
tmpCoords.addAll(getCircleCoordinates(r))
|
|
||||||
tmpCoords.removeAll(previousCoords)
|
|
||||||
previousCoords.clear()
|
|
||||||
coords.addAll(tmpCoords)
|
|
||||||
previousCoords.addAll(tmpCoords)
|
|
||||||
}
|
|
||||||
|
|
||||||
count++
|
|
||||||
val coord = coords.pop()
|
|
||||||
currentPos = Pair(coord.first + center.first, coord.second + center.second)
|
|
||||||
return currentPos
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the int coordinates for a circle
|
|
||||||
* Some coordinates might already be present in the list
|
|
||||||
* @param r - the radius
|
|
||||||
*/
|
|
||||||
private fun getCircleCoordinates(r: Int): Vector<Pair<Int, Int>> {
|
|
||||||
val coords = Vector<Pair<Int, Int>>()
|
|
||||||
val segCoords = getSegment(r)
|
|
||||||
coords.addAll(segCoords.reversed())
|
|
||||||
|
|
||||||
for (step in 1..7) {
|
|
||||||
val tmpSeg = Vector<Pair<Int, Int>>()
|
|
||||||
|
|
||||||
for (pos in segCoords) {
|
|
||||||
val coord = when (step) {
|
|
||||||
1 -> Pair(pos.first, -pos.second)
|
|
||||||
2 -> Pair(pos.second, -pos.first)
|
|
||||||
3 -> Pair(-pos.second, -pos.first)
|
|
||||||
4 -> Pair(-pos.first, -pos.second)
|
|
||||||
5 -> Pair(-pos.first, pos.second)
|
|
||||||
6 -> Pair(-pos.second, pos.first)
|
|
||||||
7 -> Pair(pos.second, pos.first)
|
|
||||||
else -> pos
|
|
||||||
}
|
|
||||||
if (coord !in coords) {
|
|
||||||
tmpSeg.add(coord)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (step % 2 == 0) {
|
|
||||||
coords.addAll(tmpSeg.reversed())
|
|
||||||
} else {
|
|
||||||
coords.addAll(tmpSeg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return coords
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the int coordinates for a circles segment
|
|
||||||
* @param r - the radius
|
|
||||||
*/
|
|
||||||
private fun getSegment(r: Int): ArrayList<Pair<Int, Int>> {
|
|
||||||
var d = -r
|
|
||||||
var x = r
|
|
||||||
var y = 0
|
|
||||||
val coords = ArrayList<Pair<Int, Int>>()
|
|
||||||
while (y <= x) {
|
|
||||||
coords.add(Pair(x, y))
|
|
||||||
d += 2 * y + 1
|
|
||||||
y += 1
|
|
||||||
if (d > 0) {
|
|
||||||
x -= 1
|
|
||||||
d -= 2 * x
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return coords
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun reset() {
|
|
||||||
this.r = 0
|
|
||||||
this.currentPos = center
|
|
||||||
this.previousCoords.clear()
|
|
||||||
this.count = 0
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,43 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.shapes
|
|
||||||
|
|
||||||
abstract class Shape(protected val center: Pair<Int, Int>, start: Pair<Int, Int>, radius: Int) {
|
|
||||||
protected var currentPos = start
|
|
||||||
protected var radius = radius
|
|
||||||
private set
|
|
||||||
var count = 0
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the next value
|
|
||||||
*/
|
|
||||||
abstract fun next(): Pair<Int, Int>
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If the shape can provide a next value
|
|
||||||
*/
|
|
||||||
abstract fun endReached(): Boolean
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the progress of the shape
|
|
||||||
*/
|
|
||||||
abstract fun progress(maxRadius: Int?): Double
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The total number of chunks to generate
|
|
||||||
*/
|
|
||||||
abstract fun total(): Double
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the current radius
|
|
||||||
*/
|
|
||||||
abstract fun currentRadius(): Int
|
|
||||||
|
|
||||||
/**
|
|
||||||
* returns a poly marker for the shape
|
|
||||||
*/
|
|
||||||
abstract fun getShapeEdgeLocations(): List<Pair<Int, Int>>
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resets the shape to its center start position
|
|
||||||
*/
|
|
||||||
abstract fun reset()
|
|
||||||
}
|
|
@ -1,110 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.shapes
|
|
||||||
|
|
||||||
import kotlin.math.abs
|
|
||||||
import kotlin.math.pow
|
|
||||||
|
|
||||||
class Square(center: Pair<Int, Int>, start: Pair<Int, Int>, radius: Int) : Shape(center, start, radius) {
|
|
||||||
private var direction = 0
|
|
||||||
|
|
||||||
override fun endReached(): Boolean {
|
|
||||||
val distances = getDistances(center, currentPos)
|
|
||||||
return radius > 0 && ((direction == 3
|
|
||||||
&& abs(distances.first) == abs(distances.second)
|
|
||||||
&& abs(distances.first) == radius)
|
|
||||||
|| (distances.first > radius || distances.second > radius))
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun total(): Double {
|
|
||||||
return (radius * 2).toDouble().pow(2)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun progress(maxRadius: Int?): Double {
|
|
||||||
return if (maxRadius != null) {
|
|
||||||
(count / (maxRadius * 2).toDouble().pow(2)).coerceAtMost(1.0)
|
|
||||||
} else {
|
|
||||||
(count / (radius * 2).toDouble().pow(2)).coerceAtMost(1.0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun currentRadius(): Int {
|
|
||||||
val distances = getDistances(center, currentPos)
|
|
||||||
return distances.first.coerceAtLeast(distances.second)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the next value in the spiral
|
|
||||||
*/
|
|
||||||
override fun next(): Pair<Int, Int> {
|
|
||||||
if (endReached()) {
|
|
||||||
return currentPos
|
|
||||||
}
|
|
||||||
if (count == 0 && currentPos != center) {
|
|
||||||
// simulate the spiral to get the correct direction and count
|
|
||||||
val simSpiral = Square(center, center, radius)
|
|
||||||
while (simSpiral.next() != currentPos && !simSpiral.endReached());
|
|
||||||
direction = simSpiral.direction
|
|
||||||
count = simSpiral.count
|
|
||||||
}
|
|
||||||
if (count == 1) { // because of the center behaviour
|
|
||||||
count++
|
|
||||||
return currentPos
|
|
||||||
}
|
|
||||||
if (currentPos == center) { // the center has to be handled exclusively
|
|
||||||
currentPos = Pair(center.first, center.second + 1)
|
|
||||||
count++
|
|
||||||
return center
|
|
||||||
} else {
|
|
||||||
val distances = getDistances(center, currentPos)
|
|
||||||
if (abs(distances.first) == abs(distances.second)) {
|
|
||||||
direction = (direction + 1) % 5
|
|
||||||
}
|
|
||||||
}
|
|
||||||
when (direction) {
|
|
||||||
0 -> {
|
|
||||||
currentPos = Pair(currentPos.first + 1, currentPos.second)
|
|
||||||
}
|
|
||||||
1 -> {
|
|
||||||
currentPos = Pair(currentPos.first, currentPos.second - 1)
|
|
||||||
}
|
|
||||||
2 -> {
|
|
||||||
currentPos = Pair(currentPos.first - 1, currentPos.second)
|
|
||||||
}
|
|
||||||
3 -> {
|
|
||||||
currentPos = Pair(currentPos.first, currentPos.second + 1)
|
|
||||||
}
|
|
||||||
4 -> {
|
|
||||||
currentPos = Pair(currentPos.first, currentPos.second + 1)
|
|
||||||
direction = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
count++
|
|
||||||
return currentPos
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the edges to be used with dynmap markers
|
|
||||||
*/
|
|
||||||
override fun getShapeEdgeLocations(): List<Pair<Int, Int>> {
|
|
||||||
val a = Pair(this.radius + center.first, this.radius + center.second)
|
|
||||||
val b = Pair(this.radius + center.first, -this.radius + center.second)
|
|
||||||
val c = Pair(-this.radius + center.first, -this.radius + center.second)
|
|
||||||
val d = Pair(-this.radius + center.first, this.radius + center.second)
|
|
||||||
return listOf(a, b, c, d, a)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the distances between 2 coordinates
|
|
||||||
*/
|
|
||||||
private fun getDistances(pos1: Pair<Int, Int>, pos2: Pair<Int, Int>): Pair<Int, Int> {
|
|
||||||
return Pair(pos2.first - pos1.first, pos2.second - pos1.second)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resets the shape to its starting parameters
|
|
||||||
*/
|
|
||||||
override fun reset() {
|
|
||||||
this.currentPos = center
|
|
||||||
this.count = 0
|
|
||||||
this.direction = 0
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,85 +0,0 @@
|
|||||||
RESUME_FOR_WORLD = Resuming chunk generation task for world '%s'...
|
|
||||||
TASK_FINISHED = Task #%d finished after %d chunks.
|
|
||||||
TASK_CANCELLED = Cancelled task #%s.
|
|
||||||
TASK_LOAD_FAILED = §cFailed to load task #%d.
|
|
||||||
TASK_LOAD_SUCCESS = %d saved tasks loaded.
|
|
||||||
TASK_NOT_FOUND = §cTask %s not found!
|
|
||||||
CREATE_DELAYED_LOAD = Creating task to load chunk generation Tasks later...
|
|
||||||
TASK_PERIODIC_REPORT = Task #%d running for '%s'. State: %s. Progress: %d chunks %s %s, Speed: %.1f ch/s, Last Chunk: %d, %d
|
|
||||||
TASK_PERIODIC_REPORT_CORRECTING = Task #%d generating missing chunks for '%s'. Progress: %d chunks %s
|
|
||||||
TASK_SAVE_FAILED = §cException when saving tasks: %s
|
|
||||||
|
|
||||||
WORLD_NAME_REQUIRED = §cYou need to provide a world name!
|
|
||||||
WORLD_NOT_FOUND = §cWorld §2%s §cnot found!
|
|
||||||
TASK_ALREADY_EXISTS = §cA task for '%s' already exists!
|
|
||||||
TASK_CREATION_SUCCESS = §9Generation Task for world §2%s§9 §2%s§9 and shape %s successfully created!
|
|
||||||
TASK_UNIT_WORLDBORDER = until world border
|
|
||||||
TASK_UNIT_RADIUS = with a radius of %s
|
|
||||||
TASK_ID_REQUIRED = §cYou need to provide a task id!
|
|
||||||
INVALID_ARGUMENT = §cInvalid argument at %s: %s!
|
|
||||||
|
|
||||||
PAUSED_TASKS_HEADER = Currently Paused Generation Tasks
|
|
||||||
TASKS_ENTRY = - §9#%d§r - §2%s§r - §2%s§r - §2%s chunks %s§r
|
|
||||||
RUNNING_TASKS_HEADER = Currently Running Generation Tasks
|
|
||||||
NO_GENERATION_TASKS = There are no generation tasks.
|
|
||||||
|
|
||||||
COMPLETED_TASKS_HEADER = §nCompleted Generation Tasks§r
|
|
||||||
COMPLETED_WORLD_HEADER = §l%s§r
|
|
||||||
COMPLETED_TASK_ENTRY = - §9#%d§r: §2%d§r chunks radius from center §2(%d, %d)§r with shape §2%s§r
|
|
||||||
|
|
||||||
PAUSE_SUCCESS = §9Paused all generation tasks.
|
|
||||||
ALREADY_PAUSED = §cThe generation process is already paused!
|
|
||||||
|
|
||||||
RESUME_SUCCESS = §9Resumed all generation Tasks.
|
|
||||||
NOT_PAUSED = §cThe generation process is not paused!
|
|
||||||
|
|
||||||
CONFIG_RELOADING = Reloading the config file...
|
|
||||||
CONFIG_RELOADED = §2The config file has been reloaded!
|
|
||||||
|
|
||||||
TELEPORTED = §9You have been teleported to chunk §2%s, %s
|
|
||||||
TP_ONLY_PLAYER = §cThis command can only be executed by a player!
|
|
||||||
|
|
||||||
NO_PERMISSION = §cYou do not have the permission for this command!
|
|
||||||
SUBCOMMAND_NOT_FOUND = §cSubcommand §2%s §cnot found!
|
|
||||||
|
|
||||||
STOPPING_ALL_TASKS = Stopping all generation tasks...
|
|
||||||
SAVING_TASK_PROGRESS = Saving the progress of task #%s to the database...
|
|
||||||
DB_INIT = Initializing database...
|
|
||||||
DB_INIT_FINISHED = Database fully initialized.
|
|
||||||
DB_INIT_EROR = Failed to init database: %s.
|
|
||||||
|
|
||||||
DATABASE_CONNECTION_ERROR = §cCould not get the database connection!
|
|
||||||
SQL_ERROR = §cAn eror occured on sql %s!
|
|
||||||
NO_DATABASE_CONNECTION = §cCould not execute sql: No database connection.
|
|
||||||
CREATE_TABLE_DEFINITION = Created table %s with definition %s.
|
|
||||||
TABLE_CREATE_ERROR = §cError when creation table %s.
|
|
||||||
UPDATE_TABLE_DEFINITION = Updated table %s with sql %s.
|
|
||||||
UPDATE_TABLE_FAILED = Failed to update table %s with sql %s.
|
|
||||||
|
|
||||||
TOO_FEW_ARGUMENTS = §cYou did not provide enough arguments.
|
|
||||||
COORD_INVALID = §cThe provided coordinate ('%s', '%s') is invalid!
|
|
||||||
CENTER_UPDATED = §9The center for world §2%s §9has been set to §2(%s, %s)§9.
|
|
||||||
CENTER_INFO = §9The center for world §2%s §9is §2(%s, %s)§9.
|
|
||||||
|
|
||||||
PLUGIN_DETECTED = Detected %s version %s
|
|
||||||
|
|
||||||
RESUME_PLAYER_LEAVE = The player count is smaller than the configured pause value. Resuming generation...
|
|
||||||
PAUSE_PLAYER_JOIN = The player count has reached the pause value. Pausing generation...
|
|
||||||
PAUSE_MANUALLY = Generation was manually paused. Not resuming automatically.
|
|
||||||
|
|
||||||
STATS_HEADER = §nStats§r
|
|
||||||
STATS_SERVER = §lServer Stats§r
|
|
||||||
STATS_SERVER_VERSION = - Server Version: §2%s§r
|
|
||||||
STATS_PLUGIN_VERSION = - Plugin Version: §2%s§r
|
|
||||||
STATS_MEMORY = - Memory (u/a): §2%d mb / %d mb = (%.2f percent)§r
|
|
||||||
STATS_CORES = - Cores: §2%d§r
|
|
||||||
|
|
||||||
STATS_WORLD_NAME = §l%s§r
|
|
||||||
STATS_ENTITY_COUNT = - §2%d§r Entities
|
|
||||||
STATS_LOADED_CHUNKS = - §2%d§r Loaded Chunks
|
|
||||||
STATS_PLUGIN_LOADED_CHUNKS = - §2%d§r Chunks Loaded by Chunkmaster
|
|
||||||
STATS_GENERATING = - Generating: §2%s§r
|
|
||||||
|
|
||||||
SAVING_CHUNKS = Saving %d loaded chunks...
|
|
||||||
CANCEL_FAIL = Failed to cancel task #%d in the given timeout!
|
|
||||||
NO_AUTOSTART = Autostart set to §2false§r. Pausing...
|
|
@ -1,86 +0,0 @@
|
|||||||
RESUME_FOR_WORLD = Setze das Chunk-Generieren für Welt '%s' fort...
|
|
||||||
TASK_FINISHED = Aufgabe #%d wurde nach %d chunks beendet.
|
|
||||||
TASK_CANCELLED = Aufgabe #%s wurde abgebrochen.
|
|
||||||
TASK_LOAD_FAILED = §cAufgabe #%d konnte nicht geladen werden.
|
|
||||||
TASK_LOAD_SUCCESS = %d gespeicherte Aufgaben wurden geladen.
|
|
||||||
TASK_NOT_FOUND = §cAufgabe %s konnte nicht gefunden werden!
|
|
||||||
CREATE_DELAYED_LOAD = Erstelle einen Bukkit-Task zum verzögerten Laden von Aufgaben...
|
|
||||||
TASK_PERIODIC_REPORT = Aufgabe #%d für Welt '%s'. Status: %s. Fortschritt: %d chunks %s %s, Geschwindigkeit: %.1f ch/s, Letzer Chunk: %d, %d
|
|
||||||
TASK_PERIODIC_REPORT_CORRECTING = Aufgabe #%d generiert fehlende Chunks für Welt '%s'. Fortschritt: %d chunks %s
|
|
||||||
TASK_SAVE_FAILED = §cFehler beim Speichern der Aufgaben: %s
|
|
||||||
|
|
||||||
WORLD_NAME_REQUIRED = §cDu musst einen Weltennamen angeben!
|
|
||||||
WORLD_NOT_FOUND = §c Die Welt §2%s §cwurde nicht gefunden!
|
|
||||||
TASK_ALREADY_EXISTS = §cEs existiert bereits eine Aufgabe für §2%s§c!
|
|
||||||
TASK_CREATION_SUCCESS = §9Generierungs-Aufgabe §2%s§9 §2%s§9 in der Form %s wurde erfolgreich erstellt!
|
|
||||||
TASK_UNIT_WORLDBORDER = bis zur World-Border
|
|
||||||
TASK_UNIT_RADIUS = mit einem Radius von %s
|
|
||||||
TASK_ID_REQUIRED = §cDu musst eine Aufgaben-Id angeben!
|
|
||||||
INVALID_ARGUMENT = §cFalscher Parameter an Stelle %s: %s!
|
|
||||||
|
|
||||||
PAUSED_TASKS_HEADER = §lPausierte Generierungsaufgaben§r
|
|
||||||
|
|
||||||
RUNNING_TASKS_HEADER = §lLaufende Generierungsaufgaben§r
|
|
||||||
NO_GENERATION_TASKS = Es gibt keine Aufgaben.
|
|
||||||
|
|
||||||
PAUSE_SUCCESS = §9Alle Aufgaben wurden pausiert.
|
|
||||||
ALREADY_PAUSED = §cDas Generieren ist bereits pausiert.
|
|
||||||
|
|
||||||
RESUME_SUCCESS = §9Alle Aufgaben wurden fortgesetzt.
|
|
||||||
NOT_PAUSED = §cEs gibt keine pausierten Aufgaben!
|
|
||||||
|
|
||||||
CONFIG_RELOADING = Die Konfigurationsdatei wird neu eingelesen...
|
|
||||||
CONFIG_RELOADED = §2Die Konfigurationsdatei wurde neu geladen!
|
|
||||||
|
|
||||||
TELEPORTED = §9Du wurdest zum Chunk §2%s, %s §9teleportiert
|
|
||||||
TP_ONLY_PLAYER = §cDieser Befehl kann nur von einem Spieler ausgeführt werden.
|
|
||||||
|
|
||||||
NO_PERMISSION = §cDu hast nicht die Rechte für diesen Befehl!
|
|
||||||
SUBCOMMAND_NOT_FOUND = §cUnteraktion §2%s §cwurde nicht gefunden!
|
|
||||||
|
|
||||||
STOPPING_ALL_TASKS = Stoppt alle Aufgaben...
|
|
||||||
SAVING_TASK_PROGRESS = Speichert den Fortschritt der Aufgabe #%s in der Datenbank...
|
|
||||||
DB_INIT = Initialisiere Datenbank...
|
|
||||||
DB_INIT_FINISHED = Die Datenbank wurde initialisiert.
|
|
||||||
DB_INIT_EROR = Fehler beim Initalisieren der Datenbank: %s.
|
|
||||||
|
|
||||||
DATABASE_CONNECTION_ERROR = §cDie Datenbankverbindung konnte nicht erzeugt werden.
|
|
||||||
SQL_ERROR = §cEin Fehler trat mit sql %s auf!
|
|
||||||
NO_DATABASE_CONNECTION = §cSql konnte nicht ausgeführt werden: Keine Datenbankverbindung.
|
|
||||||
CREATE_TABLE_DEFINITION = Tabelle %s mit Definition %s wurde erstellt.
|
|
||||||
TABLE_CREATE_ERROR = §cFehler beim erstellen der Tabelle %s.
|
|
||||||
UPDATE_TABLE_DEFINITION = Tabelle %s wurde mit sql %s geupdated.
|
|
||||||
UPDATE_TABLE_FAILED = Fehler beim Updaten der Tabelle %s mit sql %s.
|
|
||||||
|
|
||||||
TOO_FEW_ARGUMENTS = §cDu hast nicht genug Parameter angegeben.
|
|
||||||
COORD_INVALID = §cDie Koordinate ('%s', '%s') ist ungültig!
|
|
||||||
CENTER_UPDATED = §9Die Mitte der Welt §2%s §9wurde auf §2(%s, %s)§9 gesetzt.
|
|
||||||
CENTER_INFO = §9Die Mitte der Welt §2%s §9ist §2(%s, %s)§9.
|
|
||||||
|
|
||||||
PLUGIN_DETECTED = Plugin %s in der Version %s gefunden!
|
|
||||||
|
|
||||||
RESUME_PLAYER_LEAVE = Die Anzahl der Spieler hat den festgelegen Wert zum Pausieren unterschritten. Setze Generieren fort...
|
|
||||||
PAUSE_PLAYER_JOIN = Die Anzahl der Spieler hat den festgelegten Wert zum Pausieren erreicht. Pausiere...
|
|
||||||
PAUSE_MANUALLY = Das Generieren wurde manuell pausiert und wird deswegen nicht automatisch fortgesetzt.
|
|
||||||
|
|
||||||
STATS_HEADER = §nStatistiken§r
|
|
||||||
STATS_SERVER = §lServer Statistik§r
|
|
||||||
STATS_SERVER_VERSION = - Server Version: §2%s§r
|
|
||||||
STATS_PLUGIN_VERSION = - Plugin Version: §2%s§r
|
|
||||||
STATS_MEMORY = - Arbeitsspeicher (u/a): §2%d mb / %d mb = (%.2f percent)§r
|
|
||||||
STATS_CORES = - Kerne: §2%d§r
|
|
||||||
|
|
||||||
STATS_WORLD_NAME = §l%s§r
|
|
||||||
STATS_ENTITY_COUNT = - §2%d§r Entities
|
|
||||||
STATS_LOADED_CHUNKS = - §2%d§r Geladene Chunks
|
|
||||||
STATS_PLUGIN_LOADED_CHUNKS = - §2%d§r von Chunkmaster geladene Chunks
|
|
||||||
|
|
||||||
SAVING_CHUNKS = Speichere %d geladene Chunks...
|
|
||||||
CANCEL_FAIL = Konnte Aufgabe #%d nicht im angegebenen Timeout stoppen!
|
|
||||||
NO_AUTOSTART = Autostart ist auf §2false§r gesetzt. Pausiere...
|
|
||||||
|
|
||||||
COMPLETED_TASKS_HEADER = §nAbgeschlossene Aufgaben§r
|
|
||||||
COMPLETED_WORLD_HEADER = §l%s§r
|
|
||||||
COMPLETED_TASK_ENTRY = - §9#%d§r: §2%d§r Chunks Radius von der Mitte §2(%d, %d)§r aus in der Form §2%s§r
|
|
||||||
|
|
||||||
STATS_GENERATING = - Generiert: §2%s§r
|
|
@ -1,84 +0,0 @@
|
|||||||
RESUME_FOR_WORLD = Resuming chunk generation task for world '%s'...
|
|
||||||
TASK_FINISHED = Task #%d finished after %d chunks.
|
|
||||||
TASK_CANCELLED = Cancelled task #%s.
|
|
||||||
TASK_LOAD_FAILED = §cFailed to load task #%d.
|
|
||||||
TASK_LOAD_SUCCESS = %d saved tasks loaded.
|
|
||||||
TASK_NOT_FOUND = §cTask %s not found!
|
|
||||||
CREATE_DELAYED_LOAD = Creating task to load chunk generation Tasks later...
|
|
||||||
TASK_PERIODIC_REPORT = Task #%d running for '%s'. State: %s. Progress: %d chunks %s %s, Speed: %.1f ch/s, Last Chunk: %d, %d
|
|
||||||
TASK_SAVE_FAILED = §cException when saving tasks: %s
|
|
||||||
|
|
||||||
WORLD_NAME_REQUIRED = §cYou need to provide a world name!
|
|
||||||
WORLD_NOT_FOUND = §cWorld §2%s §cnot found!
|
|
||||||
TASK_ALREADY_EXISTS = §cA task for '%s' already exists!
|
|
||||||
TASK_CREATION_SUCCESS = §9Generation Task for world §2%s§9 §2%s§9 and shape %s successfully created!
|
|
||||||
TASK_UNIT_WORLDBORDER = until world border
|
|
||||||
TASK_UNIT_RADIUS = with a radius of %s
|
|
||||||
TASK_ID_REQUIRED = §cYou need to provide a task id!
|
|
||||||
INVALID_ARGUMENT = §cInvalid argument at %s: %s!
|
|
||||||
|
|
||||||
PAUSED_TASKS_HEADER = Currently Paused Generation Tasks
|
|
||||||
RUNNING_TASKS_HEADER = Currently Running Generation Tasks
|
|
||||||
NO_GENERATION_TASKS = There are no generation tasks.
|
|
||||||
|
|
||||||
PAUSE_SUCCESS = §9Paused all generation tasks.
|
|
||||||
ALREADY_PAUSED = §cThe generation process is already paused!
|
|
||||||
|
|
||||||
RESUME_SUCCESS = §9Resumed all generation Tasks.
|
|
||||||
NOT_PAUSED = §cThe generation process is not paused!
|
|
||||||
|
|
||||||
CONFIG_RELOADING = Reloading the config file...
|
|
||||||
CONFIG_RELOADED = §2The config file has been reloaded!
|
|
||||||
|
|
||||||
TELEPORTED = §9You have been teleported to chunk §2%s, %s
|
|
||||||
TP_ONLY_PLAYER = §cThis command can only be executed by a player!
|
|
||||||
|
|
||||||
NO_PERMISSION = §cYou do not have the permission for this command!
|
|
||||||
SUBCOMMAND_NOT_FOUND = §cSubcommand §2%s §cnot found!
|
|
||||||
|
|
||||||
STOPPING_ALL_TASKS = Stopping all generation tasks...
|
|
||||||
SAVING_TASK_PROGRESS = Saving the progress of task #%s to the database...
|
|
||||||
DB_INIT = Initializing database...
|
|
||||||
DB_INIT_FINISHED = Database fully initialized.
|
|
||||||
DB_INIT_EROR = Failed to init database: %s.
|
|
||||||
|
|
||||||
DATABASE_CONNECTION_ERROR = §cCould not get the database connection!
|
|
||||||
SQL_ERROR = §cAn eror occured on sql %s!
|
|
||||||
NO_DATABASE_CONNECTION = §cCould not execute sql: No database connection.
|
|
||||||
CREATE_TABLE_DEFINITION = Created table %s with definition %s.
|
|
||||||
TABLE_CREATE_ERROR = §cError when creation table %s.
|
|
||||||
UPDATE_TABLE_DEFINITION = Updated table %s with sql %s.
|
|
||||||
UPDATE_TABLE_FAILED = Failed to update table %s with sql %s.
|
|
||||||
|
|
||||||
TOO_FEW_ARGUMENTS = §cYou did not provide enough arguments.
|
|
||||||
COORD_INVALID = §cThe provided coordinate ('%s', '%s') is invalid!
|
|
||||||
CENTER_UPDATED = §9The center for world §2%s §9has been set to §2(%s, %s)§9.
|
|
||||||
CENTER_INFO = §9The center for world §2%s §9is §2(%s, %s)§9.
|
|
||||||
|
|
||||||
PLUGIN_DETECTED = Detected %s version %s
|
|
||||||
|
|
||||||
RESUME_PLAYER_LEAVE = The player count is smaller than the configured pause value. Resuming generation...
|
|
||||||
PAUSE_PLAYER_JOIN = The player count has reached the pause value. Pausing generation...
|
|
||||||
PAUSE_MANUALLY = Generation was manually paused. Not resuming automatically.
|
|
||||||
|
|
||||||
STATS_HEADER = §nStats§r
|
|
||||||
STATS_SERVER = §lServer Stats§r
|
|
||||||
STATS_SERVER_VERSION = - Server Version: §2%s§r
|
|
||||||
STATS_PLUGIN_VERSION = - Plugin Version: §2%s§r
|
|
||||||
STATS_MEMORY = - Memory (u/a): §2%d mb / %d mb = (%.2f percent)§r
|
|
||||||
STATS_CORES = - Cores: §2%d§r
|
|
||||||
|
|
||||||
STATS_WORLD_NAME = §l%s§r
|
|
||||||
STATS_ENTITY_COUNT = - §2%d§r Entities
|
|
||||||
STATS_LOADED_CHUNKS = - §2%d§r Loaded Chunks
|
|
||||||
STATS_PLUGIN_LOADED_CHUNKS = - §2%d§r Chunks Loaded by Chunkmaster
|
|
||||||
|
|
||||||
SAVING_CHUNKS = Saving %d loaded chunks...
|
|
||||||
CANCEL_FAIL = Failed to cancel task #%d in the given timeout!
|
|
||||||
NO_AUTOSTART = Autostart set to §2false§r. Pausing...
|
|
||||||
|
|
||||||
COMPLETED_TASKS_HEADER = §nCompleted Generation Tasks§r
|
|
||||||
COMPLETED_WORLD_HEADER = §l%s§r
|
|
||||||
COMPLETED_TASK_ENTRY = - §9#%d§r: §2%d§r chunks radius from center §2(%d, %d)§r with shape §2%s§r
|
|
||||||
|
|
||||||
STATS_GENERATING = - Generating: §2%s§r
|
|
@ -1,85 +0,0 @@
|
|||||||
RESUME_FOR_WORLD = Resumiendo tarea de generación de chunks para el mundo '%s'...
|
|
||||||
TASK_FINISHED = Tarea #%d terminada después de %d chunks.
|
|
||||||
TASK_CANCELLED = Tarea #%s cancelada.
|
|
||||||
TASK_LOAD_FAILED = §cFallo al cargar la tarea #%d.
|
|
||||||
TASK_LOAD_SUCCESS = %d tareas guardadas cargadas.
|
|
||||||
TASK_NOT_FOUND = §c¡Tarea %s no encontrada!
|
|
||||||
CREATE_DELAYED_LOAD = Creando tarea Bukkit para cargar la generación de chunks...
|
|
||||||
TASK_PERIODIC_REPORT = Tarea #%d en ejecución para '%s'. Estado: %s. Progreso: %d Chunks %s %s, Velocidad: %.1f ch/s, Último Chunk: %d, %d
|
|
||||||
TASK_PERIODIC_REPORT_CORRECTING = Tarea #%d gerenando chunks perdidos para '%s'. Progreso: %d Chunks %s
|
|
||||||
TASK_SAVE_FAILED = §cExcepción al guardar las tareas: %s
|
|
||||||
|
|
||||||
WORLD_NAME_REQUIRED = §c¡Tienes que proporcionar un nombre del mundo!
|
|
||||||
WORLD_NOT_FOUND = §c¡Mundo §2%s §cno encontrado!
|
|
||||||
TASK_ALREADY_EXISTS = §c¡Una tarea para '%s' ya existe!
|
|
||||||
TASK_CREATION_SUCCESS = §9¡Tarea de generación para el mundo §2%s§9 §2%s§9 y forma %s creada con éxito!
|
|
||||||
TASK_UNIT_WORLDBORDER = hasta el borde del mundo
|
|
||||||
TASK_UNIT_RADIUS = con un radius de %s
|
|
||||||
TASK_ID_REQUIRED = §c¡Necesitas proporcionar una id de tarea!
|
|
||||||
INVALID_ARGUMENT = §c¡Argumento invalido en %s: %s!
|
|
||||||
|
|
||||||
PAUSED_TASKS_HEADER = Tareas de generación actualmente en pausa
|
|
||||||
TASKS_ENTRY = - §9#%d§r - §2%s§r - §2%s§r - §2%s Chunks %s§r
|
|
||||||
RUNNING_TASKS_HEADER = Tareas de generación en curso
|
|
||||||
NO_GENERATION_TASKS = No hay tareas de generación.
|
|
||||||
|
|
||||||
COMPLETED_TASKS_HEADER = §nTareas de generación completadas§r
|
|
||||||
COMPLETED_WORLD_HEADER = §l%s§r
|
|
||||||
COMPLETED_TASK_ENTRY = - §9#%d§r: §2%d§r radio de chunks desde el centro §2(%d, %d)§r con forma §2%s§r
|
|
||||||
|
|
||||||
PAUSE_SUCCESS = §9Tareas de generación pausadas
|
|
||||||
ALREADY_PAUSED = §cEl progreso de generación ya está en pausa.
|
|
||||||
|
|
||||||
RESUME_SUCCESS = §9Tareas de generación renaudadas
|
|
||||||
NOT_PAUSED = §cEl progreso de generación no está en pausa.
|
|
||||||
|
|
||||||
CONFIG_RELOADING = Recargando el archivo de configuración...
|
|
||||||
CONFIG_RELOADED = §2El archivo de configuración ha sido recargado!
|
|
||||||
|
|
||||||
TELEPORTED = §9Has sido teletransportado al chunk §2%s, %s
|
|
||||||
TP_ONLY_PLAYER = §c¡Este comando solo puede ser ejecutado por un jugador!
|
|
||||||
|
|
||||||
NO_PERMISSION = §c¡No tienes permiso para este comando!
|
|
||||||
SUBCOMMAND_NOT_FOUND = §c¡Subcomando §2%s §cno encontrado!
|
|
||||||
|
|
||||||
STOPPING_ALL_TASKS = Deteniendo todas las tareas de generación...
|
|
||||||
SAVING_TASK_PROGRESS = Guardando el progreso de la tarea #%s en la base de datos...
|
|
||||||
DB_INIT = Iniciando la base de datos...
|
|
||||||
DB_INIT_FINISHED = Base de datos ha sido inicializada.
|
|
||||||
DB_INIT_EROR = Error al inicializar la base de datos: %s.
|
|
||||||
|
|
||||||
DATABASE_CONNECTION_ERROR = §c¡No se ha podido establecer la conexión con la base de datos!
|
|
||||||
SQL_ERROR = §cSe ha producido un error en sql %s!
|
|
||||||
NO_DATABASE_CONNECTION = §cNo se ha podido ejecutar sql: No hay conexión con la base de datos.
|
|
||||||
CREATE_TABLE_DEFINITION = Tabla %s creada con definición %s.
|
|
||||||
TABLE_CREATE_ERROR = §cSe ha producido un error al crear la tabla %s.
|
|
||||||
UPDATE_TABLE_DEFINITION = Tabla %s actualizada con sql %s.
|
|
||||||
UPDATE_TABLE_FAILED = Se ha producido un error al actualizar la tabla %s con sql %s.
|
|
||||||
|
|
||||||
TOO_FEW_ARGUMENTS = §cNo has aportado suficientes argumentos.
|
|
||||||
COORD_INVALID = §cLas coordenadas proporcionadas ('%s', '%s') son incorrectas!
|
|
||||||
CENTER_UPDATED = §9El centro del mundo §2%s §9se ha actualizado a §2(%s, %s)§9.
|
|
||||||
CENTER_INFO = §9El centro del mundo §2%s §9es §2(%s, %s)§9.
|
|
||||||
|
|
||||||
PLUGIN_DETECTED = ¡Plugin %s con versión %s detectada!
|
|
||||||
|
|
||||||
RESUME_PLAYER_LEAVE = El número de jugadores es menor que el configurado como valor de pausa. Reanudando generación...
|
|
||||||
PAUSE_PLAYER_JOIN = El número de jugadores es igual que el configurado como valor de pausa. Pausando generación...
|
|
||||||
PAUSE_MANUALLY = Generación se pausó manualmente. No se resumirá automáticamente.
|
|
||||||
|
|
||||||
STATS_HEADER = §nEstadísticas§r
|
|
||||||
STATS_SERVER = §lEstadísticas del Servidor§r
|
|
||||||
STATS_SERVER_VERSION = - Versión del Servidor: §2%s§r
|
|
||||||
STATS_PLUGIN_VERSION = - Versión del Plugin: §2%s§r
|
|
||||||
STATS_MEMORY = - Memoria (u/a): §2%d mb / %d mb = (%.2f porcentaje)§r
|
|
||||||
STATS_CORES = - Cores: §2%d§r
|
|
||||||
|
|
||||||
STATS_WORLD_NAME = §l%s§r
|
|
||||||
STATS_ENTITY_COUNT = - §2%d§r Entidades
|
|
||||||
STATS_LOADED_CHUNKS = - §2%d§r Chunks cargados
|
|
||||||
STATS_PLUGIN_LOADED_CHUNKS = - §2%d§r Chunks cargados por Chunkmaster
|
|
||||||
STATS_GENERATING = - Generando: §2%s§r
|
|
||||||
|
|
||||||
SAVING_CHUNKS = Guardando %d chunks guardados...
|
|
||||||
CANCEL_FAIL = Fallo en la cancelación de la tarea #%d en el tiempo de espera configurado!
|
|
||||||
NO_AUTOSTART = Autoarranque configurado a §2false§r. Pausando...
|
|
@ -1,75 +0,0 @@
|
|||||||
RESUME_FOR_WORLD = Reprise de la tâche de génération pour le monde '%s'...
|
|
||||||
TASK_FINISHED = Tâche #%d terminée après %d chunks.
|
|
||||||
TASK_CANCELED = Tâche #%s annulée.
|
|
||||||
TASK_LOAD_FAILED = §cImpossible de charger la tâche #%d.
|
|
||||||
TASK_LOAD_SUCCESS = %d tâches chargées avec succès.
|
|
||||||
TASK_NOT_FOUND = §cTâche %s introuvable!
|
|
||||||
CREATE_DELAYED_LOAD = Création de la tâche pour la génération du terrain plus tard...
|
|
||||||
TASK_PERIODIC_REPORT = Tâche #%d en cours pour '%s'. État: %s. Progression: %d chunks %s %s, Vitesse: %.1f ch/s, Dernier Chunk: %d, %d
|
|
||||||
TASK_SAVE_FAILED = §cErreur lors de la sauvegarde de la tâche: %s
|
|
||||||
|
|
||||||
WORLD_NAME_REQUIRED = §cVous devez renseigner le nom d'un monde!
|
|
||||||
WORLD_NOT_FOUND = §cMonde §2%s §cintrouvable!
|
|
||||||
TASK_ALREADY_EXISTS = §cUne tâche pour '%s' existe déjà!
|
|
||||||
TASK_CREATION_SUCCESS = §9Tâche de génération pour le monde §2%s§9 §2%s§9 avec une forme %s créée avec succès!
|
|
||||||
TASK_UNIT_WORLDBORDER = jusqu'à la limite du monde
|
|
||||||
TASK_UNIT_RADIUS = avec un rayon de %s
|
|
||||||
TASK_ID_REQUIRED = §cVous devez renseigner l'id de la tache!
|
|
||||||
INVALID_ARGUMENT = §cArgument invalide à %s: %s!
|
|
||||||
|
|
||||||
PAUSED_TASKS_HEADER = Tâches de génération en pause
|
|
||||||
TASKS_ENTRY = - §9#%d§r - §2%s§r - §2%s§r - §2%s chunks %s§r
|
|
||||||
RUNNING_TASKS_HEADER = Tâches de génération en cours
|
|
||||||
NO_GENERATION_TASKS = Il n'y a aucune tâche de génération.
|
|
||||||
|
|
||||||
PAUSE_SUCCESS = §9Mise en pause de toutes les tâches de génération.
|
|
||||||
ALREADY_PAUSED = §cLa génération est déjà en pause!
|
|
||||||
|
|
||||||
RESUME_SUCCESS = §9Reprise de toutes les tâches de génération.
|
|
||||||
NOT_PAUSED = §cLa génération n'est pas en pause!
|
|
||||||
|
|
||||||
CONFIG_RELOADING = Rechargement du fichier de configuration...
|
|
||||||
CONFIG_RELOADED = §2La configuration a été rechargé!
|
|
||||||
|
|
||||||
TELEPORTED = §9Vous avez été téléporté au chunk §2%s, %s
|
|
||||||
TP_ONLY_PLAYER = §cCette commande ne peut être exécutée que par un joueur!
|
|
||||||
|
|
||||||
NO_PERMISSION = §cVous n'avez pas la permission d'exécuter cette commande!
|
|
||||||
SUBCOMMAND_NOT_FOUND = §cSSous-commande §2%s §cintrouvable!
|
|
||||||
|
|
||||||
STOPPING_ALL_TASKS = Arrêts de toutes les tâches de génération...
|
|
||||||
SAVING_TASK_PROGRESS = Sauvegarde de la progression de la tâche #%s dans la base de données...
|
|
||||||
DB_INIT = Initialisation de la base de données...
|
|
||||||
DB_INIT_FINISHED = Base de données initialisée.
|
|
||||||
DB_INIT_EROR = Erreur lors de l'initialisation de la base de données: %s.
|
|
||||||
|
|
||||||
DATABASE_CONNECTION_ERROR = §cConnexion impossible à la base de données!
|
|
||||||
SQL_ERROR = §cErreur lors de l'exécution SQL %s!
|
|
||||||
NO_DATABASE_CONNECTION = §cImpossible d'exécuter une requête SQL: Pas de connexion à la base de données.
|
|
||||||
CREATE_TABLE_DEFINITION = Table créée %s avec pour définition %s.
|
|
||||||
TABLE_CREATE_ERROR = §cErreur lors de la création de la table %s.
|
|
||||||
UPDATE_TABLE_DEFINITION = Mise à jour de la table %s par la requête SQL %s.
|
|
||||||
UPDATE_TABLE_FAILED = Impossible de mettre à jour la table %s par la requête SQL %s.
|
|
||||||
|
|
||||||
TOO_FEW_ARGUMENTS = §cIl manques des arguments pour exécuter la commande.
|
|
||||||
COORD_INVALID = §cLes coordonnées renseignées ('%s', '%s') sont invalides!
|
|
||||||
CENTER_UPDATED = §9Le centre du monde §2%s §9a été défini en §2(%s, %s)§9.
|
|
||||||
CENTER_INFO = §9Le centre du monde §2%s §9est §2(%s, %s)§9.
|
|
||||||
|
|
||||||
PLUGIN_DETECTED = Version de %s détectée %s
|
|
||||||
|
|
||||||
RESUME_PLAYER_LEAVE = Le nombre de joueurs est plus bas que la limite configurée. Reprise de la génération...
|
|
||||||
PAUSE_PLAYER_JOIN = Le nombre de joueurs a atteint la limite configurée. Arrêt de la génération...
|
|
||||||
PAUSE_MANUALLY = La génération a été manuellement arrêtée. Celle-ci ne reprendra pas automatiquement.
|
|
||||||
|
|
||||||
STATS_HEADER = §nStatistiques§r
|
|
||||||
STATS_SERVER = §lStatistiques serveur§r
|
|
||||||
STATS_SERVER_VERSION = - Version du serveur: §2%s§r
|
|
||||||
STATS_PLUGIN_VERSION = - Version du plugin: §2%s§r
|
|
||||||
STATS_MEMORY = - Mémoire vive (u/a): §2%d mb / %d mb = (%.2f pourcent)§r
|
|
||||||
STATS_CORES = - Coeurs processeur: §2%d§r
|
|
||||||
|
|
||||||
STATS_WORLD_NAME = §l%s§r
|
|
||||||
STATS_ENTITY_COUNT = - §2%d§r Entités
|
|
||||||
STATS_LOADED_CHUNKS = - §2%d§r Chunks chargés
|
|
||||||
STATS_PLUGIN_LOADED_CHUNKS = - §2%d§r Chunks chargés par Chunkmaster
|
|
@ -1,60 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib
|
|
||||||
|
|
||||||
import io.kotest.matchers.shouldBe
|
|
||||||
import org.junit.Test
|
|
||||||
|
|
||||||
class ArgParserTest {
|
|
||||||
var argParser = ArgParser()
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it parses arguments`() {
|
|
||||||
argParser.parseArguments("first second third forth").shouldBe(listOf("first", "second", "third", "forth"))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it handles escaped sequences`() {
|
|
||||||
argParser.parseArguments("first second\\ pt2 third").shouldBe(listOf("first", "second pt2", "third"))
|
|
||||||
argParser.parseArguments("first \"second\\\" part 2\" third")
|
|
||||||
.shouldBe(listOf("first", "second\" part 2", "third"))
|
|
||||||
argParser.parseArguments("first \\\\second third").shouldBe(listOf("first", "\\second", "third"))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it parses quoted arguments as one argument`() {
|
|
||||||
argParser.parseArguments("first \"second with space\" third")
|
|
||||||
.shouldBe(listOf("first", "second with space", "third"))
|
|
||||||
argParser.parseArguments("\"first\" \"second\" \"third\"").shouldBe(listOf("first", "second", "third"))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it parses single arguments`() {
|
|
||||||
argParser.parseArguments("one").shouldBe(listOf("one"))
|
|
||||||
argParser.parseArguments("\"one\"").shouldBe(listOf("one"))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it parses no arguments`() {
|
|
||||||
argParser.parseArguments("").shouldBe(emptyList())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it parses just whitespace as no arguments`() {
|
|
||||||
argParser.parseArguments(" ").shouldBe(emptyList())
|
|
||||||
argParser.parseArguments("\t\t").shouldBe(emptyList())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it parses arguments with weird whitespace`() {
|
|
||||||
argParser.parseArguments(" first second \t third \n forth ")
|
|
||||||
.shouldBe(listOf("first", "second", "third", "forth"))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it deals predictable with malformed input`() {
|
|
||||||
argParser.parseArguments("first \"second third fourth").shouldBe(listOf("first", "second third fourth"))
|
|
||||||
argParser.parseArguments("\"first second \"third\" fourth")
|
|
||||||
.shouldBe(listOf("first second ", "third", " fourth"))
|
|
||||||
argParser.parseArguments("first second third fourth\"").shouldBe(listOf("first", "second", "third", "fourth"))
|
|
||||||
argParser.parseArguments("\"").shouldBe(emptyList())
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,29 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib
|
|
||||||
|
|
||||||
import io.kotest.matchers.string.shouldNotBeEmpty
|
|
||||||
import io.mockk.every
|
|
||||||
import io.mockk.mockk
|
|
||||||
import net.trivernis.chunkmaster.Chunkmaster
|
|
||||||
import org.bukkit.configuration.file.FileConfiguration
|
|
||||||
import org.junit.Test
|
|
||||||
|
|
||||||
class LanguageManagerTest {
|
|
||||||
private var langManager: LanguageManager
|
|
||||||
|
|
||||||
init {
|
|
||||||
val plugin = mockk<Chunkmaster>()
|
|
||||||
val config = mockk<FileConfiguration>()
|
|
||||||
|
|
||||||
every { plugin.dataFolder } returns createTempDir()
|
|
||||||
every { plugin.config } returns config
|
|
||||||
every { config.getString("language") } returns "en"
|
|
||||||
|
|
||||||
langManager = LanguageManager(plugin)
|
|
||||||
langManager.loadProperties()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it returns localized for a key`() {
|
|
||||||
langManager.getLocalized("NOT_PAUSED").shouldNotBeEmpty()
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,75 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.shapes
|
|
||||||
|
|
||||||
import io.kotest.matchers.booleans.shouldBeTrue
|
|
||||||
import io.kotest.matchers.collections.shouldContainAll
|
|
||||||
import io.kotest.matchers.doubles.shouldBeBetween
|
|
||||||
import io.kotest.matchers.shouldBe
|
|
||||||
import org.junit.Test
|
|
||||||
import org.junit.jupiter.api.BeforeEach
|
|
||||||
|
|
||||||
class CircleTest {
|
|
||||||
private val circle = Circle(center = Pair(0, 0), radius = 2, start = Pair(0, 0))
|
|
||||||
|
|
||||||
@BeforeEach
|
|
||||||
fun init() {
|
|
||||||
circle.reset()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it generates coordinates`() {
|
|
||||||
circle.next().shouldBe(Pair(0, 0))
|
|
||||||
circle.next().shouldBe(Pair(-1, -1))
|
|
||||||
circle.next().shouldBe(Pair(1, 0))
|
|
||||||
circle.next().shouldBe(Pair(-1, 0))
|
|
||||||
circle.next().shouldBe(Pair(1, -1))
|
|
||||||
circle.next().shouldBe(Pair(-1, 1))
|
|
||||||
circle.next().shouldBe(Pair(0, 1))
|
|
||||||
circle.next().shouldBe(Pair(0, -1))
|
|
||||||
circle.next().shouldBe(Pair(1, 1))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it reports when reaching the end`() {
|
|
||||||
for (i in 1..25) {
|
|
||||||
circle.next()
|
|
||||||
}
|
|
||||||
circle.endReached().shouldBeTrue()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it reports the radius`() {
|
|
||||||
for (i in 1..9) {
|
|
||||||
circle.next()
|
|
||||||
}
|
|
||||||
circle.currentRadius().shouldBe(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it returns the right edges`() {
|
|
||||||
circle.getShapeEdgeLocations().shouldContainAll(
|
|
||||||
listOf(
|
|
||||||
Pair(2, -1),
|
|
||||||
Pair(2, 0),
|
|
||||||
Pair(2, 1),
|
|
||||||
Pair(1, 2),
|
|
||||||
Pair(0, 2),
|
|
||||||
Pair(-1, 2),
|
|
||||||
Pair(-2, 1),
|
|
||||||
Pair(-2, 0),
|
|
||||||
Pair(-2, -1),
|
|
||||||
Pair(-1, -2),
|
|
||||||
Pair(0, -2),
|
|
||||||
Pair(1, -2),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it returns the progress`() {
|
|
||||||
circle.progress(2).shouldBe(0)
|
|
||||||
for (i in 1..7) {
|
|
||||||
circle.next()
|
|
||||||
}
|
|
||||||
circle.progress(2).shouldBeBetween(.5, .8, .0)
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,62 +0,0 @@
|
|||||||
package net.trivernis.chunkmaster.lib.shapes
|
|
||||||
|
|
||||||
import io.kotest.matchers.booleans.shouldBeTrue
|
|
||||||
import io.kotest.matchers.collections.shouldContainAll
|
|
||||||
import io.kotest.matchers.shouldBe
|
|
||||||
import org.junit.Test
|
|
||||||
import org.junit.jupiter.api.BeforeEach
|
|
||||||
|
|
||||||
class SquareTest {
|
|
||||||
|
|
||||||
private val square = Square(center = Pair(0, 0), radius = 2, start = Pair(0, 0))
|
|
||||||
|
|
||||||
@BeforeEach
|
|
||||||
fun init() {
|
|
||||||
square.reset()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it generates coordinates`() {
|
|
||||||
square.next().shouldBe(Pair(0, 0))
|
|
||||||
square.next().shouldBe(Pair(0, 1))
|
|
||||||
square.next().shouldBe(Pair(1, 1))
|
|
||||||
square.next().shouldBe(Pair(1, 0))
|
|
||||||
square.next().shouldBe(Pair(1, -1))
|
|
||||||
square.next().shouldBe(Pair(0, -1))
|
|
||||||
square.next().shouldBe(Pair(-1, -1))
|
|
||||||
square.next().shouldBe(Pair(-1, 0))
|
|
||||||
square.next().shouldBe(Pair(-1, 1))
|
|
||||||
square.next().shouldBe(Pair(-1, 2))
|
|
||||||
square.next().shouldBe(Pair(0, 2))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it reports when reaching the end`() {
|
|
||||||
for (i in 1..25) {
|
|
||||||
square.next()
|
|
||||||
}
|
|
||||||
square.endReached().shouldBeTrue()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it reports the radius`() {
|
|
||||||
for (i in 1..9) {
|
|
||||||
square.next()
|
|
||||||
}
|
|
||||||
square.currentRadius().shouldBe(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it returns the right edges`() {
|
|
||||||
square.getShapeEdgeLocations().shouldContainAll(listOf(Pair(2, 2), Pair(-2, 2), Pair(2, -2), Pair(-2, -2)))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun `it returns the progress`() {
|
|
||||||
square.progress(2).shouldBe(0)
|
|
||||||
for (i in 1..8) {
|
|
||||||
square.next()
|
|
||||||
}
|
|
||||||
square.progress(2).shouldBe(0.5)
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue