Merge branch 'master' into inventory

connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

@@ -38,6 +38,7 @@ import com.github.steveice10.packetlib.tcp.TcpSessionFactory;
 import com.nukkitx.math.GenericMath;
 import com.nukkitx.math.TrigMath;
 import com.nukkitx.math.vector.Vector2f;
+import com.nukkitx.math.vector.Vector2i;
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.nbt.tag.CompoundTag;
@@ -102,6 +103,8 @@ public class GeyserSession implements CommandSender {
 
     private DataCache<Packet> javaPacketCache;
 
+    @Setter
+    private Vector2i lastChunkPosition = null;
     private int renderDistance;
 
     private boolean loggedIn;

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

@@ -30,6 +30,7 @@ import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.connector.utils.ChunkUtils;
 
 import com.github.steveice10.mc.protocol.packet.ingame.client.world.ClientTeleportConfirmPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.server.entity.player.ServerPlayerPositionRotationPacket;
@@ -86,6 +87,8 @@ public class JavaPlayerPositionRotationTranslator extends PacketTranslator<Serve
             ClientTeleportConfirmPacket teleportConfirmPacket = new ClientTeleportConfirmPacket(packet.getTeleportId());
             session.getDownstream().getSession().send(teleportConfirmPacket);
 
+            ChunkUtils.updateChunkPosition(session, pos.toInt());
+
             session.getConnector().getLogger().info("Spawned player at " + packet.getX() + " " + packet.getY() + " " + packet.getZ());
             return;
         }

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

@@ -25,11 +25,9 @@
 
 package org.geysermc.connector.network.translators.java.world;
 
-import com.github.steveice10.mc.protocol.data.game.chunk.Chunk;
 import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
 import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerChunkDataPacket;
-import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.nbt.NbtUtils;
 import com.nukkitx.nbt.stream.NBTOutputStream;
 import com.nukkitx.nbt.tag.CompoundTag;
