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

mcpacker/format/largeoredeposit/mineraldepositcomposer.py

@@ -1,8 +1,8 @@
 from collections.abc import Iterator
 from collections.abc import Mapping
-from mcpacker.model.core.geology.inclusion import Inclusion
+from mcpacker.model.geology.inclusion import Inclusion
 from mcpacker.format.templatecomposer import TemplateComposer
-from mcpacker.model.core.geology.deposit.mineraldeposit import MineralDeposit
+from mcpacker.model.geology.deposit.mineraldeposit import MineralDeposit
 
 
 # Constants ########################################################################################

mcpacker/format/largeoredeposit/mineraldepositcomposer_test.py

@@ -1,17 +1,17 @@
-from mcpacker.model.core.ecology.biomefilter import BiomeFilter
-from mcpacker.model.core.geology.deposit.mineraldeposit import MineralDeposit
-from mcpacker.model.core.geology.inclusion import Inclusion
-from mcpacker.model.core.geology.mineral import Mineral
-from mcpacker.model.core.geology.replacement import Replacement
+from mcpacker.model.ecology.biomefilter import BiomeFilter
+from mcpacker.model.geology.deposit.mineraldeposit import MineralDeposit
+from mcpacker.model.geology.inclusion import Inclusion
+from mcpacker.model.geology.mineral import Mineral
+from mcpacker.model.geology.replacement import Replacement
 from pytest import fixture
 from mcpacker.format.largeoredeposit.mineraldepositcomposer import MineralDepositComposer
 from pytest import fixture
 
-import mcpacker.model.core.altitude as AL
-import mcpacker.model.core.ecology.flora as FL
-import mcpacker.model.core.geology.bulk as BU
-import mcpacker.model.core.geology.proportion as PR
-import mcpacker.model.core.scarcity as SC
+import mcpacker.model.altitude as AL
+import mcpacker.model.ecology.flora as FL
+import mcpacker.model.geology.bulk as BU
+import mcpacker.model.geology.proportion as PR
+import mcpacker.model.scarcity as SC
 import textwrap
 
 

mcpacker/format/report/biomereport.py

@@ -1,10 +1,10 @@
 from mcpacker.model.modpack import ModPack
-from mcpacker.model.core.ecology.biome import Biome
+from mcpacker.model.ecology.biome import Biome
 from mcpacker.format.report.composer import ReportComposer
 from pathlib import Path
 
-import mcpacker.model.core.altitude as AL
-import mcpacker.model.core.fauna.location as LO
+import mcpacker.model.altitude as AL
+import mcpacker.model.fauna.location as LO
 
 
 # Class ############################################################################################

mcpacker/format/report/biomereport_test.py

@@ -1,16 +1,16 @@
 from mcpacker.format.report.biomereport import BiomeReport
-from mcpacker.model.core.ecology.biome import Biome
+from mcpacker.model.ecology.biome import Biome
 from mcpacker.model.modpack import AugmentFunc
 from mcpacker.model.modpack import ModPack
 from pytest import fixture
 from typing import Callable
 
-import mcpacker.model.core.ecology.flora as F
-import mcpacker.model.core.ecology.geology as G
-import mcpacker.model.core.ecology.heat as E
-import mcpacker.model.core.ecology.humidity as U
-import mcpacker.model.core.ecology.soil as S
-import mcpacker.model.core.ecology.water as W
+import mcpacker.model.ecology.flora as F
+import mcpacker.model.ecology.geology as G
+import mcpacker.model.ecology.heat as E
+import mcpacker.model.ecology.humidity as U
+import mcpacker.model.ecology.soil as S
+import mcpacker.model.ecology.water as W
 import textwrap
 
 

mcpacker/format/report/depositreport.py

@@ -1,5 +1,5 @@
 from mcpacker.format.report.composer import ReportComposer
