Altitude/AltitudeQuests
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: Altitude:ff4fb6c1ae1fb2fc1bf248221b0faa5fe422b4a1
Branches Tags
Altitude:master
Altitude:refactor
Altitude:OnceABranch
..
compare: Altitude:8a22f5188e807264e32fd9f798383f140f3cb49f
Branches Tags
Altitude:master
Altitude:refactor
Altitude:OnceABranch

No commits in common. "ff4fb6c1ae1fb2fc1bf248221b0faa5fe422b4a1" and "8a22f5188e807264e32fd9f798383f140f3cb49f" have entirely different histories.
ff4fb6c1ae ... 8a22f5188e

36 changed files with 573 additions and 461 deletions
Show Stats Expand all files Collapse all files

24
Jenkinsfile vendored
View File

@ -1,24 +0,0 @@
pipeline {
agent any
stages {
stage('Gradle') {
steps {
sh '''
set +x
chmod +x gradlew
./gradlew build
'''
}
}
stage('Archive') {
steps {
archiveArtifacts artifacts: 'build/libs/', followSymlinks: false
}
}
stage('discord') {
steps {
discordSend description: "Build: ${BUILD_NUMBER}", showChangeset: true, result: currentBuild.currentResult, title: currentBuild.fullProjectName, webhookURL: env.discordwebhook
}
}
}
}

27
build.gradle.kts
View File

@ -1,5 +1,8 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
plugins { plugins {
id("java") id("java")
id("com.github.johnrengelman.shadow") version "7.1.0"
} }
group = "com.alttd" group = "com.alttd"
@ -10,7 +13,7 @@ apply<JavaLibraryPlugin>()
java { java {
toolchain { toolchain {
languageVersion.set(JavaLanguageVersion.of(21)) languageVersion.set(JavaLanguageVersion.of(17))
} }
} }
@ -22,11 +25,25 @@ tasks {
withType<Javadoc> { withType<Javadoc> {
options.encoding = Charsets.UTF_8.name() options.encoding = Charsets.UTF_8.name()
} }
shadowJar {
dependsOn(getByName("relocateJars") as ConfigureShadowRelocation)
archiveFileName.set("${project.name}-${project.version}.jar")
minimize()
configurations = listOf(project.configurations.shadow.get())
}
build {
dependsOn(shadowJar)
}
create<ConfigureShadowRelocation>("relocateJars") {
target = shadowJar.get()
prefix = "${project.name}.lib"
}
} }
dependencies { dependencies {
compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") { compileOnly("com.alttd:Galaxy-API:1.19-R0.1-SNAPSHOT")
isChanging = true
}
compileOnly("com.alttd.datalock:api:1.1.0-SNAPSHOT") compileOnly("com.alttd.datalock:api:1.1.0-SNAPSHOT")
} }

282
gradlew vendored
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/usr/bin/env sh
# #
# Copyright © 2015-2021 the original authors. # Copyright 2015 the original author or authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -17,99 +17,67 @@
# #
############################################################################## ##############################################################################
# ##
# Gradle start up script for POSIX generated by Gradle. ## Gradle start up script for UN*X
# ##
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
############################################################################## ##############################################################################
# Attempt to set APP_HOME # Attempt to set APP_HOME
# Resolve links: $0 may be a link # Resolve links: $0 may be a link
app_path=$0 PRG="$0"
# Need this for relative symlinks.
# Need this for daisy-chained symlinks. while [ -h "$PRG" ] ; do
while ls=`ls -ld "$PRG"`
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path link=`expr "$ls" : '.*-> \(.*\)$'`
[ -h "$app_path" ] if expr "$link" : '/.*' > /dev/null; then
do PRG="$link"
ls=$( ls -ld "$app_path" ) else
link=${ls#*' -> '} PRG=`dirname "$PRG"`"/$link"
case $link in #( fi
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
# This is normally unused APP_NAME="Gradle"
# shellcheck disable=SC2034 APP_BASE_NAME=`basename "$0"`
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD="maximum"
warn () { warn () {
echo "$*" echo "$*"
} >&2 }
die () { die () {
echo echo
echo "$*" echo "$*"
echo echo
exit 1 exit 1
} >&2 }
# OS specific support (must be 'true' or 'false'). # OS specific support (must be 'true' or 'false').
cygwin=false cygwin=false
msys=false msys=false
darwin=false darwin=false
nonstop=false nonstop=false
case "$( uname )" in #( case "`uname`" in
CYGWIN* ) cygwin=true ;; #( CYGWIN* )
Darwin* ) darwin=true ;; #( cygwin=true
MSYS* | MINGW* ) msys=true ;; #( ;;
NONSTOP* ) nonstop=true ;; Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@ -119,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables # IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java JAVACMD="$JAVA_HOME/jre/sh/java"
else else
JAVACMD=$JAVA_HOME/bin/java JAVACMD="$JAVA_HOME/bin/java"
fi fi
if [ ! -x "$JAVACMD" ] ; then if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@ -130,120 +98,88 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi fi
else else
JAVACMD=java JAVACMD="java"
if ! command -v java >/dev/null 2>&1 which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
case $MAX_FD in #( MAX_FD_LIMIT=`ulimit -H -n`
max*) if [ $? -eq 0 ] ; then
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
# shellcheck disable=SC2039,SC3045 MAX_FD="$MAX_FD_LIMIT"
MAX_FD=$( ulimit -H -n ) || fi
warn "Could not query maximum file descriptor limit" ulimit -n $MAX_FD
esac if [ $? -ne 0 ] ; then
case $MAX_FD in #( warn "Could not set maximum file descriptor limit: $MAX_FD"
'' | soft) :;; #( fi
*) else
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
# shellcheck disable=SC2039,SC3045 fi
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi fi
# Collect all arguments for the java command, stacking in reverse order: # For Darwin, add options to specify how the application appears in the dock
# * args from the command line if $darwin; then
# * the main class name GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
# * -classpath fi
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=$( cygpath --unix "$JAVACMD" ) JAVACMD=`cygpath --unix "$JAVACMD"`
# Now convert the arguments - kludge to limit ourselves to /bin/sh # We build the pattern for arguments to be converted via cygpath
for arg do ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
if SEP=""
case $arg in #( for dir in $ROOTDIRSRAW ; do
-*) false ;; # don't mess with options #( ROOTDIRS="$ROOTDIRS$SEP$dir"
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath SEP="|"
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done 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 fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Collect all arguments for the java command, following the shell quoting and substitution rules
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@" exec "$JAVACMD" "$@"

35
gradlew.bat vendored
View File

@ -14,7 +14,7 @@
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@ -25,8 +25,7 @@
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=. if "%DIRNAME%" == "" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@ -41,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if "%ERRORLEVEL%" == "0" goto execute
echo. 1>&2 echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo. 1>&2 echo.
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. 1>&2 echo location of your Java installation.
goto fail goto fail
@ -57,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. 1>&2 echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo. 1>&2 echo.
echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. 1>&2 echo location of your Java installation.
goto fail goto fail
@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd if "%ERRORLEVEL%"=="0" goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL% if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
if %EXIT_CODE% equ 0 set EXIT_CODE=1 exit /b 1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal

3
settings.gradle.kts
View File

@ -2,8 +2,9 @@ rootProject.name = "AQuest"
dependencyResolutionManagement { dependencyResolutionManagement {
repositories { repositories {
// mavenLocal()
mavenCentral() mavenCentral()
maven("https://repo.destro.xyz/snapshots") // Altitude - Cosmos maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy
maven("https://jitpack.io") { // Vault maven("https://jitpack.io") { // Vault
content { includeGroup("com.github.milkbowl") } content { includeGroup("com.github.milkbowl") }
} }

5
src/main/java/com/alttd/altitudequests/AQuest.java
View File

@ -72,7 +72,12 @@ public final class AQuest extends JavaPlugin {
getServer().getPluginManager().registerEvents(new DonNotMessWithNPC(), this); getServer().getPluginManager().registerEvents(new DonNotMessWithNPC(), this);
getServer().getPluginManager().registerEvents(new DataLock(), this); getServer().getPluginManager().registerEvents(new DataLock(), this);
getServer().getPluginManager().registerEvents(new ItemCaught(), this); getServer().getPluginManager().registerEvents(new ItemCaught(), this);
// getServer().getPluginManager().registerEvents(new PotionBrewingStarted(), this);
// getServer().getPluginManager().registerEvents(new PotionBrewingFinished(), this);
getServer().getPluginManager().registerEvents(new FinishedRaid(), this); getServer().getPluginManager().registerEvents(new FinishedRaid(), this);
// getServer().getMessenger().registerOutgoingPluginChannel(this, "aquest:player-data");
// getServer().getMessenger().registerIncomingPluginChannel(this, "aquest:player-data", new PluginMessageListener());
} }
private static int yearDay = Utilities.getYearDay(); private static int yearDay = Utilities.getYearDay();

7
src/main/java/com/alttd/altitudequests/commands/CommandManager.java
View File

@ -11,6 +11,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
public class CommandManager implements CommandExecutor, TabExecutor { public class CommandManager implements CommandExecutor, TabExecutor {
private final List<SubCommand> subCommands; private final List<SubCommand> subCommands;
@ -49,7 +50,7 @@ public class CommandManager implements CommandExecutor, TabExecutor {
subCommand = getSubCommand(args[0]); subCommand = getSubCommand(args[0]);
if (!commandSender.hasPermission(subCommand.getPermission())) { if (!commandSender.hasPermission(subCommand.getPermission())) {
commandSender.sendRichMessage(MessagesConfig.NO_PERMISSION); commandSender.sendMiniMessage(MessagesConfig.NO_PERMISSION, null);
return true; return true;
} }
@ -66,7 +67,7 @@ public class CommandManager implements CommandExecutor, TabExecutor {
.filter(subCommand -> commandSender.hasPermission(subCommand.getPermission())) .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission()))
.map(SubCommand::getName) .map(SubCommand::getName)
.filter(name -> args.length == 0 || name.startsWith(args[0])) .filter(name -> args.length == 0 || name.startsWith(args[0]))
.toList() .collect(Collectors.toList())
); );
} else { } else {
SubCommand subCommand = getSubCommand(args[0]); SubCommand subCommand = getSubCommand(args[0]);
@ -86,4 +87,4 @@ public class CommandManager implements CommandExecutor, TabExecutor {
.findFirst() .findFirst()
.orElse(null); .orElse(null);
} }
} }

8
src/main/java/com/alttd/altitudequests/commands/subcommands/CommandCreateScruff.java
View File

