Improve code style

This commit is contained in:
Jakob K
2021-05-12 14:17:44 +02:00
parent 3e9b243d3d
commit cf48510756
69 changed files with 144 additions and 609 deletions

View File

@@ -9,14 +9,12 @@ import org.bukkit.block.BlockFace
* vertical directions (pitch).
*/
enum class VerticalDirection {
UP, DOWN, STRAIGHT;
val facing: BlockFace?
get() = Enums.getIfPresent(BlockFace::class.java, this.name).orNull()
companion object {
fun fromLocation(location: Location): VerticalDirection {
val pitch: Float = location.pitch
return when {
@@ -25,9 +23,7 @@ enum class VerticalDirection {
else -> STRAIGHT
}
}
}
}
/**
@@ -35,14 +31,12 @@ enum class VerticalDirection {
* cardinal directions (yaw).
*/
enum class CardinalDirection {
NORTH, EAST, SOUTH, WEST;
val facing: BlockFace?
get() = Enums.getIfPresent(BlockFace::class.java, this.name).orNull()
companion object {
fun fromLocation(location: Location): CardinalDirection {
var yaw: Float = location.yaw
if (yaw < 0) yaw += 360f
@@ -54,7 +48,5 @@ enum class CardinalDirection {
else -> NORTH
}
}
}
}

View File

@@ -7,44 +7,34 @@ import org.bukkit.FireworkEffect
import org.bukkit.inventory.meta.FireworkMeta
object KSpigotFirework {
inline fun buildFireworkMeta(fireworkMeta: FireworkMeta, builder: KSpigotFireworkBuilder.() -> Unit): FireworkMeta {
return KSpigotFireworkBuilder().apply(builder).applyTo(fireworkMeta)
}
fun FireworkMeta.build(builder: KSpigotFireworkBuilder.() -> Unit) = buildFireworkMeta(this, builder)
}
class KSpigotFireworkBuilder {
val effects = ArrayList<FireworkEffect>()
var power: Int? = null
inline fun effect(builder: FireworkEffectBuilder.() -> Unit) {
effects += FireworkEffectBuilder().apply(builder).fireworkEffect
}
fun applyTo(fireworkMeta: FireworkMeta): FireworkMeta {
fireworkMeta.addEffects(effects)
power?.let { fireworkMeta.power = it }
return fireworkMeta
}
}
class FireworkEffectBuilder {
private val fireworkBuilder = FireworkEffect.builder()
var type: FireworkEffect.Type? = null
var trail: Boolean? = null
var flicker: Boolean? = null
fun fade(vararg colors: Color) {
fireworkBuilder.withFade(*colors)
}
@@ -55,13 +45,10 @@ class FireworkEffectBuilder {
val fireworkEffect: FireworkEffect
get() {
type?.let { fireworkBuilder.with(it) }
trail?.let { fireworkBuilder.trail(it) }
flicker?.let { fireworkBuilder.flicker(it) }
return fireworkBuilder.build()
}
}

View File

@@ -33,9 +33,7 @@ fun PersistentDataHolder.unmark(key: String) {
* this objects' markings.
*/
fun PersistentDataHolder.hasMark(key: String) = persistentDataContainer.has(markerKey(key), PersistentDataType.BYTE)
// quick access for ItemStacks
/** @see PersistentDataHolder.mark */
fun ItemStack.mark(key: String) = meta { mark(key) }