Workbench peripheral

Author: neumond

computercraft/subapis/peripheral.py

@@ -4,6 +4,7 @@
 
 from .base import BaseSubAPI
 from .mixins import TermMixin, TermTarget
+from .turtle import craft_result
 from ..lua import LuaNum, lua_args
 from ..rproc import (
     boolean, nil, integer, string, option_integer, option_string,
@@ -248,13 +249,19 @@ async def runCommand(self):
         return try_result(await self._send('runCommand'))
 
 
+class CCWorkbench(BasePeripheral):
+    async def craft(self, quantity: int = 64) -> bool:
+        return craft_result(await self._send('craft', quantity))
+
+
 TYPE_MAP = {
     'drive': CCDrive,
     'monitor': CCMonitor,
     'computer': CCComputer,
     'printer': CCPrinter,
     'speaker': CCSpeaker,
     'command': CCCommandBlock,
+    'workbench': CCWorkbench,
 }
 
 

computercraft/subapis/turtle.py

@@ -55,7 +55,7 @@ def always_true(r):
 
 
 class TurtleAPI(BaseSubAPI):
-    async def craft(self, quantity: int = 1) -> bool:
+    async def craft(self, quantity: int = 64) -> bool:
         return craft_result(await self._send('craft', quantity))
 
     async def forward(self) -> bool:

testmod.py

@@ -2077,27 +2077,34 @@ async def test_turtle(api):
     assert await api.turtle.dropUp() is True
     assert await api.turtle.getItemCount() == 0
 
-    await step(
-        api,
-        'Clean inventory of turtle\n'
-        'Put crafting table into slot 1\n'
-        'Put 8 cobblestones into slot 2',
-    )
+    async def craft1():
+        return await api.turtle.craft()
 
+    async def craft2():
+        c = await api.peripheral.wrap('right')
+        return await c.craft()
+
+    await step(api, 'Put crafting table into slot 1')
     assert await api.turtle.select(1) is None
     assert await api.turtle.equipRight() is None
 
-    assert await api.turtle.select(2) is None
-    assert await api.turtle.craft() is False
-    for idx in [1, 3, 5, 7, 9, 10, 11]:
-        assert await api.turtle.transferTo(idx, 1)
-    assert await api.turtle.craft() is True
-
-    assert await api.turtle.select(1) is None
-    assert await api.turtle.getItemDetail(1) == {
-        'count': 1,
-        'name': 'minecraft:furnace',
-    }
+    for craft_fn in craft1, craft2:
+        await step(
+            api,
+            'Clean inventory of turtle\n'
+            'Put 8 cobblestones into slot 1',
+        )
+
+        assert await api.turtle.select(1) is None
+        assert await craft_fn() is False
+        for idx in [2, 3, 5, 7, 9, 10, 11]:
+            assert await api.turtle.transferTo(idx, 1)
+        assert await craft_fn() is True
+        assert await craft_fn() is False
+        assert await api.turtle.getItemDetail() == {
+            'count': 1,
+            'name': 'minecraft:furnace',
+        }
 
     await api.print('Test finished successfully')