0.31 20100128 (0.31.20100128)

Author: pythonengineer

Makefile

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

README.md

@@ -5,16 +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 20100125** as released on _**January 25, 2010**_.
+The latest version is **Indev 0.31 20100128** as released on _**January 28, 2010**_.
+
+This version adds diamonds, diamond ore, gears, metal tool variants, and semi-functional crafting to the game.
 
-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.20100125`.
+To easily install this version of *Minecraft: Python Edition*, just run `python -m pip install minecraft-python==0.31.20100128`.
 
-You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100125)
+You can learn more about this version [on the Minecraft wiki.](https://minecraft.wiki/w/Java_Edition_Indev_0.31_20100128)
 
 ### Organization
 
@@ -43,7 +44,8 @@ The argument `-creative` will force the game to be in creative mode.
 
 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, F5 to toggle rain and F7 to take a cool isometric screenshot.
+Press I to open your inventory, B to craft (only recipe is an apple in the top-left corner for an arrow),
+F5 to toggle rain and F7 to take a cool isometric screenshot.
 
 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*).
@@ -54,7 +56,7 @@ The only mobs around are the Ranas, but they don't drop anything when killed. Ap
 
 ![Isometric screenshot](/map.png?raw=true)
 
-*An isometric screenshot of a Hell map generated by the game.*
+*An isometric screenshot of a deep Floating map generated by the game.*
 
 ### Additional Notes
 

map.png

@@ -1,5 +1,6 @@
 from mc.net.minecraft.client import MinecraftError
 from mc.net.minecraft.client.render.Tessellator import tessellator
+from mc.net.minecraft.client.gui.ScaledResolution import ScaledResolution
 from pyglet import clock, gl
 
 import nbtlib
@@ -16,8 +17,9 @@ def displayProgressMessage(self, title):
             raise MinecraftError
         else:
             self.__title = title
-            screenWidth = self.__mc.width * 240 / self.__mc.height
-            screenHeight = self.__mc.height * 240 / self.__mc.height
+            scaledRes = ScaledResolution(self.__mc.width, self.__mc.height)
+            screenWidth = scaledRes.getScaledWidth()
+            screenHeight = scaledRes.getScaledHeight()
 
             gl.glClear(gl.GL_DEPTH_BUFFER_BIT)
             gl.glMatrixMode(gl.GL_PROJECTION)
@@ -38,8 +40,9 @@ def setLoadingProgress(self):
         if not self.__mc.running:
             raise MinecraftError
         else:
-            screenWidth = self.__mc.width * 240 // self.__mc.height
-            screenHeight = self.__mc.height * 240 // self.__mc.height
+            scaledRes = ScaledResolution(self.__mc.width, self.__mc.height)
+            screenWidth = scaledRes.getScaledWidth()
+            screenHeight = scaledRes.getScaledHeight()
 
             gl.glClear(gl.GL_DEPTH_BUFFER_BIT)
             gl.glMatrixMode(gl.GL_PROJECTION)

mc/Resources.py

@@ -40,16 +40,20 @@ def load_library(*names, **kwargs):
 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
+from mc.net.minecraft.client.gui.ScaledResolution import ScaledResolution
 from mc.net.minecraft.client.gui.FontRenderer import FontRenderer
 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.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
@@ -85,7 +89,7 @@ class Minecraft(window.Window):
     loadMapUser = ''
     loadMapID = 0
 
-    __active = False
+    isGamePaused = True
 
     ingameGUI = None
     skipRenderWorld = False
@@ -151,8 +155,9 @@ def displayGuiScreen(self, screen):
             self.currentScreen = screen
             if screen:
                 self.__releaseMouse()
-                screenWidth = self.width * 240 // self.height
-                screenHeight = self.height * 240 // self.height
+                scaledRes = ScaledResolution(self.width, self.height)
+                screenWidth = scaledRes.getScaledWidth()
+                screenHeight = scaledRes.getScaledHeight()
                 screen.setWorldAndResolution(self, screenWidth, screenHeight)
                 self.skipRenderWorld = False
             else:
@@ -164,20 +169,20 @@ def destroy(self):
         self.sndManager.closeMinecraft()
 
     def isActive(self):
-        return self.__active
+        return not self.isGamePaused
 
     def on_close(self):
         self.running = False
 
     def on_activate(self):
-        self.__active = True
+        self.isGamePaused = False
 
         # Remove this hack when the window boundary issue is fixed upstream:
         if self.ingameFocus and compat_platform == 'win32':
             self._update_clipped_cursor()
 
     def on_deactivate(self):
-        self.__active = False
+        self.isGamePaused = True
         self.__releaseMouse()
 
     def on_mouse_press(self, x, y, button, modifiers):
@@ -244,7 +249,7 @@ def on_mouse_motion(self, x, y, dx, dy):
     def on_key_press(self, symbol, modifiers):
         try:
             if symbol == window.key.F11:
-                self.toggleFullScreen()
+                self.toggleFullscreen()
                 return
 
             if self.currentScreen:
@@ -265,7 +270,9 @@ def on_key_press(self, symbol, modifiers):
                 elif symbol == window.key.F5:
                     self.renderRain = not self.renderRain
                 elif symbol == self.options.keyBindInventory.keyCode:
-                    self.playerController.openInventory()
+                    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(
@@ -325,7 +332,13 @@ def on_text_motion(self, motion):
 
     def on_draw(self):
         try:
-            self.__timer.updateTimer()
+            if self.isGamePaused:
+                prevTicks = self.__timer.renderPartialTicks
+                self.__timer.updateTimer()
+                self.__timer.renderPartialTicks = prevTicks
+            else:
+                self.__timer.updateTimer()
+
             for i in range(self.__timer.elapsedTicks):
                 self.__ticksRan += 1
                 self.__runTick()
@@ -400,6 +413,8 @@ def run(self):
         self.renderEngine.registerTextureFX(TextureWaterFlowFX())
         self.renderEngine.registerTextureFX(TextureFlamesFX(0))
         self.renderEngine.registerTextureFX(TextureFlamesFX(1))
+        self.renderEngine.registerTextureFX(TextureGearsFX(0))
+        self.renderEngine.registerTextureFX(TextureGearsFX(1))
         self.fontRenderer = FontRenderer(self.options, 'default.png', self.renderEngine)
 
         imgData = BufferUtils.createIntBuffer(256)
@@ -466,8 +481,11 @@ def displayInGameMenu(self):
             self.displayGuiScreen(GuiIngameMenu())
 
     def __clickMouse(self, editMode):
+        if editMode == 0 and self.__leftClickCounter > 0:
+            return
+
         item = self.thePlayer.inventory.getCurrentItem()
-        if editMode == 0 and self.__leftClickCounter <= 0:
+        if editMode == 0:
             self.entityRenderer.itemRenderer.swingItem()
             self.entityRenderer.updateRenderer()
         elif editMode == 1 and item:
@@ -519,7 +537,7 @@ def __clickMouse(self, editMode):
             if item.stackSize != prevSize:
                 self.entityRenderer.itemRenderer.resetEquippedProgress()
 
-    def toggleFullScreen(self):
+    def toggleFullscreen(self):
         try:
             self.__fullScreen = not self.__fullScreen
             print('Toggle fullscreen!')
@@ -544,7 +562,9 @@ def __resize(self, width, height):
             screen.setWorldAndResolution(self, screenWidth, screenHeight)
 
     def __runTick(self):
-        self.playerController.onUpdate()
+        if not self.isGamePaused:
+            self.playerController.onUpdate()
+
         self.ingameGUI.addChatMessage()
 
         gl.glBindTexture(gl.GL_TEXTURE_2D, self.renderEngine.getTexture('terrain.png'))
@@ -557,10 +577,12 @@ def __runTick(self):
                 self.__leftClickCounter -= 1
 
             if not self.currentScreen:
-                if self.msh[window.mouse.LEFT] and float(self.__ticksRan - self.__prevFrameTime) >= self.__timer.ticksPerSecond / 4.0 and self.ingameFocus:
+                if self.msh[window.mouse.LEFT] and \
+                   self.__ticksRan - self.__prevFrameTime >= self.__timer.ticksPerSecond / 4.0 and self.ingameFocus:
                     self.__clickMouse(0)
                     self.__prevFrameTime = self.__ticksRan
-                elif self.msh[window.mouse.RIGHT] and float(self.__ticksRan - self.__prevFrameTime) >= self.__timer.ticksPerSecond / 4.0 and self.ingameFocus:
+                elif self.msh[window.mouse.RIGHT] and \
+                     self.__ticksRan - self.__prevFrameTime >= self.__timer.ticksPerSecond / 4.0 and self.ingameFocus:
                     self.__clickMouse(1)
                     self.__prevFrameTime = self.__ticksRan
 
@@ -583,8 +605,10 @@ def __runTick(self):
 
         self.entityRenderer.updateRenderer()
         self.renderGlobal.updateClouds()
-        self.theWorld.updateEntities()
-        self.theWorld.tick()
+        if not self.isGamePaused:
+            self.theWorld.updateEntities()
+            self.theWorld.tick()
+
         self.theWorld.randomDisplayUpdates(int(self.thePlayer.posX),
                                            int(self.thePlayer.posY),
                                            int(self.thePlayer.posZ))

mc/net/minecraft/client/LoadingScreenRenderer.py

@@ -4,7 +4,7 @@
 
 class Timer:
     NS_PER_SECOND = 1000000
-    MAX_TICKS_PER_UPDATE = 100
+    MAX_TICKS_PER_UPDATE = 10
     __lastHRTime = 0.0
     elapsedTicks = 0
     renderPartialTicks = 0.0

mc/net/minecraft/client/Minecraft.py

@@ -10,9 +10,6 @@ def __init__(self, mc):
     def onWorldChange(self, world):
         pass
 
-    def openInventory(self):
-        pass
-
     def clickBlock(self, x, y, z):
         self.sendBlockRemoved(x, y, z)
 

mc/net/minecraft/client/Timer.py

@@ -1,15 +1,11 @@
 from mc.net.minecraft.client.Session import Session
 from mc.net.minecraft.client.controller.PlayerController import PlayerController
-from mc.net.minecraft.client.gui.GuiInventory import GuiInventory
 from mc.net.minecraft.game.level.MobSpawner import MobSpawner
 from mc.net.minecraft.game.level.block.Blocks import blocks
 from mc.net.minecraft.game.item.ItemStack import ItemStack
 
 class PlayerControllerCreative(PlayerController):
 
-    def openInventory(self):
-        self._mc.displayGuiScreen(GuiInventory(self._mc.thePlayer.inventory))
-
     def onRespawn(self, player):
         for i in range(9):
             if player.inventory.mainInventory[i] is None:

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

@@ -1,5 +1,4 @@
 from mc.net.minecraft.client.controller.PlayerController import PlayerController
-from mc.net.minecraft.client.gui.GuiInventory import GuiInventory
 from mc.net.minecraft.game.level.MobSpawner import MobSpawner
 from mc.net.minecraft.game.level.block.Blocks import blocks
 from mc.net.minecraft.game.entity.EntityLiving import EntityLiving
@@ -34,9 +33,6 @@ def __init__(self, mc):
             blocks.clothRose, blocks.clothDarkGray, blocks.clothGray, blocks.clothWhite
         )
 
-    def openInventory(self):
-        self._mc.displayGuiScreen(GuiInventory(self._mc.thePlayer.inventory))
-
     def flipPlayer(self, player):
         x = int(player.posX)
         y = int(player.posY)
@@ -81,6 +77,7 @@ def flipPlayer(self, player):
             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)):

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

@@ -8,6 +8,7 @@ def __init__(self, upperChestInventory, lowerChestInventory):
         super().__init__(None)
         self.__upperChestInventory = upperChestInventory
         self.__lowerChestInventory = lowerChestInventory
+        self.allowUserInput = False
         self.__inventoryRows = lowerChestInventory.getSizeInventory() // 9
         self.ySize = 114 + self.__inventoryRows * 18
         yOffset = (self.__inventoryRows - 4) * 18

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

@@ -0,0 +1,57 @@
+from mc.net.minecraft.game.item.recipe.CraftingManager import CraftingManager
+from mc.net.minecraft.client.gui.InventoryCraftResult import InventoryCraftResult
+from mc.net.minecraft.client.gui.InventoryCrafting import InventoryCrafting
+from mc.net.minecraft.client.gui.GuiInventory import GuiInventory
+from mc.net.minecraft.client.gui.SlotCrafting import SlotCrafting
+from mc.net.minecraft.client.gui.Slot import Slot
+from pyglet import gl
+
+class GuiCrafting(GuiInventory):
+
+    def __init__(self, player):
+        super().__init__(None)
+        self.inventoryCrafting = InventoryCrafting(self)
+        self.__iInventory = InventoryCraftResult(self)
+        self._slotsList.append(SlotCrafting(self, self.__iInventory, 0, 124, 34))
+        for row in range(3):
+            for col in range(3):
+                self._slotsList.append(Slot(self, self.inventoryCrafting, col + row * 3,
+                                            30 + col * 18, 16 + row * 18))
+
+        for row in range(3):
+            for col in range(9):
+                self._slotsList.append(Slot(self, player, col + (row + 1) * 9,
+                                            8 + col * 18, 84 + row * 18))
+
+        for row in range(9):
+            self._slotsList.append(Slot(self, player, row, 8 + row * 18, 142))
+
+    def onGuiClosed(self):
+        super().onGuiClosed()
+        for slot in range(9):
+            stack = self.inventoryCrafting.getStackInSlot(slot)
+            if stack:
+                self._mc.thePlayer.dropPlayerItemWithRandomChoice(stack)
+
+    def onCraftMatrixChanged(self):
+        items = [0] * 9
+        for slot in range(9):
+            stack = self.inventoryCrafting.stackList[slot]
+            if stack:
+                items[slot] = stack.itemID
+            else:
+                items[slot] = -1
+
+        self.__iInventory.setInventorySlotContents(0, CraftingManager.addRecipe(items))
+
+    def _drawGuiContainerForegroundLayer(self):
+        self._fontRenderer.drawString('Crafting', 8, 6, 4210752)
+        self._fontRenderer.drawString('Inventory', 8, self.ySize - 96 + 2, 4210752)
+
+    def _drawGuiContainerBackgroundLayer(self):
+        tex = self._mc.renderEngine.getTexture('gui/crafting.png')
+        gl.glColor4f(1.0, 1.0, 1.0, 1.0)
+        gl.glBindTexture(gl.GL_TEXTURE_2D, tex)
+        x = (self.width - self.xSize) // 2
+        y = (self.height - self.ySize) // 2
+        self.drawTexturedModalRect(x, y, 0, 0, self.xSize, self.ySize)

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

@@ -1,6 +1,7 @@
 from mc.net.minecraft.client.controller.PlayerControllerSP import PlayerControllerSP
 from mc.net.minecraft.client.render.RenderBlocks import RenderBlocks
 from mc.net.minecraft.client.render.Tessellator import tessellator
+from mc.net.minecraft.client.gui.ScaledResolution import ScaledResolution
 from mc.net.minecraft.client.gui.Gui import Gui
 from mc.net.minecraft.client.RenderHelper import RenderHelper
 from mc.net.minecraft.client.ChatLine import ChatLine
@@ -19,8 +20,9 @@ def __init__(self, minecraft):
         self.__updateCounter = 0
 
     def renderGameOverlay(self, a):
-        scaledWidth = self.__mc.width * 240 // self.__mc.height
-        scaledHeight = self.__mc.height * 240 // self.__mc.height
+        scaledRes = ScaledResolution(self.__mc.width, self.__mc.height)
+        scaledWidth = scaledRes.getScaledWidth()
+        scaledHeight = scaledRes.getScaledHeight()
         self.__mc.entityRenderer.setupOverlayRendering()
         gl.glBindTexture(gl.GL_TEXTURE_2D, self.__mc.renderEngine.getTexture('gui/gui.png'))
         gl.glColor4f(1.0, 1.0, 1.0, 1.0)