Handle loading / unloading chunks better

mosfet/protocol/managers.py

@@ -70,7 +70,6 @@ class ChunksManager:
                 for item_id, locations in chunk.sub_index.items():
                     if item_id not in self.index:
                         self.index[item_id] = []
-
                     for l in locations:
                         coords = (dx + l%16, dy + l//256, dz + l%256//16)
                         self.index[item_id].append(coords)
@@ -122,28 +121,21 @@ class ChunksManager:
                 self.index[block] = []
             self.index[block].append((x, y, z))
 
-    def check_loaded(self, position, steps=1):
-        x, y, z = utils.pint(position)
-        player_chunk = (x//16, 1, z//16)
-        for i in range(steps): # TODO: base off render_distance?
-            offset = utils.spiral(i)
-            check = utils.padd(player_chunk, offset)
+    def check_loaded(self, chunk_distance):
+        num = (chunk_distance * 2 + 1) ** 2
+        num_subchunks = num * 16
+        return len(self.chunks) >= num_subchunks
 
-            if check not in self.chunks:
-                return False
-
-        return True
-
-    def unload_chunks(self, position):
-        x, y, z = utils.pint(position)
-        player_chunk = (x//16, 0, z//16)
-        loaded_chunks = list(self.chunks.keys())
-
-        for chunk in loaded_chunks:
-            check = (chunk[0], 0, chunk[2])
-            if utils.phyp_king(player_chunk, check) > 20:
-                del self.chunks[chunk]
+    def unload_chunk(self, x, z):
+        for y in range(16):
+            try:
+                del self.chunks[(x, y, z)]
+            except KeyError:
+                pass
 
+    def unload_all_chunks(self):
+        self.chunks = {}
+        self.index = {}
 
 class ChunkNotLoadedException(Exception):
     def __str__(self):

mosfet/protocol/packets.py

@@ -31,10 +31,10 @@ class ChunkDataPacket(Packet):
                 self.biomes.append(VarInt.read(file_object))
         size = VarInt.read(file_object)
         self.data = file_object.read(size)
-        size_entities = VarInt.read(file_object)
-        self.entities = []
-        for i in range(size_entities):
-            self.entities.append(Nbt.read(file_object))
+        #size_entities = VarInt.read(file_object)
+        #self.entities = []
+        #for i in range(size_entities):
+        #    self.entities.append(Nbt.read(file_object))
 
         self.decode_chunk_data()
 
@@ -49,9 +49,9 @@ class ChunkDataPacket(Packet):
                 Integer.send(self.biomes[i], packet_buffer)
         VarInt.send(len(self.data), packet_buffer)
         packet_buffer.send(self.data)
-        VarInt.send(len(self.entities), packet_buffer)
-        for e in self.entities:
-            Nbt.send(e, packet_buffer)
+        #VarInt.send(len(self.entities), packet_buffer)
+        #for e in self.entities:
+        #    Nbt.send(e, packet_buffer)
 
     def decode_chunk_data(self):
         packet_data = PacketBuffer()
@@ -64,9 +64,9 @@ class ChunkDataPacket(Packet):
             if self.bit_mask_y & (1 << i):
                 self.chunks[i].read(packet_data)
         
-        for e in self.entities:
-            y = e['y']
-            self.chunks[floor(y/16)].entities.append(e)
+        #for e in self.entities:
+        #    y = e['y']
+        #    self.chunks[floor(y/16)].entities.append(e)
 
 class Chunk:
     position = multi_attribute_alias(Vector, 'x', 'y', 'z')
@@ -458,3 +458,15 @@ class DisconnectPacket(Packet):
     definition = [
         {'reason': String},
     ]
+
+class UnloadChunkPacket(Packet):
+    # Tells the client to unload a chunk column
+    # https://wiki.vg/Protocol#Unload_Chunk
+
+    id = 0x1C
+    packet_name = 'unload chunk'
+
+    definition = [
+        {'chunk_x': Integer},
+        {'chunk_z': Integer},
+    ]