Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2026-01-06 15:52:03 +00:00
Code Issues Releases Activity

perf(network): 优化数据包的处理逻辑

Browse Source
This commit is contained in:
jhqwqmc
2025-03-24 17:34:00 +08:00
parent 1d40e29991
commit ebf0cd4dea
1 changed files with 104 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
View File

@@ -55,44 +55,73 @@ public class PacketConsumers {
BIOME_LIST = new IntIdentityList(RegistryUtils.currentBiomeRegistrySize()); BIOME_LIST = new IntIdentityList(RegistryUtils.currentBiomeRegistrySize());
} }
public static int remap(int stateId, NetWorkUser user) { public static int remap(int stateId) {
int remapId = mappings[stateId]; return mappings[stateId];
if (remapId == stateId) return stateId;
if (user.usingClientMod() && !BlockStateUtils.isVanillaBlock(stateId)) return stateId;
return remapId;
} }
public static final TriConsumer<NetWorkUser, NMSPacketEvent, Object> LEVEL_CHUNK_WITH_LIGHT = (user, event, packet) -> { public static final TriConsumer<NetWorkUser, NMSPacketEvent, Object> LEVEL_CHUNK_WITH_LIGHT = (user, event, packet) -> {
try { try {
BukkitServerPlayer player = (BukkitServerPlayer) user; if (!user.usingClientMod()) {
Object chunkData = Reflections.field$ClientboundLevelChunkWithLightPacket$chunkData.get(packet); BukkitServerPlayer player = (BukkitServerPlayer) user;
byte[] buffer = (byte[]) Reflections.field$ClientboundLevelChunkPacketData$buffer.get(chunkData); Object chunkData = Reflections.field$ClientboundLevelChunkWithLightPacket$chunkData.get(packet);
ByteBuf buf = Unpooled.copiedBuffer(buffer); byte[] buffer = (byte[]) Reflections.field$ClientboundLevelChunkPacketData$buffer.get(chunkData);
FriendlyByteBuf friendlyByteBuf = new FriendlyByteBuf(buf); ByteBuf buf = Unpooled.copiedBuffer(buffer);
FriendlyByteBuf newBuf = new FriendlyByteBuf(Unpooled.buffer()); FriendlyByteBuf friendlyByteBuf = new FriendlyByteBuf(buf);
for (int i = 0, count = player.clientSideSectionCount(); i < count; i++) { FriendlyByteBuf newBuf = new FriendlyByteBuf(Unpooled.buffer());
try { for (int i = 0, count = player.clientSideSectionCount(); i < count; i++) {
MCSection mcSection = new MCSection(BLOCK_LIST, BIOME_LIST); try {
mcSection.readPacket(friendlyByteBuf); MCSection mcSection = new MCSection(BLOCK_LIST, BIOME_LIST);
PalettedContainer<Integer> container = mcSection.blockStateContainer(); mcSection.readPacket(friendlyByteBuf);
Palette<Integer> palette = container.data().palette(); PalettedContainer<Integer> container = mcSection.blockStateContainer();
if (palette.canRemap()) { Palette<Integer> palette = container.data().palette();
palette.remap(stateId -> remap(stateId, user)); if (palette.canRemap()) {
} else { palette.remap(PacketConsumers::remap);
for (int j = 0; j < 4096; j ++) { } else {
int state = container.get(j); for (int j = 0; j < 4096; j++) {
int newState = remap(state, user); int state = container.get(j);
if (newState != state) { int newState = remap(state);
container.set(j, newState); if (newState != state) {
container.set(j, newState);
}
} }
} }
mcSection.writePacket(newBuf);
} catch (Exception e) {
break;
} }
mcSection.writePacket(newBuf);
} catch (Exception e) {
break;
} }
Reflections.field$ClientboundLevelChunkPacketData$buffer.set(chunkData, newBuf.array());
} else {
BukkitServerPlayer player = (BukkitServerPlayer) user;
Object chunkData = Reflections.field$ClientboundLevelChunkWithLightPacket$chunkData.get(packet);
byte[] buffer = (byte[]) Reflections.field$ClientboundLevelChunkPacketData$buffer.get(chunkData);
ByteBuf buf = Unpooled.copiedBuffer(buffer);
FriendlyByteBuf friendlyByteBuf = new FriendlyByteBuf(buf);
FriendlyByteBuf newBuf = new FriendlyByteBuf(Unpooled.buffer());
for (int i = 0, count = player.clientSideSectionCount(); i < count; i++) {
try {
MCSection mcSection = new MCSection(BLOCK_LIST, BIOME_LIST);
mcSection.readPacket(friendlyByteBuf);
PalettedContainer<Integer> container = mcSection.blockStateContainer();
Palette<Integer> palette = container.data().palette();
if (palette.canRemap()) {
palette.remap(state -> BlockStateUtils.isVanillaBlock(state) ? remap(state) : state);
} else {
for (int j = 0; j < 4096; j++) {
int state = container.get(j);
int newState = BlockStateUtils.isVanillaBlock(state) ? remap(state) : state;
if (newState != state) {
container.set(j, newState);
}
}
}
mcSection.writePacket(newBuf);
} catch (Exception e) {
break;
}
}
Reflections.field$ClientboundLevelChunkPacketData$buffer.set(chunkData, newBuf.array());
} }
Reflections.field$ClientboundLevelChunkPacketData$buffer.set(chunkData, newBuf.array());
} catch (Exception e) { } catch (Exception e) {
CraftEngine.instance().logger().warn("Failed to handle ClientboundLevelChunkWithLightPacket", e); CraftEngine.instance().logger().warn("Failed to handle ClientboundLevelChunkWithLightPacket", e);
} }
@@ -100,24 +129,46 @@ public class PacketConsumers {
public static final BiConsumer<NetWorkUser, ByteBufPacketEvent> SECTION_BLOCK_UPDATE = (user, event) -> { public static final BiConsumer<NetWorkUser, ByteBufPacketEvent> SECTION_BLOCK_UPDATE = (user, event) -> {
try { try {
FriendlyByteBuf buf = event.getBuffer(); if (!user.usingClientMod()) {
long pos = buf.readLong(); FriendlyByteBuf buf = event.getBuffer();
int blocks = buf.readVarInt(); long pos = buf.readLong();
short[] positions = new short[blocks]; int blocks = buf.readVarInt();
int[] states = new int[blocks]; short[] positions = new short[blocks];
for (int i = 0; i < blocks; i++) { int[] states = new int[blocks];
long k = buf.readVarLong(); for (int i = 0; i < blocks; i++) {
positions[i] = (short) ((int) (k & 4095L)); long k = buf.readVarLong();
states[i] = remap((int) (k >>> 12), user); positions[i] = (short) ((int) (k & 4095L));
states[i] = remap((int) (k >>> 12));
}
buf.clear();
buf.writeVarInt(event.packetID());
buf.writeLong(pos);
buf.writeVarInt(blocks);
for (int i = 0; i < blocks; i++) {
buf.writeVarLong((long) states[i] << 12 | positions[i]);
}
event.setChanged(true);
} else {
FriendlyByteBuf buf = event.getBuffer();
long pos = buf.readLong();
int blocks = buf.readVarInt();
short[] positions = new short[blocks];
int[] states = new int[blocks];
for (int i = 0; i < blocks; i++) {
long k = buf.readVarLong();
positions[i] = (short) ((int) (k & 4095L));
int stateId = (int) (k >>> 12);
states[i] = BlockStateUtils.isVanillaBlock(stateId) ? remap(stateId) : stateId;
}
buf.clear();
buf.writeVarInt(event.packetID());
buf.writeLong(pos);
buf.writeVarInt(blocks);
for (int i = 0; i < blocks; i++) {
buf.writeVarLong((long) states[i] << 12 | positions[i]);
}
event.setChanged(true);
} }
buf.clear();
buf.writeVarInt(event.packetID());
buf.writeLong(pos);
buf.writeVarInt(blocks);
for (int i = 0; i < blocks; i ++) {
buf.writeVarLong((long) states[i] << 12 | positions[i]);
}
event.setChanged(true);
} catch (Exception e) { } catch (Exception e) {
CraftEngine.instance().logger().warn("Failed to handle ClientboundSectionBlocksUpdatePacket", e); CraftEngine.instance().logger().warn("Failed to handle ClientboundSectionBlocksUpdatePacket", e);
} }
@@ -128,7 +179,10 @@ public class PacketConsumers {
FriendlyByteBuf buf = event.getBuffer(); FriendlyByteBuf buf = event.getBuffer();
BlockPos pos = buf.readBlockPos(buf); BlockPos pos = buf.readBlockPos(buf);
int before = buf.readVarInt(); int before = buf.readVarInt();
int state = remap(before, user); if (user.usingClientMod() && !BlockStateUtils.isVanillaBlock(before)) {
return;
}
int state = remap(before);
if (state == before) { if (state == before) {
return; return;
} }
@@ -150,7 +204,7 @@ public class PacketConsumers {
BlockPos blockPos = buf.readBlockPos(buf); BlockPos blockPos = buf.readBlockPos(buf);
int state = buf.readInt(); int state = buf.readInt();
boolean global = buf.readBoolean(); boolean global = buf.readBoolean();
int newState = remap(state, user); int newState = remap(state);
if (newState == state) { if (newState == state) {
return; return;
} }
@@ -184,7 +238,7 @@ public class PacketConsumers {
if (!Reflections.clazz$BlockParticleOption.isInstance(option)) return; if (!Reflections.clazz$BlockParticleOption.isInstance(option)) return;
Object blockState = Reflections.field$BlockParticleOption$blockState.get(option); Object blockState = Reflections.field$BlockParticleOption$blockState.get(option);
int id = BlockStateUtils.blockStateToId(blockState); int id = BlockStateUtils.blockStateToId(blockState);
int remapped = remap(id, user); int remapped = remap(id);
if (remapped == id) return; if (remapped == id) return;
Reflections.field$BlockParticleOption$blockState.set(option, BlockStateUtils.idToBlockState(remapped)); Reflections.field$BlockParticleOption$blockState.set(option, BlockStateUtils.idToBlockState(remapped));
event.setChanged(true); event.setChanged(true);
@@ -526,7 +580,7 @@ public class PacketConsumers {
// Falling blocks // Falling blocks
if (entityType == Reflections.instance$EntityType$FALLING_BLOCK) { if (entityType == Reflections.instance$EntityType$FALLING_BLOCK) {
int data = Reflections.field$ClientboundAddEntityPacket$data.getInt(packet); int data = Reflections.field$ClientboundAddEntityPacket$data.getInt(packet);
int remapped = remap(data, user); int remapped = remap(data);
if (remapped != data) { if (remapped != data) {
Reflections.field$ClientboundAddEntityPacket$data.set(packet, remapped); Reflections.field$ClientboundAddEntityPacket$data.set(packet, remapped);
} }