entities wip (5)

This commit is contained in:
bixilon 2020-06-07 00:51:38 +02:00
parent 652fdbfc43
commit 74d34a8078
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 74 additions and 0 deletions

View File

@ -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 <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.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);
}
}

View File

@ -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());
}
}

View File

@ -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);
}
}