rd-132328 (132328)

Author: pythonengineer

Makefile

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

README.md

@@ -4,15 +4,15 @@
 
 _**Minecraft: Python Edition**_ is a project that strives to recreate each and every old Minecraft version in Python using the **Pyglet** multimedia library and **Cython** for performance.
 
-This project is currently recreating the **Preclassic** versions of Minecraft. The latest version is **Preclassic rd-132211** (the very first!) as released on _**May 13, 2009**_.
+This project is currently recreating the **Preclassic** versions of Minecraft. The latest version is **Preclassic rd-132328** as released on _**May 13, 2009**_.
 
-Learn more about this version [here](https://minecraft.fandom.com/wiki/Java_Edition_pre-Classic_rd-132211).
+Learn more about this version [here](https://minecraft.fandom.com/wiki/Java_Edition_pre-Classic_rd-132328).
 
 ### General Usage
 
 *Pyglet* and *Cython* 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==132211`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==132328`.
 
 Alternatively, for a manual Cython build, run `python setup.py build_ext --inplace`.
 
@@ -22,6 +22,10 @@ Run `python -m mc.net.minecraft.Minecraft` to launch the game. *Minecraft: Pytho
 
 Very basic block picking and placing are featured in this version. You can only place stone tiles, except at exact ground level where it is only grass.
 
+Human mobs are featured in this version, but they are all spawned at game start as opposed to on key press.
+
+Press *Esc* to exit the game.
+
 ### Additional Notes
 
 The resources directory contains all of the textures that this version uses. However,

mc/Resources.py

@@ -0,0 +1,103 @@
+from mc.net.minecraft.phys.AABB import AABB
+
+import random
+import math
+
+class Entity:
+    xo = 0.0
+    yo = 0.0
+    zo = 0.0
+    xd = 0.0
+    yd = 0.0
+    zd = 0.0
+    yRot = 0.0
+    xRot = 0.0
+    yRotO = 0.0
+    xRotO = 0.0
+    onGround = False
+
+    heightOffset = 0.0
+
+    def __init__(self, level):
+        self.level = level
+        self.resetPos()
+
+    def resetPos(self):
+        x = random.random() * self.level.width
+        y = self.level.depth + 10
+        z = random.random() * self.level.height
+        self.setPos(x, y, z)
+
+    def setPos(self, x, y, z):
+        self.x = x
+        self.y = y
+        self.z = z
+        w = 0.3
+        h = 0.9
+        self.bb = AABB(x - w, y - h, z - w, x + w, y + h, z + w)
+
+    def turn(self, xo, yo):
+        orgXRot = self.xRot
+        orgYRot = self.yRot
+        self.yRot = self.yRot + xo * 0.15
+        self.xRot = self.xRot - yo * 0.15
+        if self.xRot < -90.0:
+            self.xRot = -90.0
+        if self.xRot > 90.0:
+            self.xRot = 90.0
+
+        self.xRotO += self.xRot - orgXRot
+        self.yRotO += self.yRot - orgYRot
+
+    def tick(self):
+        self.xo = self.x
+        self.yo = self.y
+        self.zo = self.z
+
+    def move(self, xa, ya, za):
+        xaOrg = xa
+        yaOrg = ya
+        zaOrg = za
+
+        aABBs = self.level.getCubes(self.bb.expand(xa, ya, za))
+        for aABB in aABBs:
+            ya = aABB.clipYCollide(self.bb, ya)
+
+        self.bb.move(0.0, ya, 0.0)
+
+        for aABB in aABBs:
+            xa = aABB.clipXCollide(self.bb, xa)
+
+        self.bb.move(xa, 0.0, 0.0)
+
+        for aABB in aABBs:
+            za = aABB.clipZCollide(self.bb, za)
+
+        self.bb.move(0.0, 0.0, za)
+
+        self.onGround = yaOrg != ya and yaOrg < 0.0
+
+        if xaOrg != xa:
+            self.xd = 0.0
+        if yaOrg != ya:
+            self.yd = 0.0
+        if zaOrg != za:
+            self.zd = 0.0
+        self.x = (self.bb.x0 + self.bb.x1) / 2.0
+        self.y = self.bb.y0 + self.heightOffset
+        self.z = (self.bb.z0 + self.bb.z1) / 2.0
+
+    def moveRelative(self, xa, za, speed):
+        dist = xa * xa + za * za
+        if dist < 0.01:
+            return
+
+        dist = speed / math.sqrt(dist)
+        xa *= dist
+        za *= dist
+
+        sin = math.sin(self.yRot * math.pi / 180.0)
+        cos = math.cos(self.yRot * math.pi / 180.0)
+
+        self.xd += xa * cos - za * sin
+        self.zd += za * cos + xa * sin

mc/net/minecraft/Entity.py

@@ -4,6 +4,9 @@
 from mc.net.minecraft.Timer import Timer
 from mc.net.minecraft.Player import Player
 from mc.net.minecraft.HitResult import HitResult
+from mc.net.minecraft.character.Vec3 import Vec3
+from mc.net.minecraft.character.Cube import Cube
+from mc.net.minecraft.character.Zombie import Zombie
 from mc.net.minecraft.level.Chunk import Chunk
 from mc.net.minecraft.level.Level import Level
 from mc.net.minecraft.level.LevelRenderer import LevelRenderer
@@ -12,18 +15,12 @@
 
 import math
 
-class Vec3:
-
-    def __init__(self, x, y, z):
-        self.x = x
-        self.y = y
-        self.z = z
-
 class Minecraft(window.Window):
     FULLSCREEN_MODE = False
     col = 920330
     fogColor = ((col >> 16 & 0xFF) / 255.0, (col >> 8 & 0xFF) / 255.0, (col & 0xFF) / 255.0, (col & 0xFF) / 255.0, 1.0)
     timer = Timer(60.0)
+    zombies = set()
     hitResult = None
     running = True
 
@@ -49,6 +46,9 @@ def __init__(self, *args, **kwargs):
         self.levelRenderer = LevelRenderer(self.level)
         self.player = Player(self.level)
 
+        for i in range(100):
+            self.zombies.add(Zombie(self.level, 128.0, 0.0, 128.0))
+
         self.set_exclusive_mouse(True)
 
     def destroy(self):
@@ -75,11 +75,6 @@ def on_mouse_press(self, x, y, button, modifiers):
     def on_mouse_motion(self, x, y, dx, dy):
         self.player.turn(dx, dy)
 
-    def on_activate(self):
-        # Remove this hack when the window boundary issue is fixed upstream:
-        if compat_platform == 'win32':
-            self._update_clipped_cursor()
-
     def on_key_press(self, symbol, modifiers):
         if symbol == window.key.R:
             self.player.resetPos()
@@ -110,6 +105,11 @@ def on_key_release(self, symbol, modifiers):
         elif symbol in (window.key.SPACE, window.key.LWINDOWS, window.key.LMETA):
             self.player.spacePressed = False
 
+    def on_activate(self):
+        # Remove this hack when the window boundary issue is fixed upstream:
+        if compat_platform == 'win32':
+            self._update_clipped_cursor()
+
     def on_draw(self):
         self.clear()
         self.timer.advanceTime()
@@ -145,6 +145,9 @@ def run(self):
         self.destroy()
 
     def tick(self):
+        for zombie in self.zombies:
+            zombie.tick()
+
         self.player.tick()
 
     def moveCameraToPlayer(self, a):
@@ -198,6 +201,10 @@ def render(self, a):
 
         gl.glDisable(gl.GL_FOG)
         self.levelRenderer.render(self.player, 0)
+
+        for zombie in self.zombies:
+            zombie.render(a)
+
         gl.glEnable(gl.GL_FOG)
         self.levelRenderer.render(self.player, 1)
         gl.glDisable(gl.GL_TEXTURE_2D)

mc/net/minecraft/Minecraft.py

@@ -1,75 +1,27 @@
-from mc.net.minecraft.phys.AABB import AABB
+from mc.net.minecraft.Entity import Entity
 
-import random
-import math
-
-class Player:
-    level = None
-    xo = 0.0
-    yo = 0.0
-    zo = 0.0
-    xd = 0.0
-    yd = 0.0
-    zd = 0.0
-    yRot = 0.0
-    xRot = 0.0
-    yRotO = 0.0
-    xRotO = 0.0
-    onGround = False
+class Player(Entity):
     upPressed = False
     downPressed = False
     leftPressed = False
     rightPressed = False
     spacePressed = False
 
     def __init__(self, level):
-        self.level = level
-        self.resetPos()
-
-    def resetPos(self):
-        x = random.random() * self.level.width
-        y = self.level.depth + 10
-        z = random.random() * self.level.height
-        self.setPos(x, y, z)
-
-    def setPos(self, x, y, z):
-        self.x = x
-        self.y = y
-        self.z = z
-        w = 0.3
-        h = 0.9
-        self.bb = AABB(x - w, y - h, z - w, x + w, y + h, z + w)
-
-    def turn(self, xo, yo):
-        orgXRot = self.xRot
-        orgYRot = self.yRot
-        self.yRot = self.yRot + xo * 0.15
-        self.xRot = self.xRot - yo * 0.15
-        if self.xRot < -90.0:
-            self.xRot = -90.0
-        if self.xRot > 90.0:
-            self.xRot = 90.0
-
-        self.xRotO += self.xRot - orgXRot
-        self.yRotO += self.yRot - orgYRot
+        super().__init__(level)
+        self.heightOffset = 1.62
 
     def tick(self):
         self.xo = self.x
         self.yo = self.y
         self.zo = self.z
-        self.xRotO = self.xRot
-        self.yRotO = self.yRot
         xa = 0.0
         ya = 0.0
 
-        if self.upPressed:
-            ya -= 1.0
-        if self.downPressed:
-            ya += 1.0
-        if self.leftPressed:
-            xa -= 1.0
-        if self.rightPressed:
-            xa += 1.0
+        if self.upPressed: ya -= 1.0
+        if self.downPressed: ya += 1.0
+        if self.leftPressed: xa -= 1.0
+        if self.rightPressed: xa += 1.0
         if self.spacePressed:
             if self.onGround:
                 self.yd = 0.12
@@ -85,51 +37,3 @@ def tick(self):
         if self.onGround:
             self.xd *= 0.8
             self.zd *= 0.8
-
-    def move(self, xa, ya, za):
-        xaOrg = xa
-        yaOrg = ya
-        zaOrg = za
-
-        aABBs = self.level.getCubes(self.bb.expand(xa, ya, za))
-        for aABB in aABBs:
-            ya = aABB.clipYCollide(self.bb, ya)
-
-        self.bb.move(0.0, ya, 0.0)
-
-        for aABB in aABBs:
-            xa = aABB.clipXCollide(self.bb, xa)
-
-        self.bb.move(xa, 0.0, 0.0)
-
-        for aABB in aABBs:
-            za = aABB.clipZCollide(self.bb, za)
-
-        self.bb.move(0.0, 0.0, za)
-
-        self.onGround = yaOrg != ya and yaOrg < 0.0
-
-        if xaOrg != xa:
-            self.xd = 0.0
-        if yaOrg != ya:
-            self.yd = 0.0
-        if zaOrg != za:
-            self.zd = 0.0
-        self.x = (self.bb.x0 + self.bb.x1) / 2.0
-        self.y = self.bb.y0 + 1.62
-        self.z = (self.bb.z0 + self.bb.z1) / 2.0
-
-    def moveRelative(self, xa, za, speed):
-        dist = xa * xa + za * za
-        if dist < 0.01:
-            return
-
-        dist = speed / math.sqrt(dist)
-        xa *= dist
-        za *= dist
-
-        sin = math.sin(self.yRot * math.pi / 180.0)
-        cos = math.cos(self.yRot * math.pi / 180.0)
-
-        self.xd += xa * cos - za * sin
-        self.zd += za * cos + xa * sin

mc/net/minecraft/Player.py

@@ -11,12 +11,14 @@ def loadTexture(cls, resourceName, mode):
         if resourceName in cls.idMap:
             return cls.idMap[resourceName]
 
-        ib = BufferUtils.createUintBuffer(1).clear()
-
+        ib = BufferUtils.createUintBuffer(1)
+        ib.clear()
         gl.glGenTextures(1, ib)
         id_ = ib.get(0)
+        cls.idMap[resourceName] = id_
+        print(resourceName + ' -> ' + str(id_))
 
-        cls.bind(id_)
+        gl.glBindTexture(gl.GL_TEXTURE_2D, id_)
 
         gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MIN_FILTER, mode)
         gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MAG_FILTER, mode)
@@ -31,9 +33,3 @@ def loadTexture(cls, resourceName, mode):
         gl.glTexImage2D(gl.GL_TEXTURE_2D, 0, gl.GL_RGBA, w, h, 0, gl.GL_RGBA, gl.GL_UNSIGNED_BYTE, pixels)
 
         return id_
-
-    @classmethod
-    def bind(cls, id_):
-        if id_ != cls.lastId:
-            gl.glBindTexture(gl.GL_TEXTURE_2D, id_)
-            cls.lastId = id_