From d1b0eb3b2c49ad8bc214d30b1fc78d67db3cd165 Mon Sep 17 00:00:00 2001 From: bixilon Date: Sun, 14 Jun 2020 15:40:27 +0200 Subject: [PATCH] thunderbolt support (weather) --- .../play/PacketSpawnWeatherEntity.java | 59 +++++++++++++++++++ .../protocol/protocol/PacketHandler.java | 4 ++ .../minosoft/protocol/protocol/Protocol.java | 1 + 3 files changed, 64 insertions(+) create mode 100644 src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnWeatherEntity.java diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnWeatherEntity.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnWeatherEntity.java new file mode 100644 index 000000000..68b66cc60 --- /dev/null +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnWeatherEntity.java @@ -0,0 +1,59 @@ +/* + * 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 PacketSpawnWeatherEntity implements ClientboundPacket { + int entityId; + Location location; + + @Override + public void read(InPacketBuffer buffer, ProtocolVersion v) { + switch (v) { + case VERSION_1_7_10: + entityId = buffer.readVarInt(); + // only thunderbolts + byte type = buffer.readByte(); + if (type != 1) { + throw new RuntimeException(String.format("Illegal global entity spawned (entityType=%d)!", type)); + } + location = new Location(buffer.readFixedPointNumberInteger(), buffer.readFixedPointNumberInteger(), buffer.readFixedPointNumberInteger()); + break; + } + } + + @Override + public void log() { + Log.protocol(String.format("Thunderbolt spawned (entityId=%d, at %s)", entityId, location.toString())); + } + + @Override + public void handle(PacketHandler h) { + h.handle(this); + } + + public int getEntityId() { + return entityId; + } + + public Location getLocation() { + return location; + } +} 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 960773b03..1ff071f6d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java @@ -235,4 +235,8 @@ public class PacketHandler { public void handle(PacketSpawnExperienceOrb pkg) { connection.getPlayer().getWorld().addEntity(pkg.getOrb()); } + + public void handle(PacketSpawnWeatherEntity pkg) { + //ToDo + } } 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 3893e3512..b4ffe240c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java @@ -80,5 +80,6 @@ public interface Protocol { packetClassMapping.put(Packets.Clientbound.PLAY_OPEN_SIGN_EDITOR, PacketOpenSignEditor.class); packetClassMapping.put(Packets.Clientbound.PLAY_SPAWN_OBJECT, PacketSpawnObject.class); packetClassMapping.put(Packets.Clientbound.PLAY_SPAWN_EXPERIENCE_ORB, PacketSpawnExperienceOrb.class); + packetClassMapping.put(Packets.Clientbound.PLAY_SPAWN_WEATHER_ENTITY, PacketSpawnWeatherEntity.class); } } \ No newline at end of file