-from mcpacker.model.core.geology.deposit.mineraldeposit import MineralDeposit
+from mcpacker.model.geology.deposit.mineraldeposit import MineralDeposit
 from mcpacker.model.modpack import ModPack
 from pathlib import Path
 

mcpacker/format/report/mineralreport_test.py

@@ -1,6 +1,6 @@
 from mcpacker.format.report.mineralreport import MineralReport
-from mcpacker.model.core.geology.mineral import Mineral
-from mcpacker.model.core.geology.replacement import Replacement
+from mcpacker.model.geology.mineral import Mineral
+from mcpacker.model.geology.replacement import Replacement
 from mcpacker.model.modpack import AugmentFunc
 from mcpacker.model.modpack import ModPack
 from pytest import fixture

mcpacker/format/report/mobspawnreport.py

@@ -1,5 +1,5 @@
 from mcpacker.format.report.composer import ReportComposer
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from mcpacker.model.ecology.biometrait import BiomeTrait
 from mcpacker.model.modpack import ModPack
 from pathlib import Path
 

mcpacker/format/report/mobspawnreport_test.py

@@ -1,26 +1,26 @@
 from mcpacker.format.report.mobspawnreport import MobSpawnReport
-from mcpacker.model.core.ecology.biomefilter import BiomeFilter as BF
-from mcpacker.model.core.fauna.mob import Mob
-from mcpacker.model.core.fauna.mobspawn import MobSpawn
-from mcpacker.model.core.geology.mineral import Mineral
-from mcpacker.model.core.geology.replacement import Replacement
-from mcpacker.model.core.habitat import Habitat
+from mcpacker.model.ecology.biomefilter import BiomeFilter as BF
+from mcpacker.model.fauna.mob import Mob
+from mcpacker.model.fauna.mobspawn import MobSpawn
+from mcpacker.model.geology.mineral import Mineral
+from mcpacker.model.geology.replacement import Replacement
+from mcpacker.model.habitat import Habitat
 from mcpacker.model.modpack import AugmentFunc
 from mcpacker.model.modpack import ModPack
 from pytest import fixture
 
-import mcpacker.model.core.altitude as AL
-import mcpacker.model.core.ecology.flora as FL
-import mcpacker.model.core.ecology.geology as GE
-import mcpacker.model.core.ecology.heat as HE
-import mcpacker.model.core.ecology.humidity as HU
-import mcpacker.model.core.ecology.soil as SO
-import mcpacker.model.core.ecology.water as WA
-import mcpacker.model.core.fauna.active as AC
-import mcpacker.model.core.fauna.group as GR
-import mcpacker.model.core.fauna.location as LO
-import mcpacker.model.core.scarcity as SC
-import mcpacker.model.core.season as SE
+import mcpacker.model.altitude as AL
+import mcpacker.model.ecology.flora as FL
+import mcpacker.model.ecology.geology as GE
+import mcpacker.model.ecology.heat as HE
+import mcpacker.model.ecology.humidity as HU
+import mcpacker.model.ecology.soil as SO
+import mcpacker.model.ecology.water as WA
+import mcpacker.model.fauna.active as AC
+import mcpacker.model.fauna.group as GR
+import mcpacker.model.fauna.location as LO
+import mcpacker.model.scarcity as SC
+import mcpacker.model.season as SE
 import textwrap
 
 

mcpacker/format/report/plantspawnreport.py

@@ -1,7 +1,7 @@
-from mcpacker.model.core.flora.patch import Patch
-from mcpacker.model.core.flora.tree import Tree
+from mcpacker.model.flora.patch import Patch
+from mcpacker.model.flora.tree import Tree
 from mcpacker.format.report.composer import ReportComposer
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from mcpacker.model.ecology.biometrait import BiomeTrait
 from mcpacker.model.modpack import ModPack
 from pathlib import Path
 

mcpacker/format/resourcepack/__init__.py

@@ -1,6 +1,6 @@
 from collections.abc import Iterable
 from collections.abc import Iterator
