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