More commandlib tweaks

14 files changed, 13 insertions, 18 deletions

diff --git a/src/main/kotlin/io/dico/parcels2/Interactable.kt b/src/main/kotlin/io/dico/parcels2/Interactable.kt
index 825be94..c301340 100644
--- a/src/main/kotlin/io/dico/parcels2/Interactable.kt
+++ b/src/main/kotlin/io/dico/parcels2/Interactable.kt
@@ -1,6 +1,6 @@
 package io.dico.parcels2
 
-import io.dico.parcels2.util.math.ext.ceilDiv
+import io.dico.parcels2.util.math.ceilDiv
 import io.dico.parcels2.util.ext.getMaterialsWithWoodTypePrefix
 import org.bukkit.Material
 import java.util.EnumMap
diff --git a/src/main/kotlin/io/dico/parcels2/ParcelWorld.kt b/src/main/kotlin/io/dico/parcels2/ParcelWorld.kt
index 87e4c68..a3c6c24 100644
--- a/src/main/kotlin/io/dico/parcels2/ParcelWorld.kt
+++ b/src/main/kotlin/io/dico/parcels2/ParcelWorld.kt
@@ -3,7 +3,7 @@ package io.dico.parcels2
 import io.dico.parcels2.options.RuntimeWorldOptions
 import io.dico.parcels2.storage.Storage
 import io.dico.parcels2.util.math.Vec2i
-import io.dico.parcels2.util.math.ext.floor
+import io.dico.parcels2.util.math.floor
 import org.bukkit.Location
 import org.bukkit.World
 import org.bukkit.block.Block
diff --git a/src/main/kotlin/io/dico/parcels2/blockvisitor/JobDispatcher.kt b/src/main/kotlin/io/dico/parcels2/blockvisitor/JobDispatcher.kt
index 702a680..c6bcacc 100644
--- a/src/main/kotlin/io/dico/parcels2/blockvisitor/JobDispatcher.kt
+++ b/src/main/kotlin/io/dico/parcels2/blockvisitor/JobDispatcher.kt
@@ -2,7 +2,7 @@ package io.dico.parcels2.blockvisitor
 
 import io.dico.parcels2.ParcelsPlugin
 import io.dico.parcels2.logger
-import io.dico.parcels2.util.math.ext.clampMin
+import io.dico.parcels2.util.math.clampMin
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart.LAZY
diff --git a/src/main/kotlin/io/dico/parcels2/blockvisitor/RegionTraverser.kt b/src/main/kotlin/io/dico/parcels2/blockvisitor/RegionTraverser.kt
index bd00407..dc8ac28 100644
--- a/src/main/kotlin/io/dico/parcels2/blockvisitor/RegionTraverser.kt
+++ b/src/main/kotlin/io/dico/parcels2/blockvisitor/RegionTraverser.kt
@@ -3,7 +3,7 @@ package io.dico.parcels2.blockvisitor
 import io.dico.parcels2.util.math.Dimension
 import io.dico.parcels2.util.math.Region
 import io.dico.parcels2.util.math.Vec3i
-import io.dico.parcels2.util.math.ext.clampMax
+import io.dico.parcels2.util.math.clampMax
 
 private typealias Scope = SequenceScope<Vec3i>
 
