0.31 20100125 (0.31.20100125)

Author: pythonengineer

Makefile

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

README.md

@@ -5,14 +5,16 @@
 _**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 20100124-2** as released on _**January 24, 2010**_.
+The latest version is **Indev 0.31 20100125** as released on _**January 25, 2010**_.
 
-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.
+This version adds torch, fire, and lava blob particles to the game.
+Features from previous Indev versions include the Indev mossy cobblestone spawn house which contains chests
+with all of the items available in this version, NBT level file saving,
+tools including flint and steel and the bow and arrow, torches, advanced liquid spread, TNT explosives, and the MD3 Rana mobs.
 
-To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100124-2`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100125`.
 
-You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100124-2)
+You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100125)
 
 ### Organization
 
@@ -48,11 +50,11 @@ You can specify the world theme as *Normal* or *Hell* (lava and dirt instead of
 
 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.
+The only mobs around are the 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.*
+*An isometric screenshot of a Hell map generated by the game.*
 
 ### Additional Notes
 

map.png

@@ -4,6 +4,7 @@ cimport cython
 
 cpdef unsigned long long getMillis()
 cdef double signum(double val)
+cdef unsigned int floatToRawIntBits(float x)
 
 cdef class Random:
 
@@ -82,7 +83,7 @@ cdef class IntBuffer(Buffer):
         object __dataPtr
 
     cpdef inline put(self, int value)
-    cdef putInts(self, int* src, int offset, int length)
+    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

@@ -20,6 +20,11 @@ cpdef unsigned long long getMillis():
 cdef double signum(double val):
     return (0 < val) - (val < 0)
 
+cdef unsigned int floatToRawIntBits(float x):
+    cdef unsigned int y = 0
+    memcpy(&y, &x, 4)
+    return y
+
 cdef class Random:
 
     def __init__(self):
@@ -398,7 +403,7 @@ cdef class IntBuffer(Buffer):
         self[self.nextPutIndex()] = value
         return self
 
-    cdef putInts(self, int* src, int offset, int length):
+    cdef putInts(self, int[:] src, int offset, int length):
         cdef int i, rem
 
         assert self.checkBounds(offset, length, length)
@@ -408,8 +413,7 @@ cdef class IntBuffer(Buffer):
             raise Exception
 
         cdef int[:] dest = self.__array[self._position + offset:self._position + offset + length]
-        for i in range(length):
-            dest[i] = src[i]
+        dest[:length] = src[:length]
 
         self._position += length
 
@@ -433,6 +437,9 @@ cdef class IntBuffer(Buffer):
     def glDrawElements(self, int mode, int count, int type):
         gl.glDrawElements(mode, count, type, self.__getDataPtr())
 
+    def glInterleavedArrays(self, int format, int stride):
+        gl.glInterleavedArrays(format, stride, self.__getDataPtr())
+
 cdef class FloatBuffer(Buffer):
 
     def __init__(self, capacity):
@@ -547,9 +554,6 @@ cdef class FloatBuffer(Buffer):
     def glTexCoordPointer(self, int size, int type, int stride):
         gl.glTexCoordPointer(size, type, stride, self.__getDataPtr())
 
-    def glInterleavedArrays(self, int format, int stride):
-        gl.glInterleavedArrays(format, stride, self.__getDataPtr())
-
     def glMultMatrix(self):
         gl.glMultMatrixf(self.__getDataPtr())
 

mc/JavaUtils.pyx

@@ -585,6 +585,9 @@ def __runTick(self):
         self.renderGlobal.updateClouds()
         self.theWorld.updateEntities()
         self.theWorld.tick()
+        self.theWorld.randomDisplayUpdates(int(self.thePlayer.posX),
+                                           int(self.thePlayer.posY),
+                                           int(self.thePlayer.posZ))
         self.effectRenderer.updateEffects()
 
     def generateLevel(self, size, shape, levelType, theme):

mc/Resources.py

@@ -21,15 +21,18 @@ def __init__(self, mc):
             blocks.stone, blocks.grass, blocks.cobblestone, blocks.planks, blocks.sapling,
             blocks.bedrock, blocks.sand, blocks.gravel, blocks.oreGold, blocks.oreIron,
             blocks.oreCoal, blocks.wood, blocks.leaves, blocks.sponge, blocks.glass,
-            blocks.clothRed, blocks.clothOrange, blocks.clothYellow, blocks.clothChartreuse,
-            blocks.clothGreen, blocks.clothSpringGreen, blocks.clothCyan, blocks.clothCapri,
-            blocks.clothUltramarine, blocks.clothViolet, blocks.clothPurple, blocks.clothMagenta,
-            blocks.clothRose, blocks.clothDarkGray, blocks.clothGray, blocks.clothWhite,
             blocks.plantYellow, blocks.plantRed, blocks.mushroomBrown, blocks.mushroomRed,
             blocks.blockGold, blocks.blockSteel, blocks.stairSingle, blocks.brick, blocks.tnt,
             blocks.bookShelf, blocks.cobblestoneMossy, blocks.obsidian, blocks.torch,
             blocks.waterSource, blocks.lavaSource, blocks.chest
         )
