added (broken and wip) world parsing

This commit is contained in:
əlemi 2022-01-06 02:28:33 +01:00
parent 9ad46c796d
commit b0b0e2dcfa
2 changed files with 146 additions and 1 deletions

View file

@ -1,3 +1,4 @@
import io
import re import re
import logging import logging
import asyncio import asyncio
@ -15,7 +16,8 @@ from aiocraft.mc.definitions import Difficulty, Dimension, Gamemode, BlockPos
from aiocraft.mc.proto.play.clientbound import ( from aiocraft.mc.proto.play.clientbound import (
PacketRespawn, PacketLogin, PacketPosition, PacketUpdateHealth, PacketExperience, PacketSetSlot, PacketRespawn, PacketLogin, PacketPosition, PacketUpdateHealth, PacketExperience, PacketSetSlot,
PacketAbilities, PacketPlayerInfo, PacketChat as PacketChatMessage, PacketHeldItemSlot as PacketHeldItemChange PacketAbilities, PacketPlayerInfo, PacketMapChunk, PacketBlockChange, PacketMultiBlockChange,
PacketChat as PacketChatMessage, PacketHeldItemSlot as PacketHeldItemChange
) )
from aiocraft.mc.proto.play.serverbound import ( from aiocraft.mc.proto.play.serverbound import (
PacketTeleportConfirm, PacketClientCommand, PacketSettings, PacketChat, PacketTeleportConfirm, PacketClientCommand, PacketSettings, PacketChat,
@ -25,6 +27,7 @@ from aiocraft.mc.proto.play.serverbound import (
from .events import ChatEvent from .events import ChatEvent
from .events.chat import MessageType from .events.chat import MessageType
from .modules.module import LogicModule from .modules.module import LogicModule
from .world.chunk import World, Chunk
REMOVE_COLOR_FORMATS = re.compile(r"§[0-9a-z]") REMOVE_COLOR_FORMATS = re.compile(r"§[0-9a-z]")
@ -49,6 +52,7 @@ class Treepuncher(MinecraftClient):
# TODO inventory # TODO inventory
position : BlockPos position : BlockPos
world : World
# TODO world # TODO world
tablist : Dict[uuid.UUID, dict] tablist : Dict[uuid.UUID, dict]
@ -80,6 +84,7 @@ class Treepuncher(MinecraftClient):
self.inventory = [ {} for _ in range(46) ] self.inventory = [ {} for _ in range(46) ]
self.position = BlockPos(0, 0, 0) self.position = BlockPos(0, 0, 0)
self.world = World()
self.tablist = {} self.tablist = {}
@ -280,4 +285,10 @@ class Treepuncher(MinecraftClient):
elif packet.action == 4: elif packet.action == 4:
self.tablist.pop(uid, None) self.tablist.pop(uid, None)
@self.on_packet(PacketMapChunk)
async def process_chunk_packet(packet:PacketMapChunk):
chunk = Chunk(packet.x, packet.z, packet.bitMap)
chunk.read(io.BytesIO(packet.chunkData))
self.world.put(chunk, x=packet.x, z=packet.z)

134
treepuncher/world/chunk.py Normal file
View file

@ -0,0 +1,134 @@
import io
from typing import Dict, Tuple, Any
import numpy as np
from aiocraft.mc.types import VarInt, Short, UnsignedByte, Type
class BitStream:
data : bytes
cursor : int
size : int
def __init__(self, data:bytes, size:int=-1):
self.data = data
self.cursor = 0
self.size = size if size > 0 else len(self.data) * 8
def __len__(self) -> int:
return self.size - self.cursor
def read(self, size:int) -> int:
if len(self) < size:
raise ValueError("Not enough bits")
aligned_size = (size//8)+1
buf = int.from_bytes(
self.data[self.cursor:aligned_size],
byteorder='little', signed=False
)
self.cursor += size
delta = aligned_size - size
return ( buf << delta ) >> delta
class PalettedContainer(Type):
pytype : type
threshold : int
maxsize : int
def __init__(self, threshold:int, maxsize:int):
self.threshold = threshold
self.maxsize = maxsize
def write(self, data, buffer:io.BytesIO, ctx:object=None):
raise NotImplementedError
def read(self, buffer:io.BytesIO, ctx:object=None):
bits = UnsignedByte.read(buffer, ctx=ctx)
palette = np.empty((0,), dtype='int32')
if bits == 0:
value = VarInt.read(buffer, ctx=ctx)
elif bits < self.threshold:
palette_len = VarInt.read(buffer, ctx=ctx)
palette = np.zeros((palette_len,), dtype='int32')
for i in range(palette_len):
palette[i] = VarInt.read(buffer)
size = VarInt.read(buffer, ctx=ctx)
stream = BitStream(buffer.read(size * 8))
section = np.zeros((self.maxsize,), dtype='int32')
index = 0
while index < self.maxsize and len(stream) > 0:
val = stream.read(bits) if bits > 0 else value
section[index] = palette[val] if bits < self.threshold and bits > 0 else val
index+=1
return section
BiomeContainer = PalettedContainer(4, 64)
BlockStateContainer = PalettedContainer(9, 4096)
class ChunkSectionType(Type):
pytype : type
def write(self, data, buffer:io.BytesIO, ctx:object=None):
raise NotImplementedError
def read(self, buffer:io.BytesIO, ctx:object=None):
block_count = Short.read(buffer)
block_states = BlockStateContainer.read(buffer)
biomes = BiomeContainer.read(buffer)
return (
block_count,
block_states.reshape((16, 16, 16)),
biomes.reshape((4, 4, 4))
)
ChunkSection = ChunkSectionType()
class Chunk(Type):
x : int
z : int
bitmask : int
blocks : np.ndarray
biomes : np.ndarray
block_count : int
def __init__(self, x:int, z:int, bitmask:int):
self.x = x
self.z = z
self.bitmask = bitmask
self.blocks = np.zeros((16, 256, 16))
self.biomes = np.zeros((4, 64, 4))
self.block_count = 0
def __getitem__(self, item:Any):
return self.blocks[item]
def read(self, buffer:io.BytesIO, ctx:object=None):
for i in range(16):
if (self.bitmask >> i) & 1:
block_count, block_states, biomes = ChunkSection.read(buffer)
self.block_count += block_count
self.blocks[:, i*16 : (i+1)*16, :] = block_states
self.biomes[:, i*4 : (i+1)*4, :] = biomes
return self
class World:
chunks : Dict[Tuple[int, int], Chunk]
def __init__(self):
self.chunks = {}
def __getitem__(self, item:Tuple[int, int, int]):
return self.get(*item)
def get(self, x:int, y:int, z:int):
coord = (x//16, z//16)
if coord not in self.chunks:
raise KeyError(f"Chunk {coord} not loaded")
return self.chunks[coord][x%16, y, z%16]
def put(self, chunk:Chunk, x:int, z:int):
self.chunks[(x,z)] = chunk