0.31 20100130 (0.31.20100130)

Author: pythonengineer

MANIFEST.in

@@ -4,11 +4,15 @@ include setup.py
 include Makefile
 include requirements.txt
 include screenshot.png
+include mc/resources/icon/minecraft.png
+graft mc/resources/icon
 include LICENSE
 include README.md
 
-recursive-include mc *.pyx *.pxd *.ogg *.png *.md3 *.MD3 *.dll
+recursive-include mc *.pyx *.pxd *.ogg *.md3 *.MD3 *.dll
+recursive-exclude mc/resources/texture *
 recursive-exclude * *.pyc
 recursive-exclude * *.pyd
+recursive-exclude * *.gif
 recursive-exclude * *.html
 recursive-exclude * *.c

Makefile

@@ -12,7 +12,7 @@ install:
 	CYTHONIZE=1 pip install .
 
 install-from-source: dist
-	pip install dist/minecraft-python-0.31.20100129.tar.gz
+	pip install dist/minecraft-python-0.31.20100130.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 0.31 20100129** as released on _**January 29, 2010**_.
+The latest version is **Indev 0.31 20100130** as released on _**January 30, 2010**_.
 
-This version adds functional crafting, sticks, the "Steve" and "Black Steve" MD3 mobs, and rudimentary smelting to the game.
-This is the first version where items must be gathered and crafted yourself, as opposed to them being provided in the chests at spawn.
+This version adds workbench crafting, gold tools, the "Beast Boy" MD3 mob, mob item drops, and soup to the game.
 
 Features from previous Indev versions include the Indev mossy cobblestone spawn house, NBT level file saving,
-most tools, torches, advanced liquid spread, TNT explosives, and passive MD3 mobs.
+tools, torches, advanced liquid spread, TNT explosives, chests, and passive MD3 mobs.
 
-To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100129`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100130`.
 
-You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100129)
+You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100130)
 
 ### Organization
 
@@ -43,8 +42,7 @@ The argument `-creative` will force the game to be in creative mode.
 ### Gameplay
 
 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, B to craft (I to exit the crafting screen),
-F5 to toggle rain and F7 to take a cool isometric screenshot.
+Press I to open your inventory, F5 to toggle rain and F7 to take a cool isometric screenshot.
 
 Smelting is unique in early Indev: to get iron or gold ingots, light the dropped ores on fire or throw them in lava.
 
@@ -53,8 +51,9 @@ 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 Steves and Black Steves, which don't drop anything when killed.
-Apples will restore health.
+MD3 Steves may drop string on death, Black Steves may drop gunpowder, and Beast Boys may drop feathers.
+
+Crafted mushroom bowl soup will restore health. Check the Wiki for crafting recipes added in this version.
 
 ![Isometric screenshot](/map.png?raw=true)
 

mc/Resources.py

@@ -28,15 +28,11 @@ 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.GameSettings import GameSettings
-from mc.net.minecraft.client.RenderHelper import RenderHelper
+from mc.net.minecraft.client.OpenGlCapsChecker import OpenGlCapsChecker
 from mc.net.minecraft.client.LoadingScreenRenderer import LoadingScreenRenderer
-from mc.net.minecraft.game.physics.Vec3D import Vec3D
 from mc.net.minecraft.game.level.World import World
-from mc.net.minecraft.game.level.block.Block import Block
 from mc.net.minecraft.game.level.block.Blocks import blocks
-from mc.net.minecraft.game.level.material.Material import Material
 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
@@ -45,20 +41,17 @@ def load_library(*names, **kwargs):
 from mc.net.minecraft.client.gui.GuiErrorScreen import GuiErrorScreen
 from mc.net.minecraft.client.gui.GuiIngameMenu import GuiIngameMenu
 from mc.net.minecraft.client.gui.GuiGameOver import GuiGameOver
-from mc.net.minecraft.client.gui.GuiInventory import GuiInventory
 from mc.net.minecraft.client.gui.GuiIngame import GuiIngame
-from mc.net.minecraft.client.gui.GuiCrafting import GuiCrafting
+from mc.net.minecraft.client.gui.container.GuiInventory import GuiInventory
 from mc.net.minecraft.client.effect.EffectRenderer import EffectRenderer
 from mc.net.minecraft.client.render.texture.TextureFlamesFX import TextureFlamesFX
 from mc.net.minecraft.client.render.texture.TextureWaterFlowFX import TextureWaterFlowFX
 from mc.net.minecraft.client.render.texture.TextureWaterFX import TextureWaterFX
 from mc.net.minecraft.client.render.texture.TextureLavaFX import TextureLavaFX
 from mc.net.minecraft.client.render.texture.TextureGearsFX import TextureGearsFX
-from mc.net.minecraft.client.render.RenderBlocks import RenderBlocks
 from mc.net.minecraft.client.render.RenderGlobal import RenderGlobal
 from mc.net.minecraft.client.render.EntityRenderer import EntityRenderer
 from mc.net.minecraft.client.render.RenderEngine import RenderEngine
