0.31 20100104 (0.31.20100104)

Author: pythonengineer

MANIFEST.in

@@ -7,7 +7,7 @@ include screenshot.png
 include LICENSE
 include README.md
 
-recursive-include mc *.pyx *.pxd *.ogg *.png *.md3 *.MD3
+recursive-include mc *.pyx *.pxd *.ogg *.png *.md3 *.MD3 *.dll
 recursive-exclude * *.pyc
 recursive-exclude * *.pyd
 recursive-exclude * *.html

Makefile

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

README.md

@@ -5,12 +5,13 @@
 _**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.
 
 The project is currently working on the Indev versions of Minecraft.
-The latest version is **Indev 0.31 20091231-2** as released on _**December 31, 2009**_.
+The latest version is **Indev 0.31 20100104** as released on _**January 4, 2010**_.
 
-This version is the last version of Minecraft released in 2009, and the first version of Indev released in survival mode.
-This version introduces the player inventory screen and isometric screenshots, the latter of which is exclusive to Indev versions as the world is not infinite.
+This version is the first version of Minecraft released in 2010, and it reintroduces sound and music to the game.
 
-You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20091231-2)
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100104`.
+
+You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100104)
 
 ### Organization
 
@@ -20,21 +21,22 @@ To play any version, specify it in the `pip install` command as demonstrated bel
 
 ### General Usage
 
-*Pyglet*, *Cython*, *Pillow*, and *NumPy* are required dependencies and can easily be installed with *pip*. Use the versions specified in `requirements.txt`.
-
-While the late Classic versions and later Indev versions feature audio, this version does not.
+*Pyglet*, *Cython*, *Pillow*, *PyOgg*, and *NumPy* 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.31.20091231-2`.
+For audio to work you will either need *PyOgg* which is recommended, or *FFmpeg* which has to be installed on your 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 and comes bundled with the source on Windows.
 
-Alternatively, for a manual Cython build, run `python setup.py build_ext --inplace`.
+For a manual Cython source build, run `python setup.py build_ext --inplace`.
 
 Run `python -m mc.net.minecraft.Minecraft` to launch the game. *Minecraft: Python Edition* should be compatible with any modern platform that supports OpenGL and Cython.
 
 Run with the argument `-fullscreen` to open the window in fullscreen mode. The argument `-creative` will force the game to be in creative mode.
 
 ### Gameplay
 
-Press I to open your inventory. Tools which were newly added in this version will be in the inventory, but they serve no function yet.
+Press I to open your inventory. Early tools are in the inventory, but they serve no function yet.
 Press F7 to take a cool isometric screenshot and F5 to toggle rain. Other keys are listed in the regular options menu.
 
 The only mobs around are the Rana mobs, but they don't drop anything when killed. Arrows and mushrooms are unusable.

mc/CompatibilityShims.pyx

@@ -10,14 +10,13 @@ from libc.time cimport time
 from pyglet import gl
 
 import ctypes
+import time as pytime
 
 import numpy as np
 cimport numpy as np
 
 cpdef unsigned long long getMillis():
-    cdef double timestamp = time(NULL)
-    cdef unsigned long long milliseconds = <unsigned long long>(timestamp * 1000)
-    return milliseconds
+    return <unsigned long long>(pytime.time() * 1000)
 
 cdef bint Random_seeded = False
 
@@ -452,6 +451,21 @@ cdef class FloatBuffer(Buffer):
     cpdef inline float getAt(self, int idx):
         return self[self.checkIndex(idx)]
 
+    def getBytes(self, b):
+        cdef int rem
+
+        assert self.checkBounds(0, len(b), len(b))
+        assert self._position <= self._limit
+        rem = self._limit - self._position if self._position <= self._limit else 0
+        if len(b) > rem:
+            raise Exception
+
+        sliced = self[self._position:self._position + len(b)]
+        b[:] = [<float>e for e in sliced]
+
+        self._position += len(b)
+        return self
+
     cdef getFloats(self, float* array, int size):
         cdef int rem, i
 

mc/lib/soft_oal_32.dll

@@ -1,6 +1,4 @@
 from mc.net.minecraft.client.KeyBinding import KeyBinding
-from mc.net.minecraft.client.render.RenderEngine import RenderEngine
-from mc import Resources
 from pyglet import window
 
 import pathlib
@@ -189,16 +187,7 @@ def setOptionValue(self, option, arg):
             self.viewBobbing = not self.viewBobbing
         elif option == 6:
             self.anaglyph = not self.anaglyph
-            for id_, img in self.__mc.renderEngine.textureContentsMap.items():
-                self.__mc.renderEngine.setupTexture(img, id_)
-
-            for string, id_ in self.__mc.renderEngine.textureMap.items():
-                if string.startswith('##'):
-                    img = RenderEngine.unwrapImageByColumns(Resources.textures[string[2:]])
-                else:
-                    img = Resources.textures[string]
-
-                self.__mc.renderEngine.setupTexture(img, id_)
+            self.__mc.renderEngine.refreshTextures()
         elif option == 7:
             self.limitFramerate = not self.limitFramerate