@@ -54,89 +52,73 @@ public class JavaChunkDataTranslator extends PacketTranslator<ServerChunkDataPac
 
     @Override
     public void translate(ServerChunkDataPacket packet, GeyserSession session) {
+        if (session.isSpawned()) {
+            ChunkUtils.updateChunkPosition(session, session.getPlayerEntity().getPosition().toInt());
+        }
+
+        if (packet.getColumn().getBiomeData() == null) //Non-full chunk
+            return;
+
         GeyserConnector.getInstance().getGeneralThreadPool().execute(() -> {
             try {
-                if (packet.getColumn().getBiomeData() != null) { //Full chunk
+                ChunkUtils.ChunkData chunkData = ChunkUtils.translateToBedrock(packet.getColumn());
-                    ChunkUtils.ChunkData chunkData = ChunkUtils.translateToBedrock(packet.getColumn());
+                ByteBuf byteBuf = Unpooled.buffer(32);
-                    ByteBuf byteBuf = Unpooled.buffer(32);
+                ChunkSection[] sections = chunkData.sections;
-                    ChunkSection[] sections = chunkData.sections;
 
-                    int sectionCount = sections.length - 1;
+                int sectionCount = sections.length - 1;
-                    while (sectionCount >= 0 && sections[sectionCount].isEmpty()) {
+                while (sectionCount >= 0 && sections[sectionCount].isEmpty()) {
-                        sectionCount--;
+                    sectionCount--;
-                    }
-                    sectionCount++;
-
-                    for (int i = 0; i < sectionCount; i++) {
-                        ChunkSection section = chunkData.sections[i];
-                        section.writeToNetwork(byteBuf);
-                    }
-
-                    byte[] bedrockBiome = BiomeTranslator.toBedrockBiome(packet.getColumn().getBiomeData());
-
-                    byteBuf.writeBytes(bedrockBiome); // Biomes - 256 bytes
-                    byteBuf.writeByte(0); // Border blocks - Edu edition only
-                    VarInts.writeUnsignedInt(byteBuf, 0); // extra data length, 0 for now
-
-                    ByteBufOutputStream stream = new ByteBufOutputStream(Unpooled.buffer());
-                    NBTOutputStream nbtStream = NbtUtils.createNetworkWriter(stream);
-                    for (CompoundTag blockEntity : chunkData.blockEntities) {
-                        nbtStream.write(blockEntity);
-                    }
-
-                    byteBuf.writeBytes(stream.buffer());
-
-                    byte[] payload = new byte[byteBuf.writerIndex()];
-                    byteBuf.readBytes(payload);
-
-                    LevelChunkPacket levelChunkPacket = new LevelChunkPacket();
-                    levelChunkPacket.setSubChunksLength(sectionCount);
-                    levelChunkPacket.setCachingEnabled(false);
-                    levelChunkPacket.setChunkX(packet.getColumn().getX());
-                    levelChunkPacket.setChunkZ(packet.getColumn().getZ());
-                    levelChunkPacket.setData(payload);
-                    session.getUpstream().sendPacket(levelChunkPacket);
-
-                    // Signs have to be sent after the chunk since in later versions they aren't included in the block entities
-                    for (Int2ObjectMap.Entry<CompoundTag> blockEntityEntry : chunkData.signs.int2ObjectEntrySet()) {
-                        int x = blockEntityEntry.getValue().getInt("x");
-                        int y = blockEntityEntry.getValue().getInt("y");
-                        int z = blockEntityEntry.getValue().getInt("z");
-
-                        ChunkUtils.updateBlock(session, new BlockState(blockEntityEntry.getIntKey()), new Position(x, y, z));
-                    }
-
-                    for (Int2ObjectMap.Entry<CompoundTag> blockEntityEntry: chunkData.beds.int2ObjectEntrySet()) {
-                        int x = blockEntityEntry.getValue().getInt("x");
-                        int y = blockEntityEntry.getValue().getInt("y");
-                        int z = blockEntityEntry.getValue().getInt("z");
-
-                        ChunkUtils.updateBlock(session, new BlockState(blockEntityEntry.getIntKey()), new Position(x, y, z));
-                    }
-                    chunkData.signs.clear();
-                    chunkData.beds.clear();
-                } else {
-                    final int xOffset = packet.getColumn().getX() << 4;
-                    final int zOffset = packet.getColumn().getZ() << 4;
-                    Chunk[] chunks = packet.getColumn().getChunks();
-                    for (int i = 0; i < chunks.length; i++) {
-                        Chunk chunk = chunks[i];
-                        if (chunk == null) continue;
-                        final int yOffset = i * 16;
-                        for (int x = 0; x < 16; x++) {
-                            for (int y = 0; y < 16; y++) {
-                                for (int z = 0; z < 16; z++) {
-                                    BlockState blockState = chunk.get(x, y, z);
-                                    Vector3i pos = Vector3i.from(
-                                            x + xOffset,
-                                            y + yOffset,
-                                            z + zOffset);
-                                    ChunkUtils.updateBlock(session, blockState, pos);
-                                }
-                            }
-                        }
-                    }
                 }
+                sectionCount++;
+
+                for (int i = 0; i < sectionCount; i++) {
+                    ChunkSection section = chunkData.sections[i];
+                    section.writeToNetwork(byteBuf);
+                }
+
+                byte[] bedrockBiome = BiomeTranslator.toBedrockBiome(packet.getColumn().getBiomeData());
+
+                byteBuf.writeBytes(bedrockBiome); // Biomes - 256 bytes
+                byteBuf.writeByte(0); // Border blocks - Edu edition only
+                VarInts.writeUnsignedInt(byteBuf, 0); // extra data length, 0 for now
+
+                ByteBufOutputStream stream = new ByteBufOutputStream(Unpooled.buffer());
+                NBTOutputStream nbtStream = NbtUtils.createNetworkWriter(stream);
+                for (CompoundTag blockEntity : chunkData.blockEntities) {
+                    nbtStream.write(blockEntity);
+                }
+
+                byteBuf.writeBytes(stream.buffer());
+
+                byte[] payload = new byte[byteBuf.writerIndex()];
+                byteBuf.readBytes(payload);
+
+                LevelChunkPacket levelChunkPacket = new LevelChunkPacket();
+                levelChunkPacket.setSubChunksLength(sectionCount);
+                levelChunkPacket.setCachingEnabled(false);
+                levelChunkPacket.setChunkX(packet.getColumn().getX());
+                levelChunkPacket.setChunkZ(packet.getColumn().getZ());
+                levelChunkPacket.setData(payload);
+                session.getUpstream().sendPacket(levelChunkPacket);
+
+                // Signs have to be sent after the chunk since in later versions they aren't included in the block entities
+                for (Int2ObjectMap.Entry<CompoundTag> blockEntityEntry : chunkData.signs.int2ObjectEntrySet()) {
+                    int x = blockEntityEntry.getValue().getInt("x");
+                    int y = blockEntityEntry.getValue().getInt("y");
+                    int z = blockEntityEntry.getValue().getInt("z");
+
+                    ChunkUtils.updateBlock(session, new BlockState(blockEntityEntry.getIntKey()), new Position(x, y, z));
+                }
+
+                for (Int2ObjectMap.Entry<CompoundTag> blockEntityEntry: chunkData.beds.int2ObjectEntrySet()) {
+                    int x = blockEntityEntry.getValue().getInt("x");
+                    int y = blockEntityEntry.getValue().getInt("y");
+                    int z = blockEntityEntry.getValue().getInt("z");
+
+                    ChunkUtils.updateBlock(session, new BlockState(blockEntityEntry.getIntKey()), new Position(x, y, z));
+                }
+                chunkData.signs.clear();
+                chunkData.beds.clear();
             } catch (Exception ex) {
                 ex.printStackTrace();
             }

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

@@ -28,6 +28,7 @@ package org.geysermc.connector.network.translators.java.world;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.connector.utils.ChunkUtils;
 
 import com.github.steveice10.mc.protocol.packet.ingame.server.world.ServerUpdateViewPositionPacket;
 import com.nukkitx.math.vector.Vector3i;
@@ -38,9 +39,8 @@ public class JavaUpdateViewPositionTranslator extends PacketTranslator<ServerUpd
 
     @Override
     public void translate(ServerUpdateViewPositionPacket packet, GeyserSession session) {
-        NetworkChunkPublisherUpdatePacket chunkPublisherUpdatePacket = new NetworkChunkPublisherUpdatePacket();
+        if (!session.isSpawned() && session.getLastChunkPosition() == null) {
-        chunkPublisherUpdatePacket.setPosition(Vector3i.from(packet.getChunkX() << 4, 0, packet.getChunkZ() << 4));
+            ChunkUtils.updateChunkPosition(session, Vector3i.from(packet.getChunkX() << 4, 64, packet.getChunkZ() << 4));
-        chunkPublisherUpdatePacket.setRadius(session.getRenderDistance() << 4);
+        }
-        session.getUpstream().sendPacket(chunkPublisherUpdatePacket);
     }
 }

connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java

@@ -30,8 +30,10 @@ import com.github.steveice10.mc.protocol.data.game.chunk.Column;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
 import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.nukkitx.math.vector.Vector2i;
 import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.protocol.bedrock.packet.LevelChunkPacket;
+import com.nukkitx.protocol.bedrock.packet.NetworkChunkPublisherUpdatePacket;
 import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -43,8 +45,8 @@ import org.geysermc.connector.network.translators.block.entity.BlockEntityTransl
 import org.geysermc.connector.world.chunk.ChunkPosition;
 import org.geysermc.connector.network.translators.Translators;
 import org.geysermc.connector.network.translators.block.BlockTranslator;
-import org.geysermc.connector.world.chunk.ChunkSection;
 import org.geysermc.connector.network.translators.block.entity.BedBlockEntityTranslator;
+import org.geysermc.connector.world.chunk.ChunkSection;
 
 import static org.geysermc.connector.network.translators.block.BlockTranslator.BEDROCK_WATER_ID;
 
@@ -108,6 +110,20 @@ public class ChunkUtils {
         return chunkData;
     }
 
+    public static void updateChunkPosition(GeyserSession session, Vector3i position) {
+        Vector2i chunkPos = session.getLastChunkPosition();
+        Vector2i newChunkPos = Vector2i.from(position.getX() >> 4, position.getZ() >> 4);
+
+        if (chunkPos == null || !chunkPos.equals(newChunkPos)) {
+            NetworkChunkPublisherUpdatePacket chunkPublisherUpdatePacket = new NetworkChunkPublisherUpdatePacket();
+            chunkPublisherUpdatePacket.setPosition(position);
+            chunkPublisherUpdatePacket.setRadius(session.getRenderDistance() << 4);
+            session.getUpstream().sendPacket(chunkPublisherUpdatePacket);
+
+            session.setLastChunkPosition(newChunkPos);
+        }
+    }
+
     public static void updateBlock(GeyserSession session, BlockState blockState, Position position) {
         Vector3i pos = Vector3i.from(position.getX(), position.getY(), position.getZ());
         updateBlock(session, blockState, pos);

connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java

@@ -52,6 +52,7 @@ public class DimensionUtils {
         player.setDimension(bedrockDimension);
         player.setPosition(pos.toFloat());
         session.setSpawned(false);
+        session.setLastChunkPosition(null);
 
         //let java server handle portal travel sound
         StopSoundPacket stopSoundPacket = new StopSoundPacket();