0.29_02 (0.29)

Author: pythonengineer

Makefile

@@ -12,7 +12,7 @@ install:
 	CYTHONIZE=1 pip install .
 
 install-from-source: dist
-	pip install dist/minecraft-python-0.28.tar.gz
+	pip install dist/minecraft-python-0.29.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 **Late Classic** versions of Minecraft. The latest version is **Classic 0.28_01** as released on _**October 27, 2009**_.
+This project is currently recreating the **Late Classic** versions of Minecraft. The latest version is **Classic 0.29_02** as released on _**October 30, 2009**_.
 
-Learn more about this version [here](https://minecraft.fandom.com/wiki/Java_Edition_Classic_0.28_01).
+Learn more about this version [here](https://minecraft.fandom.com/wiki/Java_Edition_Classic_0.29_02).
 
 Or the server version [here](https://minecraft.fandom.com/wiki/Java_Edition_Classic_server_1.8.3).
 
@@ -22,7 +22,7 @@ you can play it just by specifying the Minecraft version you want to play in the
 For audio to work you will either need *PyOgg* which is recommended, or FFmpeg which is installed on the system.
 GStreamer is also supported on Linux through the *gst-python* library. PyOgg requires that your system have one of the *Opus*, *FLAC*, or *Vorbis* codecs. OpenAL is required.
 
-To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.28`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.29`.
 
 Alternatively, for a manual Cython build, run `python setup.py build_ext --inplace`.
 

mc/net/minecraft/Entity.pxd

@@ -45,6 +45,7 @@ cdef class Entity:
         public float footSize
         public bint noPhysics
         public float pushthrough
+        public bint hovered
 
     cpdef tick(self)
     cpdef bint isFree(self, float xa, float ya, float za)

mc/net/minecraft/Entity.pyx

@@ -423,3 +423,6 @@ cdef class Entity:
 
     def isCreativeModeAllowed(self):
         return False
+
+    def renderHover(self, textures, a):
+        pass

mc/net/minecraft/Minecraft.py

@@ -64,7 +64,7 @@
 GL_DEBUG = False
 
 class Minecraft(window.Window):
-    VERSION_STRING = '0.28_01'
+    VERSION_STRING = '0.29_02'
     level = None
     levelRenderer = None
     player = None
@@ -256,9 +256,11 @@ def on_key_press(self, symbol, modifiers):
 
                     if symbol == window.key.ESCAPE:
                         self.pauseScreen()
-                    elif symbol == window.key.F5 and not self.networkClient:
+                    elif symbol == window.key.F5:
                         self.raining = not self.raining
-                    elif symbol == window.key.TAB and not self.networkClient and self.player.arrows > 0:
+                    elif symbol == window.key.TAB and \
+                         isinstance(self.gamemode, SurvivalGameMode) and \
+                         self.player.arrows > 0:
                         self.level.addEntity(Arrow(self.level, self.player, self.player.x,
                                                    self.player.y, self.player.z,
                                                    self.player.yRot, self.player.xRot, 1.2))
@@ -785,27 +787,29 @@ def __pick(self, alpha):
         d = self.gamemode.getPickRange()
         vec2 = rotVec.add(xy * d, x2 * d, y1 * d)
         self.hitResult = self.level.clip(rotVec, vec2)
+        if self.hitResult:
+            d = self.hitResult.vec.distanceTo(rotVec)
 
         vec = self.gameRenderer.getPlayerRotVec(alpha)
-        if self.hitResult:
-            d = self.hitResult.vec.distanceTo(vec)
+        if isinstance(self.gamemode, CreativeGameMode):
+            d = 32.0
 
+        vec2 = vec.add(xy * d, x2 * d, y1 * d)
         entities = self.level.blockMap.getEntitiesWithinAABBExcludingEntity(self.player, self.player.bb.expand(xy * d, x2 * d, y1 * d))
+        d = 0.0
         for entity in entities:
             if not entity.isPickable():
                 continue
 
-            axisAlignedBB = entity.bb.grow(0.1, 0.1, 0.1)
-            di = 0.0
-            while di < d:
-                if not axisAlignedBB.contains(vec.add(xy * di, x2 * di, y1 * di)):
-                    di += 0.05
-                    continue
+            hit = entity.bb.grow(0.1, 0.1, 0.1).clip(vec, vec2)
+            if hit:
+                di = vec.distanceTo(hit.vec)
+                if di < d or d == 0.0:
+                    self.gameRenderer.entity = entity
+                    d = di
 
-                d = di
-                self.hitResult = HitResult(entity)
-                di += 0.05
-                break
+        if self.gameRenderer.entity and not isinstance(self.gamemode, CreativeGameMode):
+            self.hitResult = HitResult(self.gameRenderer.entity)
 
     def __render(self, alpha):
         for i in range(2):
@@ -888,7 +892,7 @@ def __render(self, alpha):
             self.gameRenderer.toggleLight(False)
             self.gameRenderer.setupFog()
             self.particleEngine.render(self.player, alpha)
-            gl.glBindTexture(gl.GL_TEXTURE_2D, self.levelRenderer.textures.loadTexture('rock.png'))
+            gl.glBindTexture(gl.GL_TEXTURE_2D, self.textures.loadTexture('rock.png'))
             gl.glEnable(gl.GL_TEXTURE_2D)
             gl.glCallList(self.levelRenderer.surroundLists)
             self.gameRenderer.setupFog()
@@ -919,7 +923,7 @@ def __render(self, alpha):
             self.gameRenderer.setupFog()
             gl.glEnable(gl.GL_BLEND)
             gl.glEnable(gl.GL_TEXTURE_2D)
-            gl.glBindTexture(gl.GL_TEXTURE_2D, self.levelRenderer.textures.loadTexture('water.png'))
+            gl.glBindTexture(gl.GL_TEXTURE_2D, self.textures.loadTexture('water.png'))
             gl.glCallList(self.levelRenderer.surroundLists + 1)
             gl.glDisable(gl.GL_BLEND)
             gl.glEnable(gl.GL_BLEND)
@@ -933,7 +937,7 @@ def __render(self, alpha):
                     gl.glColorMask(True, False, False, False)
 
             if remaining > 0:
-                gl.glBindTexture(gl.GL_TEXTURE_2D, self.levelRenderer.textures.loadTexture('terrain.png'))
+                gl.glBindTexture(gl.GL_TEXTURE_2D, self.textures.loadTexture('terrain.png'))
                 gl.glCallLists(self.levelRenderer.ib.capacity(), gl.GL_INT, self.levelRenderer.ib)
 
             gl.glDepthMask(True)
@@ -942,6 +946,9 @@ def __render(self, alpha):
             if self.raining:
                 self.gameRenderer.renderRain(alpha)
 
+            if self.gameRenderer.entity:
+                self.gameRenderer.entity.renderHover(self.textures, alpha)
+
             gl.glClear(gl.GL_DEPTH_BUFFER_BIT)
             gl.glLoadIdentity()
             if self.options.anaglyph3d:
@@ -1023,7 +1030,14 @@ def loadLevel(self, level):
             self.gamemode.initLevel(level)
             level.font = self.font
             level.rendererContext = self
-            self.player = level.findSubclassOf(Player)
+            if self.isOnlineClient():
+                self.player = level.findSubclassOf(Player)
+            elif self.player:
+                self.player.resetPos()
+                self.gamemode.initPlayer(self.player)
+                if level:
+                    level.player = self.player
+                    level.addEntity(self.player)
 
         if not self.player:
             self.player = Player(level)

mc/net/minecraft/comm/SocketConnection.py

@@ -116,9 +116,11 @@ def processData(self):
                     b9 = data[6]
                     if b15 not in self.client.players:
                         if b15 >= 0:
+                            b8 += 128
+                            s21 -= 22
                             networkPlayer = NetworkPlayer(self.client.minecraft, b15,
                                                           string19, s18, s21, s24,
-                                                          (-b8 * 360) / 256.0,
+                                                          (b8 * 360) / 256.0,
                                                           (b9 * 360) / 256.0)
                             self.client.players[b15] = networkPlayer
                             self.client.minecraft.level.addEntity(networkPlayer)
@@ -142,7 +144,9 @@ def processData(self):
                                                             float(b25 * 360) / 256.0,
                                                             float(b8 * 360) / 256.0)
                     elif networkPlayer:
-                        networkPlayer.teleport(s17, s18, s21, float(-b25 * 360) / 256.0,
+                        b25 += 128
+                        s18 -= 22
+                        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]
@@ -153,15 +157,17 @@ def processData(self):
                     b8 = data[5]
                     networkPlayer = self.client.players.get(b15)
                     if b15 >= 0 and networkPlayer:
-                        networkPlayer.queue1(b23, b22, b6, float(-b25 * 360) / 256.0,
+                        b25 += 128
+                        networkPlayer.queue1(b23, b22, b6, float(b25 * 360) / 256.0,
                                              float(b8 * 360) / 256.0)
                 elif packet == Packets.PLAYER_ROTATE:
                     b15 = data[0]
                     b23 = data[1]
                     b22 = data[2]
                     networkPlayer = self.client.players.get(b15)
                     if b15 >= 0 and networkPlayer:
-                        networkPlayer.queue2(float(-b23 * 360) / 256.0,
+                        b23 += 128
+                        networkPlayer.queue2(float(b23 * 360) / 256.0,
                                              float(b22 * 360) / 256.0)
                 elif packet == Packets.PLAYER_MOVE:
                     b15 = data[0]

mc/net/minecraft/gamemode/CreativeGameMode.py

@@ -15,6 +15,7 @@ def initLevel(self, level):
         super().initLevel(level)
         level.removeAllNonCreativeModeEntities()
         level.creativeMode = True
+        level.growTrees = False
 
     def adjustPlayer(self, player):
         for i in range(9):

mc/net/minecraft/gamemode/GameMode.py

@@ -8,6 +8,7 @@ def __init__(self, minecraft):
 
     def initLevel(self, level):
         level.creativeMode = False
+        level.growTrees = True
 
     def handleOpenInventory(self):
         pass

mc/net/minecraft/gui/Font.py

@@ -72,6 +72,9 @@ def draw(self, string, x, y, color, darken=False):
 
                     color = r << 16 | g << 8 | b
                     i += 2
+                    if i >= len(string):
+                        break
+
                     if darken:
                         color = (color & 0xFCFCFC) >> 2
 

mc/net/minecraft/level/Level.pxd

@@ -48,6 +48,8 @@ cdef class Level:
         public object particleEngine
         public object font
 
+        public bint growTrees
+
         public int width
         public int depth
         public int height

mc/net/minecraft/level/Level.pyx

@@ -56,6 +56,9 @@ cdef class Level:
         self.multiplier = 3
         self.addend = 1013904223
 
+        self.creativeMode = False
+        self.growTrees = False
+
     def __dealloc__(self):
         free(self.__blocks)
         free(self.__heightMap)
@@ -641,9 +644,6 @@ cdef class Level:
             if tileId > 0:
                 tile = tiles.tiles[tileId]
                 if tile.getLiquidType() == Liquid.none:
-                    if tile.isOpaque():
-                        return HitResult(x1, y1, z1, sideHit, posVec)
-
                     hitResult = tile.clip(x1, y1, z1, vec1, vec2)
                     if hitResult:
                         return hitResult

mc/net/minecraft/level/tile/Flower.pyx

@@ -16,9 +16,11 @@ cdef class Flower(Tile):
         self._setShape(0.5 - f, 0.0, 0.5 - f, f + 0.5, f * 3.0, f + 0.5)
 
     cpdef void tick(self, Level level, int x, int y, int z, random) except *:
-        cdef int below = level.getTile(x, y - 1, z)
-        if not level.isLit(x, y, z) or (below != self.tiles.dirt.id and below != self.tiles.grass.id):
-            level.setTile(x, y, z, 0)
+        cdef int below
+        if not level.growTrees:
+            below = level.getTile(x, y - 1, z)
+            if not level.isLit(x, y, z) or (below != self.tiles.dirt.id and below != self.tiles.grass.id):
+                level.setTile(x, y, z, 0)
 
     cdef void __renderFlower(self, Tesselator t, float x, float y, float z) except *:
         cdef int tex, xt, yt, rots, r

mc/net/minecraft/level/tile/Tile.pyx

@@ -418,8 +418,7 @@ cdef class Tile:
         elif vec311 == v1:
             v01 = 3
 
-        vec311.add(x, y, z)
-        return HitResult(x, y, z, v01, vec311)
+        return HitResult(x, y, z, v01, vec311.add(x, y, z))
 
     cdef bint __containsX(self, vec):
         if not vec:

mc/net/minecraft/mob/Mob.pxd

@@ -24,6 +24,7 @@ cdef class Mob(Entity):
         public str modelName
         public float _bobStrength
         public int _deathScore
+        public float renderOffset
         public float rotOffs
         public int health
         public int lastHealth

mc/net/minecraft/mob/Mob.pyx

@@ -36,6 +36,7 @@ cdef class Mob(Entity):
         self.modelName = ''
         self._bobStrength = 1.0
         self._deathScore = 0
+        self.renderOffset = 0.0
         self.rotOffs = 0.0
         self.health = 20
         self.lastHealth = 0
@@ -208,7 +209,7 @@ cdef class Mob(Entity):
         rotZ = 0.0625
         f10 = -abs(cos(step * 0.6662)) * 5.0 * run * self._bobStrength - 23.0
         gl.glTranslatef(self.xo + (self.x - self.xo) * translation,
-                        self.yo + (self.y - self.yo) * translation - 1.62,
+                        self.yo + (self.y - self.yo) * translation - 1.62 + self.renderOffset,
                         self.zo + (self.z - self.zo) * translation)
         ht = self.hurtTime - translation
         if ht > 0.0 or self.health <= 0:

mc/net/minecraft/model/Vec3.py

@@ -23,46 +23,43 @@ def distanceTo(self, vec):
         zd = vec.z - self.z
         return math.sqrt(xd * xd + yd * yd + zd * zd)
 
-    def clipX(self, vec, xa):
+    def distanceToSqr(self, vec):
         xd = vec.x - self.x
         yd = vec.y - self.y
         zd = vec.z - self.z
-        try:
-            xa = (xa - self.x) / xd
-        except ZeroDivisionError:
-            return
+        return xd * xd + yd * yd + zd * zd
 
+    def clipX(self, vec, xa):
+        xd = vec.x - self.x
+        yd = vec.y - self.y
+        zd = vec.z - self.z
         if xd * xd < 1.0E-7:
             return
-        elif xa >= 0.0 and xa <= 1.0:
+
+        xa = (xa - self.x) / xd
+        if xa >= 0.0 and xa <= 1.0:
             return Vec3(self.x + xd * xa, self.y + yd * xa, self.z + zd * xa)
 
     def clipY(self, vec, ya):
         xd = vec.x - self.x
         yd = vec.y - self.y
         zd = vec.z - self.z
-        try:
-            ya = (ya - self.y) / yd
-        except ZeroDivisionError:
-            return
-
         if yd * yd < 1.0E-7:
             return
-        elif ya >= 0.0 and ya <= 1.0:
+
+        ya = (ya - self.y) / yd
+        if ya >= 0.0 and ya <= 1.0:
             return Vec3(self.x + xd * ya, self.y + yd * ya, self.z + zd * ya)
 
     def clipZ(self, vec, za):
         xd = vec.x - self.x
         yd = vec.y - self.y
         zd = vec.z - self.z
-        try:
-            za = (za - self.z) / zd
-        except ZeroDivisionError:
-            return
-
         if zd * zd < 1.0E-7:
             return
-        elif za >= 0.0 and za <= 1.0:
+
+        za = (za - self.z) / zd
+        if za >= 0.0 and za <= 1.0:
             return Vec3(self.x + xd * za, self.y + yd * za, self.z + zd * za)
 
     def toString(self):