@ -24,13 +24,13 @@ public class CommandCreateScruff extends SubCommand {
@Override @Override
public boolean onCommand(CommandSender commandSender, String[] args) { public boolean onCommand(CommandSender commandSender, String[] args) {
if (args.length != 7) { if (args.length != 7) {
commandSender.sendRichMessage(getHelpMessage()); commandSender.sendMiniMessage(getHelpMessage(), null);
return true; return true;
} }
World world = Bukkit.getServer().getWorld(args[6]); World world = Bukkit.getServer().getWorld(args[6]);
if (world == null) { if (world == null) {
commandSender.sendRichMessage(getHelpMessage()); commandSender.sendMiniMessage(getHelpMessage(), null);
return true; return true;
} }
Location location; Location location;
@ -38,7 +38,7 @@ public class CommandCreateScruff extends SubCommand {
location = new Location(world, Double.parseDouble(args[1]), Double.parseDouble(args[2]), Double.parseDouble(args[3]), location = new Location(world, Double.parseDouble(args[1]), Double.parseDouble(args[2]), Double.parseDouble(args[3]),
Float.parseFloat(args[4]), Float.parseFloat(args[5])); Float.parseFloat(args[4]), Float.parseFloat(args[5]));
} catch (NumberFormatException exception) { } catch (NumberFormatException exception) {
commandSender.sendRichMessage("<red>Invalid arguments.</red>"); commandSender.sendMiniMessage("<red>Invalid arguments.</red>", null);
return true; return true;
} }
Wolf wolf = (Wolf) world.spawnEntity(location, EntityType.WOLF, CreatureSpawnEvent.SpawnReason.CUSTOM); Wolf wolf = (Wolf) world.spawnEntity(location, EntityType.WOLF, CreatureSpawnEvent.SpawnReason.CUSTOM);
@ -55,7 +55,7 @@ public class CommandCreateScruff extends SubCommand {
UUID uuid = wolf.getUniqueId(); UUID uuid = wolf.getUniqueId();
LocalConfig.setActiveNPC(uuid); LocalConfig.setActiveNPC(uuid);
commandSender.sendRichMessage("<green>Spawned Scruff</green>"); commandSender.sendMiniMessage("<green>Spawned Scruff</green>", null);
return true; return true;
} }

12
src/main/java/com/alttd/altitudequests/commands/subcommands/CommandGetReward.java
View File

@ -21,34 +21,34 @@ public class CommandGetReward extends SubCommand {
if (args.length != 1) if (args.length != 1)
return true; return true;
if (!(commandSender instanceof Player player)) { if (!(commandSender instanceof Player player)) {
commandSender.sendRichMessage(MessagesConfig.NO_CONSOLE); commandSender.sendMiniMessage(MessagesConfig.NO_CONSOLE, null);
return true; return true;
} }
Quest dailyQuest = Quest.getDailyQuest(player.getUniqueId()); Quest dailyQuest = Quest.getDailyQuest(player.getUniqueId());
if (dailyQuest == null) { if (dailyQuest == null) {
player.sendRichMessage("<red>You have no active quests?</red>"); player.sendMiniMessage("<red>You have no active quests?</red>", null);
return true; return true;
} }
if (player.getNearbyEntities(5, 5, 5).stream() if (player.getNearbyEntities(5, 5, 5).stream()
.noneMatch(entity -> entity.getUniqueId().equals(LocalConfig.activeNPC))) { .noneMatch(entity -> entity.getUniqueId().equals(LocalConfig.activeNPC))) {
player.sendRichMessage(MessagesConfig.TOO_FAR_FROM_NPC, Placeholder.component("npc", MiniMessage.miniMessage().deserialize(Config.NPC_NAME))); player.sendMiniMessage(MessagesConfig.TOO_FAR_FROM_NPC, Placeholder.component("npc", MiniMessage.miniMessage().deserialize(Config.NPC_NAME)));
return true; return true;
} }
if (!dailyQuest.isDone()) { if (!dailyQuest.isDone()) {
player.sendRichMessage(MessagesConfig.NOT_FINISHED_QUEST); player.sendMiniMessage(MessagesConfig.NOT_FINISHED_QUEST, null);
return true; return true;
} }
if (dailyQuest.isRewardReceived()) { if (dailyQuest.isRewardReceived()) {
player.sendRichMessage(MessagesConfig.REWARD_ALREADY_RECEIVED); player.sendMiniMessage(MessagesConfig.REWARD_ALREADY_RECEIVED, null);
return true; return true;
} }
for (String command : dailyQuest.getRewardCommand()) for (String command : dailyQuest.getRewardCommand())
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), command.replaceAll("<player>", commandSender.getName())); Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), command.replaceAll("<player>", commandSender.getName()));
dailyQuest.setRewardReceived(true); dailyQuest.setRewardReceived(true);
player.sendRichMessage(MessagesConfig.REWARD_SENT); player.sendMiniMessage(MessagesConfig.REWARD_SENT, null);
return true; return true;
} }

4
src/main/java/com/alttd/altitudequests/commands/subcommands/CommandHelp.java
View File

@ -20,12 +20,12 @@ public class CommandHelp extends SubCommand {
@Override @Override
public boolean onCommand(CommandSender commandSender, String[] args) { public boolean onCommand(CommandSender commandSender, String[] args) {
commandSender.sendRichMessage(MessagesConfig.HELP_MESSAGE_WRAPPER.replaceAll("<commands>", commandManager commandSender.sendMiniMessage(MessagesConfig.HELP_MESSAGE_WRAPPER.replaceAll("<commands>", commandManager
.getSubCommands().stream() .getSubCommands().stream()
.filter(SubCommand::shouldTabComplete) .filter(SubCommand::shouldTabComplete)
.filter(subCommand -> commandSender.hasPermission(subCommand.getPermission())) .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission()))
.map(SubCommand::getHelpMessage) .map(SubCommand::getHelpMessage)
.collect(Collectors.joining("\n")))); .collect(Collectors.joining("\n"))), null);
return true; return true;
} }

10
src/main/java/com/alttd/altitudequests/commands/subcommands/CommandProgress.java
View File

