Indev 20100214 (20100214)

Author: pythonengineer

Makefile

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

README.md

@@ -5,17 +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 20100212-2** as released on _**February 12, 2010**_.
+The latest version is **Indev 20100214** as released on _**February 14, 2010**_.
 
-This version adds the day and night cycle and craftable armor (not yet functional).
-This is the first version where hostile mobs only spawn at night and in dark areas.
+This version readds audio and adds the visible player hand, the Paradise and Woods map themes, and mobs burning in daylight.
 
 Features from previous Indev versions include the Indev mossy cobblestone spawn house, NBT level file saving, mobs and animals, farming,
-durable tools, difficulty, torches, advanced liquid spread, TNT explosives, chests, the main menu, workbench crafting, and soup.
+durable tools, day and night cycle, difficulty, torches, advanced liquid spread, TNT explosives, chests, the main menu, workbench crafting, and soup.
 
-To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==20100212-2`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==20100214`.
 
-You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_20100212-2)
+You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_20100214)
 
 ### Organization
 
@@ -48,7 +47,8 @@ Press I to open your inventory, F5 to toggle rain and F7 to take a cool isometri
 Smelting is unique in early Indev: to get iron or gold ingots, light the dropped ores on fire or throw them in lava.
 
 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*).
+You can specify the world theme as *Normal*, *Hell* (lava and dirt instead of water and grass), *Paradise* (always daylight), or *Woods*.
+World size and world shape (*Square*, *Long*, *Deep*) may also be selected.
 
 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.
 
@@ -58,7 +58,7 @@ Mushroom bowl soup and bread will restore health. Check the Wiki for crafting re
 
 ![Isometric screenshot](/map.png?raw=true)
 
-*An isometric screenshot of a Floating map generated by the game, showcasing mobs and farming.*
+*An isometric screenshot of a normal Woods map generated by the game.*
 
 ### Additional Notes
 

map.png

@@ -669,7 +669,6 @@ def setLevel(self, world):
             if not self.thePlayer:
                 self.thePlayer = EntityPlayerSP(self, world, self.session)
                 self.thePlayer.preparePlayerToSpawn()
-                self.playerController.flipPlayer(self.thePlayer)
                 if world:
                     world.spawnEntityInWorld(self.thePlayer)
                     world.playerEntity = self.thePlayer

mc/Resources.py

@@ -40,9 +40,6 @@ def setPartialTime(self, damageTime):
     def getBlockReachDistance(self):
         return 5.0
 
-    def flipPlayer(self, player):
-        pass
-
     def onUpdate(self):
         pass
 

mc/net/minecraft/client/Minecraft.py

@@ -18,24 +18,6 @@ def __init__(self, mc):
         self.__blockHitWait = 0
         self.__mobSpawner = None
 
-    def flipPlayer(self, player):
-        x = int(player.posX)
-        y = int(player.posY)
-        z = int(player.posZ)
-        for xx in range(x - 3, x + 4):
-            for yy in range(y - 2, y + 3):
-                for zz in range(z - 3, z + 4):
-                    blockId = blocks.obsidian.blockID if yy < y - 1 else 0
-                    if xx == x - 3 or zz == z - 3 or xx == x + 3 or zz == z + 3 or yy == y - 2 or yy == y + 2:
-                        blockId = blocks.cobblestoneMossy.blockID
-                    if zz == z - 3 and xx == x and yy >= y - 1 and yy <= y:
-                        blockId = 0
-
-                    self._mc.theWorld.setBlockWithNotify(xx, yy, zz, blockId)
-
-        self._mc.theWorld.setBlockWithNotify(x - 3 + 1, y, z, blocks.torch.blockID)
-        self._mc.theWorld.setBlockWithNotify(x + 3 - 1, y, z, blocks.torch.blockID)
-
     def sendBlockRemoved(self, x, y, z):
         block = self._mc.theWorld.getBlockId(x, y, z)
         metadata = self._mc.theWorld.getBlockMetadata(x, y, z)

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

@@ -9,7 +9,7 @@ def __init__(self, screen):
         self.__worldType = ('Inland', 'Island', 'Floating', 'Flat')
         self.__worldShape = ('Square', 'Long', 'Deep')
         self.__worldSize = ('Small', 'Normal', 'Huge')
-        self.__worldTheme = ('Normal', 'Hell')
+        self.__worldTheme = ('Normal', 'Hell', 'Paradise', 'Woods')
         self.__selectedWorldType = 1
         self.__selectedWorldShape = 0
         self.__selectedWorldSize = 1

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

