funkemunky/KauriV3-mirror
1
0
Fork 0
mirror of https://github.com/funkemunky/KauriV3.git synced 2026-05-31 05:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding bulk chunk packet

Browse Source
This commit is contained in:
Dawson
2022-11-04 10:23:56 -04:00
parent b9246fc315
commit 29dc536c7c
6 changed files with 82 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/dev/brighten/ac/handler/block/BlockUpdateHandler.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class BlockUpdateHandler {
player.runInstantAction(k -> {
if(!k.isEnd()) {
synchronized (blockInformation) {
chunkUpdate.getBlocks().forEach((vec, mblock) -> {
chunkUpdate.getChunk().getBlocks().forEach((vec, mblock) -> {
WrappedBlock block = new WrappedBlock(vec.toLocation(player.getBukkitPlayer().getWorld()),
mblock.material, mblock.data);
blockInformation.put(vec, block);
src/main/java/dev/brighten/ac/packet/wrapper/PacketConverter.java
+2
View File
@@ -88,4 +88,6 @@ public interface PacketConverter {
Object processServerTransaction(WPacketPlayOutTransaction packet);
WPacketPlayOutMapChunk processMapChunk(Object object);
WPacketPlayOutMapChunkBulk processMapChunkBulk(Object packet);
}
src/main/java/dev/brighten/ac/packet/wrapper/PacketType.java
+3
View File
@@ -55,6 +55,7 @@ public enum PacketType {
SERVER_HELM_ITEM("PacketPlayOutHeldItemSlot"),
SERVER_TAB_COMPLETE("PacketPlayOutTabComplete"),
MAP_CHUNK("PacketPlayOutMapChunk"),
MAP_CHUNK_BULK("PacketPlayOutMapChunkBulk"),
MULTI_BLOCK_CHANGE("PacketPlayOutMultiBlockChange"),
RESPAWN("PacketPlayOutRespawn"),
WORLD_PARTICLE("PacketPlayOutWorldParticles"),
@@ -150,6 +151,8 @@ public enum PacketType {
return convert.processServerTransaction(object);
case MAP_CHUNK:
return convert.processMapChunk(object);
case MAP_CHUNK_BULK:
return convert.processMapChunkBulk(object);
default:
return object;
}
src/main/java/dev/brighten/ac/packet/wrapper/impl/Processor_18.java
+43 -86
View File
@@ -758,11 +758,46 @@ public class Processor_18 implements PacketConverter {
int size = serialized.readShort();
byte[] locs = serialized.a();
Map<IntVector, WPacketPlayOutMapChunk.MinBlock> blocks = new HashMap<>();
processChunk(locs, size, chunkX, chunkZ, groundUp, blocks);
return new WPacketPlayOutMapChunk(new WPacketPlayOutMapChunk.WrappedChunk(blocks));
}
@Override
public WPacketPlayOutMapChunkBulk processMapChunkBulk(Object packet) {
PacketPlayOutMapChunkBulk packetPlayOutMapChunkBulk = (PacketPlayOutMapChunkBulk) packet;
PacketDataSerializer serialized = serialize(packetPlayOutMapChunkBulk);
boolean groundUp = serialized.readBoolean();
int size = serialized.e();
final List<WPacketPlayOutMapChunk.WrappedChunk> chunks = new ArrayList<>();
for (int i = 0; i < size; ++i) {
int chunkX = serialized.readInt();
int chunkZ = serialized.readInt();
PacketPlayOutMapChunk.ChunkMap chunkMap = new PacketPlayOutMapChunk.ChunkMap();
chunkMap.b = serialized.readShort() & '\uffff';
chunkMap.a = new byte[a(Integer.bitCount(chunkMap.b), groundUp, true)];
Map<IntVector, WPacketPlayOutMapChunk.MinBlock> blocks = new HashMap<>();
processChunk(chunkMap.a, chunkMap.b, chunkX, chunkZ, groundUp, blocks);
chunks.add(new WPacketPlayOutMapChunk.WrappedChunk(blocks));
}
return new WPacketPlayOutMapChunkBulk(chunks);
}
private static void processChunk(byte[] locs, int size, int chunkX, int chunkZ, boolean groundUp,
Map<IntVector, WPacketPlayOutMapChunk.MinBlock> blocks) {
ChunkSection[] sections = new ChunkSection[16];
//fillChunk(chunk, locs, size, groundUp);
int i = 0;
Map<IntVector, WPacketPlayOutMapChunk.MinBlock> blocks = new HashMap<>();
for (int index = 0; index < sections.length; ++index) {
if ((size & 1 << index) != 0) {
if (sections[index] == null) {
@@ -796,93 +831,15 @@ public class Processor_18 implements PacketConverter {
sections[index] = null;
}
}
return WPacketPlayOutMapChunk.builder().blocks(blocks).build();
}
/*
public void handleChunkData(S21PacketChunkData packetIn) {
PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.gameController);
if (packetIn.func_149274_i()) {
if (packetIn.getExtractedSize() == 0) {
this.clientWorldController.doPreChunk(packetIn.getChunkX(), packetIn.getChunkZ(), false);
return;
}
this.clientWorldController.doPreChunk(packetIn.getChunkX(), packetIn.getChunkZ(), true);
}
this.clientWorldController.invalidateBlockReceiveRegion(packetIn.getChunkX() << 4, 0, packetIn.getChunkZ() << 4, (packetIn.getChunkX() << 4) + 15, 256, (packetIn.getChunkZ() << 4) + 15);
Chunk chunk = this.clientWorldController.getChunkFromChunkCoords(packetIn.getChunkX(), packetIn.getChunkZ());
chunk.fillChunk(packetIn.func_149272_d(), packetIn.getExtractedSize(), packetIn.func_149274_i());
this.clientWorldController.markBlockRangeForRenderUpdate(packetIn.getChunkX() << 4, 0, packetIn.getChunkZ() << 4, (packetIn.getChunkX() << 4) + 15, 256, (packetIn.getChunkZ() << 4) + 15);
if (!packetIn.func_149274_i() || !(this.clientWorldController.provider instanceof WorldProviderSurface)) {
chunk.resetRelightChecks();
}
private static int a(int i, boolean flag, boolean flag1) {
int j = i * 2 * 16 * 16 * 16;
int k = i * 16 * 16 * 16 / 2;
int l = flag ? i * 16 * 16 * 16 / 2 : 0;
int i1 = flag1 ? 256 : 0;
return j + k + l + i1;
}
*/
/*
public void fillChunk(byte[] p_177439_1_, int p_177439_2_, boolean p_177439_3_) {
int i = 0;
boolean flag = !this.worldObj.provider.getHasNoSky();
for (int j = 0; j < this.storageArrays.length; ++j) {
if ((p_177439_2_ & 1 << j) != 0) {
if (this.storageArrays[j] == null) {
this.storageArrays[j] = new ExtendedBlockStorage(j << 4, flag);
}
char[] achar = this.storageArrays[j].getData();
for (int k = 0; k < achar.length; ++k) {
achar[k] = (char) ((p_177439_1_[i + 1] & 255) << 8 | p_177439_1_[i] & 255);
i += 2;
}
} else if (p_177439_3_ && this.storageArrays[j] != null) {
this.storageArrays[j] = null;
}
}
for (int l = 0; l < this.storageArrays.length; ++l) {
if ((p_177439_2_ & 1 << l) != 0 && this.storageArrays[l] != null) {
NibbleArray nibblearray = this.storageArrays[l].getBlocklightArray();
System.arraycopy(p_177439_1_, i, nibblearray.getData(), 0, nibblearray.getData().length);
i += nibblearray.getData().length;
}
}
if (flag) {
for (int i1 = 0; i1 < this.storageArrays.length; ++i1) {
if ((p_177439_2_ & 1 << i1) != 0 && this.storageArrays[i1] != null) {
NibbleArray nibblearray1 = this.storageArrays[i1].getSkylightArray();
System.arraycopy(p_177439_1_, i, nibblearray1.getData(), 0, nibblearray1.getData().length);
i += nibblearray1.getData().length;
}
}
}
if (p_177439_3_) {
System.arraycopy(p_177439_1_, i, this.blockBiomeArray, 0, this.blockBiomeArray.length);
int k1 = i + this.blockBiomeArray.length;
}
for (int j1 = 0; j1 < this.storageArrays.length; ++j1) {
if (this.storageArrays[j1] != null && (p_177439_2_ & 1 << j1) != 0) {
this.storageArrays[j1].removeInvalidBlocks();
}
}
this.isLightPopulated = true;
this.isTerrainPopulated = true;
this.generateHeightMap();
for (TileEntity tileentity : this.chunkTileEntityMap.values()) {
tileentity.updateContainingBlockInfo();
}
}
*/
private static int a(byte[] abyte, byte[] abyte1, int i) {
System.arraycopy(abyte, 0, abyte1, i, abyte.length);
src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMapChunk.java
+8 -3
View File
@@ -4,17 +4,16 @@ import dev.brighten.ac.packet.wrapper.PacketType;
import dev.brighten.ac.packet.wrapper.WPacket;
import dev.brighten.ac.utils.math.IntVector;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import org.bukkit.Material;
import java.util.Map;
@Builder
@AllArgsConstructor
@Getter
public class WPacketPlayOutMapChunk extends WPacket {
private Map<IntVector, MinBlock> blocks;
private WrappedChunk chunk;
@Override
public PacketType getPacketType() {
@@ -31,4 +30,10 @@ public class WPacketPlayOutMapChunk extends WPacket {
public Material material;
public byte data;
}
@AllArgsConstructor
@Getter
public static class WrappedChunk {
private Map<IntVector, MinBlock> blocks;
}
}
src/main/java/dev/brighten/ac/packet/wrapper/out/WPacketPlayOutMapChunkBulk.java
+25
View File
@@ -0,0 +1,25 @@
package dev.brighten.ac.packet.wrapper.out;
import dev.brighten.ac.packet.wrapper.PacketType;
import dev.brighten.ac.packet.wrapper.WPacket;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.List;
@AllArgsConstructor
@Getter
public class WPacketPlayOutMapChunkBulk extends WPacket {
private List<WPacketPlayOutMapChunk.WrappedChunk> chunks;
@Override
public PacketType getPacketType() {
return PacketType.MAP_CHUNK_BULK;
}
@Override
public Object getPacket() {
return null;
}
}