From e29e8e37524db35516dd69cb2a990192cebaebea Mon Sep 17 00:00:00 2001 From: bixilon Date: Thu, 4 Jun 2020 20:09:20 +0200 Subject: [PATCH] player health, food and saturation, support for incoming plugin messages --- .../de/bixilon/minosoft/objects/Player.java | 23 +++++++++ .../play/PacketPluginMessageReceived.java | 34 +++++++++++++ .../clientbound/play/PacketUpdateHealth.java | 48 +++++++++++++++++++ .../protocol/protocol/PacketHandler.java | 9 ++++ .../minosoft/protocol/protocol/Protocol.java | 2 + 5 files changed, 116 insertions(+) create mode 100644 src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPluginMessageReceived.java create mode 100644 src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateHealth.java diff --git a/src/main/java/de/bixilon/minosoft/objects/Player.java b/src/main/java/de/bixilon/minosoft/objects/Player.java index b172efa7c..a6a8bd2a8 100644 --- a/src/main/java/de/bixilon/minosoft/objects/Player.java +++ b/src/main/java/de/bixilon/minosoft/objects/Player.java @@ -4,6 +4,9 @@ import java.util.UUID; public class Player { Account acc; + float health; + short food; + float saturation; public Player(Account acc) { this.acc = acc; @@ -21,4 +24,24 @@ public class Player { public Account getAccount() { return this.acc; } + + public float getHealth() { + return health; + } + + public void setHealth(float health) { + this.health = health; + } + + public short getFood() { + return food; + } + + public void setFood(short food) { + this.food = food; + } + + public void setSaturation(float saturation) { + this.saturation = saturation; + } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPluginMessageReceived.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPluginMessageReceived.java new file mode 100644 index 000000000..be384fe72 --- /dev/null +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPluginMessageReceived.java @@ -0,0 +1,34 @@ +package de.bixilon.minosoft.protocol.packets.clientbound.play; + +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 PacketPluginMessageReceived implements ClientboundPacket { + String channel; + byte[] data; + + + @Override + public void read(InPacketBuffer buffer, ProtocolVersion v) { + switch (v) { + case VERSION_1_7_10: + channel = buffer.readString(); + data = buffer.readBytes(buffer.readShort()); // first read length, then the data + break; + } + log(); + } + + @Override + public void log() { + Log.protocol(String.format("Plugin message received in channel %s with %s bytes of data", channel, data.length)); + } + + @Override + public void handle(PacketHandler h) { + h.handle(this); + } +} diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateHealth.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateHealth.java new file mode 100644 index 000000000..a99c9449b --- /dev/null +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateHealth.java @@ -0,0 +1,48 @@ +package de.bixilon.minosoft.protocol.packets.clientbound.play; + +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 PacketUpdateHealth implements ClientboundPacket { + float health; + short food; + float saturation; + + + @Override + public void read(InPacketBuffer buffer, ProtocolVersion v) { + switch (v) { + case VERSION_1_7_10: + health = buffer.readFloat(); + food = buffer.readShort(); + saturation = buffer.readFloat(); + break; + } + log(); + } + + @Override + public void log() { + Log.protocol(String.format("Health update. Now at %s hearts and %s food level and %s saturation", health, food, saturation)); + } + + @Override + public void handle(PacketHandler h) { + h.handle(this); + } + + public short getFood() { + return food; + } + + public float getHealth() { + return health; + } + + public float getSaturation() { + return saturation; + } +} 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 e3198eaf6..3a809fbd9 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java @@ -69,4 +69,13 @@ public class PacketHandler { public void handle(PlayChunkBulk pkg) { //ToDo } + + public void handle(PacketUpdateHealth pkg) { + connection.getPlayer().setFood(pkg.getFood()); + connection.getPlayer().setHealth(pkg.getHealth()); + connection.getPlayer().setSaturation(pkg.getSaturation()); + } + + public void handle(PacketPluginMessageReceived pkg) { + } } 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 8a8dfb1ef..0928b5a23 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java @@ -39,5 +39,7 @@ public interface Protocol { packetClassMapping.put(Packets.Clientbound.PLAY_TIME_UPDATE, PacketTimeUpdate.class); packetClassMapping.put(Packets.Clientbound.PLAY_KEEP_ALIVE, PacketKeepAlive.class); packetClassMapping.put(Packets.Clientbound.PLAY_CHUNK_BULK, PlayChunkBulk.class); + packetClassMapping.put(Packets.Clientbound.PLAY_UPDATE_HEALTH, PacketUpdateHealth.class); + packetClassMapping.put(Packets.Clientbound.PLAY_PLUGIN_MESSAGE, PacketUpdateHealth.class); } } \ No newline at end of file