@@ -366,6 +366,7 @@ def __render(self, alpha):
             gl.glTranslatef(-x, -y, -z)
 
             self.__setupFog()
+            gl.glEnable(gl.GL_FOG)
             self.__mc.renderGlobal.renderSky(alpha)
             self.__setupFog()
 

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

@@ -1,3 +1,4 @@
+from mc.net.minecraft.client.render.entity.RenderManager import RenderManager
 from mc.net.minecraft.client.render.RenderBlocks import RenderBlocks
 from mc.net.minecraft.client.render.Tessellator import tessellator
 from mc.net.minecraft.client.RenderHelper import RenderHelper
@@ -18,45 +19,48 @@ def __init__(self, minecraft):
         self.__renderBlocksInstance = RenderBlocks()
 
     def renderItemInFirstPerson(self, alpha):
-        progress = self.__prevEquippedProgress + (self.__equippedProgress - self.__prevEquippedProgress) * alpha
+        progress = self.__prevEquippedProgress + \
+                   (self.__equippedProgress - self.__prevEquippedProgress) * alpha
         gl.glPushMatrix()
         gl.glRotatef(
-            self.__mc.thePlayer.prevRotationPitch + (self.__mc.thePlayer.rotationPitch - self.__mc.thePlayer.prevRotationPitch) * alpha,
+            self.__mc.thePlayer.prevRotationPitch + \
+             (self.__mc.thePlayer.rotationPitch - self.__mc.thePlayer.prevRotationPitch) * alpha,
             1.0, 0.0, 0.0
         )
         gl.glRotatef(
-            self.__mc.thePlayer.prevRotationYaw + (self.__mc.thePlayer.rotationYaw - self.__mc.thePlayer.prevRotationYaw) * alpha,
+            self.__mc.thePlayer.prevRotationYaw + \
+             (self.__mc.thePlayer.rotationYaw - self.__mc.thePlayer.prevRotationYaw) * alpha,
             0.0, 1.0, 0.0
         )
         RenderHelper.enableStandardItemLighting()
         gl.glPopMatrix()
-        gl.glPushMatrix()
-        if self.__swingProgress == -1:
-            self.__swingProgress += 1
-        if self.__itemSwingState:
-            slot = (self.__swingProgress + alpha) / 8.0
-            swingY = math.sin(slot * math.pi)
-            swingX = math.sin(math.sqrt(slot) * math.pi)
-            gl.glTranslatef(-swingX * 0.4,
-                            math.sin(math.sqrt(slot) * math.pi * 2.0) * 0.2,
-                            -swingY * 0.2)
-
-        gl.glTranslatef(0.56, -0.52 - (1.0 - progress) * 0.6, -0.71999997)
-        gl.glRotatef(45.0, 0.0, 1.0, 0.0)
-        gl.glEnable(gl.GL_NORMALIZE)
-        if self.__itemSwingState:
-            slot = (self.__swingProgress + alpha) / 8.0
-            swingY = math.sin((slot * slot) * math.pi)
-            swingX = math.sin(math.sqrt(slot) * math.pi)
-            gl.glRotatef(-swingY * 20.0, 0.0, 1.0, 0.0)
-            gl.glRotatef(-swingX * 20.0, 0.0, 0.0, 1.0)
-            gl.glRotatef(-swingX * 80.0, 1.0, 0.0, 0.0)
-
-        brightness = self.__mc.theWorld.getBrightness(int(self.__mc.thePlayer.posX),
-                                                      int(self.__mc.thePlayer.posY),
-                                                      int(self.__mc.thePlayer.posZ))
-        gl.glColor4f(brightness, brightness, brightness, 1.0)
+        br = self.__mc.theWorld.getBrightness(int(self.__mc.thePlayer.posX),
+                                              int(self.__mc.thePlayer.posY),
+                                              int(self.__mc.thePlayer.posZ))
+        gl.glColor4f(br, br, br, 1.0)
         if self.__itemToRender:
+            gl.glPushMatrix()
+            if self.__swingProgress == -1:
+                self.__swingProgress += 1
+            if self.__itemSwingState:
+                slot = (self.__swingProgress + alpha) / 8.0
+                swingY = math.sin(slot * math.pi)
+                swingX = math.sin(math.sqrt(slot) * math.pi)
+                gl.glTranslatef(-swingX * 0.4,
+                                math.sin(math.sqrt(slot) * math.pi * 2.0) * 0.2,
+                                -swingY * 0.2)
+
+            gl.glTranslatef(0.56, -0.52 - (1.0 - progress) * 0.6, -0.71999997)
+            gl.glRotatef(45.0, 0.0, 1.0, 0.0)
+            gl.glEnable(gl.GL_NORMALIZE)
+            if self.__itemSwingState:
+                slot = (self.__swingProgress + alpha) / 8.0
+                swingY = math.sin((slot * slot) * math.pi)
+                swingX = math.sin(math.sqrt(slot) * math.pi)
+                gl.glRotatef(-swingY * 20.0, 0.0, 1.0, 0.0)
+                gl.glRotatef(-swingX * 20.0, 0.0, 0.0, 1.0)
+                gl.glRotatef(-swingX * 80.0, 1.0, 0.0, 0.0)
+
             gl.glScalef(0.4, 0.4, 0.4)
             gl.glBindTexture(gl.GL_TEXTURE_2D,
                              self.__mc.renderEngine.getTexture('terrain.png'))
@@ -67,9 +71,11 @@ def renderItemInFirstPerson(self, alpha):
                 )
             else:
                 if self.__itemToRender.itemID < 256:
-                    gl.glBindTexture(gl.GL_TEXTURE_2D, self.__mc.renderEngine.getTexture('terrain.png'))
+                    gl.glBindTexture(gl.GL_TEXTURE_2D,
+                                     self.__mc.renderEngine.getTexture('terrain.png'))
                 else:
-                    gl.glBindTexture(gl.GL_TEXTURE_2D, self.__mc.renderEngine.getTexture('gui/items.png'))
+                    gl.glBindTexture(gl.GL_TEXTURE_2D,
+                                     self.__mc.renderEngine.getTexture('gui/items.png'))
 
                 t = tessellator
                 u0 = (self.__itemToRender.getItem().getIconIndex() % 16 << 4) / 256.0
@@ -145,14 +151,46 @@ def renderItemInFirstPerson(self, alpha):
 
                 t.draw()
                 gl.glDisable(gl.GL_NORMALIZE)
+
+            gl.glPopMatrix()
         else:
-            gl.glScalef(1.0, -1.0, -1.0)
-            gl.glTranslatef(0.0, 0.2, 0.0)
-            gl.glRotatef(-120.0, 0.0, 0.0, 1.0)
-            gl.glScalef(1.0, 1.0, 1.0)
+            gl.glPushMatrix()
+            if self.__swingProgress == -1:
+                self.__swingProgress += 1
+            if self.__itemSwingState:
+                slot = (self.__swingProgress + alpha) / 8.0
+                swingY = math.sin(slot * math.pi)
+                swingX = math.sin(math.sqrt(slot) * math.pi)
+                gl.glTranslatef(-swingX * 0.3,
+                                math.sin(math.sqrt(slot) * math.pi * 2.0) * 0.4,
+                                -swingY * 0.4)
+
+            gl.glTranslatef(0.64000005, -0.6 - (1.0 - progress) * 0.6, -0.71999997)
+            gl.glRotatef(45.0, 0.0, 1.0, 0.0)
+            gl.glEnable(gl.GL_NORMALIZE)
+            if self.__itemSwingState:
+                slot = (self.__swingProgress + alpha) / 8.0
+                swingY = math.sin(slot * slot * math.pi)
+                swingX = math.sin(math.sqrt(slot) * math.pi)
+                gl.glRotatef(swingX * 70.0, 0.0, 1.0, 0.0)
+                gl.glRotatef(-swingY * 20.0, 0.0, 0.0, 1.0)
+
+            gl.glBindTexture(
+                gl.GL_TEXTURE_2D,
+                self.__mc.renderEngine.getTextureForDownloadableImage(
+                    self.__mc.thePlayer.skinUrl, self.__mc.thePlayer.getTexture()
+                )
+            )
+            gl.glTranslatef(-0.2, -0.3, 0.1)
+            gl.glRotatef(120.0, 0.0, 0.0, 1.0)
+            gl.glRotatef(200.0, 1.0, 0.0, 0.0)
+            gl.glRotatef(-135.0, 0.0, 1.0, 0.0)
+            gl.glScalef(1.0 / 16.0, 1.0 / 16.0, 1.0 / 16.0)
+            gl.glTranslatef(6.0, 0.0, 0.0)
+            RenderManager.instance.getEntityRenderObject(self.__mc.thePlayer).drawFirstPersonHand()
+            gl.glPopMatrix()
 
         gl.glDisable(gl.GL_NORMALIZE)
-        gl.glPopMatrix()
         RenderHelper.disableStandardItemLighting()
 
     def renderOverlays(self, alpha):