amulet-core 2.0a6__cp311-cp311-win_amd64.whl → 2.0a7__cp311-cp311-win_amd64.whl

amulet/__init__.py.cpp

@@ -18,6 +18,10 @@ void init_amulet(py::module m){
     if (init_run){ return; }
     init_run = true;
 
+    // This is normally added after initilsation but we need it to pass to subpackages.
+    // This may cause issues with frozen installs.
+    m.attr("__path__") = py::module::import("importlib.util").attr("find_spec")("amulet").attr("submodule_search_locations");
+
     py::module::import("amulet_nbt");
 
     py::module::import("amulet._init").attr("init")(m);

amulet/__init__.pyi

@@ -14,7 +14,6 @@ from . import (
 )
 
 __all__ = [
-    "IMG_DIRECTORY",
     "biome",
     "block",
     "block_entity",
@@ -26,5 +25,4 @@ __all__ = [
     "utils",
     "version",
 ]
-IMG_DIRECTORY: str
 __version__: str

amulet/_init.py

@@ -12,8 +12,6 @@ def init(m: Any) -> None:
 
     # m.entity_support = False
 
-    m.IMG_DIRECTORY = os.path.join(os.path.dirname(__file__), "img")
-
     # Initialise default paths. Applications should override these environment variables.
     # os.environ.setdefault("DATA_DIR", platformdirs.user_data_dir("AmuletTeam", "AmuletTeam"))
     # os.environ.setdefault("CONFIG_DIR", platformdirs.user_config_dir("AmuletTeam", "AmuletTeam"))

amulet/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-09-18T10:56:38+0100",
+ "date": "2024-09-25T13:37:55+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "6ed1d429cbd7c4f21d779c7e4ac65ddc90512b80",
- "version": "2.0a6"
+ "full-revisionid": "bef077cfb019dd2608e14edab047d37d75dfba61",
+ "version": "2.0a7"
 }
 '''  # END VERSION_JSON
 

amulet/biome.pyi

@@ -29,7 +29,6 @@ class Biome(amulet.version.PlatformVersionContainer):
     @typing.overload
     def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
     def __ge__(self, arg0: Biome) -> bool: ...
-    def __getstate__(self) -> bytes: ...
     def __gt__(self, arg0: Biome) -> bool: ...
     def __hash__(self) -> int: ...
     def __init__(
@@ -42,7 +41,6 @@ class Biome(amulet.version.PlatformVersionContainer):
     def __le__(self, arg0: Biome) -> bool: ...
     def __lt__(self, arg0: Biome) -> bool: ...
     def __repr__(self) -> str: ...
-    def __setstate__(self, arg0: bytes) -> None: ...
     @property
     def base_name(self) -> str:
         """

amulet/block.pyi

@@ -74,7 +74,6 @@ class Block(amulet.version.PlatformVersionContainer):
     @typing.overload
     def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
     def __ge__(self, arg0: Block) -> bool: ...
-    def __getstate__(self) -> bytes: ...
     def __gt__(self, arg0: Block) -> bool: ...
     def __hash__(self) -> int: ...
     def __init__(
@@ -95,7 +94,6 @@ class Block(amulet.version.PlatformVersionContainer):
     def __le__(self, arg0: Block) -> bool: ...
     def __lt__(self, arg0: Block) -> bool: ...
     def __repr__(self) -> str: ...
-    def __setstate__(self, arg0: bytes) -> None: ...
     @property
     def base_name(self) -> str:
         """

amulet/block_entity.pyi

@@ -17,7 +17,6 @@ class BlockEntity(amulet.version.PlatformVersionContainer):
     def __eq__(self, arg0: BlockEntity) -> bool: ...
     @typing.overload
     def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
-    def __getstate__(self) -> bytes: ...
     def __hash__(self) -> int: ...
     def __init__(
         self,
@@ -28,7 +27,6 @@ class BlockEntity(amulet.version.PlatformVersionContainer):
         nbt: amulet_nbt.NamedTag,
     ) -> None: ...
     def __repr__(self) -> str: ...
-    def __setstate__(self, arg0: bytes) -> None: ...
     @property
     def base_name(self) -> str:
         """

amulet/chunk.pyi

@@ -7,8 +7,6 @@ class Chunk:
     A base class for all chunk classes.
     """
 
-    def __getstate__(self) -> tuple: ...
-    def __setstate__(self, arg0: tuple) -> None: ...
     def reconstruct_chunk(self, arg0: dict[str, bytes | None]) -> None:
         """
         This is private. Do not use this. It will be removed in the future.

amulet/chunk_components.pyi

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import collections.abc
 import types
 import typing
 
@@ -8,6 +9,7 @@ import amulet.collections
 import amulet.palette.block_palette
 import amulet.version
 import numpy
+import numpy.typing
 import typing_extensions
 
 __all__ = ["BlockComponent", "BlockComponentData", "IndexArray3D", "SectionArrayMap"]
@@ -33,11 +35,6 @@ class IndexArray3D:
     A 3D index array.
     """
 
-    def __buffer__(self, flags):
-        """
-        Return a buffer object that exposes the underlying memory of the object.
-        """
-
     @typing.overload
     def __init__(self, shape: tuple[int, int, int]) -> None: ...
     @typing.overload
@@ -46,11 +43,6 @@ class IndexArray3D:
     def __init__(self, other: IndexArray3D) -> None: ...
     @typing.overload
     def __init__(self, arg0: typing_extensions.Buffer) -> None: ...
-    def __release_buffer__(self, buffer):
-        """
-        Release the buffer object that exposes the underlying memory of the object.
-        """
-
     @property
     def shape(self) -> tuple[int, int, int]: ...
     @property
@@ -64,7 +56,7 @@ class SectionArrayMap:
     def __contains__(self, arg0: int) -> bool: ...
     def __delitem__(self, arg0: int) -> None: ...
     def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
-    def __getitem__(self, arg0: int) -> typing.Any: ...
+    def __getitem__(self, arg0: int) -> numpy.typing.NDArray[numpy.uint32]: ...
     def __hash__(self) -> int: ...
     def __init__(
         self,
@@ -76,15 +68,25 @@ class SectionArrayMap:
     def __setitem__(
         self, arg0: int, arg1: IndexArray3D | typing_extensions.Buffer
     ) -> None: ...
-    def get(self, arg0: typing.Any, arg1: typing.Any) -> typing.Any: ...
-    def items(self) -> typing.Any: ...
-    def keys(self) -> typing.Any: ...
-    def pop(self, key: typing.Any, default: typing.Any = ...) -> typing.Any: ...
-    def popitem(self) -> tuple[typing.Any, typing.Any]: ...
+    def get(
+        self, arg0: int, arg1: numpy.typing.NDArray[numpy.uint32] | None
+    ) -> numpy.typing.NDArray[numpy.uint32] | None: ...
+    def items(
+        self,
+    ) -> collections.abc.ItemsView[int, numpy.typing.NDArray[numpy.uint32]]: ...
+    def keys(self) -> collections.abc.KeysView[int]: ...
+    def pop(
+        self, key: int, default: numpy.typing.NDArray[numpy.uint32] = ...
+    ) -> numpy.typing.NDArray[numpy.uint32]: ...
+    def popitem(self) -> tuple[int, numpy.typing.NDArray[numpy.uint32]]: ...
     def populate(self, arg0: int) -> None: ...
-    def setdefault(self, arg0: typing.Any, arg1: typing.Any) -> typing.Any: ...
+    def setdefault(
+        self, arg0: int, arg1: numpy.typing.NDArray[numpy.uint32] | None
+    ) -> numpy.typing.NDArray[numpy.uint32] | None: ...
     def update(self, other: typing.Any = (), **kwargs) -> None: ...
-    def values(self) -> typing.Any: ...
+    def values(
+        self,
+    ) -> collections.abc.ValuesView[numpy.typing.NDArray[numpy.uint32]]: ...
     @property
     def array_shape(self) -> tuple[int, int, int]: ...
     @property

amulet/collections/eq.py.hpp

@@ -30,7 +30,7 @@ void Eq_default(clsT cls) {
     py::object NotImplemented = py::module::import("builtins").attr("NotImplemented");
     cls.def(
         "__eq__",
-        [NotImplemented](const typename clsT::type& self, py::object other) -> std::variant<bool, py::types::NotImplementedType> {
+        [NotImplemented](const typename clsT::type& self, py::object other) -> std::variant<bool, Amulet::pybind11::types::NotImplementedType> {
             return NotImplemented;
         }
     );

amulet/collections/mapping.py.hpp

@@ -3,8 +3,11 @@
 #include <memory>
 
 #include <pybind11/pybind11.h>
+#include <pybind11/typing.h>
 
 #include <amulet/pybind11/types.hpp>
+#include <amulet/pybind11/type_hints.hpp>
+#include <amulet/pybind11/collections.hpp>
 #include "iterator.py.hpp"
 
 namespace py = pybind11;
@@ -35,11 +38,11 @@ namespace collections {
 		);
 	}
 
-	template <typename clsT>
+	template <typename KT = py::object, typename clsT>
 	void PyMapping_contains(clsT cls) {
 		cls.def(
 			"__contains__",
-			[](py::object self, py::object key) {  
+			[](py::object self, Amulet::pybind11::type_hints::PyObjectCpp<KT> key) {
 				try {
 					self.attr("__getitem__")(key);
 					return true;
@@ -56,38 +59,42 @@ namespace collections {
 		);
 	}
 
-	template <typename clsT>
+	template <typename KT = py::object, typename clsT>
 	void PyMapping_keys(clsT cls) {
 		py::object KeysView = py::module::import("collections.abc").attr("KeysView");
 		cls.def(
 			"keys",
-			[KeysView](py::object self) { return KeysView(self); }
+			[KeysView](py::object self) -> Amulet::pybind11::collections::KeysView<KT> { return KeysView(self); }
 		);
 	}
 
-	template <typename clsT>
+	template <typename VT = py::object, typename clsT>
 	void PyMapping_values(clsT cls) {
 		py::object ValuesView = py::module::import("collections.abc").attr("ValuesView");
 		cls.def(
 			"values",
-			[ValuesView](py::object self) { return ValuesView(self); }
+			[ValuesView](py::object self) -> Amulet::pybind11::collections::ValuesView<VT> { return ValuesView(self); }
 		);
 	}
 
-	template <typename clsT>
+	template <typename KT = py::object, typename VT = py::object, typename clsT>
 	void PyMapping_items(clsT cls) {
 		py::object ItemsView = py::module::import("collections.abc").attr("ItemsView");
 		cls.def(
 			"items",
-			[ItemsView](py::object self) { return ItemsView(self); }
+			[ItemsView](py::object self) -> Amulet::pybind11::collections::ItemsView<KT, VT> { return ItemsView(self); }
 		);
 	}
 
-	template <typename clsT>
+	template <typename KT = py::object, typename VT = py::object, typename clsT>
 	void PyMapping_get(clsT cls) {
 		cls.def(
 			"get",
-			[](py::object self, py::object key, py::object default_ = py::none()) {
+			[](
+				py::object self, 
+				Amulet::pybind11::type_hints::PyObjectCpp<KT> key, 
+				py::typing::Optional<VT> default_ = py::none()
+			) -> py::typing::Optional<VT> {
 				try {
 					return self.attr("__getitem__")(key);
 				}
@@ -119,7 +126,7 @@ namespace collections {
 			](
 				py::object self, 
 				py::object other
-			) -> std::variant<bool, py::types::NotImplementedType> {
+			) -> std::variant<bool, Amulet::pybind11::types::NotImplementedType> {
 				if (!isinstance(other, PyMapping)) {
 					return NotImplemented;
 				}

amulet/collections/mutable_mapping.py.hpp

@@ -10,12 +10,16 @@ namespace py = pybind11;
 
 namespace Amulet {
 namespace collections {
-	template <typename clsT>
+	template <typename KT = py::object, typename VT = py::object, typename clsT>
 	void PyMutableMapping_pop(clsT cls) {
 		py::object marker = py::module::import("builtins").attr("Ellipsis");
 		cls.def(
 			"pop",
-			[marker](py::object self, py::object key, py::object default_) {
+			[marker](
+				py::object self, 
+				Amulet::pybind11::type_hints::PyObjectCpp<KT> key, 
+				Amulet::pybind11::type_hints::PyObjectCpp<VT> default_
+			) -> Amulet::pybind11::type_hints::PyObjectCpp<VT> {
 				py::object value;
 				try {
 					value = self.attr("__getitem__")(key);
@@ -39,13 +43,16 @@ namespace collections {
 		);
 	}
 
-	template <typename clsT>
+	template <typename KT = py::object, typename VT = py::object, typename clsT>
 	void PyMutableMapping_popitem(clsT cls) {
 		py::object iter = py::module::import("builtins").attr("iter");
 		py::object next = py::module::import("builtins").attr("next");
 		cls.def(
 			"popitem",
-			[iter, next](py::object self) {
+			[iter, next](py::object self) -> std::pair<
+				Amulet::pybind11::type_hints::PyObjectCpp<KT>,
+				Amulet::pybind11::type_hints::PyObjectCpp<VT>
+			> {
 				py::object key;
 				try {
 					key = next(iter(self));
@@ -132,11 +139,15 @@ namespace collections {
 		);
 	}
 
-	template <typename clsT>
+	template <typename KT = py::object, typename VT = py::object, typename clsT>
 	void PyMutableMapping_setdefault(clsT cls) {
 		cls.def(
 			"setdefault",
-			[](py::object self, py::object key, py::object default_ = py::none()) {
+			[](
+				py::object self, 
+				Amulet::pybind11::type_hints::PyObjectCpp<KT> key,
+				py::typing::Optional<VT> default_ = py::none()
+			) -> py::typing::Optional<VT> {
 				try {
 					return self.attr("__getitem__")(key);
 				}

amulet/collections/sequence.py.hpp

@@ -7,7 +7,6 @@
 #include <pybind11/pybind11.h>
 #include "iterator.py.hpp"
 #include <amulet/pybind11/collections.hpp>
-#include <amulet/pybind11/python.hpp>
 
 namespace py = pybind11;
 
@@ -41,7 +40,7 @@ namespace Amulet {
 				[](py::object self, py::object value) {
 					py::iterator it = py::iter(self);
 					while (it != py::iterator::sentinel()) {
-						if (py::equals(*it, value)) {
+						if (it->equal(value)) {
 							return true;
 						}
 						++it;
@@ -55,7 +54,7 @@ namespace Amulet {
 		void Sequence_iter(clsT cls) {
 			cls.def(
 				"__iter__",
-				[](py::object self) -> py::collections::Iterator<elemT> {
+				[](py::object self) -> Amulet::pybind11::collections::Iterator<elemT> {
 					return py::cast(
 						static_cast<std::shared_ptr<Amulet::collections::Iterator>>(
 							std::make_shared<PySequenceIterator>(self, 0, 1)
@@ -69,7 +68,7 @@ namespace Amulet {
 		void Sequence_reversed(clsT cls) {
 			cls.def(
 				"__reversed__",
-				[](py::object self) -> py::collections::Iterator<elemT> {
+				[](py::object self) -> Amulet::pybind11::collections::Iterator<elemT> {
 					return py::cast(
 						static_cast<std::shared_ptr<Amulet::collections::Iterator>>(
 							std::make_shared<PySequenceIterator>(self, py::len(self) - 1, -1)
@@ -114,7 +113,7 @@ namespace Amulet {
 							}
 						}
 
-						if (py::equals(value, obj)) {
+						if (value.equal(obj)) {
 							return start;
 						}
 
@@ -135,7 +134,7 @@ namespace Amulet {
 					size_t size = py::len(self);
 					py::object getitem = self.attr("__getitem__");
 					for (size_t i = 0; i < size; ++i) {
-						if (py::equals(value, getitem(i))) {
+						if (value.equal(getitem(i))) {
 							count++;
 						}
 					}

amulet/collections.pyi

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import collections.abc
 import types
 import typing
 
@@ -22,10 +23,10 @@ class Mapping:
     def __iter__(self) -> typing.Iterator: ...
     def __len__(self) -> int: ...
     def __repr__(self) -> str: ...
-    def get(self, arg0: typing.Any, arg1: typing.Any) -> typing.Any: ...
-    def items(self) -> typing.Any: ...
-    def keys(self) -> typing.Any: ...
-    def values(self) -> typing.Any: ...
+    def get(self, arg0: typing.Any, arg1: typing.Any | None) -> typing.Any | None: ...
+    def items(self) -> collections.abc.ItemsView[typing.Any, typing.Any]: ...
+    def keys(self) -> collections.abc.KeysView[typing.Any]: ...
+    def values(self) -> collections.abc.ValuesView[typing.Any]: ...
 
 class MutableMapping(Mapping):
     def __delitem__(self, arg0: typing.Any) -> None: ...
@@ -33,5 +34,7 @@ class MutableMapping(Mapping):
     def clear(self) -> None: ...
     def pop(self, key: typing.Any, default: typing.Any = ...) -> typing.Any: ...
     def popitem(self) -> tuple[typing.Any, typing.Any]: ...
-    def setdefault(self, arg0: typing.Any, arg1: typing.Any) -> typing.Any: ...
+    def setdefault(
+        self, arg0: typing.Any, arg1: typing.Any | None
+    ) -> typing.Any | None: ...
     def update(self, other: typing.Any = (), **kwargs) -> None: ...

amulet/entity.py

@@ -54,28 +54,30 @@ class Entity(PlatformVersionContainer):
         self._nbt = nbt
 
     def __getstate__(self) -> tuple[tuple[str, VersionNumber], tuple[str, str, float, float, float, NamedTag]]:  # type: ignore[override]
-        return (
-            super().__getstate__(),
-            (
-                self._namespace,
-                self._base_name,
-                self._x,
-                self._y,
-                self._z,
-                self._nbt,
-            ),
-        )
+        raise NotImplementedError
+        # return (
+        #     super().__getstate__(),
+        #     (
+        #         self._namespace,
+        #         self._base_name,
+        #         self._x,
+        #         self._y,
+        #         self._z,
+        #         self._nbt,
+        #     ),
+        # )
 
     def __setstate__(self, state: tuple[tuple[str, VersionNumber], tuple[str, str, float, float, float, NamedTag]]) -> None:  # type: ignore[override]
-        super().__setstate__(state[0])
-        (
-            self._namespace,
-            self._base_name,
-            self._x,
-            self._y,
-            self._z,
-            self._nbt,
-        ) = state[1]
+        raise NotImplementedError
+        # super().__setstate__(state[0])
+        # (
+        #     self._namespace,
+        #     self._base_name,
+        #     self._x,
+        #     self._y,
+        #     self._z,
+        #     self._nbt,
+        # ) = state[1]
 
     def __eq__(self, other: Any) -> bool:
         if not isinstance(other, Entity):

amulet/game/translate/_functions/_code_functions/_text.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import List, overload, Literal, TypeVar
+from typing import overload, Literal, TypeVar
 from dataclasses import dataclass, field
 from copy import deepcopy
 from enum import Enum
@@ -336,7 +336,7 @@ class RawTextComponent:
         section_text: str,
         section_parser: type[AbstractSectionParser],
         split_newline: Literal[True],
-    ) -> List[RawTextComponent]: ...
+    ) -> list[RawTextComponent]: ...
 
     @classmethod
     def from_section_text(

amulet/game/translate/_functions/abc.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from typing import Any, Protocol, cast, Self, ClassVar
-from abc import ABC, abstractmethod, ABCMeta
+from typing import Any, Protocol, cast, Self, ClassVar, TypeVar
+from abc import abstractmethod, ABCMeta
 
 from amulet_nbt import (
     read_snbt,
@@ -65,10 +65,17 @@ class Data(Protocol):
     def __eq__(self, other: Any) -> bool: ...
 
 
+class TranslationFunctionProtocol(Protocol):
+    _instances: ClassVar[dict[Self, Self]]
+
+
+T = TypeVar("T", bound=TranslationFunctionProtocol)
+
+
 class CacheMeta(ABCMeta):
     """This modifies the construction of the instance to always return a cached instance, if one exists."""
 
-    def __call__(cls: type[AbstractBaseTranslationFunction], *args: Any, **kwargs: Any) -> AbstractBaseTranslationFunction:  # type: ignore
+    def __call__(cls: type[T], *args: Any, **kwargs: Any) -> T:  # type: ignore
         obj = cls.__new__(cls)
         obj.__init__(*args, **kwargs)  # type: ignore
         return cls._instances.setdefault(obj, obj)

amulet/img/__init__.py

@@ -0,0 +1,10 @@
+import os
+
+
+def _get_path(file: str) -> str:
+    return os.path.abspath(os.path.join(os.path.dirname(__file__), file))
+
+
+missing_no_icon_path = _get_path("missing_no.png")
+missing_pack_icon_path = _get_path("missing_pack.png")
+missing_world_icon_path = _get_path("missing_world.png")

amulet/level/__init__.pyi

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import typing
-
 from amulet.level._load import (
     NoValidLevel,
     get_level,
@@ -11,17 +9,15 @@ from amulet.level._load import (
 from amulet.level.abc._level._level import Level
 from amulet.level.java._level import JavaLevel
 
-from . import java
+from . import _load, abc, java
 
 __all__ = [
     "JavaLevel",
     "Level",
     "NoValidLevel",
+    "abc",
     "get_level",
     "java",
     "register_level_class",
     "unregister_level_class",
 ]
-
-def __dir__() -> typing.Any: ...
-def __getattr__(arg0: typing.Any) -> typing.Any: ...

amulet/level/abc/_level/_creatable_level.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any
 
-from amulet.utils.typing import Intersection
 from amulet.utils.call_spec import method_spec
 
 
@@ -18,7 +17,7 @@ class CreatableLevel(ABC):
     @classmethod
     @abstractmethod
     @method_spec()
-    def create(cls, *args: Any, **kwargs: Any) -> Intersection[Level, CreatableLevel]:
+    def create(cls, *args: Any, **kwargs: Any) -> Level:
         """
         Create a new instance without any existing data.
         You must call :meth:`~amulet.level.abc.Level.open` to open the level for editing.

amulet/level/abc/_level/_level.py

@@ -3,16 +3,15 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Optional, TypeVar, Type, Generic, Iterator, Callable
 from contextlib import contextmanager, AbstractContextManager as ContextManager
-import os
 import logging
 from weakref import finalize
 
 from runtime_final import final
 from PIL import Image
 
-from amulet import IMG_DIRECTORY
 from amulet.version import PlatformType, VersionNumber
 from amulet.data_types import DimensionId
+from amulet.img import missing_world_icon_path
 
 from amulet.chunk import Chunk
 
@@ -31,9 +30,6 @@ if TYPE_CHECKING:
 
 log = logging.getLogger(__name__)
 
-missing_world_icon_path = os.path.abspath(
-    os.path.join(IMG_DIRECTORY, "missing_world_icon.png")
-)
 missing_world_icon: Optional[Image.Image] = None
 
 

amulet/level/java/__init__.pyi

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import typing
-
 from amulet.level.java._level import JavaLevel
 
 from . import (
@@ -16,6 +14,3 @@ from . import (
 )
 
 __all__ = ["JavaLevel", "anvil", "chunk", "chunk_components", "long_array"]
-
-def __dir__() -> typing.Any: ...
-def __getattr__(arg0: typing.Any) -> typing.Any: ...

amulet/level/java/_raw/__init__.pyi

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import typing
 from builtins import str as InternalDimensionId
 
 from amulet.level.java._raw._dimension import JavaRawDimension
@@ -14,6 +13,3 @@ __all__ = [
     "JavaRawDimension",
     "JavaRawLevel",
 ]
-
-def __dir__() -> typing.Any: ...
-def __getattr__(arg0: typing.Any) -> typing.Any: ...