1 files changed, 47 insertions, 18 deletions

diff --git a/src/main/kotlin/io/dico/parcels2/blockvisitor/Schematic.kt b/src/main/kotlin/io/dico/parcels2/blockvisitor/Schematic.kt
index 8d2084b..9d9a2aa 100644
--- a/src/main/kotlin/io/dico/parcels2/blockvisitor/Schematic.kt
+++ b/src/main/kotlin/io/dico/parcels2/blockvisitor/Schematic.kt
@@ -6,6 +6,7 @@ import io.dico.parcels2.util.get
 import org.bukkit.Bukkit
 import org.bukkit.Material
 import org.bukkit.World
+import org.bukkit.block.Block
 import org.bukkit.block.data.BlockData
 
 private val air = Bukkit.createBlockData(Material.AIR)
@@ -20,19 +21,21 @@ class Schematic {
         }
 
     private var blockDatas: Array<BlockData?>? = null
-    //private var extra: Map<Vec3i, (Block) -> Unit>? = null
+    private val extra = mutableMapOf<Vec3i, (Block) -> Unit>()
     private var isLoaded = false; private set
     private val traverser: RegionTraverser = RegionTraverser.upward
 
-    fun getLoadTask(world: World, region: Region): TimeLimitedTask = {
+    suspend fun WorkerScope.load(world: World, region: Region) {
         _size = region.size
 
         val data = arrayOfNulls<BlockData>(region.blockCount).also { blockDatas = it }
-        //val extra = mutableMapOf<Vec3i, (Block) -> Unit>().also { extra = it }
         val blocks = traverser.traverseRegion(region)
+        val total = region.blockCount.toDouble()
 
         for ((index, vec) in blocks.withIndex()) {
             markSuspensionPoint()
+            setProgress(index / total)
+
             val block = world[vec]
             if (block.y > 255) continue
             val blockData = block.blockData
@@ -42,30 +45,56 @@ class Schematic {
         isLoaded = true
     }
 
-    fun getPasteTask(world: World, position: Vec3i): TimeLimitedTask = {
+    suspend fun WorkerScope.paste(world: World, position: Vec3i) {
         if (!isLoaded) throw IllegalStateException()
         val region = Region(position, _size!!)
         val blocks = traverser.traverseRegion(region, worldHeight = world.maxHeight)
         val blockDatas = blockDatas!!
+        var postponed = hashMapOf<Vec3i, BlockData>()
+
+        // 90% of the progress of this job is allocated to this code block
+        delegateWork(0.9) {
+            for ((index, vec) in blocks.withIndex()) {
+                markSuspensionPoint()
+                val block = world[vec]
+                val type = blockDatas[index] ?: air
+                if (type !== air && isAttachable(type.material)) {
+                    val supportingBlock = vec + getSupportingBlock(type)
+
+                    if (!postponed.containsKey(supportingBlock) && traverser.comesFirst(vec, supportingBlock)) {
+                        block.blockData = type
+                    } else {
+                        postponed[vec] = type
+                    }
+
+                } else {
+                    block.blockData = type
+                }
+            }
+        }
 
-        val postponed = mutableListOf<Pair<Vec3i, BlockData>>()
-
-        for ((index, vec) in blocks.withIndex()) {
-            markSuspensionPoint()
-            val block = world[vec]
-            val type = blockDatas[index] ?: air
-            if (type !== air && isAttachable(type.material)) {
-
-
-                postponed += vec to type
-            } else {
-                block.blockData = type
+        delegateWork {
+            while (!postponed.isEmpty()) {
+                val newMap = hashMapOf<Vec3i, BlockData>()
+                for ((vec, type) in postponed) {
+                    val supportingBlock = vec + getSupportingBlock(type)
+                    if (supportingBlock in postponed && supportingBlock != vec) {
+                        newMap[vec] = type
+                    } else {
+                        world[vec].blockData = type
+                    }
+                }
+                postponed = newMap
             }
         }
+    }
 
-        for ((vec, data) in postponed) {
+    fun getLoadTask(world: World, region: Region): TimeLimitedTask = {
+        load(world, region)
+    }
 
-        }
+    fun getPasteTask(world: World, position: Vec3i): TimeLimitedTask = {
+        paste(world, position)
     }
 
 }