0.0.21a (0.0.21)

Author: pythonengineer

Makefile

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

README.md

@@ -4,9 +4,9 @@
 
 _**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.20a_01** as released on _**June 20, 2009**_.
+This project is currently recreating the **Multiplayer Classic** versions of Minecraft. The latest version is **Classic 0.0.21a** as released on _**June 22, 2009**_.
 
-Learn more about this version [here](https://minecraft.fandom.com/wiki/Java_Edition_Classic_0.0.20a_01).
+Learn more about this version [here](https://minecraft.fandom.com/wiki/Java_Edition_Classic_0.0.21a).
 
 Or the server version [here](https://minecraft.fandom.com/wiki/Java_Edition_Classic_server_1.8.2).
 
@@ -19,7 +19,7 @@ you can play it just by specifying the Minecraft version you want to play in the
 
 *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.20a_01`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.0.21`.
 
 Alternatively, for a manual Cython build, run `python setup.py build_ext --inplace`.
 

mc/net/minecraft/HitResult.py

@@ -5,19 +5,3 @@ def __init__(self, type_, x, y, z, f):
         self.y = y
         self.z = z
         self.f = f
-
-    def distanceTo(self, player, editMode):
-        xx = self.x
-        yy = self.y
-        zz = self.z
-        if editMode == 1:
-            if self.f == 0: yy -= 1
-            elif self.f == 1: yy += 1
-            elif self.f == 2: zz -= 1
-            elif self.f == 3: zz += 1
-            elif self.f == 4: xx -= 1
-            elif self.f == 5: xx == 1
-        xd = xx - player.x
-        yd = yy - player.y
-        zd = zz - player.z
-        return xd * xd + yd * yd + zd * zd

mc/net/minecraft/Minecraft.py

@@ -49,7 +49,7 @@ class StopGameException(Exception):
     pass
 
 class Minecraft(window.Window):
-    VERSION_STRING = '0.0.20a_01'
+    VERSION_STRING = '0.0.21a'
     __timer = Timer(20.0)
     level = None
     __levelRenderer = None
@@ -94,6 +94,7 @@ class Minecraft(window.Window):
     __hitResult = None
 
     __fogColorMultiplier = 1.0
+    __displayActive = False
     __unusedInt1 = 0
     __unusedInt2 = 0
 
@@ -122,7 +123,8 @@ def setServer(self, server, port):
 
     def setScreen(self, screen):
         if not isinstance(self.guiScreen, ErrorScreen):
-            self.screenChanged = True
+            if self.guiScreen or screen:
+                self.screenChanged = True
             if self.guiScreen:
                 self.guiScreen.closeScreen()
 
@@ -169,52 +171,52 @@ def on_deactivate(self):
     def on_mouse_press(self, x, y, button, modifiers):
         try:
             if self.guiScreen:
-                self.guiScreen.updateEvents(button=button)
-                if self.guiScreen:
-                    self.guiScreen.tick()
-                return
+                self.guiScreen.updateMouseEvents(button)
 
-            if not self.__mouseGrabbed:
-                self.grabMouse()
-            elif button == window.mouse.LEFT:
-                self.__clickMouse()
-                self.__prevFrameTime = self.__ticksRan
-            elif button == window.mouse.RIGHT:
-                self.__editMode = (self.__editMode + 1) % 2
-            elif button == window.mouse.MIDDLE and self.__hitResult:
-                tile = self.level.getTile(self.__hitResult.x, self.__hitResult.y, self.__hitResult.z)
-                if tile == tiles.grass.id:
-                    tile = tiles.dirt.id
-
-                slot = self.player.inventory.getSlotContainsID(tile)
-                if slot >= 0:
-                    self.player.inventory.selectedSlot = slot
-                elif tile > 0 and tiles.tiles[tile] in User.creativeTiles:
-                    self.player.inventory.getSlotContainsTile(tiles.tiles[tile])
+            if self.screenChanged:
+                self.screenChanged = False
+                if compat_platform != 'darwin':
+                    return
+
+            if not self.guiScreen or (self.guiScreen and self.guiScreen.allowUserInput):
+                if not self.guiScreen:
+                    if not self.__mouseGrabbed:
+                        self.grabMouse()
+                    elif button == window.mouse.LEFT:
+                        self.__clickMouse()
+                        self.__prevFrameTime = self.__ticksRan
+                    elif button == window.mouse.RIGHT:
+                        self.__editMode = (self.__editMode + 1) % 2
+                    elif button == window.mouse.MIDDLE and self.__hitResult:
+                        tile = self.level.getTile(self.__hitResult.x, self.__hitResult.y, self.__hitResult.z)
+                        if tile == tiles.grass.id:
+                            tile = tiles.dirt.id
+
+                        slot = self.player.inventory.getSlotContainsID(tile)
+                        if slot >= 0:
+                            self.player.inventory.selectedSlot = slot
+                        elif tile > 0 and tiles.tiles[tile] in User.creativeTiles:
+                            self.player.inventory.getSlotContainsTile(tiles.tiles[tile])
         except Exception as e:
             print(traceback.format_exc())
             self.setScreen(ErrorScreen('Client error', 'The game broke! [' + str(e) + ']'))
 
     def on_mouse_scroll(self, x, y, dx, dy):
         try:
-            if self.guiScreen:
-                return
-
-            if dy == 0:
-                return
-            elif dy > 0:
-                dy = 1
-            elif dy < 0:
-                dy = -1
-
-            i3 = 0
+            if not self.guiScreen or (self.guiScreen and self.guiScreen.allowUserInput):
+                if dy == 0:
+                    return
+                elif dy > 0:
+                    dy = 1
+                elif dy < 0:
+                    dy = -1
 
-            self.player.inventory.selectedSlot -= dy
-            while self.player.inventory.selectedSlot < 0:
-                self.player.inventory.selectedSlot += len(self.player.inventory.slots)
+                self.player.inventory.selectedSlot -= dy
+                while self.player.inventory.selectedSlot < 0:
+                    self.player.inventory.selectedSlot += len(self.player.inventory.slots)
 
-            while self.player.inventory.selectedSlot >= len(self.player.inventory.slots):
-                self.player.inventory.selectedSlot -= len(self.player.inventory.slots)
+                while self.player.inventory.selectedSlot >= len(self.player.inventory.slots):
+                    self.player.inventory.selectedSlot -= len(self.player.inventory.slots)
         except Exception as e:
             self.setScreen(ErrorScreen('Client error', 'The game broke! [' + str(e) + ']'))
 
@@ -233,47 +235,49 @@ def on_mouse_motion(self, x, y, dx, dy):
     def on_key_press(self, symbol, modifiers):
         try:
             if self.guiScreen:
-                self.guiScreen.updateEvents(key=symbol)
-                if self.guiScreen:
-                    self.guiScreen.tick()
-                return
+                self.guiScreen.updateKeyboardEvents(key=symbol)
 
-            self.player.setKey(symbol, True)
+            if self.screenChanged:
+                self.screenChanged = False
+                if compat_platform != 'darwin':
+                    return
 
-            if symbol == window.key.ESCAPE:
-                self.__pauseGame()
-            elif symbol == window.key.R:
-                self.player.resetPos()
-            elif symbol == window.key.RETURN:
-                self.level.setSpawnPos(int(self.player.x), int(self.player.y), int(self.player.z), self.player.yRot)
-                self.player.resetPos()
-
-            for i in range(9):
-                if symbol == getattr(window.key, '_' + str(i + 1)):
-                    self.player.inventory.selectedSlot = i
-
-            if symbol == window.key.Y:
-                self.__yMouseAxis = -self.__yMouseAxis
-            elif symbol == window.key.G and self.connectionManager is None and len(self.level.entities) < 256:
-                self.level.entities.add(Zombie(self.level, self.player.x, self.player.y, self.player.z))
-            elif symbol == window.key.F:
-                z15 = modifiers & window.key.MOD_SHIFT
-                self.__levelRenderer.drawDistance = self.__levelRenderer.drawDistance + (-1 if z15 else 1) & 3
-            elif symbol == window.key.B:
-                self.setScreen(InventoryScreen())
-            elif symbol == window.key.T and self.connectionManager and self.connectionManager.isConnected():
-                self.player.releaseAllKeys()
-                self.setScreen(ChatScreen())
+            if not self.guiScreen or (self.guiScreen and self.guiScreen.allowUserInput):
+                self.player.setKey(symbol, True)
+
+                if not self.guiScreen:
+                    if symbol == window.key.ESCAPE:
+                        self.__pauseGame()
+                    elif symbol == window.key.R:
+                        self.player.resetPos()
+                    elif symbol == window.key.RETURN:
+                        self.level.setSpawnPos(int(self.player.x), int(self.player.y), int(self.player.z), self.player.yRot)
+                        self.player.resetPos()
+                    elif symbol == window.key.G and self.connectionManager is None and len(self.level.entities) < 256:
+                        self.level.entities.add(Zombie(self.level, self.player.x, self.player.y, self.player.z))
+                    elif symbol == window.key.B:
+                        self.setScreen(InventoryScreen())
+                    elif symbol == window.key.T and self.connectionManager and self.connectionManager.isConnected():
+                        self.player.releaseAllKeys()
+                        self.setScreen(ChatScreen())
+
+                for i in range(9):
+                    if symbol == getattr(window.key, '_' + str(i + 1)):
+                        self.player.inventory.selectedSlot = i
+
+                if symbol == window.key.Y:
+                    self.__yMouseAxis = -self.__yMouseAxis
+                elif symbol == window.key.F:
+                    z15 = modifiers & window.key.MOD_SHIFT
+                    self.__levelRenderer.drawDistance = self.__levelRenderer.drawDistance + (-1 if z15 else 1) & 3
         except Exception as e:
             print(traceback.format_exc())
             self.setScreen(ErrorScreen('Client error', 'The game broke! [' + str(e) + ']'))
 
     def on_key_release(self, symbol, modifiers):
         try:
-            if self.guiScreen:
-                return
-
-            self.player.setKey(symbol, False)
+            if not self.guiScreen or (self.guiScreen and self.guiScreen.allowUserInput):
+                self.player.setKey(symbol, False)
         except Exception as e:
             print(traceback.format_exc())
             self.setScreen(ErrorScreen('Client error', 'The game broke! [' + str(e) + ']'))
@@ -286,19 +290,15 @@ def on_text(self, text):
                     return
 
             if self.guiScreen:
-                self.guiScreen.updateEvents(char=text)
-                if self.guiScreen:
-                    self.guiScreen.tick()
+                self.guiScreen.updateKeyboardEvents(char=text)
         except Exception as e:
             print(traceback.format_exc())
             self.setScreen(ErrorScreen('Client error', 'The game broke! [' + str(e) + ']'))
 
     def on_text_motion(self, motion):
         try:
             if self.guiScreen:
-                self.guiScreen.updateEvents(motion=motion)
-                if self.guiScreen:
-                    self.guiScreen.tick()
+                self.guiScreen.updateKeyboardEvents(motion=motion)
         except Exception as e:
             print(traceback.format_exc())
             self.setScreen(ErrorScreen('Client error', 'The game broke! [' + str(e) + ']'))
@@ -339,9 +339,11 @@ def on_draw(self):
                 self.__tick()
 
             self.__checkGlError('Pre render')
-            if not self.__active:
+            if self.__displayActive and not self.__active:
                 self.__pauseGame()
 
+            self.__displayActive = self.__active
+
             if not self.hideGui:
                 if self.level:
                     self.__render(self.__timer.a)
@@ -511,7 +513,7 @@ def __clickMouse(self):
             else:
                 tile = tiles.tiles[self.level.getTile(x, y, z)]
                 texture = self.player.inventory.getSelected()
-                aabb = tiles.tiles[texture].getAABB(x, y, z)
+                aabb = tiles.tiles[texture].getTileAABB(x, y, z)
                 if (tile is None or tile == tiles.water or tile == tiles.calmWater or tile == tiles.lava or tile == tiles.calmLava) and \
                    (aabb is None or (False if self.player.bb.intersects(aabb) else self.level.isFree(aabb))):
                     if self.__isMultiplayer():
@@ -562,9 +564,7 @@ def __tick(self):
 
         if self.guiScreen:
             self.__prevFrameTime = self.__ticksRan + 10000
-            self.guiScreen.updateEvents()
-            if self.guiScreen:
-                self.guiScreen.tick()
+            self.guiScreen.tick()
         else:
             if self.msh[window.mouse.LEFT] and float(self.__ticksRan - self.__prevFrameTime) >= self.__timer.ticksPerSecond / 4.0 and self.__mouseGrabbed:
                 self.__clickMouse()
@@ -765,6 +765,8 @@ def initGui(self):
 
     def __setupFog(self):
         gl.glFogfv(gl.GL_FOG_COLOR, self.__getBuffer(self.__fogColorRed, self.__fogColorGreen, self.__fogColorBlue, 1.0))
+        gl.glNormal3f(0.0, -1.0, 0.0)
+        gl.glColor4f(1.0, 1.0, 1.0, 1.0)
         currentTile = tiles.tiles[self.level.getTile(int(self.player.x), int(self.player.y + 0.12), int(self.player.z))]
         if currentTile and currentTile.getLiquidType() != Liquid.none:
             liquid = currentTile.getLiquidType()
@@ -892,7 +894,7 @@ def addChatMessage(self, string):
         elif arg == '-mppass':
             mpPass = sys.argv[i + 1]
 
-    game = Minecraft(fullScreen, width=854, height=480, caption='Minecraft 0.0.20a_01')
+    game = Minecraft(fullScreen, width=854, height=480, caption='Minecraft 0.0.21a')
     game.user = User(name, 0, mpPass)
     if server and port:
         game.setServer(server, int(port))

mc/net/minecraft/gui/InventoryScreen.py

@@ -5,20 +5,29 @@
 
 class InventoryScreen(Screen):
 
+    def init(self, minecraft, width, height):
+        super().init(minecraft, width, height)
+        self.allowUserInput = True
+
     def __getTileAtSlot(self, xm, ym):
         for i in range(len(User.creativeTiles)):
-            i4 = self._width // 2 + i % 8 * 24 - 96
-            i5 = self._height // 2 + i // 8 * 24 - 48
+            i4 = self._width // 2 + i % 8 * 24 - 96 - 3
+            i5 = self._height // 2 + i // 8 * 24 - 48 + 3
             if xm >= i4 and xm <= i4 + 24 and ym >= i5 - 12 and ym <= i5 + 12:
                 return i
 
         return -1
 
     def render(self, xm, ym):
-        self._fillGradient(0, 0, self._width, self._height, 1610941696, -1607454624)
+        slot = self.__getTileAtSlot(xm, ym)
+        self._fillGradient(self._width // 2 - 120, 30, self._width // 2 + 120, 180, -1878719232, -1070583712)
+        if slot >= 0:
+            i2 = self._width // 2 + slot % 8 * 24 - 96
+            i3 = self._height // 2 + slot // 8 * 24 - 48
+            self._fillGradient(i2 - 3, i3 - 8, i2 + 23, i3 + 24 - 6, -1862270977, -1056964609)
+
         self.drawCenteredString('Select block', self._width // 2, 40, 0xFFFFFF)
         t = tesselator
-        tileAtSlot = self.__getTileAtSlot(xm, ym)
         id_ = self._minecraft.textures.getTextureId('terrain.png')
         gl.glBindTexture(gl.GL_TEXTURE_2D, id_)
         gl.glEnable(gl.GL_TEXTURE_2D)
@@ -33,7 +42,7 @@ def render(self, xm, ym):
             gl.glTranslatef(1.0, 0.5, 8.0)
             gl.glRotatef(-30.0, 1.0, 0.0, 0.0)
             gl.glRotatef(45.0, 0.0, 1.0, 0.0)
-            if tileAtSlot == i:
+            if slot == i:
                 gl.glScalef(1.6, 1.6, 1.6)
 
             gl.glTranslatef(-1.5, 0.5, 0.5)