0.31 20100129 (0.31.20100129)

Author: pythonengineer

Makefile

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

README.md

@@ -5,17 +5,17 @@
 _**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 20100128** as released on _**January 28, 2010**_.
+The latest version is **Indev 0.31 20100129** as released on _**January 29, 2010**_.
 
-This version adds diamonds, diamond ore, gears, metal tool variants, and semi-functional crafting to the game.
+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.
 
-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.
+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.
 
-To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100128`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100129`.
 
-You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100128)
+You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100129)
 
 ### Organization
 
@@ -42,21 +42,23 @@ The argument `-creative` will force the game to be in creative mode.
 
 ### Gameplay
 
-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, B to craft (only recipe is an apple in the top-left corner for an arrow),
+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.
 
+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*).
 
 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 Ranas, but they don't drop anything when killed. Apples will restore health.
+The only mobs around are the Steves and Black Steves, which don't drop anything when killed.
+Apples will restore health.
 
 ![Isometric screenshot](/map.png?raw=true)
 
-*An isometric screenshot of a deep Floating map generated by the game.*
+*An isometric screenshot of a normal Island map generated by the game, showing the MD3 mobs.*
 
 ### Additional Notes
 

map.png

@@ -147,7 +147,7 @@ def displayGuiScreen(self, screen):
             if self.currentScreen or screen:
                 self.screenChanged = True
             if self.currentScreen:
-                self.currentScreen.onGuiClose()
+                self.currentScreen.onGuiClosed()
 
             if not screen and self.thePlayer.health <= 0:
                 screen = GuiGameOver()

mc/Resources.py

@@ -16,22 +16,6 @@ def __init__(self, mc):
         self.__prevBlockDamage = 0
         self.__blockHitWait = 0
         self.__mobSpawner = None
-        self.__mainChestArray = (
-            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.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 flipPlayer(self, player):
         x = int(player.posX)
@@ -53,47 +37,12 @@ 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)
-        itemsChest = self._mc.theWorld.getBlockTileEntity(x - 2, y - 1, z - 2)
+        self._mc.theWorld.getBlockTileEntity(x - 2, y - 1, z - 2)
         self._mc.theWorld.setBlockWithNotify(x + 2, y - 1, z - 2, blocks.chest.blockID)
-        blocksChest1 = self._mc.theWorld.getBlockTileEntity(x + 2, y - 1, z - 2)
+        self._mc.theWorld.getBlockTileEntity(x + 2, y - 1, z - 2)
         self._mc.theWorld.setBlockWithNotify(x + 2, y - 1, z - 1, blocks.chest.blockID)
-        blocksChest2 = self._mc.theWorld.getBlockTileEntity(x + 2, y - 1, z - 1)
-        self._mc.theWorld.setBlockWithNotify(x - 1, y - 1, z + 2, blocks.chest.blockID)
-        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]:
-                limit = items.itemsList[i].getItemStackLimit()
-                itemsChest.setInventorySlotContents(slot, ItemStack(i, limit))
-                slot += 1
-                if slot >= 27:
-                    break
-
-        for slot in range(27):
-            blockId = blocks.tnt.blockID
-            stack = ItemStack(blockId, items.itemsList[blockId].getItemStackLimit())
-            tntChest1.setInventorySlotContents(slot, stack)
-            stack = ItemStack(blockId, items.itemsList[blockId].getItemStackLimit())
-            tntChest2.setInventorySlotContents(slot, stack)
-
-        for slot in range(min(len(self.__mainChestArray), 54)):
-            blockId = self.__mainChestArray[slot]
-            stack = ItemStack(blockId, items.itemsList[blockId.blockID].getItemStackLimit())
-            if slot >= 27:
-                blocksChest2.setInventorySlotContents(slot - 27, stack)
-            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)
+        self._mc.theWorld.getBlockTileEntity(x + 2, y - 1, z - 1)
+        player.inventory.mainInventory[8] = ItemStack(items.flintSteel)
 
     def sendBlockRemoved(self, x, y, z):
         block = self._mc.theWorld.getBlockId(x, y, z)

mc/net/minecraft/client/Minecraft.py

@@ -42,7 +42,7 @@ def onCraftMatrixChanged(self):
             else:
                 items[slot] = -1
 
-        self.__iInventory.setInventorySlotContents(0, CraftingManager.addRecipe(items))
+        self.__iInventory.setInventorySlotContents(0, CraftingManager.getInstance().addRecipe(items))
 
     def _drawGuiContainerForegroundLayer(self):
         self._fontRenderer.drawString('Crafting', 8, 6, 4210752)

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

@@ -46,5 +46,5 @@ def handleKeyboardEvent(self, key=None, char=None, motion=None):
     def updateScreen(self):
         pass
 
-    def onGuiClose(self):
+    def onGuiClosed(self):
         pass

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

@@ -1,7 +1,7 @@
 from mc.net.minecraft.game.Inventory import Inventory
 
 class InventoryCraftResult(Inventory):
