Add respawn translator (Closes #23)

connector/src/main/java/org/geysermc/connector/command/GeyserCommandMap.java

@@ -56,6 +56,9 @@ public class GeyserCommandMap implements CommandMap {
         commandMap.put(command.getName(), command);
         connector.getLogger().debug("Registered command " + command.getName());
 
+        if (command.getAliases() == null || command.getAliases().isEmpty())
+            return;
+
         for (String alias : command.getAliases())
             commandMap.put(alias, command);
     }

connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java

@@ -143,4 +143,9 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
     public boolean handle(MobEquipmentPacket packet) {
         return translateAndDefault(packet);
     }
+
+    @Override
+    public boolean handle(PlayerActionPacket packet) {
+        return translateAndDefault(packet);
+    }
 }

connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java

@@ -28,6 +28,7 @@ package org.geysermc.connector.network.translators;
 import com.github.steveice10.mc.protocol.data.game.window.WindowType;
 import com.github.steveice10.mc.protocol.packet.ingame.server.ServerChatPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.ServerJoinGamePacket;
+import com.github.steveice10.mc.protocol.packet.ingame.server.ServerRespawnPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.ServerTitlePacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityDestroyPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityHeadLookPacket;
@@ -55,6 +56,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.server.window.ServerSetSl
 import com.github.steveice10.mc.protocol.packet.ingame.server.window.ServerWindowItemsPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerChunkDataPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerNotifyClientPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerSpawnPositionPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerUpdateTimePacket;
 import com.nukkitx.nbt.CompoundTagBuilder;
 import com.nukkitx.nbt.NbtUtils;
@@ -63,8 +65,10 @@ import com.nukkitx.nbt.tag.CompoundTag;
 import com.nukkitx.protocol.bedrock.packet.AnimatePacket;
 import com.nukkitx.protocol.bedrock.packet.CommandRequestPacket;
 import com.nukkitx.protocol.bedrock.packet.MobEquipmentPacket;
+import com.nukkitx.protocol.bedrock.packet.PlayerActionPacket;
 import com.nukkitx.protocol.bedrock.packet.TextPacket;
 import lombok.Getter;
+import org.geysermc.connector.network.translators.bedrock.BedrockActionTranslator;
 import org.geysermc.connector.network.translators.bedrock.BedrockAnimateTranslator;
 import org.geysermc.connector.network.translators.bedrock.BedrockCommandRequestTranslator;
 import org.geysermc.connector.network.translators.bedrock.BedrockMobEquipmentTranslator;
@@ -74,6 +78,7 @@ import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
 import org.geysermc.connector.network.translators.item.ItemTranslator;
 import org.geysermc.connector.network.translators.java.JavaChatTranslator;
 import org.geysermc.connector.network.translators.java.JavaJoinGameTranslator;
+import org.geysermc.connector.network.translators.java.JavaRespawnTranslator;
 import org.geysermc.connector.network.translators.java.entity.JavaEntityDestroyTranslator;
 import org.geysermc.connector.network.translators.java.entity.JavaEntityHeadLookTranslator;
 import org.geysermc.connector.network.translators.java.entity.JavaEntityMetadataTranslator;
@@ -100,6 +105,7 @@ import org.geysermc.connector.network.translators.java.world.JavaNotifyClientTra
 import org.geysermc.connector.network.translators.java.window.JavaOpenWindowTranslator;
 import org.geysermc.connector.network.translators.java.window.JavaSetSlotTranslator;
 import org.geysermc.connector.network.translators.java.JavaTitleTranslator;
+import org.geysermc.connector.network.translators.java.world.JavaSpawnPositionTranslator;
 import org.geysermc.connector.network.translators.java.world.JavaUpdateTimeTranslator;
 import org.geysermc.connector.network.translators.java.window.JavaWindowItemsTranslator;
 
@@ -138,6 +144,8 @@ public class TranslatorsInit {
         Registry.registerJava(ServerChatPacket.class, new JavaChatTranslator());
         Registry.registerJava(ServerTitlePacket.class, new JavaTitleTranslator());
         Registry.registerJava(ServerUpdateTimePacket.class, new JavaUpdateTimeTranslator());
+        Registry.registerJava(ServerRespawnPacket.class, new JavaRespawnTranslator());
+        Registry.registerJava(ServerSpawnPositionPacket.class, new JavaSpawnPositionTranslator());
 
         Registry.registerJava(ServerEntityPositionPacket.class, new JavaEntityPositionTranslator());
         Registry.registerJava(ServerEntityPositionRotationPacket.class, new JavaEntityPositionRotationTranslator());
@@ -173,6 +181,7 @@ public class TranslatorsInit {
         Registry.registerBedrock(CommandRequestPacket.class, new BedrockCommandRequestTranslator());
         Registry.registerBedrock(TextPacket.class, new BedrockTextTranslator());
         Registry.registerBedrock(MobEquipmentPacket.class, new BedrockMobEquipmentTranslator());
+        Registry.registerBedrock(PlayerActionPacket.class, new BedrockActionTranslator());
 
         itemTranslator = new ItemTranslator();
 

connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockActionTranslator.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2019 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.network.translators.bedrock;
+
+import com.nukkitx.protocol.bedrock.packet.PlayerActionPacket;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+
+public class BedrockActionTranslator extends PacketTranslator<PlayerActionPacket> {
+
+    @Override
+    public void translate(PlayerActionPacket packet, GeyserSession session) {
+        switch (packet.getAction()) {
+            case RESPAWN:
+                // Don't put anything here as respawn is already handled
+                // in JavaPlayerSetHealthTranslator
+                break;
+        }
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2019 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.network.translators.java;
+
+import com.github.steveice10.mc.protocol.packet.ingame.server.ServerRespawnPacket;
+import com.nukkitx.protocol.bedrock.packet.PlayStatusPacket;
+import org.geysermc.connector.entity.Entity;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+
+public class JavaRespawnTranslator extends PacketTranslator<ServerRespawnPacket> {
+
+    @Override
+    public void translate(ServerRespawnPacket packet, GeyserSession session) {
+        Entity entity = session.getPlayerEntity();
+        if (entity == null)
+            return;
+
+        if (entity.getDimension() == packet.getDimension()) {
+            PlayStatusPacket playStatusPacket = new PlayStatusPacket();
+            playStatusPacket.setStatus(PlayStatusPacket.Status.PLAYER_SPAWN);
+            session.getUpstream().sendPacket(playStatusPacket);
+        }
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerHealthTranslator.java

@@ -25,6 +25,9 @@
 
 package org.geysermc.connector.network.translators.java.entity.player;
 
+import com.flowpowered.math.vector.Vector3f;
+import com.github.steveice10.mc.protocol.data.game.ClientRequest;
+import com.github.steveice10.mc.protocol.packet.ingame.client.ClientRequestPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.player.ServerPlayerHealthPacket;
 import com.nukkitx.protocol.bedrock.packet.RespawnPacket;
 import com.nukkitx.protocol.bedrock.packet.SetHealthPacket;
@@ -56,8 +59,13 @@ public class JavaPlayerHealthTranslator extends PacketTranslator<ServerPlayerHea
         entity.getAttributes().put(AttributeType.SATURATION, AttributeType.SATURATION.getAttribute(packet.getSaturation()));
         entity.updateBedrockAttributes(session);
 
-        if ((int) Math.ceil(packet.getHealth()) <= 0) {
+        if (packet.getHealth() <= 0) {
+            RespawnPacket respawnPacket = new RespawnPacket();
+            respawnPacket.setPosition(new Vector3f(0, 72, 0));
             session.getUpstream().sendPacket(new RespawnPacket());
+
+            ClientRequestPacket javaRespawnPacket = new ClientRequestPacket(ClientRequest.RESPAWN);
+            session.getDownstream().getSession().send(javaRespawnPacket);
         }
     }
 }

connector/src/main/java/org/geysermc/connector/network/translators/java/entity/player/JavaPlayerPositionRotationTranslator.java

@@ -26,6 +26,7 @@
 package org.geysermc.connector.network.translators.java.entity.player;
 
 import com.flowpowered.math.vector.Vector3f;
+import com.github.steveice10.mc.protocol.packet.ingame.client.world.ClientTeleportConfirmPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.ServerJoinGamePacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.player.ServerPlayerPositionRotationPacket;
 import com.nukkitx.protocol.bedrock.packet.MovePlayerPacket;
@@ -48,28 +49,42 @@ public class JavaPlayerPositionRotationTranslator extends PacketTranslator<Serve
         if (!session.isLoggedIn())
             return;
 
-        if (session.isSpawned())
+        if (!session.isSpawned()) {
-            return;
+            ServerJoinGamePacket javaJoinPacket = (ServerJoinGamePacket) session.getJavaPacketCache().getCachedValues().remove("java_join_packet");
 
-        ServerJoinGamePacket javaJoinPacket = (ServerJoinGamePacket) session.getJavaPacketCache().getCachedValues().remove("java_join_packet");
+            PlayStatusPacket playStatus = new PlayStatusPacket();
+            playStatus.setStatus(PlayStatusPacket.Status.LOGIN_SUCCESS);
+            session.getUpstream().sendPacketImmediately(playStatus);
 
-        PlayStatusPacket playStatus = new PlayStatusPacket();
+            entity.moveAbsolute(new Vector3f(packet.getX(), packet.getY(), packet.getZ()), packet.getPitch(), packet.getYaw());
-        playStatus.setStatus(PlayStatusPacket.Status.LOGIN_SUCCESS);
+
-        session.getUpstream().sendPacketImmediately(playStatus);
+            SetPlayerGameTypePacket playerGameTypePacket = new SetPlayerGameTypePacket();
+            playerGameTypePacket.setGamemode(javaJoinPacket.getGameMode().ordinal());
+            session.getUpstream().sendPacket(playerGameTypePacket);
+
+            SetEntityDataPacket entityDataPacket = new SetEntityDataPacket();
+            entityDataPacket.setRuntimeEntityId(entity.getGeyserId());
+            entityDataPacket.getMetadata().putAll(entity.getMetadata());
+
+            session.getUpstream().sendPacket(entityDataPacket);
+            session.getPlayerEntity().setEntityId(javaJoinPacket.getEntityId());
+
+            MovePlayerPacket movePlayerPacket = new MovePlayerPacket();
+            movePlayerPacket.setRuntimeEntityId(entity.getGeyserId());
+            movePlayerPacket.setPosition(new Vector3f(packet.getX(), packet.getY(), packet.getZ()));
+            movePlayerPacket.setRotation(new Vector3f(packet.getPitch(), packet.getYaw(), 0));
+            movePlayerPacket.setMode(MovePlayerPacket.Mode.NORMAL);
+            movePlayerPacket.setOnGround(true);
+            entity.setMovePending(false);
+
+            session.getUpstream().sendPacket(movePlayerPacket);
+            session.setSpawned(true);
+
+            GeyserLogger.DEFAULT.info("Spawned player at " + packet.getX() + " " + packet.getY() + " " + packet.getZ());
+        }
 
         entity.moveAbsolute(new Vector3f(packet.getX(), packet.getY(), packet.getZ()), packet.getPitch(), packet.getYaw());
 
-        SetPlayerGameTypePacket playerGameTypePacket = new SetPlayerGameTypePacket();
-        playerGameTypePacket.setGamemode(javaJoinPacket.getGameMode().ordinal());
-        session.getUpstream().sendPacket(playerGameTypePacket);
-
-        SetEntityDataPacket entityDataPacket = new SetEntityDataPacket();
-        entityDataPacket.setRuntimeEntityId(entity.getGeyserId());
-        entityDataPacket.getMetadata().putAll(entity.getMetadata());
-
-        session.getUpstream().sendPacket(entityDataPacket);
-        session.getPlayerEntity().setEntityId(javaJoinPacket.getEntityId());
-
         MovePlayerPacket movePlayerPacket = new MovePlayerPacket();
         movePlayerPacket.setRuntimeEntityId(entity.getGeyserId());
         movePlayerPacket.setPosition(new Vector3f(packet.getX(), packet.getY(), packet.getZ()));
@@ -81,6 +96,7 @@ public class JavaPlayerPositionRotationTranslator extends PacketTranslator<Serve
         session.getUpstream().sendPacket(movePlayerPacket);
         session.setSpawned(true);
 
-        GeyserLogger.DEFAULT.info("Spawned player at " + packet.getX() + " " + packet.getY() + " " + packet.getZ());
+        ClientTeleportConfirmPacket teleportConfirmPacket = new ClientTeleportConfirmPacket(packet.getTeleportId());
+        session.getDownstream().getSession().send(teleportConfirmPacket);
     }
 }

connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaSpawnPositionTranslator.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2019 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.network.translators.java.world;
+
+import com.flowpowered.math.vector.Vector3i;
+import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerSpawnPositionPacket;
+import com.nukkitx.protocol.bedrock.packet.SetSpawnPositionPacket;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+
+public class JavaSpawnPositionTranslator extends PacketTranslator<ServerSpawnPositionPacket> {
+
+    @Override
+    public void translate(ServerSpawnPositionPacket packet, GeyserSession session) {
+        SetSpawnPositionPacket spawnPositionPacket = new SetSpawnPositionPacket();
+        spawnPositionPacket.setBlockPosition(new Vector3i(packet.getPosition().getX(), packet.getPosition().getY(), packet.getPosition().getZ()));
+        spawnPositionPacket.setSpawnForced(true);
+        spawnPositionPacket.setSpawnType(SetSpawnPositionPacket.Type.PLAYER_SPAWN);
+        session.getUpstream().sendPacket(spawnPositionPacket);
+    }
+}