+        self.__woolChestArray = (
+            blocks.clothRed, blocks.clothOrange, blocks.clothYellow,
+            blocks.clothChartreuse, blocks.clothGreen, blocks.clothSpringGreen,
+            blocks.clothCyan, blocks.clothCapri, blocks.clothUltramarine,
+            blocks.clothViolet, blocks.clothPurple, blocks.clothMagenta,
+            blocks.clothRose, blocks.clothDarkGray, blocks.clothGray, blocks.clothWhite
+        )
 
     def openInventory(self):
         self._mc.displayGuiScreen(GuiInventory(self._mc.thePlayer.inventory))
@@ -63,6 +66,8 @@ def flipPlayer(self, player):
         tntChest1 = self._mc.theWorld.getBlockTileEntity(x - 1, y - 1, z + 2)
         self._mc.theWorld.setBlockWithNotify(x, y - 1, z + 2, blocks.chest.blockID)
         tntChest2 = self._mc.theWorld.getBlockTileEntity(x, y - 1, z + 2)
+        self._mc.theWorld.setBlockWithNotify(x + 2, y - 1, z + 1, blocks.chest.blockID)
+        woolChest = self._mc.theWorld.getBlockTileEntity(x + 2, y - 1, z + 1)
         slot = 0
         for i in range(256, 1024):
             if items.itemsList[i]:
@@ -86,6 +91,13 @@ def flipPlayer(self, player):
             else:
                 blocksChest1.setInventorySlotContents(slot, stack)
 
+        for slot in range(min(len(self.__woolChestArray), 54)):
+            stack = ItemStack(
+                self.__woolChestArray[slot],
+                items.itemsList[self.__woolChestArray[slot].blockID].getItemStackLimit()
+            )
+            woolChest.setInventorySlotContents(slot, stack)
+
     def sendBlockRemoved(self, x, y, z):
         block = self._mc.theWorld.getBlockId(x, y, z)
         change = super().sendBlockRemoved(x, y, z)

mc/net/minecraft/client/Minecraft.py

@@ -11,14 +11,12 @@ def __init__(self, world, x, y, z, xr, yr, zr):
         self._particleBlue = 1.0
         self._particleTextureIndex = 32
         self.setSize(0.02, 0.02)
+        self._particleScale *= self._rand.nextFloat() * 0.6 + 0.2
         self._motionX1 = xr * 0.2 + (random() * 2.0 - 1.0) * 0.02
         self._motionY1 = yr * 0.2 + (random() * 2.0 - 1.0) * 0.02
         self._motionZ1 = zr * 0.2 + (random() * 2.0 - 1.0) * 0.02
         self._particleMaxAge = int(8.0 / (random() * 0.8 + 0.2))
 
-    def renderParticle(self, t, a, xa, ya, za, xa2, ya2):
-        super().renderParticle(t, a, xa, ya, za, xa2, ya2)
-
     def onEntityUpdate(self):
         self.prevPosX = self.posX
         self.prevPosY = self.posY

mc/net/minecraft/client/controller/PlayerControllerSP.py

@@ -7,6 +7,7 @@ def __init__(self, world, x, y, z, xr, yr, zr, block):
         self._particleTextureIndex = block.blockIndexInTexture
         self._particleGravity = block.blockParticleGravity
         self._particleRed = self._particleGreen = self._particleBlue = 0.6
+        self._particleScale /= 2.0
 
     def getFXLayer(self):
         return 1
@@ -20,7 +21,7 @@ def renderParticle(self, t, a, xa, ya, za, xa2, ya2):
         x = self.prevPosX + (self.posX - self.prevPosX) * a
         y = self.prevPosY + (self.posY - self.prevPosY) * a
         z = self.prevPosZ + (self.posZ - self.prevPosZ) * a
-        br = self.getBrightness()
+        br = self.getBrightness(a)
         t.setColorOpaque_F(br * self._particleRed, br * self._particleGreen, br * self._particleBlue)
         t.addVertexWithUV(x - xa * r - xa2 * r, y - ya * r, z - za * r - ya2 * r, u0, v1)
         t.addVertexWithUV(x - xa * r + xa2 * r, y + ya * r, z - za * r + ya2 * r, u0, v0)

mc/net/minecraft/client/effect/EntityBubbleFX.py

@@ -1,5 +1,5 @@
 from mc.net.minecraft.client.effect.EntityFX import EntityFX