@ -21,20 +21,20 @@ public class CommandProgress extends SubCommand {
@Override @Override
public boolean onCommand(CommandSender commandSender, String[] args) { public boolean onCommand(CommandSender commandSender, String[] args) {
if (!(commandSender instanceof Player player)) { if (!(commandSender instanceof Player player)) {
commandSender.sendRichMessage(MessagesConfig.NO_CONSOLE); commandSender.sendMiniMessage(MessagesConfig.NO_CONSOLE, null);
return true; return true;
} }
if (!player.hasPlayedBefore()) { if (player == null || !player.hasPlayedBefore()) {
commandSender.sendRichMessage(getHelpMessage()); commandSender.sendMiniMessage(getHelpMessage(), null);
return true; return true;
} }
Quest dailyQuest = Quest.getDailyQuest(player.getUniqueId()); Quest dailyQuest = Quest.getDailyQuest(player.getUniqueId());
if (dailyQuest == null) { if (dailyQuest == null) {
player.sendRichMessage("<red>You have no active quests.</red>"); player.sendMiniMessage("<red>You have no active quests.</red>", null);
return true; return true;
} }
if (dailyQuest.isDone()) { if (dailyQuest.isDone()) {
player.sendRichMessage("<green>You already completed the daily quest.</green>"); player.sendMiniMessage("<green>You already completed the daily quest.</green>", null);
return true; return true;
} }
final UUID uniqueId = player.getUniqueId(); final UUID uniqueId = player.getUniqueId();

19
src/main/java/com/alttd/altitudequests/commands/subcommands/CommandReRoll.java
View File

@ -14,28 +14,17 @@ public class CommandReRoll extends SubCommand {
@Override @Override
public boolean onCommand(CommandSender commandSender, String[] args) { public boolean onCommand(CommandSender commandSender, String[] args) {
if (!(commandSender instanceof Player player)) { if (!(commandSender instanceof Player player)) {
commandSender.sendRichMessage(MessagesConfig.NO_CONSOLE); commandSender.sendMiniMessage(MessagesConfig.NO_CONSOLE, null);
return true; return true;
} }
if (player.hasPermission("aquest.reroll.on-cooldown")) { if (player.hasPermission("aquest.reroll.on-cooldown")) {
commandSender.sendRichMessage(MessagesConfig.NO_RE_ROLL_YET); commandSender.sendMiniMessage(MessagesConfig.NO_RE_ROLL_YET, null);
return true; return true;
} }
Quest dailyQuest = Quest.getDailyQuest(player.getUniqueId());
if (dailyQuest == null) {
commandSender.sendRichMessage(MessagesConfig.WAIT_FOR_QUEST);
return true;
}
if (dailyQuest.isDone()) {
commandSender.sendRichMessage(MessagesConfig.QUEST_ALREADY_FINISHED);
return true;
}
Quest.createDailyQuest(player); Quest.createDailyQuest(player);
commandSender.sendRichMessage(MessagesConfig.QUEST_RE_ROLLED); commandSender.sendMiniMessage(MessagesConfig.QUEST_RE_ROLLED, null);
ConsoleCommandSender consoleSender = Bukkit.getConsoleSender(); ConsoleCommandSender consoleSender = Bukkit.getConsoleSender();
Bukkit.dispatchCommand(consoleSender, String.format("lp user %s permission settemp aquest.reroll.on-cooldown true 7d", player.getName())); Bukkit.dispatchCommand(consoleSender, "lp user %s permission settemp aquest.reroll.on-cooldown true 7d");
return true; return true;
} }

2
src/main/java/com/alttd/altitudequests/commands/subcommands/CommandReload.java
View File

@ -19,7 +19,7 @@ public class CommandReload extends SubCommand {
@Override @Override
public boolean onCommand(CommandSender commandSender, String[] args) { public boolean onCommand(CommandSender commandSender, String[] args) {
plugin.reloadConfigs(); plugin.reloadConfigs();
commandSender.sendRichMessage("<green>Reloaded AltitudeQuests config.</green>"); commandSender.sendMiniMessage("<green>Reloaded AltitudeQuests config.</green>", null);
return true; return true;
} }

10
src/main/java/com/alttd/altitudequests/commands/subcommands/CommandSetQuest.java
View File

@ -21,22 +21,22 @@ public class CommandSetQuest extends SubCommand {
@Override @Override
public boolean onCommand(CommandSender commandSender, String[] args) { public boolean onCommand(CommandSender commandSender, String[] args) {
if (args.length != 4) { if (args.length != 4) {
commandSender.sendRichMessage(getHelpMessage()); commandSender.sendMiniMessage(getHelpMessage(), null);
return true; return true;
} }
Player player = Bukkit.getServer().getPlayer(args[1]); Player player = Bukkit.getServer().getPlayer(args[1]);
if (player == null || !player.hasPlayedBefore()) { if (player == null || !player.hasPlayedBefore()) {
commandSender.sendRichMessage(getHelpMessage()); commandSender.sendMiniMessage(getHelpMessage(), null);
return true; return true;
} }
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (!Quest.loadDailyQuest(args[2], args[3], 0, 0, player.getUniqueId(), -1, false)) if (!Quest.loadDailyQuest(args[2], args[3], 0, 0, player.getUniqueId(), -1, false))
commandSender.sendRichMessage("<red>Unable to create quest <quest> of variant <variant>.</red>", commandSender.sendMiniMessage("<red>Unable to create quest <quest> of variant <variant>.</red>",
TagResolver.resolver(Placeholder.parsed("quest", args[2]), TagResolver.resolver(Placeholder.parsed("quest", args[2]),
Placeholder.parsed("variant", args[3]))); Placeholder.parsed("variant", args[3])));
commandSender.sendRichMessage("<green>Created quest <quest> of variant <variant>.</green>", commandSender.sendMiniMessage("<green>Created quest <quest> of variant <variant>.</green>",
TagResolver.resolver(Placeholder.parsed("quest", args[2]), TagResolver.resolver(Placeholder.parsed("quest", args[2]),
Placeholder.parsed("variant", args[3]))); Placeholder.parsed("variant", args[3])));
} }
@ -55,7 +55,7 @@ public class CommandSetQuest extends SubCommand {
switch (args.length) { switch (args.length) {
case 2 -> res.addAll(Bukkit.getServer().getOnlinePlayers().stream() case 2 -> res.addAll(Bukkit.getServer().getOnlinePlayers().stream()
.map(Player::getName) .map(Player::getName)
.toList()); .collect(Collectors.toList()));
case 3 -> res.addAll(Quest.getTypes()); case 3 -> res.addAll(Quest.getTypes());
case 4 -> { case 4 -> {
switch (args[2].toLowerCase()) { switch (args[2].toLowerCase()) {

8
src/main/java/com/alttd/altitudequests/commands/subcommands/CommandTurnIn.java
View File

@ -20,22 +20,22 @@ public class CommandTurnIn extends SubCommand {
if (args.length != 1) if (args.length != 1)
return true; return true;
if (!(commandSender instanceof Player player)) { if (!(commandSender instanceof Player player)) {
commandSender.sendRichMessage(MessagesConfig.NO_CONSOLE); commandSender.sendMiniMessage(MessagesConfig.NO_CONSOLE, null);
return true; return true;
} }
Quest dailyQuest = Quest.getDailyQuest(player.getUniqueId()); Quest dailyQuest = Quest.getDailyQuest(player.getUniqueId());
if (dailyQuest == null || dailyQuest.isDone()) { if (dailyQuest == null || dailyQuest.isDone()) {
player.sendRichMessage(MessagesConfig.DAILY_ALREADY_DONE); player.sendMiniMessage(MessagesConfig.DAILY_ALREADY_DONE, null);
return true; return true;
} }
if (player.getNearbyEntities(5, 5, 5).stream() if (player.getNearbyEntities(5, 5, 5).stream()
.noneMatch(entity -> entity.getUniqueId().equals(LocalConfig.activeNPC))) { .noneMatch(entity -> entity.getUniqueId().equals(LocalConfig.activeNPC))) {
player.sendRichMessage(MessagesConfig.TOO_FAR_FROM_NPC, Placeholder.component("npc", MiniMessage.miniMessage().deserialize(Config.NPC_NAME))); player.sendMiniMessage(MessagesConfig.TOO_FAR_FROM_NPC, Placeholder.component("npc", MiniMessage.miniMessage().deserialize(Config.NPC_NAME)));
return true; return true;
} }
dailyQuest.turnIn(player); dailyQuest.turnIn(player);
if (dailyQuest.isDone()) if (dailyQuest.isDone())
player.sendRichMessage(MessagesConfig.FINISHED_QUEST, Placeholder.component("player", player.name())); player.sendMiniMessage(MessagesConfig.FINISHED_QUEST, Placeholder.component("player", player.name()));
BookOpener.openBook(player); BookOpener.openBook(player);
return true; return true;
} }

5
src/main/java/com/alttd/altitudequests/config/AbstractConfig.java
View File

@ -54,7 +54,8 @@ abstract class AbstractConfig {
} catch (InvocationTargetException ex) { } catch (InvocationTargetException ex) {
throw new RuntimeException(ex.getCause()); throw new RuntimeException(ex.getCause());
} catch (Exception ex) { } catch (Exception ex) {
Logger.throwing(AbstractConfig.class.getName(), "readConfig", ex); Logger.severe("Error invoking %.", method.toString());
ex.printStackTrace();
} }
} }
} }
@ -68,7 +69,7 @@ abstract class AbstractConfig {
yaml.save(file); yaml.save(file);
} catch (IOException ex) { } catch (IOException ex) {
Logger.severe("Could not save %.", file.toString()); Logger.severe("Could not save %.", file.toString());
Logger.throwing(AbstractConfig.class.getName(), "save", ex); ex.printStackTrace();
} }
} }

2
src/main/java/com/alttd/altitudequests/config/Config.java
View File

@ -8,7 +8,7 @@ public final class Config extends AbstractConfig {
static Config config; static Config config;
static int version; static int version;
public Config() { public Config() {
super(new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "AltitudeQuests"), "config.yml"); super(new File(System.getProperty("user.home") + File.separator + "share" + File.separator + "configs" + File.separator + "AltitudeQuests"), "config.yml");
} }
public static void reload() { public static void reload() {
config = new Config(); config = new Config();

2
src/main/java/com/alttd/altitudequests/config/DatabaseConfig.java
View File

@ -6,7 +6,7 @@ public class DatabaseConfig extends AbstractConfig {
static DatabaseConfig config; static DatabaseConfig config;
public DatabaseConfig() { public DatabaseConfig() {
super(new File(File.separator + "mnt" + File.separator + "configs" super(new File(System.getProperty("user.home") + File.separator + "share" + File.separator + "configs"
+ File.separator + "AltitudeQuests"), "database.yml"); + File.separator + "AltitudeQuests"), "database.yml");
} }

8
src/main/java/com/alttd/altitudequests/config/MessagesConfig.java
View File

@ -7,7 +7,7 @@ public class MessagesConfig extends AbstractConfig{
static MessagesConfig config; static MessagesConfig config;
public MessagesConfig() { public MessagesConfig() {
super(new File(File.separator + "mnt" + File.separator + "configs" super(new File(System.getProperty("user.home") + File.separator + "share" + File.separator + "configs"
+ File.separator + "AltitudeQuests"), "messages.yml"); + File.separator + "AltitudeQuests"), "messages.yml");
} }
@ -29,7 +29,6 @@ public class MessagesConfig extends AbstractConfig{
RELOAD_HELP_MESSAGE = config.getString("help.reload", RELOAD_HELP_MESSAGE); RELOAD_HELP_MESSAGE = config.getString("help.reload", RELOAD_HELP_MESSAGE);
SET_QUEST_HELP = config.getString("help.set-quest", SET_QUEST_HELP); SET_QUEST_HELP = config.getString("help.set-quest", SET_QUEST_HELP);
CREATE_SCRUFF_MESSAGE = config.getString("help.help-wrapper", CREATE_SCRUFF_MESSAGE); CREATE_SCRUFF_MESSAGE = config.getString("help.help-wrapper", CREATE_SCRUFF_MESSAGE);
RE_ROLL_HELP = config.getString("help.re-roll-help", RE_ROLL_HELP);
} }
@ -42,9 +41,6 @@ public class MessagesConfig extends AbstractConfig{
public static String NOT_FINISHED_QUEST = "<red>You have not finished this quest yet.</red>"; public static String NOT_FINISHED_QUEST = "<red>You have not finished this quest yet.</red>";
public static String QUEST_RE_ROLLED = "<white>[<gold>Mascot</gold>] <light_purple>Scruff</light_purple><gray>:</gray> <green>I see, that last quest was too much for you, that's okay I have given you another one!</green></white>"; public static String QUEST_RE_ROLLED = "<white>[<gold>Mascot</gold>] <light_purple>Scruff</light_purple><gray>:</gray> <green>I see, that last quest was too much for you, that's okay I have given you another one!</green></white>";
public static String NO_RE_ROLL_YET = "<white>[<gold>Mascot</gold>] <light_purple>Scruff</light_purple><gray>:</gray> <green>Sorry, you already rerolled your quest within the last 7 days. I can't give you a different quest quite yet.</green></white>"; public static String NO_RE_ROLL_YET = "<white>[<gold>Mascot</gold>] <light_purple>Scruff</light_purple><gray>:</gray> <green>Sorry, you already rerolled your quest within the last 7 days. I can't give you a different quest quite yet.</green></white>";
public static String WAIT_FOR_QUEST = "<white>[<gold>Mascot</gold>] <light_purple>Scruff</light_purple><gray>:</gray> <green>You don't seem to have any quest, please wait for it to load!</green></white>";
public static String QUEST_ALREADY_FINISHED = "<white>[<gold>Mascot</gold>] <light_purple>Scruff</light_purple><gray>:</gray> <green>You already finished your quest today. You will get a new one tomorrow.</green></white>";
private static void loadMessages() { private static void loadMessages() {
TOO_FAR_FROM_NPC = config.getString("messages.too-far-from-npc", TOO_FAR_FROM_NPC); TOO_FAR_FROM_NPC = config.getString("messages.too-far-from-npc", TOO_FAR_FROM_NPC);
DAILY_ALREADY_DONE = config.getString("messages.daily-already-done", DAILY_ALREADY_DONE); DAILY_ALREADY_DONE = config.getString("messages.daily-already-done", DAILY_ALREADY_DONE);
@ -55,8 +51,6 @@ public class MessagesConfig extends AbstractConfig{
NOT_FINISHED_QUEST = config.getString("messages.not-finished-quest", NOT_FINISHED_QUEST); NOT_FINISHED_QUEST = config.getString("messages.not-finished-quest", NOT_FINISHED_QUEST);
QUEST_RE_ROLLED = config.getString("messages.re-rolled-quest", QUEST_RE_ROLLED); QUEST_RE_ROLLED = config.getString("messages.re-rolled-quest", QUEST_RE_ROLLED);
NO_RE_ROLL_YET = config.getString("messages.no-re-rolled-yet", NO_RE_ROLL_YET); NO_RE_ROLL_YET = config.getString("messages.no-re-rolled-yet", NO_RE_ROLL_YET);
WAIT_FOR_QUEST = config.getString("messages.wait-for-yet", WAIT_FOR_QUEST);
QUEST_ALREADY_FINISHED = config.getString("messages.quest-already-finished", QUEST_ALREADY_FINISHED);
} }
public static String NO_PERMISSION = "<red>You do not have permission to do that.</red>"; public static String NO_PERMISSION = "<red>You do not have permission to do that.</red>";

24
src/main/java/com/alttd/altitudequests/config/QuestsConfig.java
View File

@ -1,4 +1,4 @@
package com.alttd.altitudequests.config; package com.alttd.altitudequests.config;;
import com.alttd.altitudequests.objects.variants.BreedMobsQuestObject; import com.alttd.altitudequests.objects.variants.BreedMobsQuestObject;
import com.alttd.altitudequests.objects.variants.CollectDropsQuestObject; import com.alttd.altitudequests.objects.variants.CollectDropsQuestObject;
@ -19,7 +19,7 @@ public class QuestsConfig extends AbstractConfig {
static QuestsConfig config; static QuestsConfig config;
public QuestsConfig() { public QuestsConfig() {
super(new File(File.separator + "mnt" + File.separator + "configs" super(new File(System.getProperty("user.home") + File.separator + "share" + File.separator + "configs"
+ File.separator + "AltitudeQuests"), "quests.yml"); + File.separator + "AltitudeQuests"), "quests.yml");
} }
@ -28,7 +28,7 @@ public class QuestsConfig extends AbstractConfig {
config.readConfig(QuestsConfig.class, null); config.readConfig(QuestsConfig.class, null);
} }
public static final List<MineQuestObject> MINE_QUESTS = new ArrayList<>(); public static List<MineQuestObject> MINE_QUESTS = new ArrayList<>();
public static String MINE_QUEST_NAME = "<green>Mining</green>"; public static String MINE_QUEST_NAME = "<green>Mining</green>";
public static String MINE_STEP_1 = "Mined"; public static String MINE_STEP_1 = "Mined";
public static String MINE_STEP_2 = "Turned in"; public static String MINE_STEP_2 = "Turned in";
@ -67,7 +67,7 @@ public class QuestsConfig extends AbstractConfig {
Logger.info("Loaded Mine quest " + key); Logger.info("Loaded Mine quest " + key);
} }
catch (Exception e) { catch (Exception e) {
Logger.throwing(QuestsConfig.class.getName(), "loadMineQuest", e); e.printStackTrace();
} }
} }
MINE_QUEST_NAME = config.getString("mining.name", MINE_QUEST_NAME); MINE_QUEST_NAME = config.getString("mining.name", MINE_QUEST_NAME);
@ -77,7 +77,7 @@ public class QuestsConfig extends AbstractConfig {
MINE_COMMANDS = config.getStringList("mining.commands", MINE_COMMANDS); MINE_COMMANDS = config.getStringList("mining.commands", MINE_COMMANDS);
} }
public static final List<KillMobsQuestObject> KILL_MOB_QUEST = new ArrayList<>(); public static List<KillMobsQuestObject> KILL_MOB_QUEST = new ArrayList<>();
public static String KILL_MOB_QUEST_NAME = "<green>Kill mobs</green>"; public static String KILL_MOB_QUEST_NAME = "<green>Kill mobs</green>";
public static String KILL_MOB_STEP_1 = "Killed"; public static String KILL_MOB_STEP_1 = "Killed";
public static String KILL_MOB_STEP_2 = "Confirmed"; public static String KILL_MOB_STEP_2 = "Confirmed";
@ -106,7 +106,7 @@ public class QuestsConfig extends AbstractConfig {
Logger.info("Loaded Kill mob quest " + key); Logger.info("Loaded Kill mob quest " + key);
} }
catch (Exception e) { catch (Exception e) {
Logger.throwing(QuestsConfig.class.getName(), "loadKillMobQuest", e); e.printStackTrace();
} }
} }
KILL_MOB_QUEST_NAME = config.getString("kill_mobs.name", KILL_MOB_QUEST_NAME); KILL_MOB_QUEST_NAME = config.getString("kill_mobs.name", KILL_MOB_QUEST_NAME);
@ -116,7 +116,7 @@ public class QuestsConfig extends AbstractConfig {
KILL_MOB_COMMANDS = config.getStringList("kill_mobs.commands", KILL_MOB_COMMANDS); KILL_MOB_COMMANDS = config.getStringList("kill_mobs.commands", KILL_MOB_COMMANDS);
} }
public static final List<CollectDropsQuestObject> COLLECT_DROPS_QUEST = new ArrayList<>(); public static List<CollectDropsQuestObject> COLLECT_DROPS_QUEST = new ArrayList<>();
public static String COLLECT_DROPS_QUEST_NAME = "<green>Collect drops quest</green>"; public static String COLLECT_DROPS_QUEST_NAME = "<green>Collect drops quest</green>";
public static String COLLECT_DROPS_STEP_1 = "Obtained"; public static String COLLECT_DROPS_STEP_1 = "Obtained";
public static String COLLECT_DROPS_STEP_2 = "Turned in"; public static String COLLECT_DROPS_STEP_2 = "Turned in";
@ -145,7 +145,7 @@ public class QuestsConfig extends AbstractConfig {
Logger.info("Loaded Collect drops quest " + key); Logger.info("Loaded Collect drops quest " + key);
} }
catch (Exception e) { catch (Exception e) {
Logger.throwing(QuestsConfig.class.getName(), "loadCollectQuest", e); e.printStackTrace();
} }
} }
COLLECT_DROPS_QUEST_NAME = config.getString("collect_drops.name", COLLECT_DROPS_QUEST_NAME); COLLECT_DROPS_QUEST_NAME = config.getString("collect_drops.name", COLLECT_DROPS_QUEST_NAME);
@ -155,7 +155,7 @@ public class QuestsConfig extends AbstractConfig {
COLLECT_DROPS_COMMANDS = config.getStringList("collect_drops.commands", COLLECT_DROPS_COMMANDS); COLLECT_DROPS_COMMANDS = config.getStringList("collect_drops.commands", COLLECT_DROPS_COMMANDS);
} }
public static final List<OtherQuestObject> OTHER_QUEST = new ArrayList<>(); public static List<OtherQuestObject> OTHER_QUEST = new ArrayList<>();
public static String OTHER_QUEST_NAME = "<green>Other quest</green>"; public static String OTHER_QUEST_NAME = "<green>Other quest</green>";
public static String OTHER_TURN_IN = "<gold>Click here to turn in your <item></gold>"; public static String OTHER_TURN_IN = "<gold>Click here to turn in your <item></gold>";
public static List<String> OTHER_COMMANDS = List.of("broadcast <player> Finished their daily quest!"); public static List<String> OTHER_COMMANDS = List.of("broadcast <player> Finished their daily quest!");
@ -195,7 +195,7 @@ public class QuestsConfig extends AbstractConfig {
Logger.info("Loaded Collect drops quest " + key); Logger.info("Loaded Collect drops quest " + key);
} }
catch (Exception e) { catch (Exception e) {
Logger.throwing(QuestsConfig.class.getName(), "loadOtherQuests", e); e.printStackTrace();
} }
} }
OTHER_QUEST_NAME = config.getString("other.name", OTHER_QUEST_NAME); OTHER_QUEST_NAME = config.getString("other.name", OTHER_QUEST_NAME);
@ -203,7 +203,7 @@ public class QuestsConfig extends AbstractConfig {
OTHER_COMMANDS = config.getStringList("other.commands", OTHER_COMMANDS); OTHER_COMMANDS = config.getStringList("other.commands", OTHER_COMMANDS);
} }
public static final List<BreedMobsQuestObject> BREED_MOB_QUEST = new ArrayList<>(); public static List<BreedMobsQuestObject> BREED_MOB_QUEST = new ArrayList<>();
public static String BREED_MOB_QUEST_NAME = "<green>Breed mobs quest</green>"; public static String BREED_MOB_QUEST_NAME = "<green>Breed mobs quest</green>";
public static String BREED_STEP_1 = "Bred"; public static String BREED_STEP_1 = "Bred";
public static String BREED_STEP_2 = "Confirmed"; public static String BREED_STEP_2 = "Confirmed";
@ -232,7 +232,7 @@ public class QuestsConfig extends AbstractConfig {
Logger.info("Loaded Breed mob quest " + key); Logger.info("Loaded Breed mob quest " + key);
} }
catch (Exception e) { catch (Exception e) {
Logger.throwing(QuestsConfig.class.getName(), "loadBreedMobQuest", e); e.printStackTrace();
} }
} }
BREED_MOB_QUEST_NAME = config.getString("breed_mobs.name", BREED_MOB_QUEST_NAME); BREED_MOB_QUEST_NAME = config.getString("breed_mobs.name", BREED_MOB_QUEST_NAME);

