Merge branch 'sql'

- Closes #50

1 files changed, 34 insertions, 6 deletions

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 0386fa98..2c2e09c7 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -213,12 +213,12 @@ options:
   quest-autotrack: true
   # How much quests should log, 0 = errors only, 1 = warnings, 2 = info, 3 = debug
   verbose-logging-level: 2
-  # Automatically clean player's quest progress files when they join.
-  # These changes will not be reflected to disk.
-  # Useful if you frequently add and remove quests on a production server. Equivalent of executing /q a moddata clean, without overwriting the file.
-  soft-clean-questsprogressfile-on-join: false
-  # The above, but overwriting the file on disk with the cleaned version, so it does not soft clean on every join.
-  push-soft-clean-to-disk: false
+  # Verify quests exist when a player's data is loaded - inconsistencies may arise when
+  # players progress on specific quests and those quests are later removed. The problem is that their progress
+  # is still kept in the quest progress file, which may lead to issues such as players reaching a quest started
+  # limit when the quests they had active no longer exist - having this option enabled prevents
+  # non-existent quests from being loaded
+  verify-quest-exists-on-load: true
   performance-tweaking: # The following are measured in server ticks, multiply SECONDS by 20 to get the number of ticks.
     quest-queue-executor-interval: 1      # how frequently Quests should execute the next check in the completion queue (def=1 - 0.05s) - increase this value if you are struggling with performance
     quest-autosave-interval: 12000        # how frequently online players data will be autosaved (def=12000 - 10 minutes)
@@ -234,6 +234,33 @@ options:
   global-task-configuration-override: false
   # Whether or not the global display configuration will override per-quest display settins
   global-quest-display-configuration-override: false
+  # Storage options - please see the following: https://github.com/LMBishop/Quests/wiki/Storage-Providers
+  storage:
+    # Either 'yaml' (flatfile) or 'mysql' (network)
+    # Please read the following before using MySQL https://github.com/LMBishop/Quests/wiki/Storage-Providers#network
+    provider: "yaml"
+    # The following is only applicable for database storage providers (e.g. mysql)
+    database-settings:
+      network:
+        # The name of the database. This database should already exist!
+        database: "minecraft"
+        username: "root"
+        password: ""
+        # Address should be in the format ip:port (just like the game itself)
+        address: "localhost:3306"
+      # This plugin uses 'HikariCP' for connection management, the pooling configuration can be changed here
+      connection-pool-settings:
+        # The maximum number of connections to keep open with the database (def=8)
+        maximum-pool-size: 8
+        # The minimum number of connections to keep open with the database (def=8)
+        minimum-idle: 8
+        # The maximum time (in milliseconds) to keep a single connection open (def=1800000 - 30 min)
+        maximum-lifetime: 1800000
+        # The time (in milliseconds) the plugin will wait for a response by the database (def=500)
+        connection-timeout: 5000
+      # The prefix each table will use
+      table-prefix: "quests_"
+
 
 # This switches up the entire quest system.
 # By enabling daily-quests, players will no longer be presented with the standard Quest GUI.
@@ -307,6 +334,7 @@ messages:
   quest-category-quest-permission: "&7You do not have permission to start this quest since it is in a category you do not have permission to view."
   quest-cancel-notstarted: "&7You have not started this quest."
   quest-updater: "&cQuests > &7A new version &c{newver} &7was found on Spigot (your version: &c{oldver}&7). Please update me! <3 - Link: {link}"
+  command-data-not-loaded: "&4Your quests progress file has not been loaded; you cannot use quests. If this issue persists, contact an admin."
   command-sub-doesntexist: "&7The specified subcommand '&c{sub}' &7does not exist."
   command-quest-start-doesntexist: "&7The specified quest '&c{quest}&7' does not exist."
   command-quest-general-doesntexist: "&7The specified quest '&c{quest}&7' does not exist."