AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-16 02:45:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

network: unify vibration source reading

Browse Source
This commit is contained in:
Bixilon 2023-04-30 15:38:12 +02:00
parent fd3fa6f298
commit 93e956828c
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/bixilon/minosoft/data/registries/particle/data/VibrationParticleData.kt
View File

@ -16,18 +16,15 @@ import de.bixilon.minosoft.data.registries.particle.ParticleType
import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
class VibrationParticleData(val source: Any, val arrival: Int, type: ParticleType) : ParticleData(type) { class VibrationParticleData(val source: Any, val arrival: Int, type: ParticleType) : ParticleData(type) {
override fun toString(): String { override fun toString(): String {
return "$type: $source in $arrival" return "$type: $source in $arrival"
} }
companion object : ParticleDataFactory<VibrationParticleData> { companion object : ParticleDataFactory<VibrationParticleData> {
override fun read(buffer: PlayInByteBuffer, type: ParticleType): VibrationParticleData { override fun read(buffer: PlayInByteBuffer, type: ParticleType): VibrationParticleData {
val sourceType = buffer.readResourceLocation() val source = buffer.readVibrationSource()
val source: Any = when (sourceType.toString()) { // TODO: combine with VibrationS2CP
"minecraft:block" -> buffer.readBlockPosition()
"minecraft:entity" -> buffer.readEntityId()
else -> error("Unknown target type: $sourceType")
}
val arrival = buffer.readVarInt() val arrival = buffer.readVarInt()
return VibrationParticleData(source, arrival, type) return VibrationParticleData(source, arrival, type)
} }

19
src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/VibrationS2CP.kt
View File

@ -13,7 +13,6 @@
package de.bixilon.minosoft.protocol.packets.s2c.play package de.bixilon.minosoft.protocol.packets.s2c.play
import de.bixilon.kotlinglm.vec3.Vec3i import de.bixilon.kotlinglm.vec3.Vec3i
import de.bixilon.minosoft.data.registries.identified.ResourceLocation
import de.bixilon.minosoft.protocol.packets.factory.LoadPacket import de.bixilon.minosoft.protocol.packets.factory.LoadPacket
import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
@ -24,19 +23,13 @@ import de.bixilon.minosoft.util.logging.LogMessageType
@LoadPacket @LoadPacket
class VibrationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket { class VibrationS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
val sourcePosition: Vec3i = buffer.readBlockPosition() val sourcePosition: Vec3i = buffer.readBlockPosition()
val targetType: ResourceLocation = buffer.readResourceLocation() val target = buffer.readVibrationSource()
val arrival: Int = buffer.readVarInt()
/**
* @return Depends on vibration target type, if block: block postion, if entity: entity id
*/
val targetData: Any = when (targetType.toString()) { // todo: combine with VibrationParticleData
"minecraft:block" -> buffer.readBlockPosition()
"minecraft:entity" -> buffer.readEntityId()
else -> error("Unknown target type: $targetType")
}
val arrivalTicks: Int = buffer.readVarInt()
override fun log(reducedLog: Boolean) { override fun log(reducedLog: Boolean) {
Log.log(LogMessageType.NETWORK_PACKETS_IN, level = LogLevels.VERBOSE) { "Vibration signal (sourcePosition=$sourcePosition, targetType=$targetType, targetData=$targetData, arrivalTicks=$arrivalTicks)" } Log.log(
LogMessageType.NETWORK_PACKETS_IN,
level = LogLevels.VERBOSE
) { "Vibration signal (sourcePosition=$sourcePosition, target=$target, arrival=$arrival)" }
} }
} }

11
src/main/java/de/bixilon/minosoft/protocol/protocol/buffers/play/PlayInByteBuffer.kt
View File

@ -334,4 +334,15 @@ class PlayInByteBuffer : InByteBuffer {
fun readVelocity(): Vec3d { fun readVelocity(): Vec3d {
return Vec3d(readShort(), readShort(), readShort()) / ProtocolDefinition.VELOCITY_NETWORK_DIVIDER return Vec3d(readShort(), readShort(), readShort()) / ProtocolDefinition.VELOCITY_NETWORK_DIVIDER
} }
fun readVibrationSource(): Any {
val type = readResourceLocation()
val source: Any = when (type.toString()) { // TODO: dynamic, factories
"minecraft:block" -> readBlockPosition()
"minecraft:entity" -> readEntityId()
else -> error("Unknown vibration source: $type")
}
return source
}
} }