Fix/merge conflict (#87)

* Version 1.3.0 (#85)

* Feature/async chunkmaster (#81)

* Change generation to be asynchronous

At this stage it will most likely crash the server at a certain point.
Pausing and resuming isn't stable. Saving the progress isn't stable as well.
Chunks are being unloaded in the main thread by an unloader class.

* Switch to native threads

- Use thread instead of async tasks
- Store pending paper chunks in the database
- Interrupt the thread when it should be stopped

* Fix insertion of pending chunks

Fix an error that is thrown when the sql for inserting pending chunks doesn't have any chunks to insert.

* Add task states

Add states to differentiate between generating and validating tasks
as well as a field in the database to store this information.
A task will first generate a world until the required radius or the
worldborder is reached. Then it validates that each chunk has been generated.

* Add object representation of world_properties table

* Add DAO for pending_chunks table

* Add DAO for generation_tasks table

* Add state updating to periodic save

* Fix loading of world properties

* Add states to tasks and fix completion handling

* Fix progress report and spiral shape

* Modify the paper generation task so it works with spigot

This change is being made because normal chunk generation doesn't allow
chunks to be requested from a different thread. With PaperLib this issue
can be solved.

* Add workarounds for spigot problems

* Fix some blocking issues and update README

* Add locking to ChunkUnloader class

* Add total chunk count to list command (closes #79) (#82)

* Fix shape beign stuck (#83)

* Add autostart config parameter (closes #78) (#84)

* Add circleci badge to readme

* Add codefactor badge

* Update Translation to 1.3.0 (#86)

* Update Translation to 1.3.0

* Tweak SQL_ERROR word order

Co-authored-by: NPBeta <shanhang007@gmail.com>

src/main/resources/i18n/zh.i18n.properties

@@ -1,11 +1,12 @@
 RESUME_FOR_WORLD = 正在恢复执行 '%s' 世界的区块生成任务...
 TASK_FINISHED = 任务 #%d 在生成 %d 个区块后完成.
-TASK_CANCELED = 已取消任务 #%s.
+TASK_CANCELLED = 已取消任务 #%s.
 TASK_LOAD_FAILED = §c加载任务 #%d 失败.
 TASK_LOAD_SUCCESS = %d 个已保存的任务加载完成.
 TASK_NOT_FOUND = §c任务 %s 未找到!
 CREATE_DELAYED_LOAD = 正在创建延迟执行的区块生成任务...
-TASK_PERIODIC_REPORT = 任务 #%d 正在 '%s' 世界执行. 进度: %d 区块 %s %s, 速度: %.1f 区块 / 秒, 最新生成的区块: %d, %d
+TASK_PERIODIC_REPORT = 任务 #%d 正在 '%s' 世界执行. 状态: %s. 进度: %d 区块 %s %s, 速度: %.1f 区块 / 秒, 最新生成的区块: %d, %d
+TASK_PERIODIC_REPORT_CORRECTING = 任务 #%d 正在为世界 '%s' 生成缺失的区块. 进度: %d 区块 %s
 TASK_SAVE_FAILED = §c保存任务时发生错误: %s
 
 WORLD_NAME_REQUIRED = §c你需要提供世界名称!
@@ -18,7 +19,7 @@ TASK_ID_REQUIRED = §c你需要提供任务 ID!
 INVALID_ARGUMENT = §c在 %s: %s 存在无效的变量!
 
 PAUSED_TASKS_HEADER = 当前暂停的区块生成任务
-TASKS_ENTRY = - §9#%d§r - §2%s§r - §2%d 区块 %s§r
+TASKS_ENTRY = - §9#%d§r - §2%s§r - §2%s§r - §2%s 区块 %s§r
 RUNNING_TASKS_HEADER = 当前运行的区块生成任务
 NO_GENERATION_TASKS = 无区块生成任务.
 
@@ -44,7 +45,7 @@ DB_INIT_FINISHED = 数据库初始化完成.
 DB_INIT_EROR = 初始化数据库时发生错误: %s.
 
 DATABASE_CONNECTION_ERROR = §c连接数据库失败!
-SQL_ERROR = §cSQL %s 发生错误!
+SQL_ERROR = §cSQL 发生错误: %s !
 NO_DATABASE_CONNECTION = §c无法执行 SQL 语句: 无数据库连接.
 CREATE_TABLE_DEFINITION = 已创建表 %s ，定义 %s.
 TABLE_CREATE_ERROR = §c创建表 %s 失败.
@@ -73,3 +74,7 @@ STATS_WORLD_NAME = §l%s§r
 STATS_ENTITY_COUNT = - §2%d§r 实体
 STATS_LOADED_CHUNKS = - §2%d§r 已载入区块
 STATS_PLUGIN_LOADED_CHUNKS  = - §2%d§r 被 Chunk Master 载入的区块
+
+SAVING_CHUNKS = 正在保存 %d 已载入的区块...
+CANCEL_FAIL = 取消任务 #%d 操作超时!
+NO_AUTOSTART = 自动启动被设置为 §2关闭§r. 正在暂停...