Reorganize model files to simplify hierarchy

mcpacker/format/datapack/biomemodifier/removespawn.py

@@ -1,6 +1,6 @@
 from collections.abc import Iterable
 from mcpacker.format.datapack.biomemodifier import BiomeModifier
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.resourceid import ResourceId
 from mcpacker.json import JsonBlob
 
 

mcpacker/format/datapack/blockstateprovider/simplestateprovider.py

@@ -1,7 +1,7 @@
-from mcpacker.json                              import JsonBlob
-from mcpacker.format.datapack.blockstate         import BlockState
+from mcpacker.json import JsonBlob
+from mcpacker.format.datapack.blockstate import BlockState
 from mcpacker.format.datapack.blockstateprovider import BlockStateProvider
-from typing                                     import Any
+from typing import Any
 
 
 # Class ############################################################################################

mcpacker/format/datapack/configuredfeature/simpleblock.py

@@ -1,7 +1,7 @@
-from mcpacker.json                              import JsonBlob
+from mcpacker.json import JsonBlob
 from mcpacker.format.datapack.blockstateprovider import BlockStateProvider
-from mcpacker.format.datapack.configuredfeature  import ConfiguredFeature
-from typing                                     import Any
+from mcpacker.format.datapack.configuredfeature import ConfiguredFeature
+from typing import Any
 
 
 # Class ############################################################################################

mcpacker/format/datapack/recipe/__init__.py

@@ -1,6 +1,6 @@
 from collections.abc import Iterable
 from collections.abc import Mapping
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.resourceid import ResourceId
 
 
 # Class ############################################################################################

mcpacker/format/datapack/recipe/shapedrecipe.py

@@ -1,7 +1,7 @@
 from collections.abc import Iterable
 from collections.abc import Mapping
 from mcpacker.format.datapack.recipe import Recipe
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.resourceid import ResourceId
 
 
 # Class ############################################################################################

mcpacker/format/datapack/recipe/shapelessrecipe.py

@@ -1,6 +1,6 @@
-from collections.abc                import Iterable
-from collections.abc                import Mapping
-from mcpacker.model.core.resourceid import ResourceId
+from collections.abc import Iterable
+from collections.abc import Mapping
+from mcpacker.model.resourceid import ResourceId
 from mcpacker.format.datapack.recipe import Recipe
 
 

mcpacker/format/datapack/structure.py

@@ -1,5 +1,5 @@
 from collections.abc import Iterable
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.resourceid import ResourceId
 from mcpacker.json import JsonBlob
 
 import mcpacker.format.datapack.heightmaptype as HM