61
src/main/java/com/alttd/altitudequests/database/Database.java
View File

@ -10,7 +10,6 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager; import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
public class Database { public class Database {
@ -33,7 +32,7 @@ public class Database {
try { try {
openConnection(); openConnection();
} catch (SQLException e) { } catch (SQLException e) {
Logger.throwing(Database.class.getName(), "init", e); e.printStackTrace();
} }
//Run all create table functions //Run all create table functions
@ -46,7 +45,8 @@ public class Database {
} catch (InvocationTargetException ex) { } catch (InvocationTargetException ex) {
throw new RuntimeException(ex.getCause()); throw new RuntimeException(ex.getCause());
} catch (Exception ex) { } catch (Exception ex) {
Logger.throwing(Database.class.getName(), "init", ex); Logger.severe("Error invoking %.", method.toString());
ex.printStackTrace();
} }
} }
} }
@ -69,7 +69,7 @@ public class Database {
try { try {
Class.forName("com.mysql.cj.jdbc.Driver"); Class.forName("com.mysql.cj.jdbc.Driver");
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
Logger.throwing(Database.class.getName(), "openConnection", e); e.printStackTrace();
} }
connection = DriverManager.getConnection( connection = DriverManager.getConnection(
@ -83,27 +83,27 @@ public class Database {
try { try {
openConnection(); openConnection();
} catch (SQLException e) { } catch (SQLException e) {
Logger.throwing(Database.class.getName(), "getConnection", e); e.printStackTrace();
} }
return connection; return connection;
} }
private static void createUserPointsTable() { private static void createUserPointsTable() {
String sql = "CREATE TABLE IF NOT EXISTS generic_quest_progress(" + try {
"year_day INT NOT NULL, " + String sql = "CREATE TABLE IF NOT EXISTS generic_quest_progress(" +
"uuid VARCHAR(36) NOT NULL, " + "year_day INT NOT NULL, " +
"quest VARCHAR(36) NOT NULL, " + "uuid VARCHAR(36) NOT NULL, " +
"quest_variant VARCHAR(36) NOT NULL, " + "quest VARCHAR(36) NOT NULL, " +
"step_1_progress INT NOT NULL, " + "quest_variant VARCHAR(36) NOT NULL, " +
"step_2_progress INT NOT NULL, " + "step_1_progress INT NOT NULL, " +
"amount INT NOT NULL, " + "step_2_progress INT NOT NULL, " +
"reward_received BIT(1) NOT NULL, " + "amount INT NOT NULL, " +
"PRIMARY KEY (uuid)" + "reward_received BIT(1) NOT NULL, " +
")"; "PRIMARY KEY (uuid)" +
try (PreparedStatement preparedStatement = getDatabase().getConnection().prepareStatement(sql)) { ")";
preparedStatement.executeUpdate(); getDatabase().getConnection().prepareStatement(sql).executeUpdate();
} catch (SQLException e) { } catch (SQLException e) {
Logger.throwing(Database.class.getName(), "createUserPointsTable", e); e.printStackTrace();
Logger.severe("Error while trying to create user point table"); Logger.severe("Error while trying to create user point table");
Logger.severe("Shutting down AltitudeQuests"); Logger.severe("Shutting down AltitudeQuests");
Bukkit.getPluginManager().disablePlugin(AQuest.getInstance()); Bukkit.getPluginManager().disablePlugin(AQuest.getInstance());
@ -111,18 +111,19 @@ public class Database {
} }
private static void createQuestLogTable() { private static void createQuestLogTable() {
String sql = "CREATE TABLE IF NOT EXISTS quest_log(" + try {
"uuid VARCHAR(36) NOT NULL, " + String sql = "CREATE TABLE IF NOT EXISTS quest_log(" +
"year INT NOT NULL, " + "uuid VARCHAR(36) NOT NULL, " +
"month INT NOT NULL, " + "year INT NOT NULL, " +
"day INT NOT NULL, " + "month INT NOT NULL, " +
"PRIMARY KEY (uuid, year, month, day)" + "day INT NOT NULL, " +
")"; "PRIMARY KEY (uuid, year, month, day)" +
try (PreparedStatement preparedStatement = getDatabase().getConnection().prepareStatement(sql)) { ")";
preparedStatement.executeUpdate(); getDatabase().getConnection().prepareStatement(sql).executeUpdate();
} catch (SQLException e) { } catch (SQLException e) {
Logger.throwing(Database.class.getName(), "createQuestLogTable", e); e.printStackTrace();
Logger.severe("Error while trying to create quest log table\nShutting down AltitudeQuests"); Logger.severe("Error while trying to create quest log table");
Logger.severe("Shutting down AltitudeQuests");
Bukkit.getPluginManager().disablePlugin(AQuest.getInstance()); Bukkit.getPluginManager().disablePlugin(AQuest.getInstance());
} }
} }

4
src/main/java/com/alttd/altitudequests/events/DataLock.java
View File

@ -30,7 +30,9 @@ public class DataLock implements Listener {
return; return;
new LoadUser(uuid).runTaskAsynchronously(AQuest.getInstance()); new LoadUser(uuid).runTaskAsynchronously(AQuest.getInstance());
} }
case QUEUE_LOCK_FAILED -> Logger.warning("Unable to queue lock"); case QUEUE_LOCK_FAILED -> {
Logger.warning("Unable to queue lock");
}
case TRY_UNLOCK_RESULT -> { case TRY_UNLOCK_RESULT -> {
if (event.getResult()) if (event.getResult())
return; return;

6
src/main/java/com/alttd/altitudequests/events/EntityBucketed.java
View File

@ -1,6 +1,7 @@
package com.alttd.altitudequests.events; package com.alttd.altitudequests.events;
import com.alttd.altitudequests.objects.Quest; import com.alttd.altitudequests.objects.Quest;
import com.alttd.altitudequests.objects.quests.CollectDropsQuest;
import com.alttd.altitudequests.objects.quests.OtherQuest; import com.alttd.altitudequests.objects.quests.OtherQuest;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -8,6 +9,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerBucketEntityEvent; import org.bukkit.event.player.PlayerBucketEntityEvent;
import org.bukkit.inventory.ItemStack;
public class EntityBucketed implements Listener { public class EntityBucketed implements Listener {
@ -18,8 +20,10 @@ public class EntityBucketed implements Listener {
if (dailyQuest == null || dailyQuest.isDone()) if (dailyQuest == null || dailyQuest.isDone())
return; return;
if (dailyQuest instanceof OtherQuest otherQuest) { if (dailyQuest instanceof OtherQuest otherQuest) {
ItemStack itemStack = event.getEntityBucket();
Entity entity = event.getEntity(); Entity entity = event.getEntity();
otherQuest.bucket(entity); if (itemStack != null && entity != null)
otherQuest.bucket(itemStack, entity);
} }
} }

5
src/main/java/com/alttd/altitudequests/events/ItemCaught.java
View File

@ -7,6 +7,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerFishEvent; import org.bukkit.event.player.PlayerFishEvent;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -14,8 +15,8 @@ public class ItemCaught implements Listener {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onItemCaught(PlayerFishEvent event) { public void onItemCaught(PlayerFishEvent event) {
if (event.getCaught() == null) { if (event.getCaught() == null || event.getCaught().getType() != EntityType.DROPPED_ITEM) {
return; return; //Only if an item was caught do further processing. Otherwise error might come up later
} }
Player player = event.getPlayer(); Player player = event.getPlayer();
Quest dailyQuest = Quest.getDailyQuest(player.getUniqueId()); Quest dailyQuest = Quest.getDailyQuest(player.getUniqueId());

33
src/main/java/com/alttd/altitudequests/events/LogoutEvent.java
View File

@ -5,14 +5,15 @@ import com.alttd.altitudequests.config.Config;
import com.alttd.altitudequests.objects.Quest; import com.alttd.altitudequests.objects.Quest;
import com.alttd.altitudequests.util.Logger; import com.alttd.altitudequests.util.Logger;
import com.alttd.datalock.DataLockAPI; import com.alttd.datalock.DataLockAPI;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.NamespacedKey;
import org.bukkit.boss.KeyedBossBar;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.scheduler.BukkitRunnable;
import javax.annotation.Nullable; import java.util.ArrayList;
import java.util.UUID; import java.util.UUID;
public class LogoutEvent implements Listener { public class LogoutEvent implements Listener {
@ -20,22 +21,14 @@ public class LogoutEvent implements Listener {
@EventHandler @EventHandler
public void onPlayerQuit(PlayerQuitEvent event) { public void onPlayerQuit(PlayerQuitEvent event) {
UUID uuid = event.getPlayer().getUniqueId(); UUID uuid = event.getPlayer().getUniqueId();
if (Config.DEBUG) new BukkitRunnable() {
Logger.info("Syncing %", event.getPlayer().getName()); @Override
removeBossBar(NamespacedKey.fromString(uuid + "-part-" + "1", AQuest.getInstance())); public void run() {
removeBossBar(NamespacedKey.fromString(uuid + "-part-" + "2", AQuest.getInstance())); if (Config.DEBUG)
Logger.info("Syncing %", event.getPlayer().getName());
Quest.unloadUser(uuid).thenAccept(result -> DataLockAPI.get().tryUnlock("aquest:player-data", uuid.toString())); Quest.unloadUser(uuid);
} DataLockAPI.get().tryUnlock("aquest:player-data", uuid.toString());
}
private void removeBossBar(@Nullable NamespacedKey namespacedKey) { }.runTaskAsynchronously(AQuest.getInstance());
if (namespacedKey == null) {
return;
}
KeyedBossBar bossBar = Bukkit.getBossBar(namespacedKey);
if (bossBar == null) {
return;
}
Bukkit.removeBossBar(namespacedKey);
} }
} }

98
src/main/java/com/alttd/altitudequests/events/PluginMessageListener.java Normal file
View File

@ -0,0 +1,98 @@
//package com.alttd.altitudequests.events;
//
//import com.alttd.altitudequests.AQuest;
//import com.alttd.altitudequests.config.Config;
//import com.alttd.altitudequests.database.Database;
//import com.alttd.altitudequests.objects.Quest;
//import com.alttd.altitudequests.util.Logger;
//import com.alttd.altitudequests.util.Utilities;
//import com.google.common.io.ByteArrayDataInput;
//import com.google.common.io.ByteStreams;
//import org.bukkit.Bukkit;
//import org.bukkit.entity.Player;
//import org.bukkit.scheduler.BukkitRunnable;
//import org.jetbrains.annotations.NotNull;
//
//import java.sql.PreparedStatement;
//import java.sql.ResultSet;
//import java.sql.SQLException;
//import java.util.UUID;
//
//public class PluginMessageListener implements org.bukkit.plugin.messaging.PluginMessageListener {
//
// @Override
// public void onPluginMessageReceived(@NotNull String channel, @NotNull Player player, @NotNull byte[] bytes) {
// if (!channel.equals("aquest:player-data")) {
// Logger.warning("Received plugin message on invalid channel");
// return;
// }
// ByteArrayDataInput in = ByteStreams.newDataInput(bytes);
// switch (in.readUTF()) {
// case "try-lock-result" -> {
// if (!in.readBoolean()) {
// Logger.warning("Unable to lock row");
// return;
// }
// UUID uuid = UUID.fromString(in.readUTF());
// if (Config.DEBUG)
// Logger.info("Received positive log result for %, loading user", uuid.toString());
// loadUser(uuid);
// }
// case "queue-lock-failed" -> Logger.warning("Encountered uuid that was locked and had a lock queued: %, lock is from %", in.readUTF(), in.readUTF());
// case "try-unlock-result" -> {
// if (in.readBoolean()) {
// // ignore?
// return;
// }
// Logger.severe("Unable to unlock %.", in.readUTF());
// }
// case "locked-queue-lock" -> {
// if (!in.readBoolean()) {
// Logger.warning("Got false back from locked queue lock");
// return;
// }
// UUID uuid = UUID.fromString(in.readUTF());
// if (Config.DEBUG)
// Logger.info("Received positive log result for %, loading user", uuid.toString());
// loadUser(uuid);
// }
// case "check-lock-result" -> {
//
// }
// }
// }
//
// private void loadUser(UUID uuid) {
// new BukkitRunnable() {
// @Override
// public void run() {
// String sql = "SELECT * FROM generic_quest_progress WHERE uuid = ?";
// try {
// PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql);
// statement.setString(1, uuid.toString());
// ResultSet resultSet = statement.executeQuery();
// if (resultSet.next() && resultSet.getInt("year_day") == Utilities.getYearDay()) {
// if (Quest.loadDailyQuest(
// resultSet.getString("quest"),
// resultSet.getString("quest_variant"),
// resultSet.getInt("step_1_progress"),
// resultSet.getInt("step_2_progress"),
// uuid,
// resultSet.getInt("amount"),
// resultSet.getInt("reward_received") == 1)) {
// if (Config.DEBUG)
// Logger.info("Loading daily quest for %", uuid.toString());
// return;
// } else
// Logger.warning("Unable to load quest for %, creating new quest...", uuid.toString());
// }
// } catch (SQLException exception) {
// exception.printStackTrace();
// }
// if (Config.DEBUG)
// Logger.info("Creating new daily quest for %", uuid.toString());
// Quest.createDailyQuest(Bukkit.getPlayer(uuid));
// }
// }.runTaskAsynchronously(AQuest.getInstance());
// }
//}

86
src/main/java/com/alttd/altitudequests/objects/Quest.java
View File

@ -22,7 +22,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public abstract class Quest { public abstract class Quest {
@ -93,13 +92,14 @@ public abstract class Quest {
this.amount = variant.calculateAmount(loadQuestsDoneThisMonth(uuid)); this.amount = variant.calculateAmount(loadQuestsDoneThisMonth(uuid));
else else
this.amount = amount; this.amount = amount;
this.barProgressOne = new AutoHideBossBar(player, "1", "Step One Progress", BarColor.GREEN); this.barProgressOne = new AutoHideBossBar(player, variant, "1", "Step One Progress", BarColor.GREEN);
this.barProgressTwo = new AutoHideBossBar(player, "2", "Step Two Progress", BarColor.PURPLE); this.barProgressTwo = new AutoHideBossBar(player, variant, "2", "Step Two Progress", BarColor.PURPLE);
} }
private int loadQuestsDoneThisMonth(UUID uuid) { private int loadQuestsDoneThisMonth(UUID uuid) {
String sql = "SELECT COUNT(uuid) AS total FROM quest_log WHERE uuid = ? AND year = ? AND month = ?"; String sql = "SELECT COUNT(uuid) AS total FROM quest_log WHERE uuid = ? AND year = ? AND month = ?";
try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { try {
PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql);
statement.setString(1, uuid.toString()); statement.setString(1, uuid.toString());
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.setTime(new Date()); instance.setTime(new Date());
@ -109,14 +109,14 @@ public abstract class Quest {
if (resultSet.next()) if (resultSet.next())
return resultSet.getInt("total"); return resultSet.getInt("total");
} catch (SQLException exception) { } catch (SQLException exception) {
Logger.throwing(Quest.class.getName(), "loadQuestsDoneThisMonth", exception); exception.printStackTrace();
} }
return 0; return 0;
} }
public static void createDailyQuest(Player player) { public static void createDailyQuest(Player player) {
if (possibleQuests.isEmpty()) { if (possibleQuests.size() == 0) {
player.sendRichMessage("<red>Unable to create quest, no quests in config</red>"); player.sendMiniMessage("<red>Unable to create quest, no quests in config</red>", null);
return; return;
} }
@ -126,21 +126,27 @@ public abstract class Quest {
putDailyQuest(player.getUniqueId(), constructor.newInstance(player)); putDailyQuest(player.getUniqueId(), constructor.newInstance(player));
} catch (InvocationTargetException | IllegalAccessException | InstantiationException | } catch (InvocationTargetException | IllegalAccessException | InstantiationException |
NoSuchMethodException e) { NoSuchMethodException e) {
player.sendRichMessage("<red>Unable to create quest, contact an admin</red>"); player.sendMiniMessage("<red>Unable to create quest, contact an admin</red>", null);
Logger.throwing(Quest.class.getName(), "createDailyQuest", e); e.printStackTrace();
Logger.severe("% does not have a constructor with a Player input or has improper access.", questClass.getName()); Logger.severe("% does not have a constructor with a Player input or has improper access.", questClass.getName());
} catch (Exception e) { } catch (Exception e) {
player.sendRichMessage("<red>Unable to create quest, contact an admin</red>"); player.sendMiniMessage("<red>Unable to create quest, contact an admin</red>", null);
Logger.throwing(Quest.class.getName(), "createDailyQuest", e); e.printStackTrace();
Logger.severe("% could not be created due to invalid namespace key or variant.", questClass.getName()); Logger.severe("% could not be created due to invalid namespace key or variant.", questClass.getName());
} }
} }
// public static void setActiveWeeklyQuest(Quest newQuest) {
// Quest.weeklyQuest = newQuest;
// }
// private static final HashSet<UUID> queriedUsers = new HashSet<>();
public static void tryLoadDailyQuest(UUID uuid) { public static void tryLoadDailyQuest(UUID uuid) {
// if (queriedUsers.contains(uuid))
// return;
if (dailyQuestContainsKey(uuid)) if (dailyQuestContainsKey(uuid))
return; return;
// queriedUsers.add(uuid);
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -151,14 +157,12 @@ public abstract class Quest {
}.runTaskAsynchronously(AQuest.getInstance()); }.runTaskAsynchronously(AQuest.getInstance());
} }
public static CompletableFuture<Boolean> unloadUser(UUID uuid) { public static void unloadUser(UUID uuid) { //Pls only run async
return CompletableFuture.supplyAsync(() ->{ // queriedUsers.remove(uuid);
Quest quest = removeDailyQuest(uuid); Quest quest = removeDailyQuest(uuid);
if (quest == null) if (quest == null)
return false; return;
quest.save(); quest.save();
return true;
});
} }
public static void saveAll() { public static void saveAll() {
@ -194,7 +198,7 @@ public abstract class Quest {
putDailyQuest(uuid, quest1); putDailyQuest(uuid, quest1);
} catch (NoSuchMethodException | IllegalAccessException | InstantiationException | } catch (NoSuchMethodException | IllegalAccessException | InstantiationException |
InvocationTargetException e) { InvocationTargetException e) {
Logger.throwing(Quest.class.getName(), "loadDailyQuest", e); e.printStackTrace();
return false; return false;
} }
return true; return true;
@ -221,7 +225,7 @@ public abstract class Quest {
public abstract TagResolver getTagResolvers(); public abstract TagResolver getTagResolvers();
public abstract void turnIn(Player player); public abstract int turnIn(Player player);
public abstract Component getDisplayName(); public abstract Component getDisplayName();
@ -259,11 +263,12 @@ public abstract class Quest {
} }
private void saveDone() { private void saveDone() {
String sql = "INSERT INTO quest_log " + try {
"(uuid, year, month, day) " + String sql = "INSERT INTO quest_log " +
"VALUES (?, ?, ?, ?) " + "(uuid, year, month, day) " +
"ON DUPLICATE KEY UPDATE uuid = ?"; "VALUES (?, ?, ?, ?) " +
try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { "ON DUPLICATE KEY UPDATE uuid = ?";
PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql);
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date()); calendar.setTime(new Date());
String uuidString = uuid.toString(); String uuidString = uuid.toString();
@ -276,8 +281,9 @@ public abstract class Quest {
if (Config.DEBUG) if (Config.DEBUG)
Logger.info("% finished their quest", uuidString); Logger.info("% finished their quest", uuidString);
} catch (SQLException e) { } catch (SQLException e) {
Logger.throwing(Quest.class.getName(), "saveDone", e); e.printStackTrace();
Logger.severe("Error while trying to create quest log table\nShutting down AltitudeQuests"); Logger.severe("Error while trying to create quest log table");
Logger.severe("Shutting down AltitudeQuests");
Bukkit.getPluginManager().disablePlugin(AQuest.getInstance()); Bukkit.getPluginManager().disablePlugin(AQuest.getInstance());
} }
} }
@ -331,26 +337,4 @@ public abstract class Quest {
public int getAmount() { public int getAmount() {
return amount; return amount;
} }
protected void saveQuest(PreparedStatement statement, Variant variant) throws SQLException {
int yearDay = Utilities.getYearDay();
if (Config.DEBUG)
Logger.info("Saving user for year day %.", String.valueOf(yearDay));
statement.setInt(1, yearDay);
statement.setString(2, getUuid().toString());
statement.setString(3, this.getClass().getSimpleName());
statement.setString(4, variant.getInternalName());
statement.setInt(5, getStep1());
statement.setInt(6, getStep2());
statement.setInt(7, getAmount());
statement.setInt(8, isRewardReceived() ? 1 : 0);
statement.setString(9, this.getClass().getSimpleName());
statement.setString(10, variant.getInternalName());
statement.setInt(11, getStep1());
statement.setInt(12, getStep2());
statement.setInt(13, yearDay);
statement.setInt(14, getAmount());
statement.setInt(15, isRewardReceived() ? 1 : 0);
statement.execute();
}
} }

43
src/main/java/com/alttd/altitudequests/objects/quests/BreedMobsQuest.java
View File

@ -27,12 +27,13 @@ public class BreedMobsQuest extends Quest {
public BreedMobsQuest(Player player) throws Exception { public BreedMobsQuest(Player player) throws Exception {
super(player, 0, 0, super(player, 0, 0,
QuestsConfig.BREED_MOB_QUEST.get(Utilities.randomOr0(QuestsConfig.BREED_MOB_QUEST.size() - 1)), -1, false); QuestsConfig.BREED_MOB_QUEST.get(Utilities.randomOr0(QuestsConfig.BREED_MOB_QUEST.size() - 1)), -1, false);
if (getVariant() instanceof BreedMobsQuestObject questObject) if (getVariant() instanceof BreedMobsQuestObject breedMobsQuestObject)
this.breedMobsQuestObject = questObject; this.breedMobsQuestObject = breedMobsQuestObject;
else else
this.breedMobsQuestObject = null; this.breedMobsQuestObject = null;
if (this.breedMobsQuestObject == null) { if (breedMobsQuestObject == null) {
Logger.warning("Tried to create breedMobQuest but unable to find variant: %s.", "unknown"); Logger.warning("Tried to create breedMobQuest but unable to find variant: %.", "unknown");
return;
} }
} }
@ -40,8 +41,8 @@ public class BreedMobsQuest extends Quest {
super(player, step1, step2, QuestsConfig.BREED_MOB_QUEST.stream() super(player, step1, step2, QuestsConfig.BREED_MOB_QUEST.stream()
.filter(object -> variant.equals(object.getInternalName())) .filter(object -> variant.equals(object.getInternalName()))
.findAny().orElse(null), amount, rewardReceived); .findAny().orElse(null), amount, rewardReceived);
if (getVariant() instanceof BreedMobsQuestObject questObject) if (getVariant() instanceof BreedMobsQuestObject breedMobsQuestObject)
this.breedMobsQuestObject = questObject; this.breedMobsQuestObject = breedMobsQuestObject;
else else
this.breedMobsQuestObject = null; this.breedMobsQuestObject = null;
if (breedMobsQuestObject == null) { if (breedMobsQuestObject == null) {
@ -59,10 +60,29 @@ public class BreedMobsQuest extends Quest {
"VALUES (?, ?, ?, ?, ?, ?, ?, ?) " + "VALUES (?, ?, ?, ?, ?, ?, ?, ?) " +
"ON DUPLICATE KEY UPDATE " + "ON DUPLICATE KEY UPDATE " +
"quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?"; "quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?";
try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { try {
saveQuest(statement, getVariant()); PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql);
int yearDay = Utilities.getYearDay();
if (Config.DEBUG)
Logger.info("Saving user for year day %.", String.valueOf(yearDay));
statement.setInt(1, yearDay);
statement.setString(2, getUuid().toString());
statement.setString(3, this.getClass().getSimpleName());
statement.setString(4, breedMobsQuestObject.getInternalName());
statement.setInt(5, getStep1());
statement.setInt(6, getStep2());
statement.setInt(7, getAmount());
statement.setInt(8, isRewardReceived() ? 1 : 0);
statement.setString(9, this.getClass().getSimpleName());
statement.setString(10, breedMobsQuestObject.getInternalName());
statement.setInt(11, getStep1());
statement.setInt(12, getStep2());
statement.setInt(13, yearDay);
statement.setInt(14, getAmount());
statement.setInt(15, isRewardReceived() ? 1 : 0);
statement.execute();
} catch (SQLException exception) { } catch (SQLException exception) {
Logger.throwing(BreedMobsQuest.class.getName(), "save", exception); exception.printStackTrace();
} }
} }
@ -87,13 +107,14 @@ public class BreedMobsQuest extends Quest {
} }
@Override @Override
public void turnIn(Player player) { public int turnIn(Player player) {
int maxToTurnIn = getMaxToTurnIn(); int maxToTurnIn = getMaxToTurnIn();
if (maxToTurnIn == 0) if (maxToTurnIn == 0)
return; return 0;
addStep2(maxToTurnIn); addStep2(maxToTurnIn);
checkDone(player); checkDone(player);
return maxToTurnIn;
} }
@Override @Override

40
src/main/java/com/alttd/altitudequests/objects/quests/CollectDropsQuest.java
View File

@ -21,6 +21,7 @@ import java.sql.SQLException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class CollectDropsQuest extends Quest { public class CollectDropsQuest extends Quest {
@ -30,12 +31,13 @@ public class CollectDropsQuest extends Quest {
public CollectDropsQuest(Player player) throws Exception { public CollectDropsQuest(Player player) throws Exception {
super(player, 0, 0, super(player, 0, 0,
QuestsConfig.COLLECT_DROPS_QUEST.get(Utilities.randomOr0(QuestsConfig.COLLECT_DROPS_QUEST.size() - 1)), -1, false); QuestsConfig.COLLECT_DROPS_QUEST.get(Utilities.randomOr0(QuestsConfig.COLLECT_DROPS_QUEST.size() - 1)), -1, false);
if (getVariant() instanceof CollectDropsQuestObject questObject) if (getVariant() instanceof CollectDropsQuestObject collectDropsQuestObject)
this.collectDropsQuestObject = questObject; this.collectDropsQuestObject = collectDropsQuestObject;
else else
this.collectDropsQuestObject = null; this.collectDropsQuestObject = null;
if (collectDropsQuestObject == null) { if (collectDropsQuestObject == null) {
Logger.warning("Tried to create collectDropsQuest but unable to find variant: %.", "unknown"); Logger.warning("Tried to create collectDropsQuest but unable to find variant: %.", "unknown");
return;
} }
} }
@ -43,8 +45,8 @@ public class CollectDropsQuest extends Quest {
super(player, step1, step2, QuestsConfig.COLLECT_DROPS_QUEST.stream() super(player, step1, step2, QuestsConfig.COLLECT_DROPS_QUEST.stream()
.filter(object -> variant.equals(object.getInternalName())) .filter(object -> variant.equals(object.getInternalName()))
.findAny().orElse(null), amount, rewardReceived); .findAny().orElse(null), amount, rewardReceived);
if (getVariant() instanceof CollectDropsQuestObject questObject) if (getVariant() instanceof CollectDropsQuestObject collectDropsQuestObject)
this.collectDropsQuestObject = questObject; this.collectDropsQuestObject = collectDropsQuestObject;
else else
this.collectDropsQuestObject = null; this.collectDropsQuestObject = null;
if (collectDropsQuestObject == null) { if (collectDropsQuestObject == null) {
@ -62,10 +64,29 @@ public class CollectDropsQuest extends Quest {
"VALUES (?, ?, ?, ?, ?, ?, ?, ?) " + "VALUES (?, ?, ?, ?, ?, ?, ?, ?) " +
"ON DUPLICATE KEY UPDATE " + "ON DUPLICATE KEY UPDATE " +
"quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?"; "quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?";
try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { try {
saveQuest(statement, getVariant()); PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql);
int yearDay = Utilities.getYearDay();
if (Config.DEBUG)
Logger.info("Saving user for year day %.", String.valueOf(yearDay));
statement.setInt(1, yearDay);
statement.setString(2, getUuid().toString());
statement.setString(3, this.getClass().getSimpleName());
statement.setString(4, collectDropsQuestObject.getInternalName());
statement.setInt(5, getStep1());
statement.setInt(6, getStep2());
statement.setInt(7, getAmount());
statement.setInt(8, isRewardReceived() ? 1 : 0);
statement.setString(9, this.getClass().getSimpleName());
statement.setString(10, collectDropsQuestObject.getInternalName());
statement.setInt(11, getStep1());
statement.setInt(12, getStep2());
statement.setInt(13, yearDay);
statement.setInt(14, getAmount());
statement.setInt(15, isRewardReceived() ? 1 : 0);
statement.execute();
} catch (SQLException exception) { } catch (SQLException exception) {
Logger.throwing(CollectDropsQuest.class.getName(), "save", exception); exception.printStackTrace();
} }
} }
@ -91,12 +112,12 @@ public class CollectDropsQuest extends Quest {
} }
@Override @Override
public void turnIn(Player player) { public int turnIn(Player player) {
PlayerInventory inventory = player.getInventory(); PlayerInventory inventory = player.getInventory();
int maxToTurnIn = getMaxToTurnIn(); int maxToTurnIn = getMaxToTurnIn();
if (maxToTurnIn == 0) if (maxToTurnIn == 0)
return; return 0;
var ref = new Object() { var ref = new Object() {
int tmpAmount = maxToTurnIn; int tmpAmount = maxToTurnIn;
}; };
@ -118,6 +139,7 @@ public class CollectDropsQuest extends Quest {
int totalTurnedIn = maxToTurnIn - ref.tmpAmount; int totalTurnedIn = maxToTurnIn - ref.tmpAmount;
addStep2(totalTurnedIn); addStep2(totalTurnedIn);
checkDone(player); checkDone(player);
return totalTurnedIn;
} }
@Override @Override

40
src/main/java/com/alttd/altitudequests/objects/quests/KillMobsQuest.java
View File

@ -18,6 +18,7 @@ import org.bukkit.entity.Player;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.List; import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class KillMobsQuest extends Quest { public class KillMobsQuest extends Quest {
@ -27,12 +28,13 @@ public class KillMobsQuest extends Quest {
public KillMobsQuest(Player player) throws Exception { public KillMobsQuest(Player player) throws Exception {
super(player, 0, 0, super(player, 0, 0,
QuestsConfig.KILL_MOB_QUEST.get(Utilities.randomOr0(QuestsConfig.KILL_MOB_QUEST.size() - 1)), -1, false); QuestsConfig.KILL_MOB_QUEST.get(Utilities.randomOr0(QuestsConfig.KILL_MOB_QUEST.size() - 1)), -1, false);
if (getVariant() instanceof KillMobsQuestObject questObject) if (getVariant() instanceof KillMobsQuestObject killMobsQuestObject)
this.killMobsQuestObject = questObject; this.killMobsQuestObject = killMobsQuestObject;
else else
this.killMobsQuestObject = null; this.killMobsQuestObject = null;
if (killMobsQuestObject == null) { if (killMobsQuestObject == null) {
Logger.warning("Tried to create killMobsQuest but unable to find variant: %.", "unknown"); Logger.warning("Tried to create killMobsQuest but unable to find variant: %.", "unknown");
return;
} }
} }
@ -40,8 +42,8 @@ public class KillMobsQuest extends Quest {
super(player, step1, step2, QuestsConfig.KILL_MOB_QUEST.stream() super(player, step1, step2, QuestsConfig.KILL_MOB_QUEST.stream()
.filter(object -> variant.equals(object.getInternalName())) .filter(object -> variant.equals(object.getInternalName()))
.findAny().orElse(null), amount, rewardReceived); .findAny().orElse(null), amount, rewardReceived);
if (getVariant() instanceof KillMobsQuestObject questObject) if (getVariant() instanceof KillMobsQuestObject killMobsQuestObject)
this.killMobsQuestObject = questObject; this.killMobsQuestObject = killMobsQuestObject;
else else
this.killMobsQuestObject = null; this.killMobsQuestObject = null;
if (killMobsQuestObject == null) { if (killMobsQuestObject == null) {
@ -59,10 +61,29 @@ public class KillMobsQuest extends Quest {
"VALUES (?, ?, ?, ?, ?, ?, ?, ?) " + "VALUES (?, ?, ?, ?, ?, ?, ?, ?) " +
"ON DUPLICATE KEY UPDATE " + "ON DUPLICATE KEY UPDATE " +
"quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?"; "quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?";
try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { try {
saveQuest(statement, getVariant()); PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql);
int yearDay = Utilities.getYearDay();
if (Config.DEBUG)
Logger.info("Saving user for year day %.", String.valueOf(yearDay));
statement.setInt(1, yearDay);
statement.setString(2, getUuid().toString());
statement.setString(3, this.getClass().getSimpleName());
statement.setString(4, killMobsQuestObject.getInternalName());
statement.setInt(5, getStep1());
statement.setInt(6, getStep2());
statement.setInt(7, getAmount());
statement.setInt(8, isRewardReceived() ? 1 : 0);
statement.setString(9, this.getClass().getSimpleName());
statement.setString(10, killMobsQuestObject.getInternalName());
statement.setInt(11, getStep1());
statement.setInt(12, getStep2());
statement.setInt(13, yearDay);
statement.setInt(14, getAmount());
statement.setInt(15, isRewardReceived() ? 1 : 0);
statement.execute();
} catch (SQLException exception) { } catch (SQLException exception) {
Logger.throwing(KillMobsQuest.class.getName(), "save", exception); exception.printStackTrace();
} }
} }
@ -87,13 +108,14 @@ public class KillMobsQuest extends Quest {
} }
@Override @Override
public void turnIn(Player player) { public int turnIn(Player player) {
int maxToTurnIn = getMaxToTurnIn(); int maxToTurnIn = getMaxToTurnIn();
if (maxToTurnIn == 0) if (maxToTurnIn == 0)
return; return 0;
addStep2(maxToTurnIn); addStep2(maxToTurnIn);
checkDone(player); checkDone(player);
return maxToTurnIn;
} }
@Override @Override

46
src/main/java/com/alttd/altitudequests/objects/quests/MineQuest.java
View File

@ -30,12 +30,13 @@ public class MineQuest extends Quest {
public MineQuest(Player player) throws Exception { public MineQuest(Player player) throws Exception {
super(player, 0, 0, super(player, 0, 0,
QuestsConfig.MINE_QUESTS.get(Utilities.randomOr0(QuestsConfig.MINE_QUESTS.size() - 1)), -1, false); QuestsConfig.MINE_QUESTS.get(Utilities.randomOr0(QuestsConfig.MINE_QUESTS.size() - 1)), -1, false);
if (getVariant() instanceof MineQuestObject questObject) if (getVariant() instanceof MineQuestObject mineQuestObject)
this.mineQuestObject = questObject; this.mineQuestObject = mineQuestObject;
else else
mineQuestObject = null; mineQuestObject = null;
if (mineQuestObject == null) { if (mineQuestObject == null) {
Logger.warning("Tried to create MineQuest but unable to find variant: %.", "unknown"); Logger.warning("Tried to create MineQuest but unable to find variant: %.", "unknown");
return;
} }
} }
@ -44,8 +45,8 @@ public class MineQuest extends Quest {
.filter(object -> variant.equals(object.getInternalName())) .filter(object -> variant.equals(object.getInternalName()))
.findAny().orElse(null), amount, .findAny().orElse(null), amount,
rewardReceived); rewardReceived);
if (getVariant() instanceof MineQuestObject questObject) if (getVariant() instanceof MineQuestObject mineQuestObject)
this.mineQuestObject = questObject; this.mineQuestObject = mineQuestObject;
else else
this.mineQuestObject = null; this.mineQuestObject = null;
if (mineQuestObject == null) { if (mineQuestObject == null) {
@ -63,10 +64,29 @@ public class MineQuest extends Quest {
"VALUES (?, ?, ?, ?, ?, ?, ?, ?) " + "VALUES (?, ?, ?, ?, ?, ?, ?, ?) " +
"ON DUPLICATE KEY UPDATE " + "ON DUPLICATE KEY UPDATE " +
"quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?"; "quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?";
try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { try {
saveQuest(statement, getVariant()); PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql);
int yearDay = Utilities.getYearDay();
if (Config.DEBUG)
Logger.info("Saving user for year day %.", String.valueOf(yearDay));
statement.setInt(1, yearDay);
statement.setString(2, getUuid().toString());
statement.setString(3, this.getClass().getSimpleName());
statement.setString(4, mineQuestObject.getInternalName());
statement.setInt(5, getStep1());
statement.setInt(6, getStep2());
statement.setInt(7, getAmount());
statement.setInt(8, isRewardReceived() ? 1 : 0);
statement.setString(9, this.getClass().getSimpleName());
statement.setString(10, mineQuestObject.getInternalName());
statement.setInt(11, getStep1());
statement.setInt(12, getStep2());
statement.setInt(13, yearDay);
statement.setInt(14, getAmount());
statement.setInt(15, isRewardReceived() ? 1 : 0);
statement.execute();
} catch (SQLException exception) { } catch (SQLException exception) {
Logger.throwing(MineQuest.class.getName(), "save", exception); exception.printStackTrace();
} }
} }
@ -91,12 +111,12 @@ public class MineQuest extends Quest {
} }
@Override @Override
public void turnIn(Player player) { public int turnIn(Player player) {
PlayerInventory inventory = player.getInventory(); PlayerInventory inventory = player.getInventory();
int maxToTurnIn = getMaxToTurnIn(); int maxToTurnIn = getMaxToTurnIn();
if (maxToTurnIn == 0) if (maxToTurnIn == 0)
return; return 0;
var ref = new Object() { var ref = new Object() {
int tmpAmount = maxToTurnIn; int tmpAmount = maxToTurnIn;
}; };
@ -118,6 +138,7 @@ public class MineQuest extends Quest {
int totalTurnedIn = maxToTurnIn - ref.tmpAmount; int totalTurnedIn = maxToTurnIn - ref.tmpAmount;
addStep2(totalTurnedIn); addStep2(totalTurnedIn);
checkDone(player); checkDone(player);
return totalTurnedIn;
} }
@Override @Override
@ -137,8 +158,11 @@ public class MineQuest extends Quest {
if (!block.getType().equals(mineQuestObject.getMaterial())) { if (!block.getType().equals(mineQuestObject.getMaterial())) {
return true; return true;
} }
else if (blockData instanceof Ageable ageable) { else if (blockData instanceof Ageable) {
return ageable.getAge() != ageable.getMaximumAge(); Ageable ageable = (Ageable) blockData;
if (ageable.getAge() != ageable.getMaximumAge()) {
return true;
}
} }
return false; return false;
} }

48
src/main/java/com/alttd/altitudequests/objects/quests/OtherQuest.java
View File

@ -34,8 +34,8 @@ public class OtherQuest extends Quest {
public OtherQuest(Player player) throws Exception { public OtherQuest(Player player) throws Exception {
super(player, 0, 0, super(player, 0, 0,
QuestsConfig.OTHER_QUEST.get(Utilities.randomOr0(QuestsConfig.OTHER_QUEST.size() - 1)), -1, false); QuestsConfig.OTHER_QUEST.get(Utilities.randomOr0(QuestsConfig.OTHER_QUEST.size() - 1)), -1, false);
if (getVariant() instanceof OtherQuestObject questObject) if (getVariant() instanceof OtherQuestObject otherQuestObject)
this.otherQuestObject = questObject; this.otherQuestObject = otherQuestObject;
else else
this.otherQuestObject = null; this.otherQuestObject = null;
if (otherQuestObject == null) { if (otherQuestObject == null) {
@ -47,8 +47,8 @@ public class OtherQuest extends Quest {
super(player, step1, step2, QuestsConfig.OTHER_QUEST.stream() super(player, step1, step2, QuestsConfig.OTHER_QUEST.stream()
.filter(object -> variant.equals(object.getInternalName())) .filter(object -> variant.equals(object.getInternalName()))
.findAny().orElse(null), amount, rewardReceived); .findAny().orElse(null), amount, rewardReceived);
if (getVariant() instanceof OtherQuestObject questObject) if (getVariant() instanceof OtherQuestObject otherQuestObject)
this.otherQuestObject = questObject; this.otherQuestObject = otherQuestObject;
else else
this.otherQuestObject = null; this.otherQuestObject = null;
if (otherQuestObject == null) { if (otherQuestObject == null) {
@ -66,10 +66,29 @@ public class OtherQuest extends Quest {
"VALUES (?, ?, ?, ?, ?, ?, ?, ?) " + "VALUES (?, ?, ?, ?, ?, ?, ?, ?) " +
"ON DUPLICATE KEY UPDATE " + "ON DUPLICATE KEY UPDATE " +
"quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?"; "quest = ?, quest_variant = ?, step_1_progress = ?, step_2_progress = ?, year_day = ?, amount = ?, reward_received = ?";
try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { try {
saveQuest(statement, getVariant()); PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql);
int yearDay = Utilities.getYearDay();
if (Config.DEBUG)
Logger.info("Saving user for year day %.", String.valueOf(yearDay));
statement.setInt(1, yearDay);
statement.setString(2, getUuid().toString());
statement.setString(3, this.getClass().getSimpleName());
statement.setString(4, otherQuestObject.getInternalName());
statement.setInt(5, getStep1());
statement.setInt(6, getStep2());
statement.setInt(7, getAmount());
statement.setInt(8, isRewardReceived() ? 1 : 0);
statement.setString(9, this.getClass().getSimpleName());
statement.setString(10, otherQuestObject.getInternalName());
statement.setInt(11, getStep1());
statement.setInt(12, getStep2());
statement.setInt(13, yearDay);
statement.setInt(14, getAmount());
statement.setInt(15, isRewardReceived() ? 1 : 0);
statement.execute();
} catch (SQLException exception) { } catch (SQLException exception) {
Logger.throwing(OtherQuest.class.getName(), "save", exception); exception.printStackTrace();
} }
} }
@ -95,12 +114,12 @@ public class OtherQuest extends Quest {
} }
@Override @Override
public void turnIn(Player player) { public int turnIn(Player player) {
PlayerInventory inventory = player.getInventory(); PlayerInventory inventory = player.getInventory();
int maxToTurnIn = getMaxToTurnIn(); int maxToTurnIn = getMaxToTurnIn();
if (maxToTurnIn == 0) if (maxToTurnIn == 0)
return; return 0;
var ref = new Object() { var ref = new Object() {
int tmpAmount = maxToTurnIn; int tmpAmount = maxToTurnIn;
}; };
@ -122,6 +141,7 @@ public class OtherQuest extends Quest {
int totalTurnedIn = maxToTurnIn - ref.tmpAmount; int totalTurnedIn = maxToTurnIn - ref.tmpAmount;
addStep2(totalTurnedIn); addStep2(totalTurnedIn);
checkDone(player); checkDone(player);
return totalTurnedIn;
} }
@Override @Override
@ -156,7 +176,7 @@ public class OtherQuest extends Quest {
checkDone(); checkDone();
} }
public void bucket(Entity entity) { public void bucket(ItemStack bucket, Entity entity) {
if (isDone() || !entity.getType().equals(otherQuestObject.getEntity()) || getAmount() == getStep1()|| !otherQuestObject.getCategory().equalsIgnoreCase("BUCKETING")) { if (isDone() || !entity.getType().equals(otherQuestObject.getEntity()) || getAmount() == getStep1()|| !otherQuestObject.getCategory().equalsIgnoreCase("BUCKETING")) {
return; return;
} }
@ -172,6 +192,14 @@ public class OtherQuest extends Quest {
checkDone(); checkDone();
} }
//public void brewingStarted(ItemStack ingredient, Location brewingStandLocation){
// Logger.warning("Brewing Started");
//}
//public void brewingFinished(List <ItemStack> results, Location brewingStandLocation) {
// Logger.warning("Brewing Finished");
//}
public static List<String> getSubTypes() { public static List<String> getSubTypes() {
return QuestsConfig.OTHER_QUEST.stream().map(Variant::getInternalName).collect(Collectors.toList()); return QuestsConfig.OTHER_QUEST.stream().map(Variant::getInternalName).collect(Collectors.toList());
} }

13
src/main/java/com/alttd/altitudequests/util/AutoHideBossBar.java
View File

@ -2,18 +2,17 @@ package com.alttd.altitudequests.util;
import com.alttd.altitudequests.AQuest; import com.alttd.altitudequests.AQuest;
import com.alttd.altitudequests.config.Config; import com.alttd.altitudequests.config.Config;
import com.alttd.altitudequests.objects.Variant;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.boss.BarColor; import org.bukkit.boss.BarColor;
import org.bukkit.boss.BarStyle; import org.bukkit.boss.BarStyle;
import org.bukkit.boss.BossBar; import org.bukkit.boss.BossBar;
import org.bukkit.boss.KeyedBossBar;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.Objects;
public class AutoHideBossBar { public class AutoHideBossBar {
@ -21,19 +20,17 @@ public class AutoHideBossBar {
private final BossBar bossBar; private final BossBar bossBar;
public AutoHideBossBar(Player player, String part, String title, BarColor barColor) throws Exception { public AutoHideBossBar(Player player, Variant variant, String part, String title, BarColor barColor) throws Exception {
NamespacedKey namespacedKeyOne = NamespacedKey.fromString(player.getUniqueId() + "-part-" + part, AQuest.getInstance()); NamespacedKey namespacedKeyOne = NamespacedKey.fromString(player.getUniqueId() + variant.getInternalName().toLowerCase() + part, AQuest.getInstance());
if (namespacedKeyOne == null) { if (namespacedKeyOne == null) {
Logger.warning("Unable to create nameSpacedKey with suffix % for quest for %", part, player.getName()); Logger.warning("Unable to create nameSpacedKey with suffix % for quest for %", part, player.getName());
throw new Exception("Failed to create namespace key"); throw new Exception("Failed to create namespace key");
} }
KeyedBossBar retrievedBossBar = Bukkit.getBossBar(namespacedKeyOne); this.bossBar = Bukkit.createBossBar(
this.bossBar = Objects.requireNonNullElseGet(retrievedBossBar, () -> Bukkit.createBossBar(
namespacedKeyOne, namespacedKeyOne,
title, title,
barColor, barColor,
BarStyle.SOLID)); BarStyle.SOLID);
bossBar.setVisible(false); bossBar.setVisible(false);
bossBar.addPlayer(player); bossBar.addPlayer(player);
} }

7
src/main/java/com/alttd/altitudequests/util/LoadUser.java
View File

@ -13,7 +13,7 @@ import java.util.UUID;
public class LoadUser extends BukkitRunnable { public class LoadUser extends BukkitRunnable {
private final UUID uuid; UUID uuid;
public LoadUser(UUID uuid) { public LoadUser(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
@ -22,7 +22,8 @@ public class LoadUser extends BukkitRunnable {
@Override @Override
public void run() { public void run() {
String sql = "SELECT * FROM generic_quest_progress WHERE uuid = ?"; String sql = "SELECT * FROM generic_quest_progress WHERE uuid = ?";
try (PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql)) { try {
PreparedStatement statement = Database.getDatabase().getConnection().prepareStatement(sql);
statement.setString(1, uuid.toString()); statement.setString(1, uuid.toString());
ResultSet resultSet = statement.executeQuery(); ResultSet resultSet = statement.executeQuery();
if (resultSet.next() && resultSet.getInt("year_day") == Utilities.getYearDay()) { if (resultSet.next() && resultSet.getInt("year_day") == Utilities.getYearDay()) {
@ -41,7 +42,7 @@ public class LoadUser extends BukkitRunnable {
Logger.warning("Unable to load quest for %, creating new quest...", uuid.toString()); Logger.warning("Unable to load quest for %, creating new quest...", uuid.toString());
} }
} catch (SQLException exception) { } catch (SQLException exception) {
Logger.throwing(LoadUser.class.getName(), "run", exception); exception.printStackTrace();
} }
if (Config.DEBUG) if (Config.DEBUG)
Logger.info("Creating new daily quest for %", uuid.toString()); Logger.info("Creating new daily quest for %", uuid.toString());

4
src/main/java/com/alttd/altitudequests/util/Logger.java
View File

@ -33,8 +33,4 @@ public class Logger {
} }
logger.severe(severe); logger.severe(severe);
} }
public static void throwing(String sourceClass, String sourceMethod, Exception e) {
logger.throwing(sourceClass, sourceMethod, e);
}
} }

3
src/main/java/com/alttd/altitudequests/util/ProgressBookOpener.java
View File

@ -40,7 +40,8 @@ public class ProgressBookOpener {
TagResolver.resolver(Placeholder.component("variant", dailyQuest.getVariant().getName())), TagResolver.resolver(Placeholder.component("variant", dailyQuest.getVariant().getName())),
dailyQuest.getTagResolvers() dailyQuest.getTagResolvers()
); );
List<String> pages = new ArrayList<>(Config.PROGRESS_PAGES); List<String> pages = new ArrayList<>();
pages.addAll(Config.PROGRESS_PAGES);
return (pages.stream() return (pages.stream()
.map(page -> miniMessage.deserialize(page, tagResolver)) .map(page -> miniMessage.deserialize(page, tagResolver))
.collect(Collectors.toList())); .collect(Collectors.toList()));