-from mcpacker.model.resourcepack.modresource import ModResource
+from mcpacker.format.resourcepack.modresource import ModResource
 
 
 # Class ############################################################################################

mcpacker/format/resourcepack/__init___test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.resourcepack
+import mcpacker.format.resourcepack
 
 
 # Tests ############################################################################################

mcpacker/format/resourcepack/blockstate.py

@@ -1,4 +1,4 @@
-from mcpacker.model.resourcepack.variant import Variant
+from mcpacker.format.resourcepack.variant import Variant
 
 
 # Class ############################################################################################

mcpacker/format/resourcepack/blockstate_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.resourcepack.blockstate
+import mcpacker.format.resourcepack.blockstate
 
 
 # Tests ############################################################################################

mcpacker/format/resourcepack/kind_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.resourcepack.kind
+import mcpacker.format.resourcepack.kind
 
 
 # Tests ############################################################################################

mcpacker/format/resourcepack/model.py

@@ -1,4 +1,4 @@
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.resourceid import ResourceId
 
 
 # Class ############################################################################################

mcpacker/format/resourcepack/model_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.resourcepack.model
+import mcpacker.format.resourcepack.model
 
 
 # Tests ############################################################################################

mcpacker/format/resourcepack/modresource.py

@@ -1,5 +1,5 @@
-from mcpacker.model.resourcepack.blockstate import BlockState
-from mcpacker.model.resourcepack.model import Model
+from mcpacker.format.resourcepack.blockstate import BlockState
+from mcpacker.format.resourcepack.model import Model
 
 
 # Class ############################################################################################

mcpacker/format/resourcepack/modresource_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.resourcepack.modresource
+import mcpacker.format.resourcepack.modresource
 
 
 # Tests ############################################################################################

mcpacker/format/resourcepack/texture.py

@@ -1,4 +1,4 @@
-from mcpacker.model.resourcepack.kind import Kind
+from mcpacker.format.resourcepack.kind import Kind
 
 
 # Class ############################################################################################

mcpacker/format/resourcepack/texture_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.resourcepack.texture
+import mcpacker.format.resourcepack.texture
 
 
 # Tests ############################################################################################

mcpacker/format/resourcepack/variant.py

@@ -1,4 +1,4 @@
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.resourceid import ResourceId
 
 
 # Class ############################################################################################

mcpacker/format/resourcepack/variant_test.py

@@ -1,4 +1,4 @@
-from mcpacker.model.resourcepack.variant import Variant
+from mcpacker.format.resourcepack.variant import Variant
 from pytest import fixture
 
 

mcpacker/json.py

@@ -1,7 +1,7 @@
-from json   import dump
-from json   import dumps
-from json   import load
-from json   import loads
+from json import dump
+from json import dumps
+from json import load
+from json import loads
 from typing import TypeAlias
 
 

mcpacker/json_test.py

@@ -1,6 +1,6 @@
 from mcpacker.json import JsonBlob
-from pytest        import fixture
-from typing        import cast
+from pytest import fixture
+from typing import cast
 
 import mcpacker.json as json
 

mcpacker/model/altitude_test.py

@@ -1,6 +1,6 @@
 from pytest import fixture
 
-import mcpacker.model.core.altitude as A
+import mcpacker.model.altitude as A
 
 
 # Fixtures #########################################################################################

mcpacker/model/blockfactory.py

@@ -1,8 +1,8 @@
-from mcpacker.model.resourcepack.blockstate import BlockState
-from mcpacker.model.resourcepack.variant import Variant
-from mcpacker.model.resourcepack.model import Model
+from mcpacker.format.resourcepack.blockstate import BlockState
+from mcpacker.format.resourcepack.variant import Variant
+from mcpacker.format.resourcepack.model import Model
 from mcpacker.model.modpack import ModPack
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.resourceid import ResourceId
 from mcpacker.format.datapack.recipe.shapedrecipe import ShapedRecipe
 
 

