0.31 20100124-2 (0.31.20100124-2)

Author: pythonengineer

.gitignore

@@ -13,3 +13,4 @@ minecraft_python.egg-info
 *.h
 .DS_Store
 *.so
+*.mclevel

Makefile

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

README.md

@@ -5,13 +5,14 @@
 _**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 20100110** as released on _**January 10, 2010**_.
+The latest version is **Indev 0.31 20100124-2** as released on _**January 24, 2010**_.
 
-This version introduces fire, apples, functional tools, and the customizable Indev level generator to the game.
+This version has the Indev mossy cobblestone spawn house which contains chests with all of the items available in this version.
+It also has level file saving, the bow and arrow, advanced liquid spread, and powerful TNT explosion blasts.
 
-To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100110`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100124-2`.
 
-You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100110)
+You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100124-2)
 
 ### Organization
 
@@ -21,7 +22,8 @@ To play any version, specify it in the `pip install` command as demonstrated bel
 
 ### General Usage
 
-*Pyglet*, *Cython*, *Pillow*, *PyOgg*, and *NumPy* are required dependencies and can easily be installed with *pip*. Use the versions specified in `requirements.txt`.
+*Pyglet*, *Cython*, *Pillow*, *PyOgg*, *NumPy*, and *nbtlib* are required dependencies which can easily be installed with *pip*. Use the versions specified in `requirements.txt`.
+*wxPython* is an optional dependency for the level file picker, but if you don't have it then *Tkinter* is used instead.
 
 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.
