0.0.18a_02

Author: pythonengineer

Makefile

@@ -12,7 +12,7 @@ install:
 	CYTHONIZE=1 pip install .
 
 install-from-source: dist
-	pip install dist/minecraft-python-0.0.17.tar.gz
+	pip install dist/minecraft-python-0.0.18a2.tar.gz
 
 clean:
 	$(RM) -r build dist src/*.egg-info

README.md

@@ -4,11 +4,11 @@
 
 _**Minecraft: Python Edition**_ is a project that strives to recreate each and every old Minecraft version in Python 3 using the **Pyglet** multimedia library and **Cython** for performance.
 
-This project is currently recreating the **Multiplayer Classic** versions of Minecraft. The latest version is **Classic 0.0.17a** as released on _**June 10, 2009**_.
+This project is currently recreating the **Multiplayer Classic** versions of Minecraft. The latest version is **Classic 0.0.18a_02** as released on _**June 14, 2009**_.
 
-Learn more about this version [here](https://minecraft.fandom.com/wiki/Java_Edition_Classic_0.0.17a).
+Learn more about this version [here](https://minecraft.fandom.com/wiki/Java_Edition_Classic_0.0.18a_02).
 
-Or the server version [here](https://minecraft.fandom.com/wiki/Java_Edition_Classic_server_1.3).
+Or the server version [here](https://minecraft.fandom.com/wiki/Java_Edition_Classic_server_1.4.1).
 
 This project is organized so that every commit is strictly the completed release of the Python version of the Java game of the same version number.
 This means that you can go back into this repository's commit history and see only the source code changes between versions of Minecraft,
@@ -17,9 +17,9 @@ you can play it just by specifying the Minecraft version you want to play in the
 
 ### General Usage
 
-*Pyglet* and *Cython* are required dependencies and can easily be installed with *pip*. Use the versions specified in `requirements.txt`.
+*Pyglet*, *Cython*, and *Pillow* are required dependencies and can easily be installed with *pip*. Use the versions specified in `requirements.txt`.
 
-To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.0.17`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.0.18a_02`.
 
 Alternatively, for a manual Cython build, run `python setup.py build_ext --inplace`.
 

mc/Resources.py

@@ -71,6 +71,12 @@ def setPos(self, x, y=None, z=None):
         self.bb = AABB(x - w, y - h, z - w, x + w, y + h, z + w)
 
     def _setRot(self, yRot, xRot):
+        while self.yRotO - yRot < -180.0:
+            self.yRotO += 360.0
+
+        while self.yRotO - yRot >= 180.0:
+            self.yRotO -= 360.0
+
         self.yRot = yRot
         self.xRot = xRot
 

mc/net/minecraft/Entity.py

@@ -41,8 +41,11 @@
 
 GL_DEBUG = False
 
+class StopGameException(Exception):
+    pass
+
 class Minecraft(window.Window):
-    VERSION_STRING = '0.0.17a'
+    VERSION_STRING = '0.0.18a_02'
     __timer = Timer(20.0)
     level = None
     __levelRenderer = None
@@ -138,7 +141,7 @@ def __checkGlError(self, string):
                 print(errorCode)
                 sys.exit(1)
 
-    def __destroy(self):
+    def destroy(self):
         try:
             LevelIO.save(self.level, gzip.open('level.dat', 'wb'))
         except Exception as e:
@@ -446,7 +449,7 @@ def run(self):
                 lastTime += 1000
                 frames = 0
 
-        self.__destroy()
+        self.destroy()
 
     def grabMouse(self):
         if self.__mouseGrabbed:
@@ -682,7 +685,7 @@ def __render(self, a):
         gl.glColorMask(True, True, True, True)
         if i20 > 0:
             gl.glEnable(gl.GL_TEXTURE_2D)
-            gl.glBindTexture(gl.GL_TEXTURE_2D, self.__levelRenderer.textures.loadTexture('terrain.png', gl.GL_NEAREST))
+            gl.glBindTexture(gl.GL_TEXTURE_2D, self.__levelRenderer.textures.getTextureId('terrain.png'))
             gl.glCallLists(self.__levelRenderer.dummyBuffer.capacity(), gl.GL_INT, self.__levelRenderer.dummyBuffer)
             gl.glDisable(gl.GL_TEXTURE_2D)
 
@@ -728,7 +731,7 @@ def __renderGui(self):
         gl.glTranslatef(-1.5, 0.5, 0.5)
         gl.glScalef(-1.0, -1.0, -1.0)
 
-        id_ = Textures.loadTexture('terrain.png', gl.GL_NEAREST)
+        id_ = self.__textures.getTextureId('terrain.png')
         gl.glBindTexture(gl.GL_TEXTURE_2D, id_)
         gl.glEnable(gl.GL_TEXTURE_2D)
         t.begin()
@@ -826,45 +829,54 @@ def __getBuffer(self, a, b, c, d):
         return self.__lb
 
     def beginLevelLoading(self, title):
-        self.__title = title
-        screenWidth = self.width * 240 / self.height
-        screenHeight = self.height * 240 / self.height
-
-        gl.glClear(gl.GL_DEPTH_BUFFER_BIT)
-        gl.glMatrixMode(gl.GL_PROJECTION)
-        gl.glLoadIdentity()
-        gl.glOrtho(0.0, screenWidth, screenHeight, 0.0, 100.0, 300.0)
-        gl.glMatrixMode(gl.GL_MODELVIEW)
-        gl.glLoadIdentity()
-        gl.glTranslatef(0.0, 0.0, -200.0)
+        if not self.running:
+            raise StopGameException
+        else:
+            self.__title = title
+            screenWidth = self.width * 240 / self.height
+            screenHeight = self.height * 240 / self.height
+
+            gl.glClear(gl.GL_DEPTH_BUFFER_BIT)
+            gl.glMatrixMode(gl.GL_PROJECTION)
+            gl.glLoadIdentity()
+            gl.glOrtho(0.0, screenWidth, screenHeight, 0.0, 100.0, 300.0)
+            gl.glMatrixMode(gl.GL_MODELVIEW)
+            gl.glLoadIdentity()
+            gl.glTranslatef(0.0, 0.0, -200.0)
 
     def levelLoadUpdate(self, status):
-        self.__text = status
-        self.setLoadingProgress()
+        if not self.running:
+            raise StopGameException
+        else:
+            self.__text = status
+            self.setLoadingProgress()
 
     def setLoadingProgress(self):
-        screenWidth = self.width * 240 // self.height
-        screenHeight = self.height * 240 // self.height
+        if not self.running:
+            raise StopGameException
+        else:
+            screenWidth = self.width * 240 // self.height
+            screenHeight = self.height * 240 // self.height
 
-        gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT)
+            gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT)
 
-        t = tesselator
-        gl.glEnable(gl.GL_TEXTURE_2D)
-        id_ = self.__textures.loadTexture('dirt.png', gl.GL_NEAREST)
-        gl.glBindTexture(gl.GL_TEXTURE_2D, id_)
-        s = 32.0
-        t.begin()
-        t.color(4210752)
-        t.vertexUV(0.0, screenHeight, 0.0, 0.0, screenHeight / s)
-        t.vertexUV(screenWidth, screenHeight, 0.0, screenWidth / s, screenHeight / s)
-        t.vertexUV(screenWidth, 0.0, 0.0, screenWidth / s, 0.0)
-        t.vertexUV(0.0, 0.0, 0.0, 0.0, 0.0)
-        t.end()
-
-        self.font.drawShadow(self.__title, (screenWidth - self.font.width(self.__title)) // 2, screenHeight // 2 - 4 - 16, 0xFFFFFF)
-        self.font.drawShadow(self.__text, (screenWidth - self.font.width(self.__text)) // 2, screenHeight // 2 - 4 + 8, 0xFFFFFF)
-        clock.tick()
-        self.flip()
+            t = tesselator
+            gl.glEnable(gl.GL_TEXTURE_2D)
+            id_ = self.__textures.getTextureId('dirt.png')
+            gl.glBindTexture(gl.GL_TEXTURE_2D, id_)
+            s = 32.0
+            t.begin()
+            t.color(4210752)
+            t.vertexUV(0.0, screenHeight, 0.0, 0.0, screenHeight / s)
+            t.vertexUV(screenWidth, screenHeight, 0.0, screenWidth / s, screenHeight / s)
+            t.vertexUV(screenWidth, 0.0, 0.0, screenWidth / s, 0.0)
+            t.vertexUV(0.0, 0.0, 0.0, 0.0, 0.0)
+            t.end()
+
+            self.font.drawShadow(self.__title, (screenWidth - self.font.width(self.__title)) // 2, screenHeight // 2 - 4 - 16, 0xFFFFFF)
+            self.font.drawShadow(self.__text, (screenWidth - self.font.width(self.__text)) // 2, screenHeight // 2 - 4 + 8, 0xFFFFFF)
+            clock.tick()
+            self.flip()
 
     def generateLevel(self, i):
         name = self.user.name if self.user else 'anonymous'
@@ -917,7 +929,7 @@ def addChatMessage(self, string):
         elif arg == '-mppass':
             mpPass = sys.argv[i + 1]
 
-    game = Minecraft(fullScreen, width=854, height=480, caption='Minecraft 0.0.17a')
+    game = Minecraft(fullScreen, width=854, height=480, caption='Minecraft 0.0.18a_02')
     game.user = User(name, 0, mpPass)
     if server and port:
         game.setServer(server, int(port))

mc/net/minecraft/Minecraft.py

@@ -51,7 +51,7 @@ def tick(self):
 
     def render(self, textures, a):
         gl.glEnable(gl.GL_TEXTURE_2D)
-        gl.glBindTexture(gl.GL_TEXTURE_2D, textures.loadTexture('char.png', gl.GL_NEAREST))
+        gl.glBindTexture(gl.GL_TEXTURE_2D, textures.getTextureId('char.png'))
 
         gl.glPushMatrix()
         t = getNs() / 1000000000.0 * 10.0 * self.speed + self.timeOffs

mc/net/minecraft/character/Zombie.py

@@ -129,7 +129,9 @@ def processData(self):
                     b25 = data[4]
                     b8 = data[5]
                     networkPlayer = self.manager.players.get(b15)
-                    if b15 >= 0 and networkPlayer:
+                    if b15 < 0:
+                        self.manager.minecraft.player.moveTo(s17 / 32.0, s18 / 32.0, s21 / 32.0, float(b25 * 360) / 256.0, float(b8 * 360) / 256.0)
+                    elif networkPlayer:
                         networkPlayer.teleport(s17, s18, s21, float(-b25 * 360) / 256.0, float(b8 * 360) / 256.0)
                 elif packet == Packets.PLAYER_MOVE_AND_ROTATE:
                     b15 = data[0]
@@ -158,9 +160,11 @@ def processData(self):
                         networkPlayer.queue(b23, b22, b6)
                 elif packet == Packets.PLAYER_DISCONNECT:
                     b15 = data[0]
-                    networkPlayer = self.manager.players.pop(b15)
-                    if b15 >= 0 and networkPlayer:
-                        self.manager.minecraft.level.entities.remove(networkPlayer)
+                    if b15 in self.manager.players:
+                        networkPlayer = self.manager.players.pop(b15)
+                        if b15 >= 0 and networkPlayer:
+                            networkPlayer.clear()
+                            self.manager.minecraft.level.entities.remove(networkPlayer)
                 elif packet == Packets.CHAT_MESSAGE:
                     b15 = data[0]
                     string19 = data[1].decode()

mc/net/minecraft/comm/SocketConnection.py

@@ -26,7 +26,7 @@ def _keyPressed(self, key, char, motion):
         else:
             if motion == window.key.MOTION_BACKSPACE and len(self.__typedMsg) > 0:
                 self.__typedMsg = self.__typedMsg[:-1]
-            if char and char in 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ,.:-_\'*!"#%/()=+?[]{}<>' and len(self.__typedMsg) < 64 - (len(self._minecraft.user.name) + 2):
+            if char and char in 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ,.:-_\'*!\\"#%/()=+?[]{}<>@|$' and len(self.__typedMsg) < 64 - (len(self._minecraft.user.name) + 2):
                 self.__typedMsg += char
 
     def render(self, xm, ym):

mc/net/minecraft/gui/ChatScreen.py

@@ -6,7 +6,7 @@ class Font:
 
     def __init__(self, name, textures):
         self.__charWidths = [0] * 256
-        self.__fontTexture = textures.loadTexture(name, gl.GL_NEAREST)
+        self.__fontTexture = textures.getTextureId(name)
         texture = Resources.textures[name]
         w = texture[0]
         h = texture[1]
@@ -38,42 +38,43 @@ def drawShadow(self, string, x, y, color):
         self.draw(string, x, y, color)
 
     def draw(self, string, x, y, color, darken=False):
-        if darken:
-            color = (color & 0xFCFCFC) >> 2
-        gl.glEnable(gl.GL_TEXTURE_2D)
-        gl.glBindTexture(gl.GL_TEXTURE_2D, self.__fontTexture)
-        t = tesselator
-        t.begin()
-        t.color(color)
-        xo = 0
-        i = 0
-        while i < len(string):
-            if string[i] == '&':
-                cc = '0123456789abcdef'.index(string[i + 1])
-                br = (cc & 8) << 3
-                b = (cc & 1) * 191 + br
-                g = ((cc & 2) >> 1) * 191 + br
-                r = ((cc & 4) >> 2) * 191 + br
-                color = r << 16 | g << 8 | b
-                i += 2
-                if darken:
-                    color = (color & 0xFCFCFC) >> 2
+        if string is not None:
+            if darken:
+                color = (color & 0xFCFCFC) >> 2
+            gl.glEnable(gl.GL_TEXTURE_2D)
+            gl.glBindTexture(gl.GL_TEXTURE_2D, self.__fontTexture)
+            t = tesselator
+            t.begin()
+            t.color(color)
+            xo = 0
+            i = 0
+            while i < len(string):
+                if string[i] == '&':
+                    cc = '0123456789abcdef'.index(string[i + 1])
+                    br = (cc & 8) << 3
+                    b = (cc & 1) * 191 + br
+                    g = ((cc & 2) >> 1) * 191 + br
+                    r = ((cc & 4) >> 2) * 191 + br
+                    color = r << 16 | g << 8 | b
+                    i += 2
+                    if darken:
+                        color = (color & 0xFCFCFC) >> 2
 
-                t.color(color)
+                    t.color(color)
 
-            ix = ord(string[i]) % ord('\020') << 3
-            iy = ord(string[i]) // ord('\020') << 3
-            f13 = 7.99
-            t.vertexUV(x + xo, y + f13, 0.0, ix / 128.0, (iy + f13) / 128.0)
-            t.vertexUV(x + xo + f13, y + f13, 0.0, (ix + f13) / 128.0, (iy + f13) / 128.0)
-            t.vertexUV(x + xo + f13, y, 0.0, (ix + f13) / 128.0, iy / 128.0)
-            t.vertexUV(x + xo, y, 0.0, ix / 128.0, iy / 128.0)
+                ix = ord(string[i]) % ord('\020') << 3
+                iy = ord(string[i]) // ord('\020') << 3
+                f13 = 7.99
+                t.vertexUV(x + xo, y + f13, 0.0, ix / 128.0, (iy + f13) / 128.0)
+                t.vertexUV(x + xo + f13, y + f13, 0.0, (ix + f13) / 128.0, (iy + f13) / 128.0)
+                t.vertexUV(x + xo + f13, y, 0.0, (ix + f13) / 128.0, iy / 128.0)
+                t.vertexUV(x + xo, y, 0.0, ix / 128.0, iy / 128.0)
 
-            xo += self.__charWidths[ord(string[i])]
-            i += 1
+                xo += self.__charWidths[ord(string[i])]
+                i += 1
 
-        t.end()
-        gl.glDisable(gl.GL_TEXTURE_2D)
+            t.end()
+            gl.glDisable(gl.GL_TEXTURE_2D)
 
     def width(self, string):
         if string is None: