From 726e4ba34c67a169103e16aacc8c861bb379e79e Mon Sep 17 00:00:00 2001
From: Trivernis <trivernis@hotmail.de>
Date: Tue, 17 Sep 2019 20:25:01 +0200
Subject: [PATCH] Added Progress percentage to periodical task status

---
 .../net/trivernis/chunkmaster/lib/GenerationManager.kt      | 6 ++++--
 .../kotlin/net/trivernis/chunkmaster/lib/GenerationTask.kt  | 4 ++--
 src/main/resources/plugin.yml                               | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/net/trivernis/chunkmaster/lib/GenerationManager.kt b/src/main/kotlin/net/trivernis/chunkmaster/lib/GenerationManager.kt
index 4516deb..0a87897 100644
--- a/src/main/kotlin/net/trivernis/chunkmaster/lib/GenerationManager.kt
+++ b/src/main/kotlin/net/trivernis/chunkmaster/lib/GenerationManager.kt
@@ -172,8 +172,10 @@ class GenerationManager(private val chunkmaster: Chunkmaster, private val server
         for (task in tasks) {
             try {
                 val genTask = task.generationTask
-                server.consoleSender.sendMessage("Task #${task.id} running for \"${genTask.world.name}\". " +
-                        "Progress ${task.generationTask.count} chunks. Last Chunk: ${genTask.lastChunk.x}, ${genTask.lastChunk.z}")
+                server.consoleSender.sendMessage("""Task #${task.id} running for "${genTask.world.name}".
+                    |Progress ${task.generationTask.count} chunks
+                    |${if (task.generationTask.stopAfter > 0)"(${(task.generationTask.count.toDouble()/task.generationTask.stopAfter.toDouble())*100}%)." else ""}
+                    |Last Chunk: ${genTask.lastChunk.x}, ${genTask.lastChunk.z}""".trimMargin("|").replace('\n', ' '))
                 val updateStatement = chunkmaster.sqliteConnection.prepareStatement("""
                     UPDATE generation_tasks SET last_x = ?, last_z = ?
                     WHERE id = ?
diff --git a/src/main/kotlin/net/trivernis/chunkmaster/lib/GenerationTask.kt b/src/main/kotlin/net/trivernis/chunkmaster/lib/GenerationTask.kt
index 0c62ef7..da58b1e 100644
--- a/src/main/kotlin/net/trivernis/chunkmaster/lib/GenerationTask.kt
+++ b/src/main/kotlin/net/trivernis/chunkmaster/lib/GenerationTask.kt
@@ -7,8 +7,8 @@ import org.bukkit.scheduler.BukkitRunnable
 import org.bukkit.scheduler.BukkitTask
 
 class GenerationTask(private val plugin: Chunkmaster, val world: World,
-                     private val centerChunk: Chunk, private val startChunk: Chunk,
-                     private val stopAfter: Int = -1): Runnable {
+                     centerChunk: Chunk, private val startChunk: Chunk,
+                     val stopAfter: Int = -1): Runnable {
     private val spiral: Spiral = Spiral(Pair(centerChunk.x, centerChunk.z), Pair(startChunk.x, startChunk.z))
     private val loadedChunks: HashSet<Chunk> = HashSet()
     private val chunkSkips = plugin.config.getInt("generation.chunks-skips-per-step")
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 26d5d3d..8708e9f 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: net.trivernis.chunkmaster.Chunkmaster
 name: Chunkmaster
-version: '1.0 SNAPSHOT'
+version: '0.10-beta-SNAPSHOT'
 description: Chunk commands plugin.
 author: Trivernis
 website: trivernis.net