Chunk fixes

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

@@ -38,7 +38,6 @@ import com.github.steveice10.packetlib.event.session.SessionAdapter;
 import com.github.steveice10.packetlib.packet.Packet;
 import com.github.steveice10.packetlib.tcp.TcpSessionFactory;
 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;
@@ -84,10 +83,8 @@ public class GeyserSession implements Player {
 
     private DataCache<Packet> javaPacketCache;
 
-    @Setter
-    private Vector2i lastChunkPosition = null;
-    @Setter
     private int renderDistance;
+    private int chunkPublisherRadius;
 
     private boolean loggedIn;
     private boolean loggingIn;
@@ -269,6 +266,17 @@ public class GeyserSession implements Player {
         windowCache.showWindow(window, id);
     }
 
+    public void setRenderDistance(int renderDistance) {
+        if (renderDistance > 32) renderDistance = 32; // <3 u ViaVersion but I don't like crashing clients x)
+        this.renderDistance = renderDistance;
+
+        chunkPublisherRadius = renderDistance * 3/2 << 4; //some chunks are ignored if this isn't increased
+
+        ChunkRadiusUpdatedPacket chunkRadiusUpdatedPacket = new ChunkRadiusUpdatedPacket();
+        chunkRadiusUpdatedPacket.setRadius(renderDistance);
+        upstream.sendPacket(chunkRadiusUpdatedPacket);
+    }
+
     @Override
     public InetSocketAddress getSocketAddress() {
         return this.upstream.getAddress();

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

@@ -146,6 +146,9 @@ public class TranslatorsInit {
         Registry.registerJava(ServerMultiBlockChangePacket.class, new JavaMultiBlockChangeTranslator());
         Registry.registerJava(ServerUnloadChunkPacket.class, new JavaUnloadChunkTranslator());
 
+        Registry.registerJava(ServerUpdateViewPositionPacket.class, new JavaUpdateViewPositionTranslator());
+        Registry.registerJava(ServerUpdateViewDistancePacket.class, new JavaUpdateViewDistanceTranslator());
+
         Registry.registerJava(ServerOpenWindowPacket.class, new OpenWindowPacketTranslator());
 
         Registry.registerBedrock(AnimatePacket.class, new BedrockAnimateTranslator());

connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java

@@ -28,18 +28,12 @@ package org.geysermc.connector.network.translators.block;
 import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
 import org.geysermc.connector.utils.Toolbox;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class BlockTranslator {
-    private final Map<String, BlockEntry> javaIdentifierMap = new HashMap<>();
-
     public BlockEntry getBlockEntry(BlockState state) {
         return Toolbox.BLOCK_ENTRIES.get(state.getId());
     }
 
     public BlockEntry getBlockEntry(String javaIdentifier) {
-        return javaIdentifierMap.computeIfAbsent(javaIdentifier, key -> Toolbox.BLOCK_ENTRIES.values()
+        return Toolbox.JAVA_IDENTIFIER_TO_ENTRY.get(javaIdentifier);
-                .stream().filter(blockEntry -> blockEntry.getJavaIdentifier().equals(key)).findFirst().orElse(null));
     }
 }

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

@@ -60,12 +60,7 @@ public class JavaJoinGameTranslator extends PacketTranslator<ServerJoinGamePacke
         entityDataPacket.getMetadata().putAll(entity.getMetadata());
         session.getUpstream().sendPacket(entityDataPacket);
 
-        session.setRenderDistance(packet.getViewDistance() + 1); // +1 to be sure it includes every chunk
+        session.setRenderDistance(packet.getViewDistance());
-        if (session.getRenderDistance() > 32) session.setRenderDistance(32); // <3 u ViaVersion but I don't like crashing clients x)
-
-        ChunkRadiusUpdatedPacket chunkRadiusPacket = new ChunkRadiusUpdatedPacket();
-        chunkRadiusPacket.setRadius(session.getRenderDistance());
-        session.getUpstream().sendPacket(chunkRadiusPacket);
 
         if (DimensionUtils.javaToBedrock(packet.getDimension()) != entity.getDimension()) {
             ChunkUtils.sendEmptyChunks(session, entity.getPosition().toInt(), 3, true);

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

@@ -25,12 +25,12 @@
 
 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.packet.ingame.server.world.ServerChunkDataPacket;
-import com.nukkitx.math.vector.Vector2i;
+import com.nukkitx.math.vector.Vector3i;
-import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.network.VarInts;
 import com.nukkitx.protocol.bedrock.packet.LevelChunkPacket;
-import com.nukkitx.protocol.bedrock.packet.NetworkChunkPublisherUpdatePacket;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.geysermc.api.Geyser;
@@ -45,20 +45,8 @@ public class JavaChunkDataTranslator extends PacketTranslator<ServerChunkDataPac
     public void translate(ServerChunkDataPacket packet, GeyserSession session) {
         // Not sure if this is safe or not, however without this the client usually times out
         Geyser.getConnector().getGeneralThreadPool().execute(() -> {
-            Vector2i chunkPos = session.getLastChunkPosition();
-            Vector3f position = session.getPlayerEntity().getPosition();
-            Vector2i newChunkPos = Vector2i.from(position.getFloorX() >> 4, position.getFloorZ() >> 4);
-
-            if (chunkPos == null || !chunkPos.equals(newChunkPos)) {
-                NetworkChunkPublisherUpdatePacket chunkPublisherUpdatePacket = new NetworkChunkPublisherUpdatePacket();
-                chunkPublisherUpdatePacket.setPosition(position.toInt());
-                chunkPublisherUpdatePacket.setRadius(session.getRenderDistance() << 4);
-                session.getUpstream().sendPacket(chunkPublisherUpdatePacket);
-
-                session.setLastChunkPosition(newChunkPos);
-            }
-
             try {
+                if (packet.getColumn().getBiomeData() != null) { //Full chunk
                     ChunkUtils.ChunkData chunkData = ChunkUtils.translateToBedrock(packet.getColumn());
                     ByteBuf byteBuf = Unpooled.buffer(32);
                     ChunkSection[] sections = chunkData.sections;
@@ -88,6 +76,28 @@ public class JavaChunkDataTranslator extends PacketTranslator<ServerChunkDataPac
                     levelChunkPacket.setChunkZ(packet.getColumn().getZ());
                     levelChunkPacket.setData(payload);
                     session.getUpstream().sendPacket(levelChunkPacket);
+                } else {
+                    Chunk[] chunks = packet.getColumn().getChunks();
+                    for (int i = 0; i < chunks.length; i++) {
+                        Chunk chunk = chunks[i];
+                        if (chunk == null) continue;
+                        final int xOffset = packet.getColumn().getX() << 4;
+                        final int yOffset = i * 16;
+                        final int zOffset = packet.getColumn().getZ() << 4;
+                        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);
+                                }
+                            }
+                        }
+                    }
+                }
             } catch (Exception ex) {
                 ex.printStackTrace();
             }

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019-2020 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.github.steveice10.mc.protocol.packet.ingame.server.world.ServerUpdateViewDistancePacket;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+
+public class JavaUpdateViewDistanceTranslator extends PacketTranslator<ServerUpdateViewDistancePacket> {
+
+    @Override
+    public void translate(ServerUpdateViewDistancePacket packet, GeyserSession session) {
+        session.setRenderDistance(packet.getViewDistance());
+    }
+}

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2019-2020 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.github.steveice10.mc.protocol.packet.ingame.server.world.ServerUpdateViewPositionPacket;
+import com.nukkitx.math.vector.Vector3i;
+import com.nukkitx.protocol.bedrock.packet.NetworkChunkPublisherUpdatePacket;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+
+public class JavaUpdateViewPositionTranslator extends PacketTranslator<ServerUpdateViewPositionPacket> {
+
+    @Override
+    public void translate(ServerUpdateViewPositionPacket packet, GeyserSession session) {
+        NetworkChunkPublisherUpdatePacket chunkPublisherUpdatePacket = new NetworkChunkPublisherUpdatePacket();
+        chunkPublisherUpdatePacket.setPosition(Vector3i.from(packet.getChunkX() << 4, 0, packet.getChunkZ() << 4));
+        chunkPublisherUpdatePacket.setRadius(session.getChunkPublisherRadius());
+        session.getUpstream().sendPacket(chunkPublisherUpdatePacket);
+    }
+}

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

@@ -31,7 +31,6 @@ import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
 import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
 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 org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.TranslatorsInit;
@@ -76,19 +75,23 @@ public class ChunkUtils {
     }
 
     public static void updateBlock(GeyserSession session, BlockState blockState, Position position) {
-        BlockEntry blockEntry = TranslatorsInit.getBlockTranslator().getBlockEntry(blockState);
         Vector3i pos = Vector3i.from(position.getX(), position.getY(), position.getZ());
+        updateBlock(session, blockState, pos);
+    }
+
+    public static void updateBlock(GeyserSession session, BlockState blockState, Vector3i position) {
+        BlockEntry blockEntry = TranslatorsInit.getBlockTranslator().getBlockEntry(blockState);
 
         UpdateBlockPacket updateBlockPacket = new UpdateBlockPacket();
         updateBlockPacket.setDataLayer(0);
-        updateBlockPacket.setBlockPosition(pos);
+        updateBlockPacket.setBlockPosition(position);
         updateBlockPacket.setRuntimeId(blockEntry.getBedrockRuntimeId());
         updateBlockPacket.getFlags().add(UpdateBlockPacket.Flag.NEIGHBORS);
         session.getUpstream().sendPacket(updateBlockPacket);
 
         UpdateBlockPacket waterPacket = new UpdateBlockPacket();
         waterPacket.setDataLayer(1);
-        waterPacket.setBlockPosition(pos);
+        waterPacket.setBlockPosition(position);
         if (blockEntry.isWaterlogged()) {
             BlockEntry water = TranslatorsInit.getBlockTranslator().getBlockEntry("minecraft:water[level=0]");
             waterPacket.setRuntimeId(water.getBedrockRuntimeId());
@@ -101,11 +104,6 @@ public class ChunkUtils {
     public static void sendEmptyChunks(GeyserSession session, Vector3i position, int radius, boolean forceUpdate) {
         int chunkX = position.getX() >> 4;
         int chunkZ = position.getZ() >> 4;
-        NetworkChunkPublisherUpdatePacket chunkPublisherUpdatePacket = new NetworkChunkPublisherUpdatePacket();
-        chunkPublisherUpdatePacket.setPosition(position);
-        chunkPublisherUpdatePacket.setRadius(radius + 1 << 4);
-        session.getUpstream().sendPacket(chunkPublisherUpdatePacket);
-        session.setLastChunkPosition(null);
         for (int x = -radius; x <= radius; x++) {
             for (int z = -radius; z <= radius; z++) {
                 LevelChunkPacket data = new LevelChunkPacket();
@@ -120,7 +118,7 @@ public class ChunkUtils {
                     Vector3i pos = Vector3i.from(chunkX + x << 4, 80, chunkZ + z << 4);
                     UpdateBlockPacket blockPacket = new UpdateBlockPacket();
                     blockPacket.setBlockPosition(pos);
-                    blockPacket.setDataLayer(1);
+                    blockPacket.setDataLayer(0);
                     blockPacket.setRuntimeId(1);
                     session.getUpstream().sendPacket(blockPacket);
                 }

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

@@ -50,6 +50,7 @@ public class Toolbox {
 
     public static final Int2ObjectMap<ItemEntry> ITEM_ENTRIES = new Int2ObjectOpenHashMap<>();
     public static final Int2ObjectMap<BlockEntry> BLOCK_ENTRIES = new Int2ObjectOpenHashMap<>();
+    public static final Map<String, BlockEntry> JAVA_IDENTIFIER_TO_ENTRY = new HashMap<>();
 
     public static void init() {
         InputStream stream = GeyserConnector.class.getClassLoader().getResourceAsStream("bedrock/runtime_block_states.dat");
@@ -140,6 +141,7 @@ public class Toolbox {
                     }
                     BlockEntry blockEntry = new BlockEntry(javaEntry.getKey(), javaIndex, bedrockIndex);
                     BLOCK_ENTRIES.put(javaIndex, blockEntry);
+                    JAVA_IDENTIFIER_TO_ENTRY.put(javaEntry.getKey(), blockEntry);
                     continue javaLoop;
                 }
             }