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

network: PacketPlayerPositionAndRotation: allow relative positions

Browse Source
This commit is contained in:
Bixilon 2021-04-07 15:37:03 +02:00
parent 074c685329
commit 5124b7b8f2
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerPositionAndRotation.java
View File

@ -1,85 +0,0 @@
/*
* Minosoft
* Copyright (C) 2020 Moritz Zwerger
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program.If not, see <https://www.gnu.org/licenses/>.
*
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.protocol.packets.clientbound.play;
import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.protocol.network.connection.PlayConnection;
import de.bixilon.minosoft.protocol.packets.clientbound.PlayClientboundPacket;
import de.bixilon.minosoft.protocol.packets.serverbound.play.PlayerPositionAndRotationServerboundPacket;
import de.bixilon.minosoft.protocol.packets.serverbound.play.TeleportConfirmServerboundPacket;
import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer;
import de.bixilon.minosoft.util.logging.Log;
import glm_.vec3.Vec3;
import static de.bixilon.minosoft.protocol.protocol.ProtocolVersions.*;
public class PacketPlayerPositionAndRotation extends PlayClientboundPacket {
private final Vec3 position;
private final EntityRotation rotation;
private boolean onGround;
private byte flags;
private int teleportId;
private boolean dismountVehicle = true;
public PacketPlayerPositionAndRotation(PlayInByteBuffer buffer) {
this.position = buffer.readEntityPosition();
this.rotation = new EntityRotation(buffer.readFloat(), buffer.readFloat(), 0);
if (buffer.getVersionId() < V_14W03B) {
this.onGround = buffer.readBoolean();
return;
} else {
this.flags = buffer.readByte();
}
if (buffer.getVersionId() >= V_15W42A) {
this.teleportId = buffer.readVarInt();
}
if (buffer.getVersionId() < V_21W05A) {
return;
}
this.dismountVehicle = buffer.readBoolean();
}
@Override
public void handle(PlayConnection connection) {
// ToDo: GUI should do this
connection.getPlayer().getEntity().setPosition(getPosition());
if (connection.getVersion().getVersionId() >= V_15W42A) {
connection.sendPacket(new TeleportConfirmServerboundPacket(getTeleportId()));
} else {
connection.sendPacket(new PlayerPositionAndRotationServerboundPacket(getPosition(), getRotation(), isOnGround()));
}
}
@Override
public void log() {
Log.protocol(String.format("[IN] Received player position (position=%s, rotation=%s, onGround=%b)", this.position, this.rotation, this.onGround));
}
public Vec3 getPosition() {
return this.position;
}
public EntityRotation getRotation() {
return this.rotation;
}
public boolean isOnGround() {
return this.onGround;
}
public int getTeleportId() {
return this.teleportId;
}
}

85
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerPositionAndRotation.kt Normal file
View File

@ -0,0 +1,85 @@
/*
* Minosoft
* Copyright (C) 2020 Moritz Zwerger
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program.If not, see <https://www.gnu.org/licenses/>.
*
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.protocol.packets.clientbound.play
import de.bixilon.minosoft.data.entities.EntityRotation
import de.bixilon.minosoft.protocol.network.connection.PlayConnection
import de.bixilon.minosoft.protocol.packets.clientbound.PlayClientboundPacket
import de.bixilon.minosoft.protocol.packets.serverbound.play.PlayerPositionAndRotationServerboundPacket
import de.bixilon.minosoft.protocol.packets.serverbound.play.TeleportConfirmServerboundPacket
import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
import de.bixilon.minosoft.util.BitByte
import de.bixilon.minosoft.util.logging.Log
import glm_.vec3.Vec3
class PacketPlayerPositionAndRotation(buffer: PlayInByteBuffer) : PlayClientboundPacket() {
val position: Vec3
val rotation: EntityRotation
var isOnGround = false
private var flags: Int = 0
var teleportId = 0
private var dismountVehicle = true
init {
position = buffer.readEntityPosition()
rotation = EntityRotation(buffer.readFloat(), buffer.readFloat(), 0.0f)
if (buffer.versionId < ProtocolVersions.V_14W03B) {
isOnGround = buffer.readBoolean()
} else {
flags = buffer.readUnsignedByte()
if (buffer.versionId >= ProtocolVersions.V_15W42A) {
teleportId = buffer.readVarInt()
}
if (buffer.versionId >= ProtocolVersions.V_21W05A) {
dismountVehicle = buffer.readBoolean()
}
}
}
override fun handle(connection: PlayConnection) {
val entity = connection.player.entity
// correct position with flags (relative position possible)
if (BitByte.isBitMask(flags, 0x01)) {
position.x += entity.position.x
}
if (BitByte.isBitMask(flags, 0x02)) {
position.y += entity.position.y
}
if (BitByte.isBitMask(flags, 0x04)) {
position.z += entity.position.z
}
if (BitByte.isBitMask(flags, 0x08)) {
rotation.yaw += entity.rotation.yaw
}
if (BitByte.isBitMask(flags, 0x10)) {
rotation.pitch += entity.rotation.pitch
}
entity.position = position
entity.rotation = rotation
if (connection.version.versionId >= ProtocolVersions.V_15W42A) {
connection.sendPacket(TeleportConfirmServerboundPacket(teleportId))
} else {
connection.sendPacket(PlayerPositionAndRotationServerboundPacket(position, rotation, isOnGround))
}
}
override fun log() {
Log.protocol(String.format("[IN] Received player position (position=%s, rotation=%s, onGround=%b)", position, rotation, isOnGround))
}
}