moritzruth/uranos
Archived
1
0
Fork 0
Code Activity

Fix getVoxelsInCube

Browse source
This commit is contained in:
Moritz Ruth 2021-01-02 01:09:44 +01:00
parent c090b1461a
commit 20e054c0f8
No known key found for this signature in database
GPG key ID: AFD57E23E753841B
6 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
blokk-api/src/main/kotlin/space/blokk/util/UntilPossiblyNegative.kt Normal file
View file

@ -0,0 +1,4 @@
package space.blokk.util
infix fun Int.untilPossiblyNegative(other: Int) =
IntProgression.fromClosedRange(this, other, if (this > other) -1 else 1)

16
blokk-api/src/main/kotlin/space/blokk/world/World.kt
View file

@ -5,6 +5,7 @@ import space.blokk.Blokk
import space.blokk.entity.Entity
import space.blokk.util.newSingleThreadDispatcher
import space.blokk.util.supervisorChild
import space.blokk.util.untilPossiblyNegative
import java.util.*
import kotlin.coroutines.CoroutineContext
@ -59,17 +60,14 @@ abstract class World(val uuid: UUID) {
*/
@OptIn(ExperimentalStdlibApi::class)
fun getVoxelsInCube(cornerA: VoxelLocation, cornerB: VoxelLocation, hollow: Boolean = false): List<Voxel> {
val xList = if (hollow) listOf(cornerA.x, cornerB.x).distinct() else (cornerA.x..cornerB.x).toList()
val zList = if (hollow) listOf(cornerA.z, cornerB.z).distinct() else (cornerA.z..cornerB.z).toList()
val yList =
if (hollow) listOf(cornerA.y.toInt(), cornerB.y.toInt()).distinct()
else (cornerA.y.toInt()..cornerB.y.toInt()).toList()
fun getList(a: Int, b: Int) =
if (hollow) listOf(a, b).distinct()
else (a untilPossiblyNegative b).toList()
return buildList {
for(x in xList) {
for(y in yList) {
for(z in zList) {
for(x in getList(cornerA.x, cornerB.x)) {
for(y in getList(cornerA.y.toInt(), cornerB.y.toInt())) {
for(z in getList(cornerA.z, cornerB.z)) {
add(getVoxel(VoxelLocation(x, y.toUByte(), z)))
}
}

10
blokk-packets/src/main/kotlin/space/blokk/net/packet/play/ChunkDataPacket.kt
View file

@ -8,4 +8,12 @@ import space.blokk.world.ChunkData
/**
* Sent to inform the player about blocks and biomes in a chunk.
*/
data class ChunkDataPacket(val key: Chunk.Key, val data: ChunkData) : OutgoingPacket()
data class ChunkDataPacket(val key: Chunk.Key, val data: ChunkData) : OutgoingPacket() {
init {
if (key.x == 0 && key.z == 0) {
data.sections[0]?.forEach {
print(it)
}
}
}
}

2
blokk-server/src/main/kotlin/space/blokk/net/BlokkSession.kt
View file

@ -34,7 +34,7 @@ import kotlin.properties.Delegates
class BlokkSession(private val channel: io.netty.channel.Channel, val server: BlokkServer) : Session() {
override val address: InetAddress = (channel.remoteAddress() as InetSocketAddress).address
private val identifier = "BlokkSession(${address.hostAddress})" + System.identityHashCode(this)
private val identifier = "BlokkSession(${address.hostAddress})"
val logger = Logger(identifier)
override val coroutineContext: CoroutineContext = server.coroutineContext.supervisorChild(identifier)

2
blokk-server/src/main/kotlin/space/blokk/net/LoginAndJoinProcedure.kt
View file

@ -201,7 +201,7 @@ class LoginAndJoinProcedure(val session: BlokkSession) {
session.send(UpdateViewPositionPacket(Chunk.Key.from(player.location.toVoxelLocation())))
session.scheduleKeepAlivePacket()
session.scheduleKeepAlivePacket(true)
player.sendChunksAndLight()
// WorldBorder

3
test-plugin/src/main/kotlin/space/blokk/testplugin/TestPlugin.kt
View file

@ -38,6 +38,9 @@ class TestPlugin: Plugin("Test", "1.0.0") {
}
Blokk.eventBus.on<SessionAfterLoginEvent> { event ->
event.gameMode = GameMode.CREATIVE
event.canFly = true
event.flying = true
event.initialWorldAndLocation = WorldAndLocationWithRotation(
world,
VoxelLocation.of(0, 2, 0).atTopCenter().withRotation(0f, 0f)