-from mc.JavaUtils import Random, random
+from mc.JavaUtils import random
 
 class EntityExplodeFX(EntityFX):
 

mc/net/minecraft/client/effect/EntityDiggingFX.py

@@ -32,7 +32,7 @@ cdef class EntityFX(Entity):
         self._particleTextureJitterX = self._rand.nextFloat() * 3.0
         self._particleTextureJitterY = self._rand.nextFloat() * 3.0
 
-        self._particleScale = self._rand.nextFloat() * 0.5 + 0.5
+        self._particleScale = (self._rand.nextFloat() * 0.5 + 0.5) * 2.0
 
         self._particleMaxAge = <int>(4 // (self._rand.nextFloat() * 0.9 + 0.1))
         self._particleAge = 0
@@ -83,10 +83,9 @@ cdef class EntityFX(Entity):
         y = self.prevPosY + (self.posY - self.prevPosY) * a
         z = self.prevPosZ + (self.posZ - self.prevPosZ) * a
 
-        br = self.getBrightness()
+        br = self.getBrightness(a)
         t.setColorOpaque_F(self._particleRed * br, self._particleGreen * br,
                            self._particleBlue * br)
-
         t.addVertexWithUV(x - xa * r - xa2 * r, y - ya * r,
                           z - za * r - ya2 * r, u0, v1)
         t.addVertexWithUV(x - xa * r + xa2 * r, y + ya * r,

mc/net/minecraft/client/effect/EntityExplodeFX.py

@@ -0,0 +1,46 @@
+from mc.net.minecraft.client.effect.EntityFX import EntityFX
+from mc.JavaUtils import random
+
+class EntityFlameFX(EntityFX):
+
+    def __init__(self, world, x, y, z):
+        super().__init__(world, x, y, z, 0.0, 0.0, 0.0)
+        self._motionX1 *= 0.01
+        self._motionY1 *= 0.01
+        self._motionZ1 *= 0.01
+        self._rand.nextFloat()
+        self._rand.nextFloat()
+        self._rand.nextFloat()
+        self._rand.nextFloat()
+        self._rand.nextFloat()
+        self._rand.nextFloat()
+        self.__flameScale = self._particleScale
+        self._particleRed = self._particleGreen = self._particleBlue = 1.0
+        self._particleMaxAge = int(8.0 / (random() * 0.8 + 0.2)) + 4
+        self.noClip = True
+        self._particleTextureIndex = 48
+
+    def renderParticle(self, t, a, xa, ya, za, xa2, ya2):
+        age = (self._particleAge + a) / self._particleMaxAge
+        self._particleScale = self.__flameScale * (1.0 - age * age * 0.5)
+        super().renderParticle(t, a, xa, ya, za, xa2, ya2)
+
+    def getBrightness(self, a):
+        age = min(max((self._particleAge + a) / self._particleMaxAge, 0.0), 1.0)
+        return super().getBrightness(a) * age + (1.0 - age)
+
+    def onEntityUpdate(self):
+        self.prevPosX = self.posX
+        self.prevPosY = self.posY
+        self.prevPosZ = self.posZ
+        self._particleAge += 1
+        if self._particleAge - 1 >= self._particleMaxAge:
+            self.setEntityDead()
+
+        self.moveEntity(self._motionX1, self._motionY1, self._motionZ1)
+        self._motionX1 *= 0.96
+        self._motionY1 *= 0.96
+        self._motionZ1 *= 0.96
+        if self.onGround:
+            self._motionX1 *= 0.7
+            self._motionZ1 *= 0.7

mc/net/minecraft/client/effect/EntityFX.pyx

@@ -0,0 +1,49 @@
+from mc.net.minecraft.client.effect.EntityFX import EntityFX
+from mc.JavaUtils import random
+
+class EntityLavaFX(EntityFX):
+
+    def __init__(self, world, x, y, z):
+        super().__init__(world, x, y, z, 0.0, 0.0, 0.0)
+        self._motionX1 *= 0.8
+        self._motionY1 *= 0.8
+        self._motionZ1 *= 0.8
+        self._motionY1 = self._rand.nextFloat() * 0.4 + 0.05
+        self._particleRed = self._particleGreen = self._particleBlue = 1.0
+        self._particleScale *= self._rand.nextFloat() * 2.0 + 0.2
+        self.__lavaScale = self._particleScale
+        self._particleMaxAge = int(16.0 / (random() * 0.8 + 0.2))
+        self.noClip = False
+        self._particleTextureIndex = 49
+
+    def getBrightness(self, a):
+        return 1.0
+
+    def renderParticle(self, t, a, xa, ya, za, xa2, ya2):
+        age = (self._particleAge + a) / self._particleMaxAge
+        self._particleScale = self.__lavaScale * (1.0 - age * age)
+        super().renderParticle(t, a, xa, ya, za, xa2, ya2)
+
+    def onEntityUpdate(self):
+        self.prevPosX = self.posX
+        self.prevPosY = self.posY
+        self.prevPosZ = self.posZ
+        self._particleAge += 1
+        if self._particleAge - 1 >= self._particleMaxAge:
+            self.setEntityDead()
+
+        age = self._particleAge / self._particleMaxAge
+        if self._rand.nextFloat() > age:
+            self._worldObj.spawnParticle(
+                'smoke', self.posX, self.posY, self.posZ,
+                self._motionX1, self._motionY1, self._motionZ1
+            )
+
+        self._motionY1 -= 0.03
+        self.moveEntity(self._motionX1, self._motionY1, self._motionZ1)
+        self._motionX1 *= 0.999
+        self._motionY1 *= 0.999
+        self._motionZ1 *= 0.999
+        if self.onGround:
+            self._motionX1 *= 0.7
+            self._motionZ1 *= 0.7

mc/net/minecraft/client/effect/EntityFlameFX.py

@@ -11,6 +11,7 @@ def __init__(self, world, x, y, z):
         self._particleRed = random() * 0.3
         self._particleGreen = self._particleRed
         self._particleBlue = self._particleRed
+        self._particleScale *= 12.0 / 16.0
         self._particleMaxAge = int(8.0 / (random() * 0.8 + 0.2))
         self.noClip = True
 

mc/net/minecraft/client/effect/EntityLavaFX.py

@@ -25,13 +25,13 @@ def __init__(self, upperChestInventory, lowerChestInventory):
             self._slotsList.append(Slot(self, upperChestInventory, row,
                                         8 + row * 18, yOffset + 161))
 
-    def _drawStrings(self):
+    def _drawGuiContainerForegroundLayer(self):
         self._fontRenderer.drawString(self.__lowerChestInventory.getInvName(),
                                       8, 6, 4210752)
         self._fontRenderer.drawString(self.__upperChestInventory.getInvName(),
                                       8, self.ySize - 96 + 2, 4210752)
 
-    def _drawRows(self):
+    def _drawGuiContainerBackgroundLayer(self):
         tex = self._mc.renderEngine.getTexture('gui/container.png')
         gl.glColor4f(1.0, 1.0, 1.0, 1.0)
         gl.glBindTexture(gl.GL_TEXTURE_2D, tex)

mc/net/minecraft/client/effect/EntitySmokeFX.py

@@ -38,7 +38,7 @@ def drawScreen(self, xm, ym):
         self._drawGradientRect(0, 0, self.width, self.height, 1610941696, -1607454624)
         w = (self.width - self.xSize) // 2
         h = (self.height - self.ySize) // 2
-        self._drawRows()
+        self._drawGuiContainerBackgroundLayer()
         gl.glPushMatrix()
         gl.glRotatef(180.0, 1.0, 0.0, 0.0)
         RenderHelper.enableStandardItemLighting()
@@ -86,18 +86,18 @@ def drawScreen(self, xm, ym):
         RenderHelper.disableStandardItemLighting()
         gl.glDisable(gl.GL_LIGHTING)
         gl.glDisable(gl.GL_DEPTH_TEST)
-        self._drawStrings()
+        self._drawGuiContainerForegroundLayer()
         gl.glEnable(gl.GL_LIGHTING)
         gl.glEnable(gl.GL_DEPTH_TEST)
         gl.glPopMatrix()
 
-    def _drawStrings(self):
+    def _drawGuiContainerForegroundLayer(self):
         self._fontRenderer.drawString('PLAYER NAME', 84, 8, 4210752)
         self._fontRenderer.drawString('ATK: 100', 84, 24, 4210752)
         self._fontRenderer.drawString('DEF: 100', 84, 32, 4210752)
         self._fontRenderer.drawString('SPD: 100', 84, 40, 4210752)
 
-    def _drawRows(self):
+    def _drawGuiContainerBackgroundLayer(self):
         tex = self._mc.renderEngine.getTexture('gui/inventory.png')
         gl.glColor4f(1.0, 1.0, 1.0, 1.0)
         gl.glBindTexture(gl.GL_TEXTURE_2D, tex)

mc/net/minecraft/client/gui/GuiChest.py

@@ -191,6 +191,9 @@ def updateCameraAndRender(self, alpha):
                     gl.glTranslatef(-((i << 1) - 1) * 0.07, 0.0, 0.0)
 
                 fov = 70.0
+                if self.__mc.thePlayer.isInsideOfMaterial():
+                    fov = 60.0
+
                 if self.__mc.thePlayer.health <= 0:
                     t = self.__mc.thePlayer.deathTime + alpha
                     fov /= (1.0 - 500.0 / (t + 500.0)) * 2.0 + 1.0