-    STACK_LIMIT = 100
+    STACK_LIMIT = 64
 
     def __init__(self, eventHandler):
         self.__stackResult = [None]

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

@@ -1,7 +1,7 @@
 from mc.net.minecraft.game.Inventory import Inventory
 
 class InventoryCrafting(Inventory):
-    STACK_LIMIT = 100
+    STACK_LIMIT = 64
 
     def __init__(self, eventHandler):
         self.__eventHandler = eventHandler
@@ -16,6 +16,23 @@ def getStackInSlot(self, slot):
     def getInvName(self):
         return 'Crafting'
 
+    def decrStackSize(self, slot, size):
+        if not self.stackList[slot]:
+            return None
+
+        if self.stackList[slot].stackSize <= 1:
+            stack = self.stackList[slot]
+            self.stackList[slot] = None
+            self.__eventHandler.onCraftMatrixChanged()
+            return stack
+        else:
+            stack = self.stackList[slot].splitStack(1)
+            if self.stackList[slot].stackSize == 0:
+                self.stackList[slot] = None
+
+            self.__eventHandler.onCraftMatrixChanged()
+            return stack
+
     def setInventorySlotContents(self, slot, stack):
         self.stackList[slot] = stack
         self.__eventHandler.onCraftMatrixChanged()

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

@@ -11,4 +11,5 @@ def isItemValid(self):
 
     def onPickupFromSlot(self):
         for slot in range(9):
-            self.__craftMatrix.inventoryCrafting.setInventorySlotContents(slot, None)
+            if self.__craftMatrix.inventoryCrafting.getStackInSlot(slot):
+                self.__craftMatrix.inventoryCrafting.decrStackSize(slot, 1)

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

@@ -159,6 +159,6 @@ def __loadMD3Info(buffer, size):
 
         for i in range(len(b)):
             if b[i] == 0:
-                return b[:i].decode('utf-8')
+                return b[:i].decode('utf-8', errors='ignore')
 
-        return b.decode('utf-8')
+        return b.decode('utf-8', errors='ignore')

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

@@ -8,7 +8,10 @@ def __init__(self, vertices):
         self.__vertices = vertices
         self.__displayList = 0
 
-    def renderModelVertices(self):
+    def getFrames(self):
+        return self.__vertices.totalFrames
+
+    def renderModelVertices(self, a, _, ticks):
         if self.__displayList == 0:
             self.__displayList = gl.glGenLists(self.__vertices.totalFrames)
 
@@ -35,4 +38,4 @@ def renderModelVertices(self):
                 gl.glDisableClientState(gl.GL_TEXTURE_COORD_ARRAY)
                 gl.glDisableClientState(gl.GL_NORMAL_ARRAY)
 
-        gl.glCallList(self.__displayList)
+        gl.glCallList(self.__displayList + a)

mc/net/minecraft/client/model/md3/MD3Loader.py

@@ -11,7 +11,8 @@ def __init__(self):
         self._shadowSize = 0.5
 
         try:
-            self.__model[0] = MD3Model((MD3Loader()).loadModel('test2.md3'))
+            self.__model[0] = MD3Model((MD3Loader()).loadModel('mcexport01.MD3'))
+            print('Animation frames:', self.__model[0].getFrames())
         except IOError as e:
             print(e)
 
@@ -21,12 +22,20 @@ def doRender(self, entity, xd, yd, zd, yaw, a):
         try:
             zo = entity.prevRenderYawOffset + (entity.renderYawOffset - entity.prevRenderYawOffset) * a
             gl.glTranslatef(xd, yd, zd)
-            self._loadTexture('cube-nes.png')
+            if entity.mobType == 0:
+                self._loadTexture('mcexport2.png')
+            elif entity.mobType == 1:
+                self._loadTexture('mcexport.png')
+
             gl.glRotatef(-zo + 180.0, 0.0, 1.0, 0.0)
             gl.glRotatef(-90.0, 1.0, 0.0, 0.0)
             gl.glScalef(0.02, -0.02, 0.02)
+            ticks = (entity.ticksExisted + a) * entity.randVal
+            a = int(ticks) % self.__model[0].getFrames()
+            _ = (a + 1) % self.__model[0].getFrames()
+            ticks -= int(ticks)
             gl.glEnable(gl.GL_NORMALIZE)
-            self.__model[0].renderModelVertices()
+            self.__model[0].renderModelVertices(a, _, ticks)
             gl.glDisable(gl.GL_NORMALIZE)
         except Exception as e:
             print(e)

mc/net/minecraft/client/model/md3/MD3Model.py

@@ -286,7 +286,7 @@ cdef class Entity:
         self.__ySize *= 0.4
         inWater = self.handleWaterMovement()
         if self._worldObj.isBoundingBoxBurning(self.boundingBox):
