Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2025-02-03 23:42:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix 1.7 bulk chunk

Browse Source
This commit is contained in:
creeper123123321 2021-11-13 18:43:31 -03:00
parent aea4f91c6e
commit 4e0cbf267e
1 changed files with 62 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/main/kotlin/com/viaversion/aas/protocol/id47toid5/chunks/ChunkPacketTransformer.kt
View File

@ -5,6 +5,8 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper
import com.viaversion.viaversion.api.type.Type import com.viaversion.viaversion.api.type.Type
import com.viaversion.viaversion.api.type.types.CustomByteType import com.viaversion.viaversion.api.type.types.CustomByteType
import com.viaversion.viaversion.protocol.packet.PacketWrapperImpl import com.viaversion.viaversion.protocol.packet.PacketWrapperImpl
import io.netty.buffer.ByteBufAllocator
import io.netty.buffer.Unpooled
import java.util.stream.IntStream import java.util.stream.IntStream
import java.util.zip.Inflater import java.util.zip.Inflater
import kotlin.streams.toList import kotlin.streams.toList
@ -55,61 +57,78 @@ object ChunkPacketTransformer {
@Throws(Exception::class) @Throws(Exception::class)
fun transformChunkBulk(packetWrapper: PacketWrapper) { fun transformChunkBulk(packetWrapper: PacketWrapper) {
val columnCount = packetWrapper.read(Type.SHORT).toInt() //short1 val columnCount = packetWrapper.read(Type.SHORT).toInt()
val compressedSize = packetWrapper.read(Type.INT) //size val compressedSize = packetWrapper.read(Type.INT)
val skyLightSent = packetWrapper.read(Type.BOOLEAN) //h val skyLightSent = packetWrapper.read(Type.BOOLEAN)
val chunkX = IntArray(columnCount) //a val chunkX = IntArray(columnCount)
val chunkZ = IntArray(columnCount) //b val chunkZ = IntArray(columnCount)
val primaryBitMask = IntArray(columnCount) //c val primaryBitMask = IntArray(columnCount)
val addBitMask = IntArray(columnCount) //d val compressedData = packetWrapper.read(CustomByteType(compressedSize))
val inflatedBuffers = arrayOfNulls<ByteArray>(columnCount) //inflatedBuffers
var customByteType = CustomByteType(compressedSize) val decompressedData = ByteArray(196864 * columnCount)
val buildBuffer = packetWrapper.read(customByteType) //buildBuffer
var data = ByteArray(196864 * columnCount) //abyte
val inflater = Inflater() val inflater = Inflater()
inflater.setInput(buildBuffer, 0, compressedSize)
try { try {
inflater.inflate(data) inflater.setInput(compressedData)
inflater.inflate(decompressedData)
} finally { } finally {
inflater.end() inflater.end()
} }
var cursor = 0
val decompressedBuf = Unpooled.wrappedBuffer(decompressedData)
val chunks = arrayOfNulls<Chunk1_8to1_7_6_10>(columnCount)
for (column in 0 until columnCount) { for (column in 0 until columnCount) {
chunkX[column] = packetWrapper.read(Type.INT) chunkX[column] = packetWrapper.read(Type.INT)
chunkZ[column] = packetWrapper.read(Type.INT) chunkZ[column] = packetWrapper.read(Type.INT)
primaryBitMask[column] = packetWrapper.read(Type.SHORT).toInt() primaryBitMask[column] = packetWrapper.read(Type.SHORT).toInt()
addBitMask[column] = packetWrapper.read(Type.SHORT).toInt() val addBitMask = packetWrapper.read(Type.SHORT).toInt()
var primaryCount = 0 var primaryCount = 0
var secondaryCount = 0 var secondaryCount = 0
(0 until 16).forEach { for (chunkY in 0 until 16) {
primaryCount += primaryBitMask[column] shr it and 1 primaryCount += primaryBitMask[column].shr(chunkY).and(1)
secondaryCount += addBitMask[column] shr it and 1 secondaryCount += addBitMask.shr(chunkY).and(1)
} }
var copySize = 8192 * primaryCount + 256 var copySize = 8192 * primaryCount + 256
copySize += 2048 * secondaryCount copySize += 2048 * secondaryCount
if (skyLightSent) { if (skyLightSent) {
copySize += 2048 * primaryCount copySize += 2048 * primaryCount
} }
inflatedBuffers[column] = ByteArray(copySize)
System.arraycopy(data, cursor, inflatedBuffers[column]!!, 0, copySize) val columnData = ByteArray(copySize)
cursor += copySize decompressedBuf.readBytes(columnData)
}
val chunks = arrayOfNulls<Chunk1_8to1_7_6_10>(columnCount) chunks[column] = Chunk1_8to1_7_6_10(
(0 until columnCount).forEach { columnData, primaryBitMask[column],
chunks[it] = addBitMask, skyLightSent, true
Chunk1_8to1_7_6_10(inflatedBuffers[it]!!, primaryBitMask[it], addBitMask[it], skyLightSent, true) )
} }
packetWrapper.write(Type.BOOLEAN, skyLightSent) packetWrapper.write(Type.BOOLEAN, skyLightSent)
packetWrapper.write(Type.VAR_INT, columnCount) packetWrapper.write(Type.VAR_INT, columnCount)
(0 until columnCount).forEach {
packetWrapper.write(Type.INT, chunkX[it]) for (column in 0 until columnCount) {
packetWrapper.write(Type.INT, chunkZ[it]) packetWrapper.write(Type.INT, chunkX[column])
packetWrapper.write(Type.UNSIGNED_SHORT, primaryBitMask[it]) packetWrapper.write(Type.INT, chunkZ[column])
packetWrapper.write(Type.UNSIGNED_SHORT, primaryBitMask[column])
} }
(0 until columnCount).forEach {
data = chunks[it]!!.get1_8Data() for (column in 0 until columnCount) {
customByteType = CustomByteType(data.size) val columnData = chunks[column]!!.get1_8Data()
packetWrapper.write(customByteType, data) packetWrapper.write(CustomByteType(columnData.size), columnData)
}
val buffer = ByteBufAllocator.DEFAULT.buffer()
try {
packetWrapper.writeToBuffer(buffer)
Type.VAR_INT.readPrimitive(buffer) // packet id
packetWrapper.clearPacket()
(packetWrapper as PacketWrapperImpl).inputBuffer!!.writeBytes(buffer)
} finally {
buffer.release()
} }
} }
@ -127,14 +146,15 @@ object ChunkPacketTransformer {
} }
packetWrapper.write(Type.INT, chunkX) packetWrapper.write(Type.INT, chunkX)
packetWrapper.write(Type.INT, chunkZ) packetWrapper.write(Type.INT, chunkZ)
packetWrapper.write(Type.BLOCK_CHANGE_RECORD_ARRAY, IntStream.range(0, size) packetWrapper.write(
.mapToObj { Type.BLOCK_CHANGE_RECORD_ARRAY, IntStream.range(0, size)
val encodedPos = (positions[it].toInt()) .mapToObj {
val x = encodedPos.ushr(12).and(0xF) val encodedPos = (positions[it].toInt())
val y = encodedPos.and(0xFF) val x = encodedPos.ushr(12).and(0xF)
val z = encodedPos.ushr(8).and(0xF) val y = encodedPos.and(0xFF)
BlockChangeRecord1_8(x, y, z, blocks[it].toInt()) val z = encodedPos.ushr(8).and(0xF)
}.toList().toTypedArray() BlockChangeRecord1_8(x, y, z, blocks[it].toInt())
}.toList().toTypedArray()
) )
} }
} }