amulet-core 2.0a5__cp312-cp312-win_amd64.whl → 2.0a7__cp312-cp312-win_amd64.whl

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/io/binary_reader.hpp

@@ -0,0 +1,45 @@
+#pragma once
+
+#include <string>
+#include <cstdint>
+#include <cstring>
+#include <algorithm>
+#include <bit>
+#include <functional>
+#include <stdexcept>
+#include <memory>
+
+#include <amulet_nbt/io/binary_reader.hpp>
+
+
+namespace Amulet {
+    class BinaryReader: public AmuletNBT::BinaryReader {
+    
+
+    public:
+        BinaryReader(
+            const std::string& input,
+            size_t& position
+        ) : AmuletNBT::BinaryReader(input, position, std::endian::little, [](const std::string& value) {return value; }) {}
+
+        std::string readSizeAndBytes() {
+            std::uint64_t length;
+            readNumericInto<std::uint64_t>(length);
+            // Ensure the buffer is long enough
+            if (position + length > data.size()) {
+                throw std::out_of_range("Cannot read string of length " + std::to_string(length) + " at position " + std::to_string(position));
+            }
+
+            std::string value = data.substr(position, length);
+            position += length;
+            return value;
+        }
+    };
+
+    template <class T>
+    std::shared_ptr<T> deserialise(const std::string& data){
+        size_t position = 0;
+        BinaryReader reader(data, position);
+        return T::deserialise(reader);
+    }
+}

amulet/io/binary_writer.hpp

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <string>
+#include <cstdint>
+#include <cstring>
+#include <algorithm>
+#include <bit>
+#include <functional>
+
+#include <amulet_nbt/io/binary_writer.hpp>
+
+
+namespace Amulet {
+    class BinaryWriter: public AmuletNBT::BinaryWriter {
+        public:
+            BinaryWriter(): AmuletNBT::BinaryWriter(std::endian::little, [](const std::string& value) {return value; }) {}
+
+            void writeSizeAndBytes(const std::string& value) {
+                writeNumeric<std::uint64_t>(value.size());
+                data.append(value);
+            }
+    };
+
+    template <typename T>
+    std::string serialise(const T& obj){
+        BinaryWriter writer;
+        obj.serialise(writer);
+        return writer.getBuffer();
+    }
+}

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: ...