@@ -30,22 +32,28 @@ PyOgg requires that your system have one of the Opus, FLAC, or Vorbis codecs.
 
 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 `python -m mc.net.minecraft.client.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.
+Run with the argument `-fullscreen` to open the window in fullscreen mode (or press F11 in-game).
+The argument `-creative` will force the game to be in creative mode.
 
 ### Gameplay
 
-Press I to open your inventory. All available tools (shovel, axe, pickaxe, flint and steel) are in the hotbar in addition to some building blocks and torches.
-Press F7 to take a cool isometric screenshot and F5 to toggle rain. Q will drop items. Other keys are listed in the regular options menu.
+All available tools and blocks are in the chests in the spawn house.
+All controls are as you would expect for the game and they can be configured in the options menu.
+Press I to open your inventory, F5 to toggle rain and F7 to take a cool isometric screenshot.
 
 The Indev level generator is customizable and you can choose between the *Inland*, *Island*, *Floating*, and *Flat* level types.
 You can specify the world theme as *Normal* or *Hell* (lava and dirt instead of water and grass), world size, and world shape (*Square*, *Long*, *Deep*).
 
-The only mobs around are the MD3 Ranas, but they don't drop anything when killed. Mushrooms are unusable, but apples will restore health.
+Levels can be saved to a single *.mclevel* NBT file in the pause menu. The level files are perfectly compatible with Java and vice versa.
+
+The only mobs around are the MD3 Ranas, but they don't drop anything when killed. Apples will restore health.
 
 ![Isometric screenshot](/map.png?raw=true)
 
+*An isometric screenshot of a small and long Inland map generated by the game.*
+
 ### Additional Notes
 
 The `mc.resources` directory contains all of the textures and sounds that this version uses. However,

map.png

@@ -7,9 +7,18 @@ cdef double signum(double val)
 
 cdef class Random:
 
-    cdef float randFloatM(self, float multiply)
-    cdef float randFloat(self)
-    cdef int nextInt(self, int limit)
+    cdef:
+        long long __seed
+        double __nextNextGaussian
+        bint __haveNextNextGaussian
+
+    cdef int _next(self, int bits)
+    cpdef int nextInt(self, int limit=?)
+    cpdef float nextFloat(self)
+    cdef double nextDouble(self)
+    cpdef double nextGaussian(self)
+
+cpdef double random()
 
 cdef class Bits:
 
@@ -73,6 +82,7 @@ cdef class IntBuffer(Buffer):
         object __dataPtr
 
     cpdef inline put(self, int value)
+    cdef putInts(self, int* src, int offset, int length)
     cpdef inline int get(self)
     cpdef inline int getAt(self, int idx)
     cdef inline __getDataPtr(self)

mc/JavaUtils.pxd

@@ -4,62 +4,84 @@
 cimport cython
 
 from libc.string cimport memcpy
-from libc.stdlib cimport srand, rand, RAND_MAX
-from libc.time cimport time
+from libc.math cimport sqrt, log
 
 from pyglet import gl
 
 import ctypes
-import time as pytime
+import time
 
 import numpy as np
 cimport numpy as np
 
 cpdef unsigned long long getMillis():
-    return <unsigned long long>(pytime.time() * 1000)
+    return <unsigned long long>(time.time() * 1000)
 
 cdef double signum(double val):
     return (0 < val) - (val < 0)
 
-cdef bint Random_seeded = False
-
 cdef class Random:
 
-    property seeded:
+    def __init__(self):
+        self.setSeed(time.perf_counter_ns())
+        self.__haveNextNextGaussian = False
+
+    def setSeed(self, long long seed):
+        self.__seed = (seed ^ 0x5DEECE66D) & ((1 << 48) - 1)
 
-        def __get__(self):
-            return Random_seeded
+    cdef int _next(self, int bits):
+        self.__seed = (self.__seed * 0x5DEECE66D + 0xB) & ((1 << 48) - 1)
+        return <int>(self.__seed >> (48 - bits))
 
-        def __set__(self, x):
-            global Random_seeded
-            Random_seeded = x
+    cpdef int nextInt(self, int limit = 0):
+        cdef int bits, val
 
-    def __init__(self, seed=0):
-        if not self.seeded:
-            if seed == 0:
-                srand(time(NULL))
-            else:
-                srand(seed)
+        if not limit:
+            return self._next(32)
 
-            self.seeded = True
+        if limit <= 0:
+            raise ValueError('limit must be a positive integer')
 
-    cdef float randFloatM(self, float multiply):
-        return self.randFloat() * multiply
+        if limit & -limit == limit:
+            return <int>((limit * <unsigned long long>self._next(31)) >> 31)
 
-    cdef float randFloat(self):
-        return rand() / <float>RAND_MAX
+        val = 0
+        while True:
+            bits = self._next(31)
+            val = bits % limit
+            if bits - val + (limit - 1) >= 0:
+                break
 
-    cdef int nextInt(self, int limit):
-        cdef double scaleFactor
-        cdef int value
+        return val
 
-        if limit <= 0:
-            raise ValueError('limit must be a positive integer')
+    cpdef float nextFloat(self):
+        return self._next(24) / <float>(1 << 24)
 
-        scaleFactor = limit / (RAND_MAX + 1.0)
-        value = <int>(rand() * scaleFactor)
+    cdef double nextDouble(self):
+        cdef unsigned long long l = (<unsigned long long>(self._next(26)) << 27) + self._next(27)
+        return l / <double>(1 << 53)
 
-        return value
+    cpdef double nextGaussian(self):
+        cdef double v1, v2, s, multiplier
+        if not self.__haveNextNextGaussian:
+            s = 0
+            while s >= 1 or s == 0:
+                v1 = 2 * self.nextDouble() - 1
+                v2 = 2 * self.nextDouble() - 1
+                s = v1 * v1 + v2 * v2
+
+            multiplier = sqrt(-2 * log(s) / s)
+            self.__nextNextGaussian = v2 * multiplier
+            self.__haveNextNextGaussian = True
+            return v1 * multiplier
+        else:
+            self.__haveNextNextGaussian = False
+            return self.__nextNextGaussian
+
+cdef Random rand = Random()
+
+cpdef double random():
+    return rand.nextDouble()
 
 cdef class Bits:
 
@@ -376,6 +398,23 @@ cdef class IntBuffer(Buffer):
         self[self.nextPutIndex()] = value
         return self
 
+    cdef putInts(self, int* src, int offset, int length):
+        cdef int i, rem
+
+        assert self.checkBounds(offset, length, length)
+        assert self._position <= self._limit
+        rem = self._limit - self._position if self._position <= self._limit else 0
+        if length > rem:
+            raise Exception
+
+        cdef int[:] dest = self.__array[self._position + offset:self._position + offset + length]
+        for i in range(length):
+            dest[i] = src[i]
+
+        self._position += length
+
+        return self
+
     cpdef inline int get(self):
         return self[self.nextGetIndex()]
 
@@ -516,14 +555,18 @@ cdef class FloatBuffer(Buffer):
 
 cdef class BufferUtils:
 
+    @staticmethod
     def wrapByteBuffer(byteArray):
         return ByteBuffer(len(byteArray)).clear().putBytes(byteArray).clear()
 
+    @staticmethod
     def createByteBuffer(capacity):
         return ByteBuffer(capacity).clear()
 
+    @staticmethod
     def createIntBuffer(capacity):
         return IntBuffer(capacity).clear()
 
+    @staticmethod
     def createFloatBuffer(capacity):
         return FloatBuffer(capacity).clear()

mc/JavaUtils.pyx

@@ -195,7 +195,7 @@ def setOptionValue(self, option, arg):
 
         self.__saveOptions()
 
-    def setOptionString(self, option):
+    def getOptionDisplayString(self, option):
         if option == 0:
             return 'Music: ' + ('ON' if self.music else 'OFF')
         elif option == 1:

mc/Resources.py

@@ -2,6 +2,8 @@
 from mc.net.minecraft.client.render.Tessellator import tessellator
 from pyglet import clock, gl
 
+import nbtlib
+
 class LoadingScreenRenderer:
 
     def __init__(self, minecraft):
@@ -73,3 +75,7 @@ def setLoadingProgress(self):
 
             clock.tick()
             self.__mc.flip()
+
+    @staticmethod
+    def writeLevelTags(file):
+        return nbtlib.load(file, gzipped=True)