py2hackCraft2 1.1.41__tar.gz → 1.1.43__tar.gz

{py2hackcraft2-1.1.41 → py2hackcraft2-1.1.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py2hackCraft2
-Version: 1.1.41
+Version: 1.1.43
 Summary: Python client library for hackCraft2
 Home-page: https://github.com/0x48lab/hackCraft2-python
 Author: masafumi_t

{py2hackcraft2-1.1.41 → py2hackcraft2-1.1.43}/py2hackCraft/modules.py

@@ -1920,3 +1920,349 @@ class Entity:
         self.client.send_call(self.uuid, "blockColor", [color])
         block = Block(** json.loads(self.client.result))
         return block
+
+    def _convert_recipe_pattern(self, recipe):
+        """
+        Convert recipe pattern to comma-separated string format.
+
+        Handles two input formats:
+        1. String: "1,1,1,,2,,,2" -> returns as-is
+        2. List: [1,1,1,None,2,None,None,2] -> "1,1,1,,2,,,2"
+
+        Args:
+            recipe: Recipe pattern as string or list
+
+        Returns:
+            str: Comma-separated string pattern
+
+        Raises:
+            ValueError: If pattern is invalid
+        """
+        # If already a string, validate and return
+        if isinstance(recipe, str):
+            if not recipe.strip():
+                raise ValueError("Pattern cannot be empty")
+
+            elements = recipe.split(",")
+            if len(elements) > 9:
+                raise ValueError(f"Pattern exceeds 3x3 grid size (max 9 elements, got {len(elements)})")
+
+            # Validate each non-empty element is a valid number or 'X'
+            for i, element in enumerate(elements):
+                trimmed = element.strip()
+                if trimmed:
+                    # Allow 'X' or 'x' as AIR placeholder
+                    if trimmed.upper() == 'X':
+                        continue
+                    try:
+                        int(trimmed)
+                        # Allow any integer (negative values are treated as AIR on server)
+                    except ValueError as e:
+                        if "invalid literal" in str(e):
+                            raise ValueError(f"Invalid slot number at position {i}: '{element}' (use number or 'X' for empty)")
+                        raise
+
+            return recipe
+
+        # List format
+        if isinstance(recipe, list):
+            if len(recipe) == 0:
+                raise ValueError("Pattern list cannot be empty")
+
+            if len(recipe) > 9:
+                raise ValueError(f"Pattern exceeds 3x3 grid size (max 9 elements, got {len(recipe)})")
+
+            # Validate and convert to string
+            result = []
+            for i, slot in enumerate(recipe):
+                if slot is None or slot == "":
+                    result.append("")
+                elif isinstance(slot, str):
+                    # Allow 'X' or 'x' as AIR placeholder, convert to -1
+                    if slot.strip().upper() == 'X':
+                        result.append("-1")
+                    else:
+                        raise ValueError(f"Invalid slot value at position {i}: '{slot}' (use number, None, or 'X')")
+                elif isinstance(slot, int):
+                    # Allow any integer (negative values are treated as AIR on server)
+                    result.append(str(slot))
+                else:
+                    raise ValueError(f"Invalid slot value at position {i}: {slot}")
+
+            return ",".join(result)
+
+        raise ValueError("Recipe pattern must be a string or list")
+
+    def craft(self, recipe, qty=1, slot=None):
+        """
+        ペットのインベントリにある材料を使ってアイテムをクラフトする。
+
+        引数:
+            recipe: レシピパターン（文字列またはリスト形式）
+                - 文字列形式: "1,1,1,X,2,X,X,2,X" （カンマ区切りのスロット番号、空は X または空文字）
+                - リスト形式: [1,1,1,"X",2,"X","X",2,"X"] または [1,1,1,None,2,None,None,2,None]
+                - スロット番号は0から始まる（0=スロット1）
+                - 負の数(-1など)も空気として扱われる
+            qty: クラフトする個数（デフォルト: 1）
+            slot: 結果を配置するスロット番号（デフォルト: None = 自動配置）
+
+        戻り値:
+            dict: クラフト結果（以下の構造）
+                {
+                    "success": bool,              # 成功したか
+                    "result_item": str | None,    # 作成されたアイテム名
+                    "result_quantity": int | None,# 作成された個数
+                    "requested_quantity": int,    # リクエストした個数
+                    "result_slot": int | None,    # 配置されたスロット
+                    "materials_consumed": dict,   # 消費された材料
+                    "game_mode": str,             # ゲームモード
+                    "error": dict | None          # エラー情報
+                }
+
+        使用例:
+            >>> # パンをクラフト（スロット0に小麦3つ）
+            >>> result = entity.craft("0,0,0")
+            >>> if result["success"]:
+            >>>     print(f"{result['result_item']}を{result['result_quantity']}個作ったよ！")
+
+            >>> # リスト形式でつるはしをクラフト
+            >>> result = entity.craft([3,3,3,"X",4,"X","X",4,"X"])
+
+            >>> # 複数個クラフトして、スロット10に配置
+            >>> result = entity.craft("0,0,0", qty=5, slot=10)
+
+            >>> # エラー処理
+            >>> result = entity.craft("0,0,0")
+            >>> if not result["success"]:
+            >>>     error = result["error"]
+            >>>     print(f"エラー: {error['message']}")
+            >>>     if error["code"] == "INSUFFICIENT_MATERIALS":
+            >>>         print("材料が足りないよ")
+        """
+        # Convert recipe to string format
+        pattern = self._convert_recipe_pattern(recipe)
+
+        # Prepare arguments
+        args = [pattern, qty]
+        if slot is not None:
+            args.append(slot)
+
+        # Send craft request
+        self.client.send_call(self.uuid, "craft", args)
+
+        # Parse response
+        result = json.loads(self.client.result)
+
+        return result
+
+    # ===== Livestock Methods =====
+
+    def livestock_count_nearby(self, animal_type: str = "ALL", radius: float = 50.0) -> int:
+        """
+        近くの動物を数える
+        
+        Args:
+            animal_type (str): 動物種別（COW, PIG, SHEEP, CHICKEN, RABBIT, HORSE, ALL）
+            radius (float): 検索半径（ブロック数）
+            
+        Returns:
+            int: 動物の数
+            
+        Example:
+            >>> count = entity.livestock_count_nearby("COW", 50)
+            >>> print(f"Found {count} cows")
+        """
+        self.client.send_call(self.uuid, "livestockCountNearby", [animal_type, radius])
+        result = json.loads(self.client.result)
+        if not result.get('success', False):
+            raise Exception(f"Livestock operation failed: {result.get('message', 'Unknown error')}")
+        return result.get('data', {}).get('count', 0)
+
+    def livestock_get_nearest_uuid(self, animal_type: str = "ALL", radius: float = 50.0) -> Optional[str]:
+        """
+        最も近い動物のUUIDを取得
+        
+        Args:
+            animal_type (str): 動物種別（COW, PIG, SHEEP, CHICKEN, RABBIT, HORSE, ALL）
+            radius (float): 検索半径（ブロック数）
+            
+        Returns:
+            Optional[str]: 動物のUUID（見つからない場合はNone）
+            
+        Example:
+            >>> cow_uuid = entity.livestock_get_nearest_uuid("COW", 50)
+            >>> if cow_uuid:
+            >>>     print(f"Found cow: {cow_uuid}")
+        """
+        self.client.send_call(self.uuid, "livestockGetNearestUuid", [animal_type, radius])
+        result = json.loads(self.client.result)
+        if not result.get('success', False):
+            raise Exception(f"Livestock operation failed: {result.get('message', 'Unknown error')}")
+        uuid = result.get('data', {}).get('uuid')
+        return uuid if uuid else None
+
+    def livestock_find_nearby(self, animal_type: str = "ALL", radius: float = 50.0) -> list:
+        """
+        近くの動物を詳細情報付きで検索
+        
+        Args:
+            animal_type (str): 動物種別（COW, PIG, SHEEP, CHICKEN, RABBIT, HORSE, ALL）
+            radius (float): 検索半径（ブロック数）
+            
+        Returns:
+            list: 動物情報の辞書リスト
+            
+        Example:
+            >>> animals = entity.livestock_find_nearby("SHEEP", 30)
+            >>> for animal in animals:
+            >>>     print(f"{animal['animalType']} at distance {animal['distance']}")
+        """
+        self.client.send_call(self.uuid, "livestockFindNearby", [animal_type, radius])
+        result = json.loads(self.client.result)
+        if not result.get('success', False):
+            raise Exception(f"Livestock operation failed: {result.get('message', 'Unknown error')}")
+        return result.get('data', {}).get('entities', [])
+
+    def livestock_herd(self, animal_uuid: str, x: float, y: float, z: float, cord: str = "^", speed: float = 1.0) -> None:
+        """
+        動物を指定座標に誘導
+        
+        Args:
+            animal_uuid (str): 動物のUUID
+            x (float): 目標X座標
+            y (float): 目標Y座標
+            z (float): 目標Z座標
+            cord (str): 座標系（"": 絶対座標, "~": 相対座標, "^": ローカル座標、デフォルト: "^"）
+            speed (float): 移動速度（0.5-2.0、デフォルト1.0）
+            
+        Example:
+            >>> entity.livestock_herd(cow_uuid, 100, 64, 200, "^", 1.0)
+        """
+        self.client.send_call(animal_uuid, "livestockHerd", [x, y, z, cord, speed])
+        result = json.loads(self.client.result)
+        if not result.get('success', False):
+            raise Exception(f"Herd operation failed: {result.get('message', 'Unknown error')}")
+
+    def livestock_herd_all_nearby(
+        self, 
+        animal_type: str, 
+        radius: float, 
+        x: float, 
+        y: float, 
+        z: float, 
+        cord: str = "^",
+        speed: float = 1.0
+    ) -> int:
+        """
+        近くの動物すべてを指定座標に誘導
+        
+        Args:
+            animal_type (str): 動物種別（COW, PIG, SHEEP, CHICKEN, RABBIT, HORSE, ALL）
+            radius (float): 検索半径（ブロック数）
+            x (float): 目標X座標
+            y (float): 目標Y座標
+            z (float): 目標Z座標
+            cord (str): 座標系（"": 絶対座標, "~": 相対座標, "^": ローカル座標、デフォルト: "^"）
+            speed (float): 移動速度（0.5-2.0、デフォルト1.0）
+            
+        Returns:
+            int: 誘導した動物の数
+            
+        Example:
+            >>> count = entity.livestock_herd_all_nearby("COW", 50, 100, 64, 200)
+            >>> print(f"Herded {count} cows")
+        """
+        self.client.send_call(self.uuid, "livestockHerdAllNearby", [animal_type, radius, x, y, z, cord, speed])
+        result = json.loads(self.client.result)
+        if not result.get('success', False):
+            raise Exception(f"Herd all operation failed: {result.get('message', 'Unknown error')}")
+        return result.get('data', {}).get('count', 0)
+
+    def livestock_shear(self, sheep_uuid: str) -> dict:
+        """
+        羊の毛を刈る
+        
+        Args:
+            sheep_uuid (str): 羊のUUID
+            
+        Returns:
+            dict: 羊毛情報 {wool, color, amount}
+            
+        Raises:
+            Exception: 羊毛が生えていない、または羊以外の動物の場合
+            
+        Example:
+            >>> try:
+            >>>     result = entity.livestock_shear(sheep_uuid)
+            >>>     print(f"Got {result['amount']} {result['color']} wool")
+            >>> except Exception as e:
+            >>>     print(f"Cannot shear: {e}")
+        """
+        self.client.send_call(sheep_uuid, "livestockShear", [])
+        result = json.loads(self.client.result)
+        if not result.get('success', False):
+            raise Exception(f"Shear operation failed: {result.get('message', 'Unknown error')}")
+        return result.get('data', {})
+
+    def livestock_milk(self, cow_uuid: str) -> dict:
+        """
+        牛のミルクを搾る
+        
+        Args:
+            cow_uuid (str): 牛のUUID
+            
+        Returns:
+            dict: ミルク情報 {milk, amount}
+            
+        Raises:
+            Exception: 牛以外の動物の場合
+            
+        Example:
+            >>> try:
+            >>>     result = entity.livestock_milk(cow_uuid)
+            >>>     print(f"Got {result['amount']} milk bucket")
+            >>> except Exception as e:
+            >>>     print(f"Cannot milk: {e}")
+        """
+        self.client.send_call(cow_uuid, "livestockMilk", [])
+        result = json.loads(self.client.result)
+        if not result.get('success', False):
+            raise Exception(f"Milk operation failed: {result.get('message', 'Unknown error')}")
+        return result.get('data', {})
+
+    def livestock_feed(self, animal_uuid: str, food_type: str = "wheat") -> None:
+        """
+        動物に餌をやる
+        
+        Args:
+            animal_uuid (str): 動物のUUID
+            food_type (str): 餌種別（wheat, carrot, seeds, beetroot）
+            
+        Example:
+            >>> entity.livestock_feed(cow_uuid, "wheat")
+        """
+        self.client.send_call(animal_uuid, "livestockFeed", [food_type])
+        result = json.loads(self.client.result)
+        if not result.get('success', False):
+            raise Exception(f"Feed operation failed: {result.get('message', 'Unknown error')}")
+
+    def livestock_get_info(self, animal_uuid: str) -> dict:
+        """
+        動物の詳細情報を取得
+        
+        Args:
+            animal_uuid (str): 動物のUUID
+            
+        Returns:
+            dict: 動物の詳細情報
+            
+        Example:
+            >>> info = entity.livestock_get_info(cow_uuid)
+            >>> print(f"Health: {info['health']}/{info['maxHealth']}")
+            >>> print(f"Can breed: {info['canBreed']}")
+        """
+        self.client.send_call(animal_uuid, "livestockInfo", [])
+        result = json.loads(self.client.result)
+        if not result.get('success', False):
+            raise Exception(f"Get info operation failed: {result.get('message', 'Unknown error')}")
+        return result.get('data', {}).get('entityInfo', {})

{py2hackcraft2-1.1.41 → py2hackcraft2-1.1.43}/py2hackCraft2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py2hackCraft2
-Version: 1.1.41
+Version: 1.1.43
 Summary: Python client library for hackCraft2
 Home-page: https://github.com/0x48lab/hackCraft2-python
 Author: masafumi_t

{py2hackcraft2-1.1.41 → py2hackcraft2-1.1.43}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="py2hackCraft2",
-    version="1.1.41",
+    version="1.1.43",
     packages=find_packages(),
     install_requires=[
         "websocket-client>=1.6.0",