Add more typehints (removing now-redundant world.pxd)

Author: Nebual

biome_explorer.py

@@ -3,7 +3,7 @@
 from terrain import BiomeGenerator
 import globals as G
 
-with open(os.path.join(G.game_dir, "world", "seed"), "rb") as f:
+with open(os.path.join(G.game_dir, "world", "seed"), "r") as f:
     SEED = f.read()
 
 b = BiomeGenerator(SEED)

controllers.py

@@ -691,7 +691,7 @@ def on_close(self):
     def show_map(self):
         print("map called...")
          # taken from Nebual's biome_explorer, this is ment to be a full screen map that uses mini tiles to make a full 2d map.
-        with open(os.path.join(G.game_dir, "world", "seed"), "rb") as f:
+        with open(os.path.join(G.game_dir, "world", "seed"), "r") as f:
             SEED = f.read()
         b = BiomeGenerator(SEED)
         x, y, z = self.player.position
@@ -719,7 +719,7 @@ def show_map(self):
             tmap = letters[b.get_biome_type(x,y)]
             tile_map = load_image('resources', 'textures', tmap +'.png')
             tile_map.anchor_x = x * 8
-            tile_map.anchor_Y = y * 8
+            tile_map.anchor_y = y * 8
             sprite = pyglet.sprite.Sprite(tile_map, x=x * 8, y=y * 8, batch=pbatch)
             game_map = image_sprite(tile_map, pbatch, pgroup, x * 8, y * 8, 8, 8)
             game_map = pyglet.sprite.Sprite(image,x=G.WINDOW_WIDTH, y=G.WINDOW_HEIGHT,batch=pbatch, group=pgroup)

custom_types.py

@@ -0,0 +1,4 @@
+from typing import Tuple
+
+iVector = Tuple[int, int, int]
+fVector = Tuple[float, float, float]

main.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Imports, sorted alphabetically.
 

savingsystem.py

@@ -7,11 +7,14 @@
 import struct
 import time
 import sqlite3
+from typing import Optional
 
 # Third-party packages
 # Nothing for now...
 
 # Modules from this project
+from custom_types import iVector
+
 from blocks import BlockID
 from debug import performance_info
 import globals as G
@@ -34,22 +37,22 @@
 null1024 = null2*512      #1024 \0's
 air = G.BLOCKS_DIR[(0,0)]
 