mcpacker/model/blockstate.py

@@ -1,5 +1,5 @@
 from mcpacker.json import JsonBlob
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.resourceid import ResourceId
 from typing import Any
 
 

mcpacker/model/blockstate_test.py

@@ -1,6 +1,6 @@
 from pytest import fixture
-from mcpacker.model.core.blockstate import BlockState
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.blockstate import BlockState
+from mcpacker.model.resourceid import ResourceId
 
 
 # Fixtures #########################################################################################

mcpacker/model/core/ecology/biomecatalog.py

@@ -1,10 +0,0 @@
-from mcpacker.model.catalog                  import Catalog
-from mcpacker.model.core.ecology.biome       import Biome
-from mcpacker.model.core.ecology.biomefilter import BiomeFilter
-from typing                                  import Iterator
-
-
-# Classes ##########################################################################################
-
-class BiomeCatalog(Catalog[Biome]):
-    pass

mcpacker/model/core/fauna/mobspawncatalog_test.py

@@ -1,8 +0,0 @@
-import mcpacker.model.core.fauna.mobspawncatalog
-
-
-# Tests ############################################################################################
-
-def test_syntax():
-    pass
-

mcpacker/model/core/flora/plantspawncatalog_test.py

@@ -1,7 +0,0 @@
-import mcpacker.model.core.flora.plantspawncatalog
-
-
-# Tests ############################################################################################
-
-def test_syntax():
-    pass

mcpacker/model/core/geology/depositcatalog_test.py

@@ -1,7 +0,0 @@
-import mcpacker.model.core.geology.depositcatalog
-
-
-# Tests ############################################################################################
-
-def test_syntax():
-    pass

mcpacker/model/core/geology/mineralcatalog_test.py

@@ -1,7 +0,0 @@
-import mcpacker.model.core.geology.mineralcatalog
-
-
-# Tests ############################################################################################
-
-def test_syntax():
-    pass

mcpacker/model/core/material/blockcatalog_test.py

@@ -1,7 +0,0 @@
-import mcpacker.model.core.material.blockcatalog
-
-
-# Tests ############################################################################################
-
-def test_syntax():
-    pass

mcpacker/model/core/material/itemcatalog_test.py

@@ -1,7 +0,0 @@
-import mcpacker.model.core.material.itemcatalog
-
-
-# Tests ############################################################################################
-
-def test_syntax():
-    pass

mcpacker/model/dimension_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.dimension
+import mcpacker.model.dimension
 
 
 # Tests ############################################################################################

mcpacker/model/ecology/biome.py

@@ -1,11 +1,11 @@
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
-from mcpacker.model.core.ecology.flora import Flora
-from mcpacker.model.core.ecology.geology import Geology
-from mcpacker.model.core.ecology.heat import Heat
-from mcpacker.model.core.ecology.humidity import Humidity
-from mcpacker.model.core.ecology.soil import Soil
-from mcpacker.model.core.ecology.water import Water
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.ecology.biometrait import BiomeTrait
+from mcpacker.model.ecology.flora import Flora
+from mcpacker.model.ecology.geology import Geology
+from mcpacker.model.ecology.heat import Heat
+from mcpacker.model.ecology.humidity import Humidity
+from mcpacker.model.ecology.soil import Soil
+from mcpacker.model.ecology.water import Water
+from mcpacker.model.resourceid import ResourceId
 
 
 ####################################################################################################

mcpacker/model/ecology/biome_test.py

@@ -1,12 +1,12 @@
-from mcpacker.model.core.ecology.biome import Biome
+from mcpacker.model.ecology.biome import Biome
 from pytest import fixture
 
-import mcpacker.model.core.ecology.flora as F
-import mcpacker.model.core.ecology.geology as G
-import mcpacker.model.core.ecology.heat as E
-import mcpacker.model.core.ecology.humidity as U
-import mcpacker.model.core.ecology.soil as S
-import mcpacker.model.core.ecology.water as W
+import mcpacker.model.ecology.flora as F
+import mcpacker.model.ecology.geology as G
+import mcpacker.model.ecology.heat as E
+import mcpacker.model.ecology.humidity as U
+import mcpacker.model.ecology.soil as S
+import mcpacker.model.ecology.water as W
 
 
 # Fixtures #########################################################################################

mcpacker/model/ecology/biomecatalog.py

@@ -0,0 +1,10 @@
+from mcpacker.model.catalog import Catalog
+from mcpacker.model.ecology.biome import Biome
+from mcpacker.model.ecology.biomefilter import BiomeFilter
+from typing import Iterator
+
+
+# Classes ##########################################################################################
+
+class BiomeCatalog(Catalog[Biome]):
+    pass

mcpacker/model/ecology/biomecatalog_test.py

@@ -1,14 +1,14 @@
-from mcpacker.model.core.ecology.biome import Biome
-from mcpacker.model.core.ecology.biomecatalog import BiomeCatalog
-from mcpacker.model.core.ecology.biomefilter import BiomeFilter
+from mcpacker.model.ecology.biome import Biome
+from mcpacker.model.ecology.biomecatalog import BiomeCatalog
+from mcpacker.model.ecology.biomefilter import BiomeFilter
 from pytest import fixture
 
-import mcpacker.model.core.ecology.flora as F
-import mcpacker.model.core.ecology.geology as G
-import mcpacker.model.core.ecology.heat as E
-import mcpacker.model.core.ecology.humidity as U
-import mcpacker.model.core.ecology.soil as S
-import mcpacker.model.core.ecology.water as W
+import mcpacker.model.ecology.flora as F
+import mcpacker.model.ecology.geology as G
+import mcpacker.model.ecology.heat as E
+import mcpacker.model.ecology.humidity as U
+import mcpacker.model.ecology.soil as S
+import mcpacker.model.ecology.water as W
 
 # Fixtures #########################################################################################
 

mcpacker/model/ecology/biomefilter.py

@@ -1,7 +1,7 @@
 from collections.abc import Sequence
-from mcpacker.model.core.resourceid import ResourceId
-from mcpacker.model.core.ecology.biome import Biome
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from mcpacker.model.resourceid import ResourceId
+from mcpacker.model.ecology.biome import Biome
+from mcpacker.model.ecology.biometrait import BiomeTrait
 
 
 # Class ############################################################################################

mcpacker/model/ecology/biomefilter_test.py

@@ -1,14 +1,14 @@
-from mcpacker.model.core.ecology.biome import Biome
-from mcpacker.model.core.ecology.biomefilter import BiomeFilter
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.ecology.biome import Biome
+from mcpacker.model.ecology.biomefilter import BiomeFilter
+from mcpacker.model.resourceid import ResourceId
 from pytest import fixture
 
-import mcpacker.model.core.ecology.flora as F
-import mcpacker.model.core.ecology.geology as G
-import mcpacker.model.core.ecology.heat as E
-import mcpacker.model.core.ecology.humidity as U
-import mcpacker.model.core.ecology.soil as S
-import mcpacker.model.core.ecology.water as W
+import mcpacker.model.ecology.flora as F
+import mcpacker.model.ecology.geology as G
+import mcpacker.model.ecology.heat as E
+import mcpacker.model.ecology.humidity as U
+import mcpacker.model.ecology.soil as S
+import mcpacker.model.ecology.water as W
 
 
 # Fixtures #########################################################################################

mcpacker/model/ecology/biometrait_test.py

@@ -1,7 +1,7 @@
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from mcpacker.model.ecology.biometrait import BiomeTrait
 from pytest import fixture
 
-import mcpacker.model.core.ecology.biometrait as biomeTrait
+import mcpacker.model.ecology.biometrait as biomeTrait
 
 
 # Fixtures #########################################################################################

mcpacker/model/ecology/flora.py

@@ -1,6 +1,6 @@
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from mcpacker.model.ecology.biometrait import BiomeTrait
 
-import mcpacker.model.core.ecology.biometrait as biomeTrait
+import mcpacker.model.ecology.biometrait as biomeTrait
 
 
 # Class ############################################################################################

mcpacker/model/ecology/flora_test.py

@@ -1,6 +1,6 @@
 from pytest import fixture
 
-import mcpacker.model.core.ecology.flora as flora
+import mcpacker.model.ecology.flora as flora
 
 
 # Tests ############################################################################################

mcpacker/model/ecology/geology.py

@@ -1,4 +1,4 @@
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from mcpacker.model.ecology.biometrait import BiomeTrait
 
 
 # Class ############################################################################################

mcpacker/model/ecology/geology_test.py

@@ -1,6 +1,6 @@
 from pytest import fixture
 
-import mcpacker.model.core.ecology.geology as geology
+import mcpacker.model.ecology.geology as geology
 
 
 # Tests ############################################################################################

mcpacker/model/ecology/heat.py

@@ -1,6 +1,6 @@
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from mcpacker.model.ecology.biometrait import BiomeTrait
 
-import mcpacker.model.core.ecology.biometrait as biomeTrait
+import mcpacker.model.ecology.biometrait as biomeTrait
 
 
 # Class ############################################################################################

mcpacker/model/ecology/heat_test.py

@@ -1,6 +1,6 @@
 from pytest import fixture
 
-import mcpacker.model.core.ecology.heat as heat
+import mcpacker.model.ecology.heat as heat
 
 
 # Tests ############################################################################################

mcpacker/model/ecology/humidity.py

@@ -1,7 +1,7 @@
-from collections.abc                        import Iterable
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from collections.abc import Iterable
+from mcpacker.model.ecology.biometrait import BiomeTrait
 
-import mcpacker.model.core.ecology.biometrait as biomeTrait
+import mcpacker.model.ecology.biometrait as biomeTrait
 
 
 # Class ############################################################################################

mcpacker/model/ecology/humidity_test.py

@@ -1,6 +1,6 @@
 from pytest import fixture
 
-import mcpacker.model.core.ecology.humidity as humidity
+import mcpacker.model.ecology.humidity as humidity
 
 
 # Tests ############################################################################################

mcpacker/model/ecology/soil.py

@@ -1,4 +1,4 @@
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from mcpacker.model.ecology.biometrait import BiomeTrait
 
 
 # Class ############################################################################################

mcpacker/model/ecology/soil_test.py

@@ -1,6 +1,6 @@
 from pytest import fixture
 
-import mcpacker.model.core.ecology.soil as soil
+import mcpacker.model.ecology.soil as soil
 
 
 # Tests ############################################################################################

mcpacker/model/ecology/water.py

@@ -1,4 +1,4 @@
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from mcpacker.model.ecology.biometrait import BiomeTrait
 
 
 # Class ############################################################################################

mcpacker/model/ecology/water_test.py

@@ -1,6 +1,6 @@
 from pytest import fixture
 
-import mcpacker.model.core.ecology.water as water
+import mcpacker.model.ecology.water as water
 
 
 # Tests ############################################################################################

mcpacker/model/fauna/active_test.py

@@ -1,6 +1,6 @@
 from pytest import fixture
 
-import mcpacker.model.core.fauna.active as active
+import mcpacker.model.fauna.active as active
 
 
 # Tests ############################################################################################

mcpacker/model/fauna/group_test.py

@@ -1,6 +1,6 @@
 from pytest import fixture
 
-import mcpacker.model.core.fauna.group as group
+import mcpacker.model.fauna.group as group
 
 
 # Fixtures #########################################################################################

mcpacker/model/fauna/location.py

@@ -1,4 +1,4 @@
-from mcpacker.model.core.ecology.biometrait import BiomeTrait
+from mcpacker.model.ecology.biometrait import BiomeTrait
 
 
 # Class ############################################################################################

mcpacker/model/fauna/location_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.fauna.location
+import mcpacker.model.fauna.location
 
 
 # Tests ############################################################################################

mcpacker/model/fauna/mob.py

@@ -1,8 +1,8 @@
 from collections.abc import Iterable
-from mcpacker.model.core.fauna.active import Active
-from mcpacker.model.core.resourceid import ResourceId
+from mcpacker.model.fauna.active import Active
+from mcpacker.model.resourceid import ResourceId
 
-import mcpacker.model.core.fauna.active as AC
+import mcpacker.model.fauna.active as AC
 
 
 # Class ############################################################################################

mcpacker/model/fauna/mob_test.py

@@ -1,7 +1,7 @@
-from mcpacker.model.core.fauna.mob import Mob
+from mcpacker.model.fauna.mob import Mob
 from pytest import fixture
 
-import mcpacker.model.core.fauna.active as AC
+import mcpacker.model.fauna.active as AC
 
 
 # Fixtures #########################################################################################

mcpacker/model/fauna/mobcatalog.py

@@ -1,5 +1,5 @@
-from mcpacker.model.catalog        import Catalog
-from mcpacker.model.core.fauna.mob import Mob
+from mcpacker.model.catalog import Catalog
+from mcpacker.model.fauna.mob import Mob
 
 
 # Classes ##########################################################################################

mcpacker/model/fauna/mobcatalog_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.fauna.mobcatalog
+import mcpacker.model.fauna.mobcatalog
 
 
 # Tests ############################################################################################

mcpacker/model/fauna/mobspawn.py

@@ -1,8 +1,8 @@
 from collections.abc import Iterable
-from mcpacker.model.core.ecology.biome import Biome
-from mcpacker.model.core.habitat import Habitat
-from mcpacker.model.core.fauna.mob import Mob
-from mcpacker.model.core.spawn import Spawn
+from mcpacker.model.ecology.biome import Biome
+from mcpacker.model.habitat import Habitat
+from mcpacker.model.fauna.mob import Mob
+from mcpacker.model.spawn import Spawn
 
 
 # Class ############################################################################################

mcpacker/model/fauna/mobspawn_test.py

@@ -1,12 +1,12 @@
-from mcpacker.model.core.ecology.biomefilter import BiomeFilter
-from mcpacker.model.core.fauna.mob import Mob
-from mcpacker.model.core.fauna.mobspawn import MobSpawn
-from mcpacker.model.core.habitat import Habitat
+from mcpacker.model.ecology.biomefilter import BiomeFilter
+from mcpacker.model.fauna.mob import Mob
+from mcpacker.model.fauna.mobspawn import MobSpawn
+from mcpacker.model.habitat import Habitat
 from pytest import fixture
 
-import mcpacker.model.core.fauna.active as AC
-import mcpacker.model.core.ecology.flora as FL
-import mcpacker.model.core.ecology.heat as HE
+import mcpacker.model.fauna.active as AC
+import mcpacker.model.ecology.flora as FL
+import mcpacker.model.ecology.heat as HE
 
 
 # Fixtures #########################################################################################

mcpacker/model/fauna/mobspawncatalog.py

@@ -1,5 +1,5 @@
-from mcpacker.model.catalog             import Catalog
-from mcpacker.model.core.fauna.mobspawn import MobSpawn
+from mcpacker.model.catalog import Catalog
+from mcpacker.model.fauna.mobspawn import MobSpawn
 
 
 # Classes ##########################################################################################

mcpacker/model/fauna/mobspawncatalog_test.py

@@ -0,0 +1,8 @@
+import mcpacker.model.fauna.mobspawncatalog
+
+
+# Tests ############################################################################################
+
+def test_syntax():
+    pass
+