-from mc.net.minecraft.client.render.Tessellator import tessellator
 from mc.net.minecraft.client.render.WorldRenderer import WorldRenderer
 from mc.net.minecraft.client.controller.PlayerControllerCreative import PlayerControllerCreative
 from mc.net.minecraft.client.controller.PlayerControllerSP import PlayerControllerSP
@@ -271,8 +264,6 @@ def on_key_press(self, symbol, modifiers):
                     self.renderRain = not self.renderRain
                 elif symbol == self.options.keyBindInventory.keyCode:
                     self.displayGuiScreen(GuiInventory(self.thePlayer.inventory))
-                elif symbol == window.key.B:
-                    self.displayGuiScreen(GuiCrafting(self.thePlayer.inventory))
                 elif symbol == self.options.keyBindDrop.keyCode:
                     self.thePlayer.dropPlayerItemWithRandomChoice(
                         self.thePlayer.inventory.decrStackSize(
@@ -383,6 +374,8 @@ def run(self):
         gl.glLoadIdentity()
         gl.glMatrixMode(gl.GL_MODELVIEW)
 
+        self.__glCapabilities = OpenGlCapsChecker()
+
         name = 'minecraft'
         home = os.path.expanduser('~') or '.'
         if 'unix' in sys.platform or 'linux' in sys.platform or \
@@ -429,7 +422,7 @@ def run(self):
             world.setLevel(8, 8, 8, bytearray(512))
             self.setLevel(level)
         elif not self.theWorld:
-            self.generateLevel(1, 0, 1, 0)
+            self.generateNewLevel(1, 0, 1, 0)
 
         self.effectRenderer = EffectRenderer(self.theWorld, self.renderEngine)
 
@@ -477,7 +470,7 @@ def __releaseMouse(self):
         self.set_mouse_position(self.width // 2, self.height // 2)
 
     def displayInGameMenu(self):
-        if not isinstance(self.currentScreen, GuiIngameMenu):
+        if not self.currentScreen:
             self.displayGuiScreen(GuiIngameMenu())
 
     def __clickMouse(self, editMode):
@@ -489,10 +482,9 @@ def __clickMouse(self, editMode):
             self.entityRenderer.itemRenderer.swingItem()
             self.entityRenderer.updateRenderer()
         elif editMode == 1 and item:
-            if item.getItem().onItemRightClick(item, self.theWorld, self.thePlayer):
-                if item.stackSize == 0:
-                    self.thePlayer.inventory.mainInventory[self.thePlayer.inventory.currentItem] = None
-
+            stack = item.getItem().onItemRightClick(item, self.theWorld, self.thePlayer)
+            if stack != item or stack and stack.stackSize != item.stackSize:
+                self.thePlayer.inventory.mainInventory[self.thePlayer.inventory.currentItem] = stack
                 self.entityRenderer.itemRenderer.resetEquippedProgress()
 
         if not self.objectMouseOver:
@@ -614,7 +606,7 @@ def __runTick(self):
                                            int(self.thePlayer.posZ))
         self.effectRenderer.updateEffects()
 
-    def generateLevel(self, size, shape, levelType, theme):
+    def generateNewLevel(self, size, shape, levelType, theme):
         name = self.session.username if self.session else 'anonymous'
         levelGen = LevelGenerator(self.loadingScreen)
         levelGen.islandGen = levelType == 1

mc/net/minecraft/client/Minecraft.py

@@ -0,0 +1,2 @@
+class OpenGlCapsChecker:
+    cap = False

mc/net/minecraft/client/OpenGlCapsChecker.py

@@ -17,7 +17,7 @@ def __init__(self, mc):
         self.__blockHitWait = 0
         self.__mobSpawner = None
 
-    def flipPlayer(self, player):
+    def onRespawn(self, player):
         x = int(player.posX)
         y = int(player.posY)
         z = int(player.posZ)
@@ -36,12 +36,6 @@ def flipPlayer(self, player):
 
                     self._mc.theWorld.setBlockWithNotify(xx, yy, zz, blockId)
 
-        self._mc.theWorld.setBlockWithNotify(x - 2, y - 1, z - 2, blocks.chest.blockID)
-        self._mc.theWorld.getBlockTileEntity(x - 2, y - 1, z - 2)
-        self._mc.theWorld.setBlockWithNotify(x + 2, y - 1, z - 2, blocks.chest.blockID)
-        self._mc.theWorld.getBlockTileEntity(x + 2, y - 1, z - 2)
-        self._mc.theWorld.setBlockWithNotify(x + 2, y - 1, z - 1, blocks.chest.blockID)
-        self._mc.theWorld.getBlockTileEntity(x + 2, y - 1, z - 1)
         player.inventory.mainInventory[8] = ItemStack(items.flintSteel)
 
     def sendBlockRemoved(self, x, y, z):