-def sector_to_filename(secpos: (int, int, int)) -> str:
+def sector_to_filename(secpos: iVector) -> str:
     x,y,z = secpos
     return "%i.%i.%i.pyr" % (x//4, y//4, z//4)
 
-def region_to_filename(region: (int, int, int)) -> str:
+def region_to_filename(region: iVector) -> str:
     return "%i.%i.%i.pyr" % region
 
-def sector_to_region(secpos: (int, int, int)) -> (int, int, int):
+def sector_to_region(secpos: iVector) -> iVector:
     x,y,z = secpos
     return (x//4, y//4, z//4)
 
-def sector_to_offset(secpos: (int, int, int)) -> int:
+def sector_to_offset(secpos: iVector) -> int:
     x,y,z = secpos
     return ((x % 4)*16 + (y % 4)*4 + (z % 4)) * 1024
 
-def sector_to_blockpos(secpos: (int, int, int)) -> (int, int, int):
+def sector_to_blockpos(secpos: iVector) -> iVector:
     x,y,z = secpos
     return x*8, y*8, z*8
 
@@ -68,7 +71,7 @@ def connect_db(world=None):
     return sqlite3.connect(os.path.join(world_dir, G.DB_NAME)) 
 
 
-def save_sector_to_bytes(blocks, secpos: (int, int, int)) -> bytes:
+def save_sector_to_bytes(blocks, secpos: iVector) -> bytes:
     """
 
     :type blocks: world_server.WorldServer
@@ -150,8 +153,7 @@ def sector_exists(sector, world=None):
     if world is None: world = "world"
     return os.path.lexists(os.path.join(G.game_dir, world, sector_to_filename(sector)))
 
-def load_region(world, world_name: str = None, region: (int, int, int) = None, sector: (int, int, int) = None):
-    if world_name is None: world_name = "world"
+def load_region(world, world_name: str = "world", region: Optional[iVector] = None, sector: Optional[iVector] = None):
     sectors = world.sectors
     blocks = world
     SECTOR_SIZE = G.SECTOR_SIZE

server.py

@@ -1,18 +1,13 @@
-# Python packages
+#!/usr/bin/env python3
+
 from _socket import SHUT_RDWR
 import socket
 import struct
 import time
 import timer
-
-try:  # Python 3
-    import socketserver
-except ImportError:  # Python 2
-    import socketserver as socketserver
+import socketserver
 import threading
-# Third-party packages
 
-# Modules from this project
 import globals as G
 from savingsystem import save_sector_to_bytes, save_blocks, save_world, load_player, save_player
 from world_server import WorldServer
@@ -32,11 +27,11 @@ def sendpacket(self, size: int, packet: bytes):
         self.request.sendall(struct.pack("i", 5 + size) + packet)
 
     def sendchat(self, txt: str, color=(255,255,255,255)):
-        txt = txt.encode('utf-8')
-        self.sendpacket(len(txt) + 4, b"\5" + txt + struct.pack("BBBB", *color))
+        txt_bytes = txt.encode('utf-8')
+        self.sendpacket(len(txt_bytes) + 4, b"\5" + txt_bytes + struct.pack("BBBB", *color))
     def sendinfo(self, info: str, color=(255,255,255,255)):
-        info = info.encode('utf-8')
-        self.sendpacket(len(info) + 4, b"\5" + info + struct.pack("BBBB", *color))
+        info_bytes = info.encode('utf-8')
+        self.sendpacket(len(info_bytes) + 4, b"\5" + info_bytes + struct.pack("BBBB", *color))
     def broadcast(self, txt: str):
         for player in self.server.players.values():
             player.sendchat(txt)

terrain.pxd

@@ -1,5 +1,4 @@
 import cython
-cimport world
 cimport perlin
 
 #cython: boundscheck=False

utils.py

@@ -3,13 +3,15 @@
 # Python packages
 import os
 import struct
+from typing import Tuple, List
 
 # Third-party packages
 import pyglet
 from pyglet.gl import *
 
 # Modules from this project
 import globals as G
+from custom_types import iVector, fVector
 
 
 __all__ = (
@@ -81,7 +83,7 @@ def get_block_icon(block, icon_size, world):
     return block_icon
 
 
-FACES = (
+FACES: Tuple[iVector, ...] = (
     ( 0,  1,  0),
     ( 0, -1,  0),
     (-1,  0,  0),
@@ -90,7 +92,7 @@ def get_block_icon(block, icon_size, world):
     ( 0,  0, -1),
 )
 
-FACES_WITH_DIAGONALS = FACES + (
+FACES_WITH_DIAGONALS: Tuple[iVector, ...] = FACES + (
     (-1, -1,  0),
     (-1,  0, -1),
     ( 0, -1, -1),
@@ -133,12 +135,12 @@ def normalize_float(f: float) -> int:
     return int_f - 1
 
 
-def normalize(position: (float, float, float)) -> (float, float, float):
+def normalize(position: fVector) -> fVector:
     x, y, z = position
     return normalize_float(x), normalize_float(y), normalize_float(z)
 
 
-def sectorize(position: (int, int, int)) -> (int, int, int):
+def sectorize(position: iVector) -> iVector:
     x, y, z = normalize(position)
     x, y, z = (x // G.SECTOR_SIZE,
                y // G.SECTOR_SIZE,
@@ -164,13 +166,19 @@ def unset_state(self):
 def make_int_packet(i: int) -> bytes:
     return struct.pack('i', i)
 
-def extract_int_packet(packet):
+def extract_int_packet(packet: bytes):
+    """
+    :rtype: (bytes, int)
+    """
     return packet[4:], struct.unpack('i', packet[:4])[0]
 
 def make_string_packet(s: str) -> bytes:
     return struct.pack('i', len(s)) + s.encode('utf-8')
 
-def extract_string_packet(packet: bytes) -> (bytes, str):
+def extract_string_packet(packet: bytes):
+    """
+    :rtype: (bytes, str)
+    """
     strlen = struct.unpack('i', packet[:4])[0]
     packet = packet[4:]
     s = packet[:strlen].decode('utf-8')