Add ignore-worldborder config option

- [Convert to unix linebreaks]
- Add ignore-worldborder config option to generate past the vanilla world border

build.gradle

@@ -48,7 +48,8 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    compileOnly "org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT"
+    //compileOnly "org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT"
+    compileOnly "com.destroystokyo.paper:paper-api:1.14.4-R0.1-SNAPSHOT"
     compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.28.0'
     compile "io.papermc:paperlib:1.0.2"
     compile "org.bstats:bstats-bukkit:1.5"

src/main/kotlin/net/trivernis/chunkmaster/Chunkmaster.kt

@@ -8,14 +8,12 @@ import org.bstats.bukkit.Metrics
 import org.bukkit.plugin.java.JavaPlugin
 import org.bukkit.scheduler.BukkitTask
 import java.lang.Exception
-import java.sql.Connection
-import java.sql.DriverManager
 
 class Chunkmaster: JavaPlugin() {
     lateinit var sqliteManager: SqliteManager
     lateinit var generationManager: GenerationManager
     private lateinit var tpsTask: BukkitTask
-    var mspt = 50L      // keep track of the milliseconds per tick
+    var mspt = 20      // keep track of the milliseconds per tick
         private set
 
     /**
@@ -36,12 +34,18 @@ class Chunkmaster: JavaPlugin() {
 
         server.pluginManager.registerEvents(ChunkmasterEvents(this, server), this)
 
-        tpsTask = server.scheduler.runTaskTimer(this, Runnable {
-            val start = System.currentTimeMillis()
-            server.scheduler.runTaskLater(this, Runnable {
-                mspt = System.currentTimeMillis() - start
-            }, 1)
-        }, 1, 300)
+        if (PaperLib.isPaper() && PaperLib.getMinecraftPatchVersion() >= 225) {
+            tpsTask = server.scheduler.runTaskTimer(this, Runnable {
+                mspt = 1000/server.currentTick   // use papers exposed tick rather than calculating it
+            }, 1, 300)
+        } else {
+            tpsTask = server.scheduler.runTaskTimer(this, Runnable {
+                val start = System.currentTimeMillis()
+                server.scheduler.runTaskLater(this, Runnable {
+                    mspt = (System.currentTimeMillis() - start).toInt()
+                }, 1)
+            }, 1, 300)
+        }
     }
 
     /**
@@ -64,6 +68,7 @@ class Chunkmaster: JavaPlugin() {
         config.addDefault("generation.pause-on-join", true)
         config.addDefault("generation.max-pending-chunks", 10)
         config.addDefault("generation.max-loaded-chunks", 10)
+        config.addDefault("generation.ignore-worldborder", false)
         config.addDefault("database.filename", "chunkmaster.db")
         config.options().copyDefaults(true)
         saveConfig()

src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationTask.kt

@@ -24,6 +24,7 @@ abstract class GenerationTask(plugin: Chunkmaster, centerChunk: ChunkCoordinates
     protected val msptThreshold = plugin.config.getLong("generation.mspt-pause-threshold")
     protected val maxLoadedChunks = plugin.config.getInt("generation.max-loaded-chunks")
     protected val chunksPerStep = plugin.config.getInt("generation.chunks-per-step")
+    protected val ignoreWorldborder = plugin.config.getBoolean("generation.ignore-worldborder")
 
     protected var endReachedCallback: ((GenerationTask) -> Unit)? = null
         private set
@@ -52,7 +53,8 @@ abstract class GenerationTask(plugin: Chunkmaster, centerChunk: ChunkCoordinates
      * Checks if the World border or the maximum chunk setting for the task is reached.
      */
     protected fun borderReached(): Boolean {
-        return !world.worldBorder.isInside(lastChunkCoords.getCenterLocation(world)) || (stopAfter in 1..count)
+        return (!world.worldBorder.isInside(lastChunkCoords.getCenterLocation(world)) && !ignoreWorldborder)
+                || (stopAfter in 1..count)
     }
 
     /**

src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationTaskPaper.kt

@@ -4,7 +4,6 @@ import net.trivernis.chunkmaster.Chunkmaster
 import org.bukkit.Chunk
 import org.bukkit.World
 import java.util.concurrent.CompletableFuture
-import io.papermc.lib.PaperLib
 
 class GenerationTaskPaper(
     private val plugin: Chunkmaster, override val world: World,
@@ -44,22 +43,22 @@ class GenerationTaskPaper(
 
                 var chunk = nextChunkCoordinates
                 for (i in 1 until chunkSkips) {
-                    if (PaperLib.isChunkGenerated(world, chunk.x, chunk.z)) {
+                    if (world.isChunkGenerated(chunk.x, chunk.z)) {
                         chunk = nextChunkCoordinates
                     } else {
                         break
                     }
                 }
 
-                if (!PaperLib.isChunkGenerated(world, chunk.x, chunk.z)) {
+                if (!world.isChunkGenerated(chunk.x, chunk.z)) {
                     for (i in 0 until minOf(chunksPerStep, (stopAfter - count) - 1)) {
-                        if (!PaperLib.isChunkGenerated(world, chunk.x, chunk.z)) {
-                            pendingChunks.add(PaperLib.getChunkAtAsync(world, chunk.x, chunk.z, true))
+                        if (!world.isChunkGenerated(chunk.x, chunk.z)) {
+                            pendingChunks.add(world.getChunkAtAsync(chunk.x, chunk.z, true))
                         }
                         chunk = nextChunkCoordinates
                     }
-                    if (!PaperLib.isChunkGenerated(world, chunk.x, chunk.z)) {
-                        pendingChunks.add(PaperLib.getChunkAtAsync(world, chunk.x, chunk.z, true))
+                    if (!world.isChunkGenerated(chunk.x, chunk.z)) {
+                        pendingChunks.add(world.getChunkAtAsync(chunk.x, chunk.z, true))
                     }
                 }
                 lastChunkCoords = chunk

src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationTaskSpigot.kt

@@ -1,7 +1,6 @@
 package net.trivernis.chunkmaster.lib.generation
 
 import net.trivernis.chunkmaster.Chunkmaster
-import org.bukkit.Chunk
 import org.bukkit.World
 
 class GenerationTaskSpigot(