From 1097853fe3233a25af7e56ed24408c0789d9d7ab Mon Sep 17 00:00:00 2001 From: gentlegiantJGC Date: Mon, 23 Oct 2023 14:36:12 +0100 Subject: [PATCH] renamed registry to palette --- amulet/api/chunk/chunk.py | 4 ++-- amulet/api/level/base_level/base_level.py | 2 +- amulet/api/level/base_level/clone.py | 2 +- amulet/api/wrapper/chunk/translator.py | 2 +- amulet/api/wrapper/format_wrapper.py | 2 +- amulet/chunk/biome.py | 2 +- amulet/chunk/block.py | 2 +- amulet/level/formats/construction/format_wrapper.py | 2 +- amulet/level/formats/construction/util.py | 2 +- amulet/level/formats/schematic/format_wrapper.py | 2 +- amulet/level/interfaces/chunk/anvil/anvil_2844.py | 2 +- amulet/level/translators/chunk/bedrock/__init__.py | 2 +- .../translators/chunk/java/java_blockstate_translator.py | 2 +- .../level/translators/chunk/java/java_numerical_translator.py | 2 +- amulet/{registry => palette}/__init__.py | 0 amulet/{registry => palette}/biome_palette.py | 0 amulet/{registry => palette}/block_palette.py | 0 tests/test_level/test_blocks.py | 2 +- 18 files changed, 16 insertions(+), 16 deletions(-) rename amulet/{registry => palette}/__init__.py (100%) rename amulet/{registry => palette}/biome_palette.py (100%) rename amulet/{registry => palette}/block_palette.py (100%) diff --git a/amulet/api/chunk/chunk.py b/amulet/api/chunk/chunk.py index 142709f53..8b5ff4167 100644 --- a/amulet/api/chunk/chunk.py +++ b/amulet/api/chunk/chunk.py @@ -5,8 +5,8 @@ import pickle from amulet.block import Block -from amulet.registry import BlockPalette -from amulet.registry import BiomePalette +from amulet.palette import BlockPalette +from amulet.palette import BiomePalette from amulet.api.chunk import ( Biomes, BiomesShape, diff --git a/amulet/api/level/base_level/base_level.py b/amulet/api/level/base_level/base_level.py index d6cf90c3d..cee1f55fd 100644 --- a/amulet/api/level/base_level/base_level.py +++ b/amulet/api/level/base_level/base_level.py @@ -12,7 +12,7 @@ from amulet.block import Block, UniversalAirBlock from amulet.block_entity import BlockEntity from amulet.entity import Entity -from amulet.registry import BlockPalette, BiomePalette +from amulet.palette import BlockPalette, BiomePalette from amulet.api.errors import ChunkDoesNotExist, ChunkLoadError, DimensionDoesNotExist from amulet.api.chunk import Chunk, EntityList from amulet.selection import SelectionGroup, SelectionBox diff --git a/amulet/api/level/base_level/clone.py b/amulet/api/level/base_level/clone.py index b2e6da771..d1cb50e63 100644 --- a/amulet/api/level/base_level/clone.py +++ b/amulet/api/level/base_level/clone.py @@ -8,7 +8,7 @@ from amulet.block import Block, UniversalAirBlock from amulet.api.errors import ChunkDoesNotExist, ChunkLoadError from amulet.api.chunk import Chunk -from amulet.registry import BlockPalette +from amulet.palette import BlockPalette from amulet.utils.matrix import transform_matrix, displacement_matrix import amulet.api.level diff --git a/amulet/api/wrapper/chunk/translator.py b/amulet/api/wrapper/chunk/translator.py index ee0062087..235ce8b0c 100644 --- a/amulet/api/wrapper/chunk/translator.py +++ b/amulet/api/wrapper/chunk/translator.py @@ -8,7 +8,7 @@ import numpy from amulet import entity_support -from amulet.registry import BlockPalette, BiomePalette +from amulet.palette import BlockPalette, BiomePalette from amulet.block import Block from amulet.block_entity import BlockEntity from amulet.entity import Entity diff --git a/amulet/api/wrapper/format_wrapper.py b/amulet/api/wrapper/format_wrapper.py index 1061b8893..536ddc2d7 100644 --- a/amulet/api/wrapper/format_wrapper.py +++ b/amulet/api/wrapper/format_wrapper.py @@ -27,7 +27,7 @@ from amulet.api import level as api_level, wrapper as api_wrapper from amulet.api.chunk import Chunk -from amulet.registry import BlockPalette +from amulet.palette import BlockPalette from amulet.api.errors import ( ChunkLoadError, ChunkDoesNotExist, diff --git a/amulet/chunk/biome.py b/amulet/chunk/biome.py index 528e3acf4..432dec2de 100644 --- a/amulet/chunk/biome.py +++ b/amulet/chunk/biome.py @@ -3,7 +3,7 @@ import numpy from numpy.typing import ArrayLike -from amulet.registry import BiomePalette +from amulet.palette import BiomePalette from .sub_chunk_array import SubChunkArrayContainer diff --git a/amulet/chunk/block.py b/amulet/chunk/block.py index 75fdc78f3..06da7090a 100644 --- a/amulet/chunk/block.py +++ b/amulet/chunk/block.py @@ -2,7 +2,7 @@ from numpy.typing import ArrayLike -from amulet.registry import BlockPalette +from amulet.palette import BlockPalette from .sub_chunk_array import SubChunkArrayContainer diff --git a/amulet/level/formats/construction/format_wrapper.py b/amulet/level/formats/construction/format_wrapper.py index 416da36a8..5a98ff025 100644 --- a/amulet/level/formats/construction/format_wrapper.py +++ b/amulet/level/formats/construction/format_wrapper.py @@ -37,7 +37,7 @@ PlatformType, ChunkCoordinates, ) -from amulet.registry import BlockPalette +from amulet.palette import BlockPalette from amulet.api.wrapper import StructureFormatWrapper from amulet.api.chunk import Chunk from amulet.selection import SelectionGroup, SelectionBox diff --git a/amulet/level/formats/construction/util.py b/amulet/level/formats/construction/util.py index 70a10cbbb..46df0b3c7 100644 --- a/amulet/level/formats/construction/util.py +++ b/amulet/level/formats/construction/util.py @@ -16,7 +16,7 @@ from amulet.block import Block from amulet.entity import Entity from amulet.block_entity import BlockEntity -from amulet.registry import BlockPalette +from amulet.palette import BlockPalette def unpack_palette(raw_palette: ListTag) -> List[Block]: diff --git a/amulet/level/formats/schematic/format_wrapper.py b/amulet/level/formats/schematic/format_wrapper.py index 67f881f45..cf290e979 100644 --- a/amulet/level/formats/schematic/format_wrapper.py +++ b/amulet/level/formats/schematic/format_wrapper.py @@ -30,7 +30,7 @@ PointCoordinates, ChunkCoordinates, ) -from amulet.registry import BlockPalette +from amulet.palette import BlockPalette from amulet.api.wrapper import StructureFormatWrapper from amulet.api.chunk import Chunk from amulet.selection import SelectionBox, SelectionGroup diff --git a/amulet/level/interfaces/chunk/anvil/anvil_2844.py b/amulet/level/interfaces/chunk/anvil/anvil_2844.py index 649588ccd..f7b25f2da 100644 --- a/amulet/level/interfaces/chunk/anvil/anvil_2844.py +++ b/amulet/level/interfaces/chunk/anvil/anvil_2844.py @@ -12,7 +12,7 @@ ) from amulet.api.chunk import Chunk -from amulet.registry import BiomePalette +from amulet.palette import BiomePalette from amulet.api.data_types import AnyNDArray, BiomeType from amulet.utils.world_utils import ( decode_long_array, diff --git a/amulet/level/translators/chunk/bedrock/__init__.py b/amulet/level/translators/chunk/bedrock/__init__.py index 0a89d786b..30c7a6e68 100644 --- a/amulet/level/translators/chunk/bedrock/__init__.py +++ b/amulet/level/translators/chunk/bedrock/__init__.py @@ -8,7 +8,7 @@ from amulet.block import Block -from amulet.registry import BlockPalette +from amulet.palette import BlockPalette from amulet.entity import Entity from amulet.api.wrapper.chunk.translator import Translator from amulet.api.data_types import ( diff --git a/amulet/level/translators/chunk/java/java_blockstate_translator.py b/amulet/level/translators/chunk/java/java_blockstate_translator.py index dcfd2311d..4c0611a68 100644 --- a/amulet/level/translators/chunk/java/java_blockstate_translator.py +++ b/amulet/level/translators/chunk/java/java_blockstate_translator.py @@ -6,7 +6,7 @@ from amulet.api.chunk import Chunk from amulet.api.wrapper import Translator from amulet.block import Block -from amulet.registry import BlockPalette +from amulet.palette import BlockPalette from amulet.api.data_types import ( VersionIdentifierType, AnyNDArray, diff --git a/amulet/level/translators/chunk/java/java_numerical_translator.py b/amulet/level/translators/chunk/java/java_numerical_translator.py index 4e62cfe49..52ca1430e 100644 --- a/amulet/level/translators/chunk/java/java_numerical_translator.py +++ b/amulet/level/translators/chunk/java/java_numerical_translator.py @@ -6,7 +6,7 @@ from amulet.api.chunk import Chunk from amulet.api.wrapper import Translator from amulet.api.data_types import VersionIdentifierType, AnyNDArray, BlockNDArray -from amulet.registry import BlockPalette +from amulet.palette import BlockPalette if TYPE_CHECKING: from PyMCTranslate import Version, TranslationManager diff --git a/amulet/registry/__init__.py b/amulet/palette/__init__.py similarity index 100% rename from amulet/registry/__init__.py rename to amulet/palette/__init__.py diff --git a/amulet/registry/biome_palette.py b/amulet/palette/biome_palette.py similarity index 100% rename from amulet/registry/biome_palette.py rename to amulet/palette/biome_palette.py diff --git a/amulet/registry/block_palette.py b/amulet/palette/block_palette.py similarity index 100% rename from amulet/registry/block_palette.py rename to amulet/palette/block_palette.py diff --git a/tests/test_level/test_blocks.py b/tests/test_level/test_blocks.py index ae66a47fd..6d10cff4e 100644 --- a/tests/test_level/test_blocks.py +++ b/tests/test_level/test_blocks.py @@ -1,6 +1,6 @@ import unittest from amulet.block import Block -from amulet.registry import BlockPalette +from amulet.palette import BlockPalette from amulet.api.errors import BlockException from amulet_nbt import StringTag