Redstoner/Parcels
Archived
0
Fork 0
Code Activity

More commandlib tweaks

Browse Source
This commit is contained in:
Dico
2018-09-27 09:03:28 +01:00
parent f28e4393db
commit 09aaa9ff72
27 changed files with 68 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/io/dico/parcels2/Interactable.kt
View File

@@ -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

2
src/main/kotlin/io/dico/parcels2/ParcelWorld.kt
View File

@@ -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

2
src/main/kotlin/io/dico/parcels2/blockvisitor/JobDispatcher.kt
View File

@@ -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

2
src/main/kotlin/io/dico/parcels2/blockvisitor/RegionTraverser.kt
View File

@@ -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>

2
src/main/kotlin/io/dico/parcels2/command/ParcelCommandBuilder.kt
View File

@@ -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)
}

2
src/main/kotlin/io/dico/parcels2/command/ParcelTarget.kt
View File

@@ -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

4
src/main/kotlin/io/dico/parcels2/defaultimpl/DefaultParcelGenerator.kt
View File

@@ -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

4
src/main/kotlin/io/dico/parcels2/listener/ParcelListeners.kt
View File

@@ -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

2
src/main/kotlin/io/dico/parcels2/storage/exposed/ExposedBacking.kt
View File

@@ -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

2
src/main/kotlin/io/dico/parcels2/util/MainThreadDispatcher.kt
View File

@@ -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)
}
}

3
src/main/kotlin/io/dico/parcels2/util/ext/Misc.kt
View File

@@ -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()) {

2
src/main/kotlin/io/dico/parcels2/util/math/ext/Math.kt → src/main/kotlin/io/dico/parcels2/util/math/Math.kt
View File

@@ -1,4 +1,4 @@
package io.dico.parcels2.util.math.ext
package io.dico.parcels2.util.math
fun Double.floor(): Int {
val down = toInt()

1
src/main/kotlin/io/dico/parcels2/util/math/Vec3d.kt
View File

@@ -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

1
src/main/kotlin/io/dico/parcels2/util/math/Vec3i.kt
View File

@@ -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