0.31 20100131 (0.31.20100131)

Author: pythonengineer

MANIFEST.in

@@ -9,7 +9,7 @@ graft mc/resources/icon
 include LICENSE
 include README.md
 
-recursive-include mc *.pyx *.pxd *.ogg *.md3 *.MD3 *.dll
+recursive-include mc *.pyx *.pxd *.ogg *.dll
 recursive-exclude mc/resources/texture *
 recursive-exclude * *.pyc
 recursive-exclude * *.pyd

Makefile

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

README.md

@@ -5,16 +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 20100130** as released on _**January 30, 2010**_.
+The latest version is **Indev 0.31 20100131** as released on _**January 31, 2010**_.
 
-This version adds workbench crafting, gold tools, the "Beast Boy" MD3 mob, mob item drops, and soup to the game.
+This version adds the main menu, passive human mobs, and item durability to the game.
 
 Features from previous Indev versions include the Indev mossy cobblestone spawn house, NBT level file saving,
-tools, torches, advanced liquid spread, TNT explosives, chests, and passive MD3 mobs.
+tools, torches, advanced liquid spread, TNT explosives, chests, workbench crafting, and soup.
 
-To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100130`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100131`.
 
-You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100130)
+You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100131)
 
 ### Organization
 
@@ -51,13 +51,13 @@ 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.
 
-MD3 Steves may drop string on death, Black Steves may drop gunpowder, and Beast Boys may drop feathers.
+Humans may drop string on death, gunpowder, or feathers upon death.
 
 Crafted mushroom bowl soup will restore health. Check the Wiki for crafting recipes added in this version.
 
 ![Isometric screenshot](/map.png?raw=true)
 
-*An isometric screenshot of a normal Island map generated by the game, showing the MD3 mobs.*
+*An isometric screenshot of a normal Island map generated by the game, with several spawn houses from map loading.*
 
 ### Additional Notes
 
