Skip to content

Implement sub chunk request #6252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
valaphee wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Implement sub chunk request #6252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions core/src/main/java/org/geysermc/geyser/level/chunk/GeyserChunk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@
package org.geysermc.geyser.level.chunk;

import org.geysermc.mcprotocollib.protocol.data.game.chunk.DataPalette;
import org.geysermc.mcprotocollib.protocol.data.game.level.LightUpdateData;
import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityInfo;

/**
* Acts as a lightweight chunk class that doesn't store biomes, heightmaps or block entities.
* Acts as a lightweight chunk class that doesn't store biomes.
*/
public record GeyserChunk(DataPalette[] sections) {
public record GeyserChunk(DataPalette[] sections, BlockEntityInfo[][] blockEntities, LightUpdateData lightData) {

public static GeyserChunk from(DataPalette[] sections) {
return new GeyserChunk(sections);
public static GeyserChunk from(DataPalette[] sections, BlockEntityInfo[][] blockEntities, LightUpdateData lightData) {
return new GeyserChunk(sections, blockEntities, lightData);
}
}
2 changes: 0 additions & 2 deletions core/src/main/java/org/geysermc/geyser/network/CodecProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
import org.cloudburstmc.protocol.bedrock.packet.SetEntityMotionPacket;
import org.cloudburstmc.protocol.bedrock.packet.SettingsCommandPacket;
import org.cloudburstmc.protocol.bedrock.packet.SimpleEventPacket;
import org.cloudburstmc.protocol.bedrock.packet.SubChunkRequestPacket;
import org.cloudburstmc.protocol.bedrock.packet.SubClientLoginPacket;
import org.cloudburstmc.protocol.common.util.VarInts;

Expand Down Expand Up @@ -265,7 +264,6 @@ static BedrockCodec processCodec(BedrockCodec codec) {
// Illegal unusued serverbound packets that relate to unused features
.updateSerializer(ClientCacheBlobStatusPacket.class, ILLEGAL_SERIALIZER)
.updateSerializer(SubClientLoginPacket.class, ILLEGAL_SERIALIZER)
.updateSerializer(SubChunkRequestPacket.class, ILLEGAL_SERIALIZER)
.updateSerializer(GameTestRequestPacket.class, ILLEGAL_SERIALIZER)
// Ignored serverbound packets
.updateSerializer(ClientToServerHandshakePacket.class, IGNORED_SERIALIZER)
Expand Down
8 changes: 5 additions & 3 deletions core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.util.MathUtils;
import org.geysermc.mcprotocollib.protocol.data.game.chunk.DataPalette;
import org.geysermc.mcprotocollib.protocol.data.game.level.LightUpdateData;
import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityInfo;

public class ChunkCache {
private final boolean cache;
Expand All @@ -50,20 +52,20 @@ public ChunkCache(GeyserSession session) {
chunks = cache ? new Long2ObjectOpenHashMap<>() : null;
}

public void addToCache(int x, int z, DataPalette[] chunks) {
public void addToCache(int x, int z, DataPalette[] chunks, BlockEntityInfo[][] blockEntities, LightUpdateData lightData) {
if (!cache) {
return;
}

long chunkPosition = MathUtils.chunkPositionToLong(x, z);
GeyserChunk geyserChunk = GeyserChunk.from(chunks);
GeyserChunk geyserChunk = GeyserChunk.from(chunks, blockEntities, lightData);
this.chunks.put(chunkPosition, geyserChunk);
}

/**
* Doesn't check for cache enabled, so don't use this without checking that first!
*/
private GeyserChunk getChunk(int chunkX, int chunkZ) {
public GeyserChunk getChunk(int chunkX, int chunkZ) {
long chunkPosition = MathUtils.chunkPositionToLong(chunkX, chunkZ);
return chunks.getOrDefault(chunkPosition, null);
}
Expand Down
Loading
Loading