-            self.attackEntityFrom(None, 1)
+            self._hurt(1)
             if not inWater:
                 self.fire += 1
                 if self.fire == 0:
@@ -301,6 +301,9 @@ cdef class Entity:
             )
             self.fire = -self.fireResistance
 
+    def _hurt(self, int hp):
+        self.attackEntityFrom(None, 1)
+
     cdef _fall(self, float distance):
         pass
 

mc/net/minecraft/client/render/entity/RenderMD3.py

@@ -21,6 +21,8 @@ cdef class EntityLiving(Entity):
         public float prevCameraPitch
         public float cameraPitch
         public AILiving _entityAI
+        public float randVal
+        public int mobType
 
     cdef _fall(self, float d)
     cdef travel(self, float x, float z)

mc/net/minecraft/game/entity/Entity.pyx

@@ -37,6 +37,8 @@ cdef class EntityLiving(Entity):
         self.setPosition(self.posX, self.posY, self.posZ)
         self.rotationYaw = random() * (pi * 2.0)
         self.stepHeight = 0.5
+        self.randVal = random() * 0.9 + 0.1
+        self.mobType = self._rand.nextInt(2)
 
     def canBeCollidedWith(self):
         return not self.isDead

mc/net/minecraft/game/entity/EntityLiving.pxd

@@ -97,6 +97,14 @@ def onEntityUpdate(self):
         if self.age >= 6000:
             self.setEntityDead()
 
+    def _hurt(self, hp):
+        if self.item.getItem().onPlaced(self._worldObj, self.posX,
+                                        self.posY, self.posZ):
+            self.item.stackSize = 0
+
+        if self.item.stackSize == 0:
+            self.setEntityDead()
+
     def attackEntityFrom(self, entity, damage):
         self.__health -= damage
         if self.__health <= 0:

mc/net/minecraft/game/entity/EntityLiving.pyx

@@ -3,7 +3,7 @@
 from mc.net.minecraft.game.Inventory import Inventory
 
 class InventoryPlayer(Inventory):
-    PLAYER_STACK_LIMIT = 50
+    PLAYER_STACK_LIMIT = 64
 
     def __init__(self):
         self.currentItem = 0
@@ -73,7 +73,7 @@ def storePartialItemStack(self, stack):
             if self.mainInventory[maybeSlot] and self.mainInventory[maybeSlot].itemID == itemId:
                 item = self.mainInventory[maybeSlot]
                 if self.mainInventory[maybeSlot].stackSize < item.getItem().getItemStackLimit() and \
-                   self.mainInventory[maybeSlot].stackSize < 50:
+                   self.mainInventory[maybeSlot].stackSize < InventoryPlayer.PLAYER_STACK_LIMIT:
                     slot = maybeSlot
                     break
 
@@ -92,7 +92,10 @@ def storePartialItemStack(self, stack):
                 item = self.mainInventory[slot]
                 stackExcess = item.getItem().getItemStackLimit() - self.mainInventory[slot].stackSize
 
-            stackExcess = min(stackExcess, 50 - self.mainInventory[slot].stackSize)
+            stackExcess = min(
+                stackExcess,
+                InventoryPlayer.PLAYER_STACK_LIMIT - self.mainInventory[slot].stackSize
+            )
             if stackExcess == 0:
                 stackSize = stackSize
             else:

mc/net/minecraft/game/entity/misc/EntityItem.py

@@ -1,5 +1,4 @@
 from mc.net.minecraft.game.entity.Entity import Entity
-from mc.net.minecraft.game.item.ItemStack import ItemStack
 from mc.net.minecraft.game.physics.Vec3D import Vec3D
 
 from nbtlib.tag import Short, Byte
@@ -132,6 +131,7 @@ def _getEntityString(self):
 
     def onCollideWithPlayer(self, player):
         from mc.net.minecraft.game.item.Items import items
+        from mc.net.minecraft.game.item.ItemStack import ItemStack
         if self.__inGround and self.__owner == player and self.arrowShake <= 0 and \
            player.inventory.storePartialItemStack(ItemStack(items.arrow.shiftedIndex, 1)):
             self.setEntityDead()

mc/net/minecraft/game/entity/player/InventoryPlayer.py

@@ -25,3 +25,6 @@ def onItemRightClick(self, stack, world, player):
 
     def getItemStackLimit(self):
         return self._maxStackSize
+
+    def onPlaced(self, world, x, y, z):
+        return False

mc/net/minecraft/game/entity/projectile/EntityArrow.py

@@ -40,3 +40,6 @@ def onItemUse(self, stack, world, x, y, z, sideHit):
         volume = (block.stepSound.soundVolume + 1.0) / 2.0
         world.playSoundEffect(x, y, z, name, volume, block.stepSound.soundPitch * 0.8)
         stack.stackSize -= 1
+
+    def onPlaced(self, world, x, y, z):
+        return blocks.blocksList[self.__blockID].oreDrop(world, x, y, z)