From 74d34a8078a6021fff2fe11f2d6c3d8325d59a79 Mon Sep 17 00:00:00 2001 From: bixilon Date: Sun, 7 Jun 2020 00:51:38 +0200 Subject: [PATCH] entities wip (5) --- .../play/PacketEntityTeleport.java | 67 +++++++++++++++++++ .../protocol/protocol/PacketHandler.java | 6 ++ .../minosoft/protocol/protocol/Protocol.java | 1 + 3 files changed, 74 insertions(+) create mode 100644 src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityTeleport.java diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityTeleport.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityTeleport.java new file mode 100644 index 000000000..026c92bdc --- /dev/null +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityTeleport.java @@ -0,0 +1,67 @@ +/* + * Codename 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 . + * + * 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.game.datatypes.entities.Location; +import de.bixilon.minosoft.logging.Log; +import de.bixilon.minosoft.protocol.packets.ClientboundPacket; +import de.bixilon.minosoft.protocol.protocol.InPacketBuffer; +import de.bixilon.minosoft.protocol.protocol.PacketHandler; +import de.bixilon.minosoft.protocol.protocol.ProtocolVersion; + + +public class PacketEntityTeleport implements ClientboundPacket { + int entityId; + Location location; + int yaw; + int pitch; + + @Override + public void read(InPacketBuffer buffer, ProtocolVersion v) { + switch (v) { + case VERSION_1_7_10: + this.entityId = buffer.readInteger(); + this.location = new Location(buffer.readFixedPointNumberInteger(), buffer.readFixedPointNumberInteger(), buffer.readFixedPointNumberInteger()); + this.yaw = buffer.readByte(); //ToDo + this.pitch = buffer.readByte(); + break; + } + } + + @Override + public void log() { + Log.protocol(String.format("Entity %d moved to %s - %s %s", entityId, location.toString(), yaw, pitch)); + } + + public int getEntityId() { + return entityId; + } + + public Location getRelativeLocation() { + return location; + } + + public int getYaw() { + return yaw; + } + + public int getPitch() { + return pitch; + } + + @Override + public void handle(PacketHandler h) { + h.handle(this); + } +} diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java index 30083ff82..69fd74dfe 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java @@ -176,4 +176,10 @@ public class PacketHandler { public void handle(PacketSpawnPlayer pkg) { connection.getPlayer().getWorld().addEntity(pkg.getPlayer()); } + + public void handle(PacketEntityTeleport pkg) { + connection.getPlayer().getWorld().getEntity(pkg.getEntityId()).setLocation(pkg.getRelativeLocation()); + connection.getPlayer().getWorld().getEntity(pkg.getEntityId()).setYaw(pkg.getYaw()); + connection.getPlayer().getWorld().getEntity(pkg.getEntityId()).setPitch(pkg.getPitch()); + } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java index b32ca55a3..71214b61b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java @@ -69,5 +69,6 @@ public interface Protocol { packetClassMapping.put(Packets.Clientbound.PLAY_DESTROY_ENTITIES, PacketDestoryEntity.class); packetClassMapping.put(Packets.Clientbound.PLAY_ENTITY_VELOCITY, PacketEntityVelocity.class); packetClassMapping.put(Packets.Clientbound.PLAY_SPAWN_PLAYER, PacketSpawnPlayer.class); + packetClassMapping.put(Packets.Clientbound.PLAY_ENTITY_TELEPORT, PacketEntityTeleport.class); } } \ No newline at end of file