diff --git a/src/main/kotlin/io/dico/parcels2/command/ParcelCommandBuilder.kt b/src/main/kotlin/io/dico/parcels2/command/ParcelCommandBuilder.kt
index 891988c..6a604c3 100644
--- a/src/main/kotlin/io/dico/parcels2/command/ParcelCommandBuilder.kt
+++ b/src/main/kotlin/io/dico/parcels2/command/ParcelCommandBuilder.kt
@@ -88,7 +88,7 @@ private fun generateCommands(address: ICommandAddress, vararg names: String) {
 
     while (addresses.isNotEmpty()) {
         val cur = addresses.poll()
-        addresses.addAll(cur.children.values.distinct())
+        cur.childrenMainKeys.mapTo(addresses) { cur.getChild(it) }
         if (cur.hasCommand()) {
             ReflectiveRegistration.generateCommands(cur, names)
         }
diff --git a/src/main/kotlin/io/dico/parcels2/command/ParcelTarget.kt b/src/main/kotlin/io/dico/parcels2/command/ParcelTarget.kt
index 05a10bd..f4d051e 100644
--- a/src/main/kotlin/io/dico/parcels2/command/ParcelTarget.kt
+++ b/src/main/kotlin/io/dico/parcels2/command/ParcelTarget.kt
@@ -17,7 +17,7 @@ import io.dico.parcels2.command.ParcelTarget.TargetKind.Companion.PREFER_OWNED_F
 import io.dico.parcels2.command.ParcelTarget.TargetKind.Companion.REAL
 import io.dico.parcels2.storage.Storage
 import io.dico.parcels2.util.math.Vec2i
-import io.dico.parcels2.util.math.ext.floor
+import io.dico.parcels2.util.math.floor
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 
diff --git a/src/main/kotlin/io/dico/parcels2/defaultimpl/DefaultParcelGenerator.kt b/src/main/kotlin/io/dico/parcels2/defaultimpl/DefaultParcelGenerator.kt
index 25d76e3..51671d4 100644
--- a/src/main/kotlin/io/dico/parcels2/defaultimpl/DefaultParcelGenerator.kt
+++ b/src/main/kotlin/io/dico/parcels2/defaultimpl/DefaultParcelGenerator.kt
@@ -6,8 +6,8 @@ import io.dico.parcels2.options.DefaultGeneratorOptions
 import io.dico.parcels2.util.math.Region
 import io.dico.parcels2.util.math.Vec2i
 import io.dico.parcels2.util.math.Vec3i
-import io.dico.parcels2.util.math.ext.even
-import io.dico.parcels2.util.math.ext.umod
+import io.dico.parcels2.util.math.even
+import io.dico.parcels2.util.math.umod
 import io.dico.parcels2.util.math.get
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.CoroutineStart.UNDISPATCHED
diff --git a/src/main/kotlin/io/dico/parcels2/listener/ParcelListeners.kt b/src/main/kotlin/io/dico/parcels2/listener/ParcelListeners.kt
index ff96536..94fca4b 100644
--- a/src/main/kotlin/io/dico/parcels2/listener/ParcelListeners.kt
+++ b/src/main/kotlin/io/dico/parcels2/listener/ParcelListeners.kt
@@ -10,8 +10,8 @@ import io.dico.parcels2.util.ext.*
 import io.dico.parcels2.util.math.Dimension
 import io.dico.parcels2.util.math.Vec3d
 import io.dico.parcels2.util.math.Vec3i
-import io.dico.parcels2.util.math.ext.clampMax
-import io.dico.parcels2.util.math.ext.clampMin
+import io.dico.parcels2.util.math.clampMax
+import io.dico.parcels2.util.math.clampMin
 import org.bukkit.Location
 import org.bukkit.Material.*
 import org.bukkit.World
diff --git a/src/main/kotlin/io/dico/parcels2/storage/exposed/ExposedBacking.kt b/src/main/kotlin/io/dico/parcels2/storage/exposed/ExposedBacking.kt
index e3ed21b..fa68338 100644
--- a/src/main/kotlin/io/dico/parcels2/storage/exposed/ExposedBacking.kt
+++ b/src/main/kotlin/io/dico/parcels2/storage/exposed/ExposedBacking.kt
@@ -6,7 +6,7 @@ import com.zaxxer.hikari.HikariDataSource
 import io.dico.parcels2.*
 import io.dico.parcels2.PlayerProfile.Star.name
 import io.dico.parcels2.storage.*
-import io.dico.parcels2.util.math.ext.clampMax
+import io.dico.parcels2.util.math.clampMax
 import io.dico.parcels2.util.ext.synchronized
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.ArrayChannel
diff --git a/src/main/kotlin/io/dico/parcels2/util/MainThreadDispatcher.kt b/src/main/kotlin/io/dico/parcels2/util/MainThreadDispatcher.kt
index ce1bf0f..3eb2e81 100644
--- a/src/main/kotlin/io/dico/parcels2/util/MainThreadDispatcher.kt
+++ b/src/main/kotlin/io/dico/parcels2/util/MainThreadDispatcher.kt
@@ -36,7 +36,7 @@ fun MainThreadDispatcher(plugin: Plugin): MainThreadDispatcher {
                 with (continuation) { resumeUndispatched(Unit) }
             }
 
-            val millis = TimeUnit.MILLISECONDS.convert(time, unit)
+            val millis = unit.toMillis(time)
             plugin.server.scheduler.runTaskLater(plugin, task, (millis + 25) / 50 - 1)
         }
     }
diff --git a/src/main/kotlin/io/dico/parcels2/util/ext/Misc.kt b/src/main/kotlin/io/dico/parcels2/util/ext/Misc.kt
index a826687..75aba35 100644
--- a/src/main/kotlin/io/dico/parcels2/util/ext/Misc.kt
+++ b/src/main/kotlin/io/dico/parcels2/util/ext/Misc.kt
@@ -2,10 +2,7 @@ package io.dico.parcels2.util.ext
 
 import io.dico.dicore.Formatting
 import io.dico.parcels2.logger
-import org.bukkit.Bukkit
-import org.bukkit.OfflinePlayer
 import java.io.File
-import java.util.UUID
 
 fun File.tryCreate(): Boolean {
     if (exists()) {
diff --git a/src/main/kotlin/io/dico/parcels2/util/math/ext/Math.kt b/src/main/kotlin/io/dico/parcels2/util/math/Math.kt
index 1211894..12c3e9f 100644
--- a/src/main/kotlin/io/dico/parcels2/util/math/ext/Math.kt
+++ b/src/main/kotlin/io/dico/parcels2/util/math/Math.kt
@@ -1,4 +1,4 @@
-package io.dico.parcels2.util.math.ext
+package io.dico.parcels2.util.math
 
 fun Double.floor(): Int {
     val down = toInt()
diff --git a/src/main/kotlin/io/dico/parcels2/util/math/Vec3d.kt b/src/main/kotlin/io/dico/parcels2/util/math/Vec3d.kt
index 45e6216..787f46c 100644
--- a/src/main/kotlin/io/dico/parcels2/util/math/Vec3d.kt
+++ b/src/main/kotlin/io/dico/parcels2/util/math/Vec3d.kt
@@ -1,6 +1,5 @@
 package io.dico.parcels2.util.math
 
-import io.dico.parcels2.util.math.ext.floor
 import org.bukkit.Location
 import kotlin.math.sqrt
 
diff --git a/src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt b/src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt
index 418fd0f..a721afa 100644
--- a/src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt
+++ b/src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt
@@ -1,6 +1,5 @@
 package io.dico.parcels2.util.math
 
-import io.dico.parcels2.util.math.ext.clampMax
 import org.bukkit.Location
 import org.bukkit.World
 import org.bukkit.block.Block