star/KSpigot
1
0
Fork 0
Code Pull Requests Packages Activity

Applied kotlin style conventions

Browse Source
This commit is contained in:
bluefireoly
2020-10-18 18:36:49 +02:00
parent e1d4e8bbfc
commit da848728d2
39 changed files with 509 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/kotlin/net/axay/kspigot/structures/StructureLoader.kt
View File

@@ -12,38 +12,45 @@ import org.bukkit.entity.Entity
/**
* @return A [Structure] containing all data of the given [LocationArea].
*/
fun LocationArea.loadStructure(includeBlocks: Boolean = true, includeEntities: Boolean = false)
= Structure(
if (includeBlocks)
fillBlocks.mapTo(HashSet()) {
SingleStructureData(it.location relationTo minLoc.blockLoc, StructureDataBlock(it)) }
else emptySet(),
if (includeEntities)
entities.mapTo(HashSet()) {
SingleStructureData(it.location relationTo minLoc.blockLoc, StructureDataEntity(it)) }
else emptySet()
)
fun LocationArea.loadStructure(includeBlocks: Boolean = true, includeEntities: Boolean = false) = Structure(
if (includeBlocks)
fillBlocks.mapTo(HashSet()) {
SingleStructureData(it.location relationTo minLoc.blockLoc, StructureDataBlock(it))
}
else emptySet(),
if (includeEntities)
entities.mapTo(HashSet()) {
SingleStructureData(it.location relationTo minLoc.blockLoc, StructureDataEntity(it))
}
else emptySet()
)
/**
* @return All blocks in the given [LocationArea].
* Sorted by their coordinates.
*/
val LocationArea.fillBlocks: Set<Block> get()
val LocationArea.fillBlocks: Set<Block>
get()
= LinkedHashSet<Block>().apply {
(minLoc.blockX until maxLoc.blockX + 1).forEach { x ->
(minLoc.blockY until maxLoc.blockY + 1).forEach { y ->
(minLoc.blockZ until maxLoc.blockZ + 1).forEach { z ->
this += Location(world, x.toDouble(), y.toDouble(), z.toDouble()).block
} } }
(minLoc.blockY until maxLoc.blockY + 1).forEach { y ->
(minLoc.blockZ until maxLoc.blockZ + 1).forEach { z ->
this += Location(world, x.toDouble(), y.toDouble(), z.toDouble()).block
}
}
}
}
/**
* @return All entities in the given [LocationArea].
*/
val LocationArea.entities: Set<Entity> get()
val LocationArea.entities: Set<Entity>
get()
= HashSet<Entity>().apply {
touchedChunks.forEach { it.entities.forEach { en ->
if (simpleLocationPair.isInArea(en.location))
this += en
} }
touchedChunks.forEach {
it.entities.forEach { en ->
if (simpleLocationPair.isInArea(en.location))
this += en
}
}
}