@@ -66,3 +66,5 @@ the textures are only there for convenience, as all of the texture buffers are a
 in the `mc.Resources` module.
 
 This would have been much more challenging to work on without the great tools provided by [RetroMCP-Java](https://github.com/MCPHackers/RetroMCP-Java).
+
+All credit for Minecraft goes towards its creator Notch and Mojang Specifications.

map.png

@@ -0,0 +1,78 @@
+from mc.net.minecraft.client.gui.GuiScreen import GuiScreen
+from mc.net.minecraft.client.gui.GuiOptions import GuiOptions
+from mc.net.minecraft.client.gui.GuiNewLevel import GuiNewLevel
+from mc.net.minecraft.client.gui.GuiLoadLevel import GuiLoadLevel
+from mc.net.minecraft.client.gui.GuiButton import GuiButton
+from mc.net.minecraft.client.render.Tessellator import tessellator
+from mc.JavaUtils import getMillis
+from pyglet import gl
+
+import math
+
+class GuiMainTitle(GuiScreen):
+
+    def __init__(self):
+        self.__updateCounter = 0.0
+
+    def updateScreen(self):
+        self.__updateCounter += 0.01
+
+    def _keyTyped(self, key, char, motion):
+        pass
+
+    def initGui(self):
+        self._controlList.clear()
+        self._controlList.append(GuiButton(1, self.width // 2 - 100,
+                                           self.height // 4 + 48, 'Generate new level...'))
+        self._controlList.append(GuiButton(2, self.width // 2 - 100,
+                                           self.height // 4 + 72, 'Load level..'))
+        self._controlList.append(GuiButton(3, self.width // 2 - 100,
+                                           self.height // 4 + 96, 'Play tutorial level'))
+        self._controlList.append(GuiButton(0, self.width // 2 - 100,
+                                           self.height // 4 + 120 + 12, 'Options...'))
+        self._controlList[2].enabled = False
+        if not self.mc.session:
+            self._controlList[1].enabled = False
+
+    def _actionPerformed(self, button):
+        if button.id == 0:
+            self.mc.displayGuiScreen(GuiOptions(self, self.mc.options))
+        elif button.id == 1:
+            self.mc.displayGuiScreen(GuiNewLevel(self))
+        elif self.mc.session and button.id == 2:
+            self.mc.displayGuiScreen(GuiLoadLevel(self))
+
+    def drawScreen(self, xm, ym):
+        gl.glDisable(gl.GL_LIGHTING)
+        gl.glDisable(gl.GL_FOG)
+        t = tessellator
+        gl.glBindTexture(gl.GL_TEXTURE_2D, self.mc.renderEngine.getTexture('dirt.png'))
+        gl.glColor4f(1.0, 1.0, 1.0, 1.0)
+        t.startDrawingQuads()
+        t.setColorOpaque_I(4210752)
+        t.addVertexWithUV(0.0, self.height, 0.0, 0.0,
+                          self.height / 32.0 + self.__updateCounter)
+        t.addVertexWithUV(self.width, self.height, 0.0, self.width / 32.0,
+                          self.height / 32.0 + self.__updateCounter)
+        t.addVertexWithUV(self.width, 0.0, 0.0,
+                          self.width / 32.0, 0.0 + self.__updateCounter)
+        t.addVertexWithUV(0.0, 0.0, 0.0, 0.0, 0.0 + self.__updateCounter)
+        t.draw()
+        gl.glBindTexture(gl.GL_TEXTURE_2D, self.mc.renderEngine.getTexture('gui/logo.png'))
+        gl.glColor4f(1.0, 1.0, 1.0, 1.0)
+        t.setColorOpaque_I(16777215)
+        self.drawTexturedModalRect((self.width - 256) // 2, 30, 0, 0, 256, 49)
+        gl.glPushMatrix()
+        gl.glTranslatef(self.width / 2 + 90, 70.0, 0.0)
+        gl.glRotatef(-20.0, 0.0, 0.0, 1.0)
+        size = 1.8 - abs(math.sin((getMillis() % 1000) / 1000.0 * math.pi * 2.0) * 0.1)
+        gl.glScalef(size, size, size)
+        self.drawCenteredString(self._fontRenderer, 'Pre-beta!', 0, -8, 16776960)
+        gl.glPopMatrix()
+        copyright = 'Copyright Mojang Specifications. Do not distribute.'
+        self.drawString(
+            self._fontRenderer, copyright,
+            self.width - self._fontRenderer.getStringWidth(copyright) - 2,
+            self.height - 10, 16777215
+        )
+        super().drawScreen(xm, ym)

mc/Resources.py

@@ -27,12 +27,15 @@ def load_library(*names, **kwargs):
 
 from mc.net.minecraft.client import MinecraftError
 from mc.net.minecraft.client.Timer import Timer
+from mc.net.minecraft.client.GuiMainTitle import GuiMainTitle
 from mc.net.minecraft.client.GameSettings import GameSettings
 from mc.net.minecraft.client.OpenGlCapsChecker import OpenGlCapsChecker
 from mc.net.minecraft.client.LoadingScreenRenderer import LoadingScreenRenderer
 from mc.net.minecraft.game.level.World import World
 from mc.net.minecraft.game.level.block.Blocks import blocks
+from mc.net.minecraft.game.item.Items import items
 from mc.net.minecraft.game.level.generator.LevelGenerator import LevelGenerator
+from mc.net.minecraft.game.entity.EntityLiving import EntityLiving
 from mc.net.minecraft.client.model.ModelBiped import ModelBiped
 from mc.net.minecraft.client.player.EntityPlayerSP import EntityPlayerSP
 from mc.net.minecraft.client.player.MovementInputFromOptions import MovementInputFromOptions
@@ -118,6 +121,7 @@ def __init__(self, fullscreen, creative, *args, **kwargs):
         self.objectMouseOver = None
         self.sndManager = SoundManager()
         self.__leftClickCounter = 0
+        self.mcDataDir = ''
 
         self.__serverIp = ''
 
@@ -142,7 +146,9 @@ def displayGuiScreen(self, screen):
             if self.currentScreen:
                 self.currentScreen.onGuiClosed()
 
-            if not screen and self.thePlayer.health <= 0:
+            if not screen and not self.theWorld:
+                screen = GuiMainTitle()
+            elif not screen and self.thePlayer.health <= 0:
                 screen = GuiGameOver()
 
             self.currentScreen = screen
@@ -397,7 +403,8 @@ def run(self):
         if not os.path.isdir(file):
             raise RuntimeError(f'The working directory could not be created: {file}')
 
-        self.options = GameSettings(self, file)
+        self.mcDataDir = file
+        self.options = GameSettings(self, self.mcDataDir)
         self.sndManager.loadSoundSettings(self.options)
 
         self.renderEngine = RenderEngine(self.options)
@@ -422,7 +429,7 @@ def run(self):
             world.setLevel(8, 8, 8, bytearray(512))
             self.setLevel(level)
         elif not self.theWorld:
-            self.generateNewLevel(1, 0, 1, 0)
+            self.displayGuiScreen(GuiMainTitle())
 
         self.effectRenderer = EffectRenderer(self.theWorld, self.renderEngine)
 
@@ -464,7 +471,9 @@ def __releaseMouse(self):
         if not self.ingameFocus:
             return
 
-        self.thePlayer.movementInput.resetKeyState()
+        if self.thePlayer:
+            self.thePlayer.movementInput.resetKeyState()
+
         self.ingameFocus = False
         self.set_exclusive_mouse(False)
         self.set_mouse_position(self.width // 2, self.height // 2)
@@ -494,7 +503,16 @@ def __clickMouse(self, editMode):
             return
         elif self.objectMouseOver.typeOfHit == 1:
             if editMode == 0:
-                self.objectMouseOver.entityHit.attackEntityFrom(self.thePlayer, 4)
+                stack = self.thePlayer.inventory.getStackInSlot(self.thePlayer.inventory.currentItem)
+                damage = items.itemsList[stack.itemID].getItemDamage() if stack else 1
+                if damage > 0:
+                    self.objectMouseOver.entityHit.attackEntityFrom(self.thePlayer,
+                                                                    damage)
+                    item = self.thePlayer.inventory.getCurrentItem()
+                    if item and isinstance(self.objectMouseOver.entityHit, EntityLiving):
+                        items.itemsList[item.itemID].hitEntity(item)
+                        if item.stackSize <= 0:
+                            self.thePlayer.displayGUIInventory()
 
             return
         elif self.objectMouseOver.typeOfHit != 0:
@@ -554,10 +572,9 @@ def __resize(self, width, height):
             screen.setWorldAndResolution(self, screenWidth, screenHeight)
 
     def __runTick(self):
-        if not self.isGamePaused:
-            self.playerController.onUpdate()
-
         self.ingameGUI.addChatMessage()
+        if not self.isGamePaused and self.theWorld:
+            self.playerController.onUpdate()
 
         gl.glBindTexture(gl.GL_TEXTURE_2D, self.renderEngine.getTexture('terrain.png'))
         self.renderEngine.updateDynamicTextures()

mc/net/minecraft/client/GuiMainTitle.py

@@ -23,12 +23,18 @@ def enableStandardItemLighting():
         y = 0.6
         z = 0.8
         gl.glLightModelf(gl.GL_LIGHT_MODEL_LOCAL_VIEWER, 1.0)
-        vec = Vec3D(-0.4, 1.0, 1.0)
+        vec = Vec3D(0.4, 1.0, -0.2)
         RenderHelper.__setColorBuffer(vec.xCoord, vec.yCoord, vec.zCoord,
                                       0.0).glLightfv(gl.GL_LIGHT0, gl.GL_POSITION)
         RenderHelper.__setColorBuffer(y, y, y, 1.0).glLightfv(gl.GL_LIGHT0, gl.GL_DIFFUSE)
         RenderHelper.__setColorBuffer(0.0, 0.0, 0.0, 1.0).glLightfv(gl.GL_LIGHT0, gl.GL_AMBIENT)
         RenderHelper.__setColorBuffer(z, z, z, 1.0).glLightfv(gl.GL_LIGHT0, gl.GL_SPECULAR)
+        vec = Vec3D(-0.4, 1.0, 0.2)
+        RenderHelper.__setColorBuffer(vec.xCoord, vec.yCoord, vec.zCoord,
+                                      0.0).glLightfv(gl.GL_LIGHT1, gl.GL_POSITION)
+        RenderHelper.__setColorBuffer(0.6, 0.6, 0.6, 1.0).glLightfv(gl.GL_LIGHT1, gl.GL_DIFFUSE)
+        RenderHelper.__setColorBuffer(0.0, 0.0, 0.0, 1.0).glLightfv(gl.GL_LIGHT1, gl.GL_AMBIENT)
+        RenderHelper.__setColorBuffer(0.8, 0.8, 0.8, 1.0).glLightfv(gl.GL_LIGHT1, gl.GL_SPECULAR)
         gl.glShadeModel(gl.GL_SMOOTH)
         RenderHelper.__setColorBuffer(x, x, x, 1.0).glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT)
 

mc/net/minecraft/client/Minecraft.py

@@ -36,11 +36,14 @@ def onRespawn(self, player):
 
                     self._mc.theWorld.setBlockWithNotify(xx, yy, zz, blockId)
 
-        player.inventory.mainInventory[8] = ItemStack(items.flintSteel)
-
     def sendBlockRemoved(self, x, y, z):
         block = self._mc.theWorld.getBlockId(x, y, z)
         change = super().sendBlockRemoved(x, y, z)
+        stack = self._mc.thePlayer.inventory.getCurrentItem()
+        if stack:
+            items.itemsList[stack.itemID].onBlockDestroyed(stack)
+            if stack.stackSize == 0:
+                self._mc.thePlayer.displayGUIInventory()
         if change:
             blocks.blocksList[block].dropBlockAsItem(self._mc.theWorld, x, y, z)
 

mc/net/minecraft/client/RenderHelper.py

@@ -10,8 +10,7 @@ def __init__(self, screen, options):
         self.__parentScreen = screen
         self.__options = options
 
-    def setWorldAndResolution(self, minecraft, width, height):
-        super().setWorldAndResolution(minecraft, width, height)
+    def initGui(self):
         for i, binding in enumerate(self.__options.keyBindings):
             self._controlList.append(GuiSmallButton(i, self.width // 2 - 155 + i % 2 * 160,
                                                     self.height // 6 + 24 * (i >> 1),
@@ -25,7 +24,7 @@ def _actionPerformed(self, button):
             self._controlList[i].displayString = self.__options.setKeyBindingString(i)
 
         if button.id == 200:
-            self._mc.displayGuiScreen(self.__parentScreen)
+            self.mc.displayGuiScreen(self.__parentScreen)
         else:
             self.__buttonId = button.id
             button.displayString = '> ' + self.__options.setKeyBindingString(button.id) + ' <'

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

@@ -6,9 +6,6 @@ def __init__(self, title, text):
         self.__title = title
         self.__text = text
 
-    def setWorldAndResolution(self, minecraft, width, height):
-        super().setWorldAndResolution(minecraft, width, height)
-
     def drawScreen(self, xm, ym):
         self._drawGradientRect(0, 0, self.width, self.height, -12574688, -11530224)
         self.drawCenteredString(self._fontRenderer, self.__title, self.width // 2, 90, 0xFFFFFF)

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

@@ -7,30 +7,32 @@
 
 class GuiGameOver(GuiScreen):
 
-    def setWorldAndResolution(self, minecraft, width, height):
-        super().setWorldAndResolution(minecraft, width, height)
+    def initGui(self):
         self._controlList.clear()
         self._controlList.append(GuiButton(1, self.width // 2 - 100, self.height // 4 + 72,
                                            'Generate new world...'))
         self._controlList.append(GuiButton(2, self.width // 2 - 100, self.height // 4 + 96,
                                            'Load world..'))
-        if not self._mc.session:
+        if not self.mc.session:
             self._controlList[2].enabled = False
 
+    def _keyTyped(self, key, char, motion):
+        pass
+
     def _actionPerformed(self, button):
         if button.id == 0:
-            self._mc.displayGuiScreen(GuiOptions(self, self._mc.options))
+            self.mc.displayGuiScreen(GuiOptions(self, self.mc.options))
         elif button.id == 1:
-            self._mc.displayGuiScreen(GuiNewLevel(self))
-        elif button.id == 2 and self._mc.session:
-            self._mc.displayGuiScreen(GuiLoadLevel(self))
+            self.mc.displayGuiScreen(GuiNewLevel(self))
+        elif button.id == 2 and self.mc.session:
+            self.mc.displayGuiScreen(GuiLoadLevel(self))
 
     def drawScreen(self, xm, ym):
         self._drawGradientRect(0, 0, self.width, self.height, 0x60500000, -1602211792)
         gl.glPushMatrix()
         gl.glScalef(2.0, 2.0, 2.0)
         self.drawCenteredString(self._fontRenderer, 'Game over!', self.width // 2 // 2, 30, 0xFFFFFF)
         gl.glPopMatrix()
-        self.drawCenteredString(self._fontRenderer, 'Score: &e' + str(self._mc.thePlayer.getScore()),
+        self.drawCenteredString(self._fontRenderer, 'Score: &e' + str(self.mc.thePlayer.getScore()),
                                 self.width // 2, 100, 0xFFFFFF)
         super().drawScreen(xm, ym)

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

@@ -87,21 +87,16 @@ def renderGameOverlay(self, a):
                     gl.glTranslatef(-(width + 8), -(height + 12), 0.0)
 
                 self.__itemRenderer.renderItemIntoGUI(
-                    self.__mc.fontRenderer, self.__mc.renderEngine,
+                    self.__mc.renderEngine,
                     stack, width, height
                 )
                 if anim > 0.0:
                     gl.glPopMatrix()
 
-                if stack.stackSize > 1:
-                    size = str(stack.stackSize)
-                    gl.glDisable(gl.GL_LIGHTING)
-                    gl.glDisable(gl.GL_DEPTH_TEST)
-                    self.__mc.fontRenderer.drawStringWithShadow(
-                        size, width + 19 - 2 - self.__mc.fontRenderer.getStringWidth(size),
-                        height + 6 + 3, 16777215)
-                    gl.glEnable(gl.GL_LIGHTING)
-                    gl.glEnable(gl.GL_DEPTH_TEST)
+                self.__itemRenderer.renderItemDamage(
+                    self.__mc.fontRenderer,
+                    stack, width, height
+                )
 
         RenderHelper.disableStandardItemLighting()
         gl.glDisable(gl.GL_NORMALIZE)