mcpacker/model/flora/canopyshape_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.flora.canopyshape
+import mcpacker.model.flora.canopyshape
 
 
 # Tests ############################################################################################

mcpacker/model/flora/companion.py

@@ -1,4 +1,4 @@
-from mcpacker.model.core.flora.plant import Plant
+from mcpacker.model.flora.plant import Plant
 
 
 # Class ############################################################################################

mcpacker/model/flora/companion_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.flora.companion
+import mcpacker.model.flora.companion
 
 
 # Tests ############################################################################################

mcpacker/model/flora/density_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.flora.density
+import mcpacker.model.flora.density
 
 
 # Class ############################################################################################

mcpacker/model/flora/immersion_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.flora.immersion
+import mcpacker.model.flora.immersion
 
 
 # Tests ############################################################################################

mcpacker/model/flora/patch.py

@@ -1,15 +1,15 @@
 from collections.abc import Iterable
-from mcpacker.model.core.blockstate import BlockState
-from mcpacker.model.core.flora.companion import Companion
-from mcpacker.model.core.flora.density import Density
-from mcpacker.model.core.flora.immersion import Immersion
-from mcpacker.model.core.flora.plant import Plant
-from mcpacker.model.core.resourceid import ResourceId
-from mcpacker.model.core.scarcity import Scarcity
+from mcpacker.model.blockstate import BlockState
+from mcpacker.model.flora.companion import Companion
+from mcpacker.model.flora.density import Density
+from mcpacker.model.flora.immersion import Immersion
+from mcpacker.model.flora.plant import Plant
+from mcpacker.model.resourceid import ResourceId
+from mcpacker.model.scarcity import Scarcity
 
 import math
-import mcpacker.model.core.flora.density as DE
-import mcpacker.model.core.flora.immersion as IM
+import mcpacker.model.flora.density as DE
+import mcpacker.model.flora.immersion as IM
 
 
 # Class ############################################################################################

mcpacker/model/flora/patch_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.flora.plant
+import mcpacker.model.flora.plant
 
 
 # Tests ############################################################################################

mcpacker/model/flora/plant_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.flora.plant
+import mcpacker.model.flora.plant
 
 
 # Tests ############################################################################################

mcpacker/model/flora/plantcatalog.py

@@ -1,5 +1,5 @@
 from mcpacker.model.catalog import Catalog
-from mcpacker.model.core.flora.plant import Plant
+from mcpacker.model.flora.plant import Plant
 
 
 # Class ############################################################################################

mcpacker/model/flora/plantcatalog_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.flora.plantcatalog
+import mcpacker.model.flora.plantcatalog
 
 
 # Tests ############################################################################################

mcpacker/model/flora/plantspawn.py

@@ -1,12 +1,12 @@
 from collections.abc import Iterable
-from mcpacker.model.core.altitude import Altitude
-from mcpacker.model.core.ecology.biome import Biome
-from mcpacker.model.core.ecology.biomefilter import BiomeFilter
-from mcpacker.model.core.flora.plant import Plant
-from mcpacker.model.core.scarcity import Scarcity
+from mcpacker.model.altitude import Altitude
+from mcpacker.model.ecology.biome import Biome
+from mcpacker.model.ecology.biomefilter import BiomeFilter
+from mcpacker.model.flora.plant import Plant
+from mcpacker.model.scarcity import Scarcity
 
-import mcpacker.model.core.altitude as AL
-import mcpacker.model.core.scarcity as SC
+import mcpacker.model.altitude as AL
+import mcpacker.model.scarcity as SC
 
 
 # Class ############################################################################################

mcpacker/model/flora/plantspawn_test.py

@@ -1,4 +1,4 @@
-import mcpacker.model.core.flora.plantspawn
+import mcpacker.model.flora.plantspawn
 
 
 # Tests ############################################################################################