From 75d38abe1d1c95bf636a2eb372504ca904fd0c10 Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Sun, 21 Jul 2019 15:39:03 -0500 Subject: [PATCH] Add hand animations --- .../network/UpstreamPacketHandler.java | 9 ++++++- .../network/translators/TranslatorsInit.java | 26 ------------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java index c278cfd4..6d0a082f 100644 --- a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java @@ -25,7 +25,9 @@ package org.geysermc.connector.network; +import com.github.steveice10.mc.protocol.data.game.entity.player.Hand; import com.github.steveice10.mc.protocol.packet.ingame.client.ClientChatPacket; +import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerSwingArmPacket; import com.nimbusds.jose.JWSObject; import com.nukkitx.protocol.bedrock.handler.BatchHandler; import com.nukkitx.protocol.bedrock.handler.BedrockPacketHandler; @@ -120,7 +122,12 @@ public class UpstreamPacketHandler implements BedrockPacketHandler { @Override public boolean handle(AnimatePacket packet) { System.out.println("Handled packet: " + packet.getClass().getSimpleName()); - return false; + switch (packet.getAction()) { + case SWING_ARM: + ClientPlayerSwingArmPacket swingArmPacket = new ClientPlayerSwingArmPacket(Hand.MAIN_HAND); + session.getDownstream().getSession().send(swingArmPacket); + } + return true; } @Override diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java b/connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java index f9a205ac..4a4cc888 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java @@ -26,7 +26,6 @@ package org.geysermc.connector.network.translators; import com.flowpowered.math.vector.Vector2f; -import com.flowpowered.math.vector.Vector2i; import com.flowpowered.math.vector.Vector3f; import com.flowpowered.math.vector.Vector3i; import com.github.steveice10.mc.protocol.data.message.TranslationMessage; @@ -36,20 +35,14 @@ import com.nukkitx.nbt.CompoundTagBuilder; import com.nukkitx.nbt.NbtUtils; import com.nukkitx.nbt.stream.NBTOutputStream; import com.nukkitx.nbt.tag.CompoundTag; -import com.nukkitx.network.VarInts; import com.nukkitx.protocol.bedrock.data.GamePublishSetting; import com.nukkitx.protocol.bedrock.data.GameRule; import com.nukkitx.protocol.bedrock.packet.*; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufOutputStream; -import io.netty.buffer.Unpooled; -import org.geysermc.connector.utils.GeyserUtils; import org.geysermc.connector.utils.MessageUtils; import org.geysermc.connector.utils.Toolbox; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.HashMap; public class TranslatorsInit { private static final CompoundTag EMPTY_TAG = CompoundTagBuilder.builder().buildRootTag(); @@ -192,23 +185,4 @@ public class TranslatorsInit { session.getUpstream().sendPacket(textPacket); }); } - - private static byte[] empty(byte[] b, Vector2i pos) { - ByteBuf by = Unpooled.buffer(); - - GeyserUtils.writePEChunkCoord(by, pos); - - return by.array(); - } - - private static class CanWriteToBB extends ByteArrayOutputStream { - - CanWriteToBB() { - super(8192); - } - - void writeTo(ByteBuf buf) { - buf.writeBytes(super.buf, 0, super.count); - } - } }