From d0b57600678d3af70ffe104e76e52055c3d3706d Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Tue, 21 Oct 2025 17:12:09 -0600 Subject: [PATCH] Reorganize model files to simplify hierarchy --- .../datapack/biomemodifier/removespawn.py | 2 +- .../blockstateprovider/simplestateprovider.py | 6 +-- .../datapack/configuredfeature/simpleblock.py | 6 +-- mcpacker/format/datapack/recipe/__init__.py | 2 +- .../format/datapack/recipe/shapedrecipe.py | 2 +- .../format/datapack/recipe/shapelessrecipe.py | 6 +-- mcpacker/format/datapack/structure.py | 2 +- .../largeoredeposit/mineraldepositcomposer.py | 4 +- .../mineraldepositcomposer_test.py | 20 ++++---- mcpacker/format/report/biomereport.py | 6 +-- mcpacker/format/report/biomereport_test.py | 14 +++--- mcpacker/format/report/depositreport.py | 2 +- mcpacker/format/report/mineralreport_test.py | 4 +- mcpacker/format/report/mobspawnreport.py | 2 +- mcpacker/format/report/mobspawnreport_test.py | 36 +++++++-------- mcpacker/format/report/plantspawnreport.py | 6 +-- .../resourcepack/__init__.py | 2 +- .../resourcepack/__init___test.py | 2 +- .../resourcepack/blockstate.py | 2 +- .../resourcepack/blockstate_test.py | 2 +- .../{model => format}/resourcepack/kind.py | 0 .../resourcepack/kind_test.py | 2 +- .../{model => format}/resourcepack/model.py | 2 +- .../resourcepack/model_test.py | 2 +- .../resourcepack/modresource.py | 4 +- .../resourcepack/modresource_test.py | 2 +- .../{model => format}/resourcepack/texture.py | 2 +- .../resourcepack/texture_test.py | 2 +- .../{model => format}/resourcepack/variant.py | 2 +- .../resourcepack/variant_test.py | 2 +- mcpacker/json.py | 8 ++-- mcpacker/json_test.py | 4 +- mcpacker/model/{core => }/altitude.py | 0 mcpacker/model/{core => }/altitude_test.py | 2 +- mcpacker/model/blockfactory.py | 8 ++-- mcpacker/model/{core => }/blockstate.py | 2 +- mcpacker/model/{core => }/blockstate_test.py | 4 +- mcpacker/model/core/ecology/biomecatalog.py | 10 ---- .../model/core/fauna/mobspawncatalog_test.py | 8 ---- .../core/flora/plantspawncatalog_test.py | 7 --- .../model/core/geology/depositcatalog_test.py | 7 --- .../model/core/geology/mineralcatalog_test.py | 7 --- mcpacker/model/core/material/__init__.py | 0 .../model/core/material/blockcatalog_test.py | 7 --- .../model/core/material/itemcatalog_test.py | 7 --- mcpacker/model/{core => }/dimension.py | 0 mcpacker/model/{core => }/dimension_test.py | 2 +- mcpacker/model/{core => ecology}/__init__.py | 0 mcpacker/model/{core => }/ecology/biome.py | 16 +++---- .../model/{core => }/ecology/biome_test.py | 14 +++--- mcpacker/model/ecology/biomecatalog.py | 10 ++++ .../{core => }/ecology/biomecatalog_test.py | 18 ++++---- .../model/{core => }/ecology/biomefilter.py | 6 +-- .../{core => }/ecology/biomefilter_test.py | 18 ++++---- .../model/{core => }/ecology/biometrait.py | 0 .../{core => }/ecology/biometrait_test.py | 4 +- mcpacker/model/{core => }/ecology/flora.py | 4 +- .../model/{core => }/ecology/flora_test.py | 2 +- mcpacker/model/{core => }/ecology/geology.py | 2 +- .../model/{core => }/ecology/geology_test.py | 2 +- mcpacker/model/{core => }/ecology/heat.py | 4 +- .../model/{core => }/ecology/heat_test.py | 2 +- mcpacker/model/{core => }/ecology/humidity.py | 6 +-- .../model/{core => }/ecology/humidity_test.py | 2 +- mcpacker/model/{core => }/ecology/soil.py | 2 +- .../model/{core => }/ecology/soil_test.py | 2 +- mcpacker/model/{core => }/ecology/water.py | 2 +- .../model/{core => }/ecology/water_test.py | 2 +- .../model/{core/ecology => fauna}/__init__.py | 0 mcpacker/model/{core => }/fauna/active.py | 0 .../model/{core => }/fauna/active_test.py | 2 +- mcpacker/model/{core => }/fauna/group.py | 0 mcpacker/model/{core => }/fauna/group_test.py | 2 +- mcpacker/model/{core => }/fauna/location.py | 2 +- .../model/{core => }/fauna/location_test.py | 2 +- mcpacker/model/{core => }/fauna/mob.py | 6 +-- mcpacker/model/{core => }/fauna/mob_test.py | 4 +- mcpacker/model/{core => }/fauna/mobcatalog.py | 4 +- .../model/{core => }/fauna/mobcatalog_test.py | 2 +- mcpacker/model/{core => }/fauna/mobspawn.py | 8 ++-- .../model/{core => }/fauna/mobspawn_test.py | 14 +++--- .../model/{core => }/fauna/mobspawncatalog.py | 4 +- mcpacker/model/fauna/mobspawncatalog_test.py | 8 ++++ .../model/{core/fauna => flora}/__init__.py | 0 .../model/{core => }/flora/canopyshape.py | 0 .../{core => }/flora/canopyshape_test.py | 2 +- mcpacker/model/{core => }/flora/companion.py | 2 +- .../model/{core => }/flora/companion_test.py | 2 +- mcpacker/model/{core => }/flora/density.py | 0 .../model/{core => }/flora/density_test.py | 2 +- mcpacker/model/{core => }/flora/immersion.py | 0 .../model/{core => }/flora/immersion_test.py | 2 +- mcpacker/model/{core => }/flora/patch.py | 18 ++++---- mcpacker/model/{core => }/flora/patch_test.py | 2 +- mcpacker/model/{core => }/flora/plant.py | 0 mcpacker/model/{core => }/flora/plant_test.py | 2 +- .../model/{core => }/flora/plantcatalog.py | 2 +- .../{core => }/flora/plantcatalog_test.py | 2 +- mcpacker/model/{core => }/flora/plantspawn.py | 14 +++--- .../model/{core => }/flora/plantspawn_test.py | 2 +- .../{core => }/flora/plantspawncatalog.py | 2 +- .../model/flora/plantspawncatalog_test.py | 7 +++ mcpacker/model/{core => }/flora/tree.py | 12 ++--- mcpacker/model/{core => }/flora/tree_test.py | 2 +- mcpacker/model/{core => }/flora/trunkshape.py | 0 .../model/{core => }/flora/trunkshape_test.py | 2 +- .../model/{core/flora => geology}/__init__.py | 0 mcpacker/model/{core => }/geology/bulk.py | 0 .../model/{core => }/geology/bulk_test.py | 2 +- .../{core => }/geology/deposit/__init__.py | 16 +++---- .../geology/deposit/__init___test.py | 2 +- .../geology/deposit/geodedeposit.py | 16 +++---- .../geology/deposit/geodedeposit_test.py | 2 +- .../geology/deposit/mineraldeposit.py | 22 ++++----- .../geology/deposit/mineraldeposit_test.py | 18 ++++---- .../{core => }/geology/depositcatalog.py | 4 +- mcpacker/model/geology/depositcatalog_test.py | 7 +++ .../model/{core => }/geology/inclusion.py | 2 +- .../{core => }/geology/inclusion_test.py | 6 +-- mcpacker/model/{core => }/geology/mineral.py | 4 +- .../model/{core => }/geology/mineral_test.py | 6 +-- .../{core => }/geology/mineralcatalog.py | 4 +- mcpacker/model/geology/mineralcatalog_test.py | 7 +++ .../model/{core => }/geology/proportion.py | 0 .../{core => }/geology/proportion_test.py | 2 +- .../model/{core => }/geology/replacement.py | 2 +- .../{core => }/geology/replacement_test.py | 2 +- mcpacker/model/{core => }/habitat.py | 24 +++++----- mcpacker/model/{core => }/habitat_test.py | 12 ++--- .../{core/geology => material}/__init__.py | 0 mcpacker/model/{core => }/material/block.py | 10 ++-- .../model/{core => }/material/block_test.py | 2 +- .../model/{core => }/material/blockcatalog.py | 4 +- mcpacker/model/material/blockcatalog_test.py | 7 +++ mcpacker/model/{core => }/material/item.py | 2 +- .../model/{core => }/material/item_test.py | 2 +- .../model/{core => }/material/itemcatalog.py | 4 +- mcpacker/model/material/itemcatalog_test.py | 7 +++ mcpacker/model/{core => }/material/loot.py | 2 +- .../model/{core => }/material/loot_test.py | 2 +- .../model/{core => }/material/loottable.py | 4 +- .../{core => }/material/loottable_test.py | 2 +- .../model/{core => }/material/soundtype.py | 0 .../{core => }/material/soundtype_test.py | 2 +- mcpacker/model/modpack.py | 6 +-- mcpacker/model/{core => }/resourceid.py | 0 mcpacker/model/{core => }/resourceid_test.py | 2 +- mcpacker/model/{core => }/scarcity.py | 0 mcpacker/model/{core => }/scarcity_test.py | 2 +- mcpacker/model/{core => }/season.py | 0 mcpacker/model/{core => }/season_test.py | 2 +- mcpacker/model/{core => }/spawn.py | 2 +- mcpacker/model/{core => }/spawn_test.py | 10 ++-- mcpacker/model/{core => }/world.py | 18 ++++---- mcpacker/model/{core => }/world_test.py | 2 +- mcpacker/pack/mysteriousisland/addbiomes.py | 14 +++--- mcpacker/pack/mysteriousisland/addblocks.py | 14 +++--- mcpacker/pack/mysteriousisland/adddatapack.py | 2 +- mcpacker/pack/mysteriousisland/adddeposits.py | 28 +++++------ .../mysteriousisland/adddisabledfeatures.py | 2 +- mcpacker/pack/mysteriousisland/additems.py | 4 +- mcpacker/pack/mysteriousisland/addminerals.py | 8 ++-- mcpacker/pack/mysteriousisland/addmobs.py | 6 +-- .../pack/mysteriousisland/addmobspawns.py | 36 +++++++-------- mcpacker/pack/mysteriousisland/addplants.py | 14 +++--- .../pack/mysteriousisland/addplantspawns.py | 24 +++++----- .../pack/mysteriousisland/addresourcepack.py | 4 +- mcpacker/ui/runner_test.py | 38 +++++++-------- mcpacker/write/datapack/depositwriter.py | 4 +- mcpacker/write/incontrol/spawnerwriter.py | 28 +++++------ .../write/incontrol/spawnerwriter_test.py | 46 +++++++++---------- .../write/largeoredeposits/depositwriter.py | 2 +- mcpacker/write/staticwriter.py | 4 +- mcpacker/write/writer_test.py | 6 +-- 174 files changed, 511 insertions(+), 511 deletions(-) rename mcpacker/{model => format}/resourcepack/__init__.py (95%) rename mcpacker/{model => format}/resourcepack/__init___test.py (78%) rename mcpacker/{model => format}/resourcepack/blockstate.py (92%) rename mcpacker/{model => format}/resourcepack/blockstate_test.py (78%) rename mcpacker/{model => format}/resourcepack/kind.py (100%) rename mcpacker/{model => format}/resourcepack/kind_test.py (76%) rename mcpacker/{model => format}/resourcepack/model.py (87%) rename mcpacker/{model => format}/resourcepack/model_test.py (75%) rename mcpacker/{model => format}/resourcepack/modresource.py (72%) rename mcpacker/{model => format}/resourcepack/modresource_test.py (73%) rename mcpacker/{model => format}/resourcepack/texture.py (82%) rename mcpacker/{model => format}/resourcepack/texture_test.py (75%) rename mcpacker/{model => format}/resourcepack/variant.py (86%) rename mcpacker/{model => format}/resourcepack/variant_test.py (89%) rename mcpacker/model/{core => }/altitude.py (100%) rename mcpacker/model/{core => }/altitude_test.py (92%) rename mcpacker/model/{core => }/blockstate.py (95%) rename mcpacker/model/{core => }/blockstate_test.py (84%) delete mode 100644 mcpacker/model/core/ecology/biomecatalog.py delete mode 100644 mcpacker/model/core/fauna/mobspawncatalog_test.py delete mode 100644 mcpacker/model/core/flora/plantspawncatalog_test.py delete mode 100644 mcpacker/model/core/geology/depositcatalog_test.py delete mode 100644 mcpacker/model/core/geology/mineralcatalog_test.py delete mode 100644 mcpacker/model/core/material/__init__.py delete mode 100644 mcpacker/model/core/material/blockcatalog_test.py delete mode 100644 mcpacker/model/core/material/itemcatalog_test.py rename mcpacker/model/{core => }/dimension.py (100%) rename mcpacker/model/{core => }/dimension_test.py (78%) rename mcpacker/model/{core => ecology}/__init__.py (100%) rename mcpacker/model/{core => }/ecology/biome.py (79%) rename mcpacker/model/{core => }/ecology/biome_test.py (60%) create mode 100644 mcpacker/model/ecology/biomecatalog.py rename mcpacker/model/{core => }/ecology/biomecatalog_test.py (74%) rename mcpacker/model/{core => }/ecology/biomefilter.py (95%) rename mcpacker/model/{core => }/ecology/biomefilter_test.py (81%) rename mcpacker/model/{core => }/ecology/biometrait.py (100%) rename mcpacker/model/{core => }/ecology/biometrait_test.py (91%) rename mcpacker/model/{core => }/ecology/flora.py (85%) rename mcpacker/model/{core => }/ecology/flora_test.py (83%) rename mcpacker/model/{core => }/ecology/geology.py (88%) rename mcpacker/model/{core => }/ecology/geology_test.py (74%) rename mcpacker/model/{core => }/ecology/heat.py (88%) rename mcpacker/model/{core => }/ecology/heat_test.py (85%) rename mcpacker/model/{core => }/ecology/humidity.py (77%) rename mcpacker/model/{core => }/ecology/humidity_test.py (81%) rename mcpacker/model/{core => }/ecology/soil.py (89%) rename mcpacker/model/{core => }/ecology/soil_test.py (76%) rename mcpacker/model/{core => }/ecology/water.py (88%) rename mcpacker/model/{core => }/ecology/water_test.py (76%) rename mcpacker/model/{core/ecology => fauna}/__init__.py (100%) rename mcpacker/model/{core => }/fauna/active.py (100%) rename mcpacker/model/{core => }/fauna/active_test.py (76%) rename mcpacker/model/{core => }/fauna/group.py (100%) rename mcpacker/model/{core => }/fauna/group_test.py (90%) rename mcpacker/model/{core => }/fauna/location.py (90%) rename mcpacker/model/{core => }/fauna/location_test.py (75%) rename mcpacker/model/{core => }/fauna/mob.py (85%) rename mcpacker/model/{core => }/fauna/mob_test.py (90%) rename mcpacker/model/{core => }/fauna/mobcatalog.py (60%) rename mcpacker/model/{core => }/fauna/mobcatalog_test.py (75%) rename mcpacker/model/{core => }/fauna/mobspawn.py (79%) rename mcpacker/model/{core => }/fauna/mobspawn_test.py (80%) rename mcpacker/model/{core => }/fauna/mobspawncatalog.py (58%) create mode 100644 mcpacker/model/fauna/mobspawncatalog_test.py rename mcpacker/model/{core/fauna => flora}/__init__.py (100%) rename mcpacker/model/{core => }/flora/canopyshape.py (100%) rename mcpacker/model/{core => }/flora/canopyshape_test.py (74%) rename mcpacker/model/{core => }/flora/companion.py (81%) rename mcpacker/model/{core => }/flora/companion_test.py (75%) rename mcpacker/model/{core => }/flora/density.py (100%) rename mcpacker/model/{core => }/flora/density_test.py (76%) rename mcpacker/model/{core => }/flora/immersion.py (100%) rename mcpacker/model/{core => }/flora/immersion_test.py (75%) rename mcpacker/model/{core => }/flora/patch.py (86%) rename mcpacker/model/{core => }/flora/patch_test.py (77%) rename mcpacker/model/{core => }/flora/plant.py (100%) rename mcpacker/model/{core => }/flora/plant_test.py (77%) rename mcpacker/model/{core => }/flora/plantcatalog.py (79%) rename mcpacker/model/{core => }/flora/plantcatalog_test.py (74%) rename mcpacker/model/{core => }/flora/plantspawn.py (78%) rename mcpacker/model/{core => }/flora/plantspawn_test.py (75%) rename mcpacker/model/{core => }/flora/plantspawncatalog.py (77%) create mode 100644 mcpacker/model/flora/plantspawncatalog_test.py rename mcpacker/model/{core => }/flora/tree.py (81%) rename mcpacker/model/{core => }/flora/tree_test.py (77%) rename mcpacker/model/{core => }/flora/trunkshape.py (100%) rename mcpacker/model/{core => }/flora/trunkshape_test.py (75%) rename mcpacker/model/{core/flora => geology}/__init__.py (100%) rename mcpacker/model/{core => }/geology/bulk.py (100%) rename mcpacker/model/{core => }/geology/bulk_test.py (91%) rename mcpacker/model/{core => }/geology/deposit/__init__.py (76%) rename mcpacker/model/{core => }/geology/deposit/__init___test.py (75%) rename mcpacker/model/{core => }/geology/deposit/geodedeposit.py (53%) rename mcpacker/model/{core => }/geology/deposit/geodedeposit_test.py (70%) rename mcpacker/model/{core => }/geology/deposit/mineraldeposit.py (68%) rename mcpacker/model/{core => }/geology/deposit/mineraldeposit_test.py (72%) rename mcpacker/model/{core => }/geology/depositcatalog.py (57%) create mode 100644 mcpacker/model/geology/depositcatalog_test.py rename mcpacker/model/{core => }/geology/inclusion.py (91%) rename mcpacker/model/{core => }/geology/inclusion_test.py (74%) rename mcpacker/model/{core => }/geology/mineral.py (84%) rename mcpacker/model/{core => }/geology/mineral_test.py (85%) rename mcpacker/model/{core => }/geology/mineralcatalog.py (57%) create mode 100644 mcpacker/model/geology/mineralcatalog_test.py rename mcpacker/model/{core => }/geology/proportion.py (100%) rename mcpacker/model/{core => }/geology/proportion_test.py (82%) rename mcpacker/model/{core => }/geology/replacement.py (95%) rename mcpacker/model/{core => }/geology/replacement_test.py (94%) rename mcpacker/model/{core => }/habitat.py (81%) rename mcpacker/model/{core => }/habitat_test.py (84%) rename mcpacker/model/{core/geology => material}/__init__.py (100%) rename mcpacker/model/{core => }/material/block.py (66%) rename mcpacker/model/{core => }/material/block_test.py (75%) rename mcpacker/model/{core => }/material/blockcatalog.py (57%) create mode 100644 mcpacker/model/material/blockcatalog_test.py rename mcpacker/model/{core => }/material/item.py (87%) rename mcpacker/model/{core => }/material/item_test.py (76%) rename mcpacker/model/{core => }/material/itemcatalog.py (70%) create mode 100644 mcpacker/model/material/itemcatalog_test.py rename mcpacker/model/{core => }/material/loot.py (94%) rename mcpacker/model/{core => }/material/loot_test.py (76%) rename mcpacker/model/{core => }/material/loottable.py (72%) rename mcpacker/model/{core => }/material/loottable_test.py (74%) rename mcpacker/model/{core => }/material/soundtype.py (100%) rename mcpacker/model/{core => }/material/soundtype_test.py (74%) rename mcpacker/model/{core => }/resourceid.py (100%) rename mcpacker/model/{core => }/resourceid_test.py (89%) rename mcpacker/model/{core => }/scarcity.py (100%) rename mcpacker/model/{core => }/scarcity_test.py (76%) rename mcpacker/model/{core => }/season.py (100%) rename mcpacker/model/{core => }/season_test.py (90%) rename mcpacker/model/{core => }/spawn.py (91%) rename mcpacker/model/{core => }/spawn_test.py (83%) rename mcpacker/model/{core => }/world.py (72%) rename mcpacker/model/{core => }/world_test.py (75%) diff --git a/mcpacker/format/datapack/biomemodifier/removespawn.py b/mcpacker/format/datapack/biomemodifier/removespawn.py index 23af5d4..83962b9 100644 --- a/mcpacker/format/datapack/biomemodifier/removespawn.py +++ b/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 diff --git a/mcpacker/format/datapack/blockstateprovider/simplestateprovider.py b/mcpacker/format/datapack/blockstateprovider/simplestateprovider.py index 2f3eedd..2525e42 100644 --- a/mcpacker/format/datapack/blockstateprovider/simplestateprovider.py +++ b/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 ############################################################################################ diff --git a/mcpacker/format/datapack/configuredfeature/simpleblock.py b/mcpacker/format/datapack/configuredfeature/simpleblock.py index c89207e..327661e 100644 --- a/mcpacker/format/datapack/configuredfeature/simpleblock.py +++ b/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 ############################################################################################ diff --git a/mcpacker/format/datapack/recipe/__init__.py b/mcpacker/format/datapack/recipe/__init__.py index 200e87b..948b75a 100644 --- a/mcpacker/format/datapack/recipe/__init__.py +++ b/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 ############################################################################################ diff --git a/mcpacker/format/datapack/recipe/shapedrecipe.py b/mcpacker/format/datapack/recipe/shapedrecipe.py index 815ffd9..3184957 100644 --- a/mcpacker/format/datapack/recipe/shapedrecipe.py +++ b/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 ############################################################################################ diff --git a/mcpacker/format/datapack/recipe/shapelessrecipe.py b/mcpacker/format/datapack/recipe/shapelessrecipe.py index 97ba33a..6cbe736 100644 --- a/mcpacker/format/datapack/recipe/shapelessrecipe.py +++ b/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 diff --git a/mcpacker/format/datapack/structure.py b/mcpacker/format/datapack/structure.py index 1def808..eb15557 100644 --- a/mcpacker/format/datapack/structure.py +++ b/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 diff --git a/mcpacker/format/largeoredeposit/mineraldepositcomposer.py b/mcpacker/format/largeoredeposit/mineraldepositcomposer.py index c49e75a..3b9f4a3 100644 --- a/mcpacker/format/largeoredeposit/mineraldepositcomposer.py +++ b/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 ######################################################################################## diff --git a/mcpacker/format/largeoredeposit/mineraldepositcomposer_test.py b/mcpacker/format/largeoredeposit/mineraldepositcomposer_test.py index 36d01e9..495bb39 100644 --- a/mcpacker/format/largeoredeposit/mineraldepositcomposer_test.py +++ b/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 diff --git a/mcpacker/format/report/biomereport.py b/mcpacker/format/report/biomereport.py index 0228eb4..4e6ae5a 100644 --- a/mcpacker/format/report/biomereport.py +++ b/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 ############################################################################################ diff --git a/mcpacker/format/report/biomereport_test.py b/mcpacker/format/report/biomereport_test.py index 0c6a768..4ad5dc8 100644 --- a/mcpacker/format/report/biomereport_test.py +++ b/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 diff --git a/mcpacker/format/report/depositreport.py b/mcpacker/format/report/depositreport.py index ebddab6..84cc741 100644 --- a/mcpacker/format/report/depositreport.py +++ b/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 diff --git a/mcpacker/format/report/mineralreport_test.py b/mcpacker/format/report/mineralreport_test.py index 8b44ac4..0833ee4 100644 --- a/mcpacker/format/report/mineralreport_test.py +++ b/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 diff --git a/mcpacker/format/report/mobspawnreport.py b/mcpacker/format/report/mobspawnreport.py index 96a26f8..52fbfbd 100644 --- a/mcpacker/format/report/mobspawnreport.py +++ b/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 diff --git a/mcpacker/format/report/mobspawnreport_test.py b/mcpacker/format/report/mobspawnreport_test.py index 99aee95..ca16cc2 100644 --- a/mcpacker/format/report/mobspawnreport_test.py +++ b/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 diff --git a/mcpacker/format/report/plantspawnreport.py b/mcpacker/format/report/plantspawnreport.py index 24c100f..692f16b 100644 --- a/mcpacker/format/report/plantspawnreport.py +++ b/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 diff --git a/mcpacker/model/resourcepack/__init__.py b/mcpacker/format/resourcepack/__init__.py similarity index 95% rename from mcpacker/model/resourcepack/__init__.py rename to mcpacker/format/resourcepack/__init__.py index 8e0387c..54a65be 100644 --- a/mcpacker/model/resourcepack/__init__.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/resourcepack/__init___test.py b/mcpacker/format/resourcepack/__init___test.py similarity index 78% rename from mcpacker/model/resourcepack/__init___test.py rename to mcpacker/format/resourcepack/__init___test.py index 5adb9a2..e47745d 100644 --- a/mcpacker/model/resourcepack/__init___test.py +++ b/mcpacker/format/resourcepack/__init___test.py @@ -1,4 +1,4 @@ -import mcpacker.model.resourcepack +import mcpacker.format.resourcepack # Tests ############################################################################################ diff --git a/mcpacker/model/resourcepack/blockstate.py b/mcpacker/format/resourcepack/blockstate.py similarity index 92% rename from mcpacker/model/resourcepack/blockstate.py rename to mcpacker/format/resourcepack/blockstate.py index 6515e6a..b6207ca 100644 --- a/mcpacker/model/resourcepack/blockstate.py +++ b/mcpacker/format/resourcepack/blockstate.py @@ -1,4 +1,4 @@ -from mcpacker.model.resourcepack.variant import Variant +from mcpacker.format.resourcepack.variant import Variant # Class ############################################################################################ diff --git a/mcpacker/model/resourcepack/blockstate_test.py b/mcpacker/format/resourcepack/blockstate_test.py similarity index 78% rename from mcpacker/model/resourcepack/blockstate_test.py rename to mcpacker/format/resourcepack/blockstate_test.py index bb8ce98..aee8f5b 100644 --- a/mcpacker/model/resourcepack/blockstate_test.py +++ b/mcpacker/format/resourcepack/blockstate_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.resourcepack.blockstate +import mcpacker.format.resourcepack.blockstate # Tests ############################################################################################ diff --git a/mcpacker/model/resourcepack/kind.py b/mcpacker/format/resourcepack/kind.py similarity index 100% rename from mcpacker/model/resourcepack/kind.py rename to mcpacker/format/resourcepack/kind.py diff --git a/mcpacker/model/resourcepack/kind_test.py b/mcpacker/format/resourcepack/kind_test.py similarity index 76% rename from mcpacker/model/resourcepack/kind_test.py rename to mcpacker/format/resourcepack/kind_test.py index 1d7c727..fa1c23c 100644 --- a/mcpacker/model/resourcepack/kind_test.py +++ b/mcpacker/format/resourcepack/kind_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.resourcepack.kind +import mcpacker.format.resourcepack.kind # Tests ############################################################################################ diff --git a/mcpacker/model/resourcepack/model.py b/mcpacker/format/resourcepack/model.py similarity index 87% rename from mcpacker/model/resourcepack/model.py rename to mcpacker/format/resourcepack/model.py index 376e512..e7197cf 100644 --- a/mcpacker/model/resourcepack/model.py +++ b/mcpacker/format/resourcepack/model.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.resourceid import ResourceId # Class ############################################################################################ diff --git a/mcpacker/model/resourcepack/model_test.py b/mcpacker/format/resourcepack/model_test.py similarity index 75% rename from mcpacker/model/resourcepack/model_test.py rename to mcpacker/format/resourcepack/model_test.py index 512694d..14450e6 100644 --- a/mcpacker/model/resourcepack/model_test.py +++ b/mcpacker/format/resourcepack/model_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.resourcepack.model +import mcpacker.format.resourcepack.model # Tests ############################################################################################ diff --git a/mcpacker/model/resourcepack/modresource.py b/mcpacker/format/resourcepack/modresource.py similarity index 72% rename from mcpacker/model/resourcepack/modresource.py rename to mcpacker/format/resourcepack/modresource.py index a2f0662..51c4e1a 100644 --- a/mcpacker/model/resourcepack/modresource.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/resourcepack/modresource_test.py b/mcpacker/format/resourcepack/modresource_test.py similarity index 73% rename from mcpacker/model/resourcepack/modresource_test.py rename to mcpacker/format/resourcepack/modresource_test.py index 90ade6a..ffc80ae 100644 --- a/mcpacker/model/resourcepack/modresource_test.py +++ b/mcpacker/format/resourcepack/modresource_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.resourcepack.modresource +import mcpacker.format.resourcepack.modresource # Tests ############################################################################################ diff --git a/mcpacker/model/resourcepack/texture.py b/mcpacker/format/resourcepack/texture.py similarity index 82% rename from mcpacker/model/resourcepack/texture.py rename to mcpacker/format/resourcepack/texture.py index 77b5d5a..0581f90 100644 --- a/mcpacker/model/resourcepack/texture.py +++ b/mcpacker/format/resourcepack/texture.py @@ -1,4 +1,4 @@ -from mcpacker.model.resourcepack.kind import Kind +from mcpacker.format.resourcepack.kind import Kind # Class ############################################################################################ diff --git a/mcpacker/model/resourcepack/texture_test.py b/mcpacker/format/resourcepack/texture_test.py similarity index 75% rename from mcpacker/model/resourcepack/texture_test.py rename to mcpacker/format/resourcepack/texture_test.py index 255b070..58aecf8 100644 --- a/mcpacker/model/resourcepack/texture_test.py +++ b/mcpacker/format/resourcepack/texture_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.resourcepack.texture +import mcpacker.format.resourcepack.texture # Tests ############################################################################################ diff --git a/mcpacker/model/resourcepack/variant.py b/mcpacker/format/resourcepack/variant.py similarity index 86% rename from mcpacker/model/resourcepack/variant.py rename to mcpacker/format/resourcepack/variant.py index 6b9609a..5a9d081 100644 --- a/mcpacker/model/resourcepack/variant.py +++ b/mcpacker/format/resourcepack/variant.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.resourceid import ResourceId # Class ############################################################################################ diff --git a/mcpacker/model/resourcepack/variant_test.py b/mcpacker/format/resourcepack/variant_test.py similarity index 89% rename from mcpacker/model/resourcepack/variant_test.py rename to mcpacker/format/resourcepack/variant_test.py index 863a54d..ed05b20 100644 --- a/mcpacker/model/resourcepack/variant_test.py +++ b/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 diff --git a/mcpacker/json.py b/mcpacker/json.py index db6afbc..985d2d5 100644 --- a/mcpacker/json.py +++ b/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 diff --git a/mcpacker/json_test.py b/mcpacker/json_test.py index 1ac199c..f68d906 100644 --- a/mcpacker/json_test.py +++ b/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 diff --git a/mcpacker/model/core/altitude.py b/mcpacker/model/altitude.py similarity index 100% rename from mcpacker/model/core/altitude.py rename to mcpacker/model/altitude.py diff --git a/mcpacker/model/core/altitude_test.py b/mcpacker/model/altitude_test.py similarity index 92% rename from mcpacker/model/core/altitude_test.py rename to mcpacker/model/altitude_test.py index 35a931d..04ef4f9 100644 --- a/mcpacker/model/core/altitude_test.py +++ b/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 ######################################################################################### diff --git a/mcpacker/model/blockfactory.py b/mcpacker/model/blockfactory.py index f011310..1c67048 100644 --- a/mcpacker/model/blockfactory.py +++ b/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 diff --git a/mcpacker/model/core/blockstate.py b/mcpacker/model/blockstate.py similarity index 95% rename from mcpacker/model/core/blockstate.py rename to mcpacker/model/blockstate.py index adf4ea2..0e06a1a 100644 --- a/mcpacker/model/core/blockstate.py +++ b/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 diff --git a/mcpacker/model/core/blockstate_test.py b/mcpacker/model/blockstate_test.py similarity index 84% rename from mcpacker/model/core/blockstate_test.py rename to mcpacker/model/blockstate_test.py index 25f9775..c2858e4 100644 --- a/mcpacker/model/core/blockstate_test.py +++ b/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 ######################################################################################### diff --git a/mcpacker/model/core/ecology/biomecatalog.py b/mcpacker/model/core/ecology/biomecatalog.py deleted file mode 100644 index 61a1c11..0000000 --- a/mcpacker/model/core/ecology/biomecatalog.py +++ /dev/null @@ -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 diff --git a/mcpacker/model/core/fauna/mobspawncatalog_test.py b/mcpacker/model/core/fauna/mobspawncatalog_test.py deleted file mode 100644 index ec4745c..0000000 --- a/mcpacker/model/core/fauna/mobspawncatalog_test.py +++ /dev/null @@ -1,8 +0,0 @@ -import mcpacker.model.core.fauna.mobspawncatalog - - -# Tests ############################################################################################ - -def test_syntax(): - pass - diff --git a/mcpacker/model/core/flora/plantspawncatalog_test.py b/mcpacker/model/core/flora/plantspawncatalog_test.py deleted file mode 100644 index 2cc4a54..0000000 --- a/mcpacker/model/core/flora/plantspawncatalog_test.py +++ /dev/null @@ -1,7 +0,0 @@ -import mcpacker.model.core.flora.plantspawncatalog - - -# Tests ############################################################################################ - -def test_syntax(): - pass diff --git a/mcpacker/model/core/geology/depositcatalog_test.py b/mcpacker/model/core/geology/depositcatalog_test.py deleted file mode 100644 index 528da5f..0000000 --- a/mcpacker/model/core/geology/depositcatalog_test.py +++ /dev/null @@ -1,7 +0,0 @@ -import mcpacker.model.core.geology.depositcatalog - - -# Tests ############################################################################################ - -def test_syntax(): - pass diff --git a/mcpacker/model/core/geology/mineralcatalog_test.py b/mcpacker/model/core/geology/mineralcatalog_test.py deleted file mode 100644 index 48dcfb1..0000000 --- a/mcpacker/model/core/geology/mineralcatalog_test.py +++ /dev/null @@ -1,7 +0,0 @@ -import mcpacker.model.core.geology.mineralcatalog - - -# Tests ############################################################################################ - -def test_syntax(): - pass diff --git a/mcpacker/model/core/material/__init__.py b/mcpacker/model/core/material/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/mcpacker/model/core/material/blockcatalog_test.py b/mcpacker/model/core/material/blockcatalog_test.py deleted file mode 100644 index 01b7782..0000000 --- a/mcpacker/model/core/material/blockcatalog_test.py +++ /dev/null @@ -1,7 +0,0 @@ -import mcpacker.model.core.material.blockcatalog - - -# Tests ############################################################################################ - -def test_syntax(): - pass diff --git a/mcpacker/model/core/material/itemcatalog_test.py b/mcpacker/model/core/material/itemcatalog_test.py deleted file mode 100644 index 4995903..0000000 --- a/mcpacker/model/core/material/itemcatalog_test.py +++ /dev/null @@ -1,7 +0,0 @@ -import mcpacker.model.core.material.itemcatalog - - -# Tests ############################################################################################ - -def test_syntax(): - pass diff --git a/mcpacker/model/core/dimension.py b/mcpacker/model/dimension.py similarity index 100% rename from mcpacker/model/core/dimension.py rename to mcpacker/model/dimension.py diff --git a/mcpacker/model/core/dimension_test.py b/mcpacker/model/dimension_test.py similarity index 78% rename from mcpacker/model/core/dimension_test.py rename to mcpacker/model/dimension_test.py index 85789d3..76ae2e7 100644 --- a/mcpacker/model/core/dimension_test.py +++ b/mcpacker/model/dimension_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.dimension +import mcpacker.model.dimension # Tests ############################################################################################ diff --git a/mcpacker/model/core/__init__.py b/mcpacker/model/ecology/__init__.py similarity index 100% rename from mcpacker/model/core/__init__.py rename to mcpacker/model/ecology/__init__.py diff --git a/mcpacker/model/core/ecology/biome.py b/mcpacker/model/ecology/biome.py similarity index 79% rename from mcpacker/model/core/ecology/biome.py rename to mcpacker/model/ecology/biome.py index 44bb048..8a03e56 100644 --- a/mcpacker/model/core/ecology/biome.py +++ b/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 #################################################################################################### diff --git a/mcpacker/model/core/ecology/biome_test.py b/mcpacker/model/ecology/biome_test.py similarity index 60% rename from mcpacker/model/core/ecology/biome_test.py rename to mcpacker/model/ecology/biome_test.py index 227172a..b634850 100644 --- a/mcpacker/model/core/ecology/biome_test.py +++ b/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 ######################################################################################### diff --git a/mcpacker/model/ecology/biomecatalog.py b/mcpacker/model/ecology/biomecatalog.py new file mode 100644 index 0000000..479675b --- /dev/null +++ b/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 diff --git a/mcpacker/model/core/ecology/biomecatalog_test.py b/mcpacker/model/ecology/biomecatalog_test.py similarity index 74% rename from mcpacker/model/core/ecology/biomecatalog_test.py rename to mcpacker/model/ecology/biomecatalog_test.py index b7291e3..b92de38 100644 --- a/mcpacker/model/core/ecology/biomecatalog_test.py +++ b/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 ######################################################################################### diff --git a/mcpacker/model/core/ecology/biomefilter.py b/mcpacker/model/ecology/biomefilter.py similarity index 95% rename from mcpacker/model/core/ecology/biomefilter.py rename to mcpacker/model/ecology/biomefilter.py index b7b5e36..4e45118 100644 --- a/mcpacker/model/core/ecology/biomefilter.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/biomefilter_test.py b/mcpacker/model/ecology/biomefilter_test.py similarity index 81% rename from mcpacker/model/core/ecology/biomefilter_test.py rename to mcpacker/model/ecology/biomefilter_test.py index 08a44e7..7ba6379 100644 --- a/mcpacker/model/core/ecology/biomefilter_test.py +++ b/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 ######################################################################################### diff --git a/mcpacker/model/core/ecology/biometrait.py b/mcpacker/model/ecology/biometrait.py similarity index 100% rename from mcpacker/model/core/ecology/biometrait.py rename to mcpacker/model/ecology/biometrait.py diff --git a/mcpacker/model/core/ecology/biometrait_test.py b/mcpacker/model/ecology/biometrait_test.py similarity index 91% rename from mcpacker/model/core/ecology/biometrait_test.py rename to mcpacker/model/ecology/biometrait_test.py index 85bc53c..26b7e1a 100644 --- a/mcpacker/model/core/ecology/biometrait_test.py +++ b/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 ######################################################################################### diff --git a/mcpacker/model/core/ecology/flora.py b/mcpacker/model/ecology/flora.py similarity index 85% rename from mcpacker/model/core/ecology/flora.py rename to mcpacker/model/ecology/flora.py index eb688a9..cef0fad 100644 --- a/mcpacker/model/core/ecology/flora.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/flora_test.py b/mcpacker/model/ecology/flora_test.py similarity index 83% rename from mcpacker/model/core/ecology/flora_test.py rename to mcpacker/model/ecology/flora_test.py index ba60b27..bf5bfce 100644 --- a/mcpacker/model/core/ecology/flora_test.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/geology.py b/mcpacker/model/ecology/geology.py similarity index 88% rename from mcpacker/model/core/ecology/geology.py rename to mcpacker/model/ecology/geology.py index bb685b5..fd72ccb 100644 --- a/mcpacker/model/core/ecology/geology.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/geology_test.py b/mcpacker/model/ecology/geology_test.py similarity index 74% rename from mcpacker/model/core/ecology/geology_test.py rename to mcpacker/model/ecology/geology_test.py index 2c0086b..b1c00a0 100644 --- a/mcpacker/model/core/ecology/geology_test.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/heat.py b/mcpacker/model/ecology/heat.py similarity index 88% rename from mcpacker/model/core/ecology/heat.py rename to mcpacker/model/ecology/heat.py index 82d36f6..519f593 100644 --- a/mcpacker/model/core/ecology/heat.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/heat_test.py b/mcpacker/model/ecology/heat_test.py similarity index 85% rename from mcpacker/model/core/ecology/heat_test.py rename to mcpacker/model/ecology/heat_test.py index fd44f3e..f24f024 100644 --- a/mcpacker/model/core/ecology/heat_test.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/humidity.py b/mcpacker/model/ecology/humidity.py similarity index 77% rename from mcpacker/model/core/ecology/humidity.py rename to mcpacker/model/ecology/humidity.py index 1d550a9..477e518 100644 --- a/mcpacker/model/core/ecology/humidity.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/humidity_test.py b/mcpacker/model/ecology/humidity_test.py similarity index 81% rename from mcpacker/model/core/ecology/humidity_test.py rename to mcpacker/model/ecology/humidity_test.py index cf5c12f..1ba4e20 100644 --- a/mcpacker/model/core/ecology/humidity_test.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/soil.py b/mcpacker/model/ecology/soil.py similarity index 89% rename from mcpacker/model/core/ecology/soil.py rename to mcpacker/model/ecology/soil.py index 946693e..078d78b 100644 --- a/mcpacker/model/core/ecology/soil.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/soil_test.py b/mcpacker/model/ecology/soil_test.py similarity index 76% rename from mcpacker/model/core/ecology/soil_test.py rename to mcpacker/model/ecology/soil_test.py index 1ecd0e5..42d485e 100644 --- a/mcpacker/model/core/ecology/soil_test.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/water.py b/mcpacker/model/ecology/water.py similarity index 88% rename from mcpacker/model/core/ecology/water.py rename to mcpacker/model/ecology/water.py index 6bdffc2..6e53468 100644 --- a/mcpacker/model/core/ecology/water.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/water_test.py b/mcpacker/model/ecology/water_test.py similarity index 76% rename from mcpacker/model/core/ecology/water_test.py rename to mcpacker/model/ecology/water_test.py index 3754bcf..beb060c 100644 --- a/mcpacker/model/core/ecology/water_test.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/ecology/__init__.py b/mcpacker/model/fauna/__init__.py similarity index 100% rename from mcpacker/model/core/ecology/__init__.py rename to mcpacker/model/fauna/__init__.py diff --git a/mcpacker/model/core/fauna/active.py b/mcpacker/model/fauna/active.py similarity index 100% rename from mcpacker/model/core/fauna/active.py rename to mcpacker/model/fauna/active.py diff --git a/mcpacker/model/core/fauna/active_test.py b/mcpacker/model/fauna/active_test.py similarity index 76% rename from mcpacker/model/core/fauna/active_test.py rename to mcpacker/model/fauna/active_test.py index 2141ad4..10f9434 100644 --- a/mcpacker/model/core/fauna/active_test.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/fauna/group.py b/mcpacker/model/fauna/group.py similarity index 100% rename from mcpacker/model/core/fauna/group.py rename to mcpacker/model/fauna/group.py diff --git a/mcpacker/model/core/fauna/group_test.py b/mcpacker/model/fauna/group_test.py similarity index 90% rename from mcpacker/model/core/fauna/group_test.py rename to mcpacker/model/fauna/group_test.py index 84aee8d..b51d0da 100644 --- a/mcpacker/model/core/fauna/group_test.py +++ b/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 ######################################################################################### diff --git a/mcpacker/model/core/fauna/location.py b/mcpacker/model/fauna/location.py similarity index 90% rename from mcpacker/model/core/fauna/location.py rename to mcpacker/model/fauna/location.py index 1eb4da6..717972c 100644 --- a/mcpacker/model/core/fauna/location.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/fauna/location_test.py b/mcpacker/model/fauna/location_test.py similarity index 75% rename from mcpacker/model/core/fauna/location_test.py rename to mcpacker/model/fauna/location_test.py index d03724a..55e3c8c 100644 --- a/mcpacker/model/core/fauna/location_test.py +++ b/mcpacker/model/fauna/location_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.fauna.location +import mcpacker.model.fauna.location # Tests ############################################################################################ diff --git a/mcpacker/model/core/fauna/mob.py b/mcpacker/model/fauna/mob.py similarity index 85% rename from mcpacker/model/core/fauna/mob.py rename to mcpacker/model/fauna/mob.py index 0dafbd2..4214ecb 100644 --- a/mcpacker/model/core/fauna/mob.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/fauna/mob_test.py b/mcpacker/model/fauna/mob_test.py similarity index 90% rename from mcpacker/model/core/fauna/mob_test.py rename to mcpacker/model/fauna/mob_test.py index 6f773c1..e7d39b8 100644 --- a/mcpacker/model/core/fauna/mob_test.py +++ b/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 ######################################################################################### diff --git a/mcpacker/model/core/fauna/mobcatalog.py b/mcpacker/model/fauna/mobcatalog.py similarity index 60% rename from mcpacker/model/core/fauna/mobcatalog.py rename to mcpacker/model/fauna/mobcatalog.py index 01da0f7..8002ab2 100644 --- a/mcpacker/model/core/fauna/mobcatalog.py +++ b/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 ########################################################################################## diff --git a/mcpacker/model/core/fauna/mobcatalog_test.py b/mcpacker/model/fauna/mobcatalog_test.py similarity index 75% rename from mcpacker/model/core/fauna/mobcatalog_test.py rename to mcpacker/model/fauna/mobcatalog_test.py index 3dbebb7..01e8862 100644 --- a/mcpacker/model/core/fauna/mobcatalog_test.py +++ b/mcpacker/model/fauna/mobcatalog_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.fauna.mobcatalog +import mcpacker.model.fauna.mobcatalog # Tests ############################################################################################ diff --git a/mcpacker/model/core/fauna/mobspawn.py b/mcpacker/model/fauna/mobspawn.py similarity index 79% rename from mcpacker/model/core/fauna/mobspawn.py rename to mcpacker/model/fauna/mobspawn.py index 3b43264..74e82eb 100644 --- a/mcpacker/model/core/fauna/mobspawn.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/fauna/mobspawn_test.py b/mcpacker/model/fauna/mobspawn_test.py similarity index 80% rename from mcpacker/model/core/fauna/mobspawn_test.py rename to mcpacker/model/fauna/mobspawn_test.py index f5f54d8..572e655 100644 --- a/mcpacker/model/core/fauna/mobspawn_test.py +++ b/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 ######################################################################################### diff --git a/mcpacker/model/core/fauna/mobspawncatalog.py b/mcpacker/model/fauna/mobspawncatalog.py similarity index 58% rename from mcpacker/model/core/fauna/mobspawncatalog.py rename to mcpacker/model/fauna/mobspawncatalog.py index b531ac1..5f556fb 100644 --- a/mcpacker/model/core/fauna/mobspawncatalog.py +++ b/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 ########################################################################################## diff --git a/mcpacker/model/fauna/mobspawncatalog_test.py b/mcpacker/model/fauna/mobspawncatalog_test.py new file mode 100644 index 0000000..a4401a8 --- /dev/null +++ b/mcpacker/model/fauna/mobspawncatalog_test.py @@ -0,0 +1,8 @@ +import mcpacker.model.fauna.mobspawncatalog + + +# Tests ############################################################################################ + +def test_syntax(): + pass + diff --git a/mcpacker/model/core/fauna/__init__.py b/mcpacker/model/flora/__init__.py similarity index 100% rename from mcpacker/model/core/fauna/__init__.py rename to mcpacker/model/flora/__init__.py diff --git a/mcpacker/model/core/flora/canopyshape.py b/mcpacker/model/flora/canopyshape.py similarity index 100% rename from mcpacker/model/core/flora/canopyshape.py rename to mcpacker/model/flora/canopyshape.py diff --git a/mcpacker/model/core/flora/canopyshape_test.py b/mcpacker/model/flora/canopyshape_test.py similarity index 74% rename from mcpacker/model/core/flora/canopyshape_test.py rename to mcpacker/model/flora/canopyshape_test.py index 0e84e94..ca472a0 100644 --- a/mcpacker/model/core/flora/canopyshape_test.py +++ b/mcpacker/model/flora/canopyshape_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.flora.canopyshape +import mcpacker.model.flora.canopyshape # Tests ############################################################################################ diff --git a/mcpacker/model/core/flora/companion.py b/mcpacker/model/flora/companion.py similarity index 81% rename from mcpacker/model/core/flora/companion.py rename to mcpacker/model/flora/companion.py index 688c8db..2986c51 100644 --- a/mcpacker/model/core/flora/companion.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/flora/companion_test.py b/mcpacker/model/flora/companion_test.py similarity index 75% rename from mcpacker/model/core/flora/companion_test.py rename to mcpacker/model/flora/companion_test.py index 992ecfe..82910ec 100644 --- a/mcpacker/model/core/flora/companion_test.py +++ b/mcpacker/model/flora/companion_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.flora.companion +import mcpacker.model.flora.companion # Tests ############################################################################################ diff --git a/mcpacker/model/core/flora/density.py b/mcpacker/model/flora/density.py similarity index 100% rename from mcpacker/model/core/flora/density.py rename to mcpacker/model/flora/density.py diff --git a/mcpacker/model/core/flora/density_test.py b/mcpacker/model/flora/density_test.py similarity index 76% rename from mcpacker/model/core/flora/density_test.py rename to mcpacker/model/flora/density_test.py index d59e3ab..c524259 100644 --- a/mcpacker/model/core/flora/density_test.py +++ b/mcpacker/model/flora/density_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.flora.density +import mcpacker.model.flora.density # Class ############################################################################################ diff --git a/mcpacker/model/core/flora/immersion.py b/mcpacker/model/flora/immersion.py similarity index 100% rename from mcpacker/model/core/flora/immersion.py rename to mcpacker/model/flora/immersion.py diff --git a/mcpacker/model/core/flora/immersion_test.py b/mcpacker/model/flora/immersion_test.py similarity index 75% rename from mcpacker/model/core/flora/immersion_test.py rename to mcpacker/model/flora/immersion_test.py index 3ef3e9d..f1c8776 100644 --- a/mcpacker/model/core/flora/immersion_test.py +++ b/mcpacker/model/flora/immersion_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.flora.immersion +import mcpacker.model.flora.immersion # Tests ############################################################################################ diff --git a/mcpacker/model/core/flora/patch.py b/mcpacker/model/flora/patch.py similarity index 86% rename from mcpacker/model/core/flora/patch.py rename to mcpacker/model/flora/patch.py index d8653b1..615ff98 100644 --- a/mcpacker/model/core/flora/patch.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/flora/patch_test.py b/mcpacker/model/flora/patch_test.py similarity index 77% rename from mcpacker/model/core/flora/patch_test.py rename to mcpacker/model/flora/patch_test.py index 4896b10..6e27679 100644 --- a/mcpacker/model/core/flora/patch_test.py +++ b/mcpacker/model/flora/patch_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.flora.plant +import mcpacker.model.flora.plant # Tests ############################################################################################ diff --git a/mcpacker/model/core/flora/plant.py b/mcpacker/model/flora/plant.py similarity index 100% rename from mcpacker/model/core/flora/plant.py rename to mcpacker/model/flora/plant.py diff --git a/mcpacker/model/core/flora/plant_test.py b/mcpacker/model/flora/plant_test.py similarity index 77% rename from mcpacker/model/core/flora/plant_test.py rename to mcpacker/model/flora/plant_test.py index 4896b10..6e27679 100644 --- a/mcpacker/model/core/flora/plant_test.py +++ b/mcpacker/model/flora/plant_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.flora.plant +import mcpacker.model.flora.plant # Tests ############################################################################################ diff --git a/mcpacker/model/core/flora/plantcatalog.py b/mcpacker/model/flora/plantcatalog.py similarity index 79% rename from mcpacker/model/core/flora/plantcatalog.py rename to mcpacker/model/flora/plantcatalog.py index 220323b..9c05e92 100644 --- a/mcpacker/model/core/flora/plantcatalog.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/flora/plantcatalog_test.py b/mcpacker/model/flora/plantcatalog_test.py similarity index 74% rename from mcpacker/model/core/flora/plantcatalog_test.py rename to mcpacker/model/flora/plantcatalog_test.py index 014f8cc..a2a159c 100644 --- a/mcpacker/model/core/flora/plantcatalog_test.py +++ b/mcpacker/model/flora/plantcatalog_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.flora.plantcatalog +import mcpacker.model.flora.plantcatalog # Tests ############################################################################################ diff --git a/mcpacker/model/core/flora/plantspawn.py b/mcpacker/model/flora/plantspawn.py similarity index 78% rename from mcpacker/model/core/flora/plantspawn.py rename to mcpacker/model/flora/plantspawn.py index fe0589b..471c7ba 100644 --- a/mcpacker/model/core/flora/plantspawn.py +++ b/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 ############################################################################################ diff --git a/mcpacker/model/core/flora/plantspawn_test.py b/mcpacker/model/flora/plantspawn_test.py similarity index 75% rename from mcpacker/model/core/flora/plantspawn_test.py rename to mcpacker/model/flora/plantspawn_test.py index 13686c7..aab1c32 100644 --- a/mcpacker/model/core/flora/plantspawn_test.py +++ b/mcpacker/model/flora/plantspawn_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.flora.plantspawn +import mcpacker.model.flora.plantspawn # Tests ############################################################################################ diff --git a/mcpacker/model/core/flora/plantspawncatalog.py b/mcpacker/model/flora/plantspawncatalog.py similarity index 77% rename from mcpacker/model/core/flora/plantspawncatalog.py rename to mcpacker/model/flora/plantspawncatalog.py index f95088b..eb4486f 100644 --- a/mcpacker/model/core/flora/plantspawncatalog.py +++ b/mcpacker/model/flora/plantspawncatalog.py @@ -1,5 +1,5 @@ from mcpacker.model.catalog import Catalog -from mcpacker.model.core.flora.plantspawn import PlantSpawn +from mcpacker.model.flora.plantspawn import PlantSpawn # Class ############################################################################################ diff --git a/mcpacker/model/flora/plantspawncatalog_test.py b/mcpacker/model/flora/plantspawncatalog_test.py new file mode 100644 index 0000000..9f81ed8 --- /dev/null +++ b/mcpacker/model/flora/plantspawncatalog_test.py @@ -0,0 +1,7 @@ +import mcpacker.model.flora.plantspawncatalog + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/model/core/flora/tree.py b/mcpacker/model/flora/tree.py similarity index 81% rename from mcpacker/model/core/flora/tree.py rename to mcpacker/model/flora/tree.py index 3096c7b..0fd1d73 100644 --- a/mcpacker/model/core/flora/tree.py +++ b/mcpacker/model/flora/tree.py @@ -1,10 +1,10 @@ -from mcpacker.model.core.flora.canopyshape import CanopyShape -from mcpacker.model.core.flora.trunkshape import TrunkShape -from mcpacker.model.core.resourceid import ResourceId -from mcpacker.model.core.flora.plant import Plant +from mcpacker.model.flora.canopyshape import CanopyShape +from mcpacker.model.flora.trunkshape import TrunkShape +from mcpacker.model.resourceid import ResourceId +from mcpacker.model.flora.plant import Plant -import mcpacker.model.core.flora.canopyshape as CA -import mcpacker.model.core.flora.trunkshape as TR +import mcpacker.model.flora.canopyshape as CA +import mcpacker.model.flora.trunkshape as TR # Class ############################################################################################ diff --git a/mcpacker/model/core/flora/tree_test.py b/mcpacker/model/flora/tree_test.py similarity index 77% rename from mcpacker/model/core/flora/tree_test.py rename to mcpacker/model/flora/tree_test.py index 9894770..fe95289 100644 --- a/mcpacker/model/core/flora/tree_test.py +++ b/mcpacker/model/flora/tree_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.flora.tree +import mcpacker.model.flora.tree # Tests ############################################################################################ diff --git a/mcpacker/model/core/flora/trunkshape.py b/mcpacker/model/flora/trunkshape.py similarity index 100% rename from mcpacker/model/core/flora/trunkshape.py rename to mcpacker/model/flora/trunkshape.py diff --git a/mcpacker/model/core/flora/trunkshape_test.py b/mcpacker/model/flora/trunkshape_test.py similarity index 75% rename from mcpacker/model/core/flora/trunkshape_test.py rename to mcpacker/model/flora/trunkshape_test.py index 4c3d72b..4f49dd8 100644 --- a/mcpacker/model/core/flora/trunkshape_test.py +++ b/mcpacker/model/flora/trunkshape_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.flora.trunkshape +import mcpacker.model.flora.trunkshape # Tests ############################################################################################ diff --git a/mcpacker/model/core/flora/__init__.py b/mcpacker/model/geology/__init__.py similarity index 100% rename from mcpacker/model/core/flora/__init__.py rename to mcpacker/model/geology/__init__.py diff --git a/mcpacker/model/core/geology/bulk.py b/mcpacker/model/geology/bulk.py similarity index 100% rename from mcpacker/model/core/geology/bulk.py rename to mcpacker/model/geology/bulk.py diff --git a/mcpacker/model/core/geology/bulk_test.py b/mcpacker/model/geology/bulk_test.py similarity index 91% rename from mcpacker/model/core/geology/bulk_test.py rename to mcpacker/model/geology/bulk_test.py index a447d54..99cd650 100644 --- a/mcpacker/model/core/geology/bulk_test.py +++ b/mcpacker/model/geology/bulk_test.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.geology.bulk import Bulk +from mcpacker.model.geology.bulk import Bulk from pytest import fixture diff --git a/mcpacker/model/core/geology/deposit/__init__.py b/mcpacker/model/geology/deposit/__init__.py similarity index 76% rename from mcpacker/model/core/geology/deposit/__init__.py rename to mcpacker/model/geology/deposit/__init__.py index a76534e..a878cd1 100644 --- a/mcpacker/model/core/geology/deposit/__init__.py +++ b/mcpacker/model/geology/deposit/__init__.py @@ -1,13 +1,13 @@ 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.geology.bulk import Bulk -from mcpacker.model.core.geology.mineral import Mineral -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.geology.bulk import Bulk +from mcpacker.model.geology.mineral import Mineral +from mcpacker.model.scarcity import Scarcity -import mcpacker.model.core.altitude as altitude -import mcpacker.model.core.scarcity as scarcity +import mcpacker.model.altitude as altitude +import mcpacker.model.scarcity as scarcity # Class ############################################################################################ diff --git a/mcpacker/model/core/geology/deposit/__init___test.py b/mcpacker/model/geology/deposit/__init___test.py similarity index 75% rename from mcpacker/model/core/geology/deposit/__init___test.py rename to mcpacker/model/geology/deposit/__init___test.py index 76ba822..80863df 100644 --- a/mcpacker/model/core/geology/deposit/__init___test.py +++ b/mcpacker/model/geology/deposit/__init___test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.geology.deposit +import mcpacker.model.geology.deposit # Tests ############################################################################################ diff --git a/mcpacker/model/core/geology/deposit/geodedeposit.py b/mcpacker/model/geology/deposit/geodedeposit.py similarity index 53% rename from mcpacker/model/core/geology/deposit/geodedeposit.py rename to mcpacker/model/geology/deposit/geodedeposit.py index bffed6d..1a10c32 100644 --- a/mcpacker/model/core/geology/deposit/geodedeposit.py +++ b/mcpacker/model/geology/deposit/geodedeposit.py @@ -1,13 +1,13 @@ from collections.abc import Iterable -from mcpacker.model.core.altitude import Altitude -from mcpacker.model.core.ecology.biomefilter import BiomeFilter -from mcpacker.model.core.geology.bulk import Bulk -from mcpacker.model.core.geology.deposit import Deposit -from mcpacker.model.core.geology.mineral import Mineral -from mcpacker.model.core.scarcity import Scarcity +from mcpacker.model.altitude import Altitude +from mcpacker.model.ecology.biomefilter import BiomeFilter +from mcpacker.model.geology.bulk import Bulk +from mcpacker.model.geology.deposit import Deposit +from mcpacker.model.geology.mineral import Mineral +from mcpacker.model.scarcity import Scarcity -import mcpacker.model.core.altitude as altitude -import mcpacker.model.core.scarcity as scarcity +import mcpacker.model.altitude as altitude +import mcpacker.model.scarcity as scarcity # Class ############################################################################################ diff --git a/mcpacker/model/core/geology/deposit/geodedeposit_test.py b/mcpacker/model/geology/deposit/geodedeposit_test.py similarity index 70% rename from mcpacker/model/core/geology/deposit/geodedeposit_test.py rename to mcpacker/model/geology/deposit/geodedeposit_test.py index 4ca815e..3868a38 100644 --- a/mcpacker/model/core/geology/deposit/geodedeposit_test.py +++ b/mcpacker/model/geology/deposit/geodedeposit_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.geology.deposit.geodedeposit +import mcpacker.model.geology.deposit.geodedeposit # Class ############################################################################################ diff --git a/mcpacker/model/core/geology/deposit/mineraldeposit.py b/mcpacker/model/geology/deposit/mineraldeposit.py similarity index 68% rename from mcpacker/model/core/geology/deposit/mineraldeposit.py rename to mcpacker/model/geology/deposit/mineraldeposit.py index 76c2a41..bcc76be 100644 --- a/mcpacker/model/core/geology/deposit/mineraldeposit.py +++ b/mcpacker/model/geology/deposit/mineraldeposit.py @@ -1,16 +1,16 @@ from collections.abc import Iterable -from mcpacker.model.core.altitude import Altitude -from mcpacker.model.core.ecology.biomefilter import BiomeFilter -from mcpacker.model.core.geology.bulk import Bulk -from mcpacker.model.core.geology.deposit import Deposit -from mcpacker.model.core.geology.inclusion import Inclusion -from mcpacker.model.core.geology.proportion import Proportion -from mcpacker.model.core.scarcity import Scarcity +from mcpacker.model.altitude import Altitude +from mcpacker.model.ecology.biomefilter import BiomeFilter +from mcpacker.model.geology.bulk import Bulk +from mcpacker.model.geology.deposit import Deposit +from mcpacker.model.geology.inclusion import Inclusion +from mcpacker.model.geology.proportion import Proportion +from mcpacker.model.scarcity import Scarcity -import mcpacker.model.core.altitude as AL -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.geology.bulk as BU +import mcpacker.model.geology.proportion as PR +import mcpacker.model.scarcity as SC # Class ############################################################################################ diff --git a/mcpacker/model/core/geology/deposit/mineraldeposit_test.py b/mcpacker/model/geology/deposit/mineraldeposit_test.py similarity index 72% rename from mcpacker/model/core/geology/deposit/mineraldeposit_test.py rename to mcpacker/model/geology/deposit/mineraldeposit_test.py index 2f210d3..5c09bcc 100644 --- a/mcpacker/model/core/geology/deposit/mineraldeposit_test.py +++ b/mcpacker/model/geology/deposit/mineraldeposit_test.py @@ -1,14 +1,14 @@ -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 -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.ecology.flora as FL +import mcpacker.model.geology.bulk as BU +import mcpacker.model.geology.proportion as PR +import mcpacker.model.scarcity as SC # Fixtures ######################################################################################### diff --git a/mcpacker/model/core/geology/depositcatalog.py b/mcpacker/model/geology/depositcatalog.py similarity index 57% rename from mcpacker/model/core/geology/depositcatalog.py rename to mcpacker/model/geology/depositcatalog.py index d09ba97..31fbe37 100644 --- a/mcpacker/model/core/geology/depositcatalog.py +++ b/mcpacker/model/geology/depositcatalog.py @@ -1,5 +1,5 @@ -from mcpacker.model.catalog import Catalog -from mcpacker.model.core.geology.deposit import Deposit +from mcpacker.model.catalog import Catalog +from mcpacker.model.geology.deposit import Deposit # Classes ########################################################################################## diff --git a/mcpacker/model/geology/depositcatalog_test.py b/mcpacker/model/geology/depositcatalog_test.py new file mode 100644 index 0000000..d3aadda --- /dev/null +++ b/mcpacker/model/geology/depositcatalog_test.py @@ -0,0 +1,7 @@ +import mcpacker.model.geology.depositcatalog + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/model/core/geology/inclusion.py b/mcpacker/model/geology/inclusion.py similarity index 91% rename from mcpacker/model/core/geology/inclusion.py rename to mcpacker/model/geology/inclusion.py index 9d8262a..5ac55ff 100644 --- a/mcpacker/model/core/geology/inclusion.py +++ b/mcpacker/model/geology/inclusion.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.geology.mineral import Mineral +from mcpacker.model.geology.mineral import Mineral # Class ############################################################################################ diff --git a/mcpacker/model/core/geology/inclusion_test.py b/mcpacker/model/geology/inclusion_test.py similarity index 74% rename from mcpacker/model/core/geology/inclusion_test.py rename to mcpacker/model/geology/inclusion_test.py index 959501c..de8a62b 100644 --- a/mcpacker/model/core/geology/inclusion_test.py +++ b/mcpacker/model/geology/inclusion_test.py @@ -1,6 +1,6 @@ -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.geology.inclusion import Inclusion +from mcpacker.model.geology.mineral import Mineral +from mcpacker.model.geology.replacement import Replacement from pytest import fixture diff --git a/mcpacker/model/core/geology/mineral.py b/mcpacker/model/geology/mineral.py similarity index 84% rename from mcpacker/model/core/geology/mineral.py rename to mcpacker/model/geology/mineral.py index 58d20d8..780e237 100644 --- a/mcpacker/model/core/geology/mineral.py +++ b/mcpacker/model/geology/mineral.py @@ -1,6 +1,6 @@ from collections.abc import Iterable -from mcpacker.model.core.geology.replacement import Replacement -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.geology.replacement import Replacement +from mcpacker.model.resourceid import ResourceId # Class ############################################################################################ diff --git a/mcpacker/model/core/geology/mineral_test.py b/mcpacker/model/geology/mineral_test.py similarity index 85% rename from mcpacker/model/core/geology/mineral_test.py rename to mcpacker/model/geology/mineral_test.py index 4cdd9a5..88d1fe0 100644 --- a/mcpacker/model/core/geology/mineral_test.py +++ b/mcpacker/model/geology/mineral_test.py @@ -1,8 +1,8 @@ -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 pytest import fixture -import mcpacker.model.core.geology.mineral as mineral +import mcpacker.model.geology.mineral as mineral # Fixtures ######################################################################################### diff --git a/mcpacker/model/core/geology/mineralcatalog.py b/mcpacker/model/geology/mineralcatalog.py similarity index 57% rename from mcpacker/model/core/geology/mineralcatalog.py rename to mcpacker/model/geology/mineralcatalog.py index b58d96e..06f9e37 100644 --- a/mcpacker/model/core/geology/mineralcatalog.py +++ b/mcpacker/model/geology/mineralcatalog.py @@ -1,5 +1,5 @@ -from mcpacker.model.catalog import Catalog -from mcpacker.model.core.geology.mineral import Mineral +from mcpacker.model.catalog import Catalog +from mcpacker.model.geology.mineral import Mineral # Classes ########################################################################################## diff --git a/mcpacker/model/geology/mineralcatalog_test.py b/mcpacker/model/geology/mineralcatalog_test.py new file mode 100644 index 0000000..48b17ca --- /dev/null +++ b/mcpacker/model/geology/mineralcatalog_test.py @@ -0,0 +1,7 @@ +import mcpacker.model.geology.mineralcatalog + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/model/core/geology/proportion.py b/mcpacker/model/geology/proportion.py similarity index 100% rename from mcpacker/model/core/geology/proportion.py rename to mcpacker/model/geology/proportion.py diff --git a/mcpacker/model/core/geology/proportion_test.py b/mcpacker/model/geology/proportion_test.py similarity index 82% rename from mcpacker/model/core/geology/proportion_test.py rename to mcpacker/model/geology/proportion_test.py index 7b0cea9..a168f83 100644 --- a/mcpacker/model/core/geology/proportion_test.py +++ b/mcpacker/model/geology/proportion_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import mcpacker.model.core.geology.proportion as proportion +import mcpacker.model.geology.proportion as proportion # Tests ############################################################################################ diff --git a/mcpacker/model/core/geology/replacement.py b/mcpacker/model/geology/replacement.py similarity index 95% rename from mcpacker/model/core/geology/replacement.py rename to mcpacker/model/geology/replacement.py index 7aaa71e..e4196d8 100644 --- a/mcpacker/model/core/geology/replacement.py +++ b/mcpacker/model/geology/replacement.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.resourceid import ResourceId # Constants ######################################################################################## diff --git a/mcpacker/model/core/geology/replacement_test.py b/mcpacker/model/geology/replacement_test.py similarity index 94% rename from mcpacker/model/core/geology/replacement_test.py rename to mcpacker/model/geology/replacement_test.py index f3bb14f..64c8487 100644 --- a/mcpacker/model/core/geology/replacement_test.py +++ b/mcpacker/model/geology/replacement_test.py @@ -1,5 +1,5 @@ from pytest import fixture -from mcpacker.model.core.geology.replacement import Replacement +from mcpacker.model.geology.replacement import Replacement # Fixtures ######################################################################################### diff --git a/mcpacker/model/core/habitat.py b/mcpacker/model/habitat.py similarity index 81% rename from mcpacker/model/core/habitat.py rename to mcpacker/model/habitat.py index a5a9a1e..202271f 100644 --- a/mcpacker/model/core/habitat.py +++ b/mcpacker/model/habitat.py @@ -1,17 +1,17 @@ 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.fauna.group import Group -from mcpacker.model.core.fauna.location import Location -from mcpacker.model.core.scarcity import Scarcity -from mcpacker.model.core.season import Season +from mcpacker.model.altitude import Altitude +from mcpacker.model.ecology.biome import Biome +from mcpacker.model.ecology.biomefilter import BiomeFilter +from mcpacker.model.fauna.group import Group +from mcpacker.model.fauna.location import Location +from mcpacker.model.scarcity import Scarcity +from mcpacker.model.season import Season -import mcpacker.model.core.altitude as A -import mcpacker.model.core.fauna.group as G -import mcpacker.model.core.fauna.location as L -import mcpacker.model.core.scarcity as C -import mcpacker.model.core.season as E +import mcpacker.model.altitude as A +import mcpacker.model.fauna.group as G +import mcpacker.model.fauna.location as L +import mcpacker.model.scarcity as C +import mcpacker.model.season as E # Class ############################################################################################ diff --git a/mcpacker/model/core/habitat_test.py b/mcpacker/model/habitat_test.py similarity index 84% rename from mcpacker/model/core/habitat_test.py rename to mcpacker/model/habitat_test.py index 64e987d..6acdb45 100644 --- a/mcpacker/model/core/habitat_test.py +++ b/mcpacker/model/habitat_test.py @@ -1,11 +1,11 @@ -from mcpacker.model.core.ecology.biomefilter import BiomeFilter -from mcpacker.model.core.habitat import Habitat +from mcpacker.model.ecology.biomefilter import BiomeFilter +from mcpacker.model.habitat import Habitat from pytest import fixture -import mcpacker.model.core.ecology.flora as FL -import mcpacker.model.core.ecology.heat as HE -import mcpacker.model.core.season as SE -import mcpacker.model.core.scarcity as SC +import mcpacker.model.ecology.flora as FL +import mcpacker.model.ecology.heat as HE +import mcpacker.model.season as SE +import mcpacker.model.scarcity as SC # Fixtures ######################################################################################### diff --git a/mcpacker/model/core/geology/__init__.py b/mcpacker/model/material/__init__.py similarity index 100% rename from mcpacker/model/core/geology/__init__.py rename to mcpacker/model/material/__init__.py diff --git a/mcpacker/model/core/material/block.py b/mcpacker/model/material/block.py similarity index 66% rename from mcpacker/model/core/material/block.py rename to mcpacker/model/material/block.py index 51ef305..5042873 100644 --- a/mcpacker/model/core/material/block.py +++ b/mcpacker/model/material/block.py @@ -1,9 +1,9 @@ -from collections.abc import Iterable -from mcpacker.model.core.material.loottable import LootTable -from mcpacker.model.core.material.soundtype import SoundType -from mcpacker.model.core.resourceid import ResourceId +from collections.abc import Iterable +from mcpacker.model.material.loottable import LootTable +from mcpacker.model.material.soundtype import SoundType +from mcpacker.model.resourceid import ResourceId -import mcpacker.model.core.material.soundtype as ST +import mcpacker.model.material.soundtype as ST # Class ############################################################################################ diff --git a/mcpacker/model/core/material/block_test.py b/mcpacker/model/material/block_test.py similarity index 75% rename from mcpacker/model/core/material/block_test.py rename to mcpacker/model/material/block_test.py index e701d58..df48b13 100644 --- a/mcpacker/model/core/material/block_test.py +++ b/mcpacker/model/material/block_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.material.block +import mcpacker.model.material.block # Tests ############################################################################################ diff --git a/mcpacker/model/core/material/blockcatalog.py b/mcpacker/model/material/blockcatalog.py similarity index 57% rename from mcpacker/model/core/material/blockcatalog.py rename to mcpacker/model/material/blockcatalog.py index 2f43113..b39894a 100644 --- a/mcpacker/model/core/material/blockcatalog.py +++ b/mcpacker/model/material/blockcatalog.py @@ -1,5 +1,5 @@ -from mcpacker.model.catalog import Catalog -from mcpacker.model.core.material.block import Block +from mcpacker.model.catalog import Catalog +from mcpacker.model.material.block import Block # Classes ########################################################################################## diff --git a/mcpacker/model/material/blockcatalog_test.py b/mcpacker/model/material/blockcatalog_test.py new file mode 100644 index 0000000..cddc7a0 --- /dev/null +++ b/mcpacker/model/material/blockcatalog_test.py @@ -0,0 +1,7 @@ +import mcpacker.model.material.blockcatalog + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/model/core/material/item.py b/mcpacker/model/material/item.py similarity index 87% rename from mcpacker/model/core/material/item.py rename to mcpacker/model/material/item.py index 6f13179..f520b96 100644 --- a/mcpacker/model/core/material/item.py +++ b/mcpacker/model/material/item.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.resourceid import ResourceId # Class ############################################################################################ diff --git a/mcpacker/model/core/material/item_test.py b/mcpacker/model/material/item_test.py similarity index 76% rename from mcpacker/model/core/material/item_test.py rename to mcpacker/model/material/item_test.py index 6416a91..97cbf56 100644 --- a/mcpacker/model/core/material/item_test.py +++ b/mcpacker/model/material/item_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.material.item +import mcpacker.model.material.item # Tests ############################################################################################ diff --git a/mcpacker/model/core/material/itemcatalog.py b/mcpacker/model/material/itemcatalog.py similarity index 70% rename from mcpacker/model/core/material/itemcatalog.py rename to mcpacker/model/material/itemcatalog.py index 47a0e7d..a42db0f 100644 --- a/mcpacker/model/core/material/itemcatalog.py +++ b/mcpacker/model/material/itemcatalog.py @@ -1,7 +1,7 @@ from collections.abc import Iterable from mcpacker.model.catalog import Catalog -from mcpacker.model.core.material.item import Item -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.material.item import Item +from mcpacker.model.resourceid import ResourceId from typing import Iterator diff --git a/mcpacker/model/material/itemcatalog_test.py b/mcpacker/model/material/itemcatalog_test.py new file mode 100644 index 0000000..4fd182b --- /dev/null +++ b/mcpacker/model/material/itemcatalog_test.py @@ -0,0 +1,7 @@ +import mcpacker.model.material.itemcatalog + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/model/core/material/loot.py b/mcpacker/model/material/loot.py similarity index 94% rename from mcpacker/model/core/material/loot.py rename to mcpacker/model/material/loot.py index 6154149..e30de2d 100644 --- a/mcpacker/model/core/material/loot.py +++ b/mcpacker/model/material/loot.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.material.item import Item +from mcpacker.model.material.item import Item # Class ############################################################################################ diff --git a/mcpacker/model/core/material/loot_test.py b/mcpacker/model/material/loot_test.py similarity index 76% rename from mcpacker/model/core/material/loot_test.py rename to mcpacker/model/material/loot_test.py index 7bee294..f146bdd 100644 --- a/mcpacker/model/core/material/loot_test.py +++ b/mcpacker/model/material/loot_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.material.loot +import mcpacker.model.material.loot # Tests ############################################################################################ diff --git a/mcpacker/model/core/material/loottable.py b/mcpacker/model/material/loottable.py similarity index 72% rename from mcpacker/model/core/material/loottable.py rename to mcpacker/model/material/loottable.py index 765f377..06d5dec 100644 --- a/mcpacker/model/core/material/loottable.py +++ b/mcpacker/model/material/loottable.py @@ -1,5 +1,5 @@ -from collections.abc import Iterable -from mcpacker.model.core.material.loot import Loot +from collections.abc import Iterable +from mcpacker.model.material.loot import Loot # Class ############################################################################################ diff --git a/mcpacker/model/core/material/loottable_test.py b/mcpacker/model/material/loottable_test.py similarity index 74% rename from mcpacker/model/core/material/loottable_test.py rename to mcpacker/model/material/loottable_test.py index 190ee3a..bb2bb5e 100644 --- a/mcpacker/model/core/material/loottable_test.py +++ b/mcpacker/model/material/loottable_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.material.loottable +import mcpacker.model.material.loottable # Tests ############################################################################################ diff --git a/mcpacker/model/core/material/soundtype.py b/mcpacker/model/material/soundtype.py similarity index 100% rename from mcpacker/model/core/material/soundtype.py rename to mcpacker/model/material/soundtype.py diff --git a/mcpacker/model/core/material/soundtype_test.py b/mcpacker/model/material/soundtype_test.py similarity index 74% rename from mcpacker/model/core/material/soundtype_test.py rename to mcpacker/model/material/soundtype_test.py index 893c007..cadb7b6 100644 --- a/mcpacker/model/core/material/soundtype_test.py +++ b/mcpacker/model/material/soundtype_test.py @@ -1,4 +1,4 @@ -import mcpacker.model.core.material.soundtype +import mcpacker.model.material.soundtype # Tests ############################################################################################ diff --git a/mcpacker/model/modpack.py b/mcpacker/model/modpack.py index 4a8a85f..4c4b850 100644 --- a/mcpacker/model/modpack.py +++ b/mcpacker/model/modpack.py @@ -1,9 +1,9 @@ from collections.abc import Iterable from mcpacker.format.datapack import DataPack -from mcpacker.model.core.resourceid import ResourceId -from mcpacker.model.core.world import World +from mcpacker.model.resourceid import ResourceId +from mcpacker.model.world import World from mcpacker.model.mod import Mod -from mcpacker.model.resourcepack import ResourcePack +from mcpacker.format.resourcepack import ResourcePack from typing import Callable from typing import Self diff --git a/mcpacker/model/core/resourceid.py b/mcpacker/model/resourceid.py similarity index 100% rename from mcpacker/model/core/resourceid.py rename to mcpacker/model/resourceid.py diff --git a/mcpacker/model/core/resourceid_test.py b/mcpacker/model/resourceid_test.py similarity index 89% rename from mcpacker/model/core/resourceid_test.py rename to mcpacker/model/resourceid_test.py index 93ef156..398e341 100644 --- a/mcpacker/model/core/resourceid_test.py +++ b/mcpacker/model/resourceid_test.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.resourceid import ResourceId # Tests ############################################################################################ diff --git a/mcpacker/model/core/scarcity.py b/mcpacker/model/scarcity.py similarity index 100% rename from mcpacker/model/core/scarcity.py rename to mcpacker/model/scarcity.py diff --git a/mcpacker/model/core/scarcity_test.py b/mcpacker/model/scarcity_test.py similarity index 76% rename from mcpacker/model/core/scarcity_test.py rename to mcpacker/model/scarcity_test.py index c62c8cb..622fe79 100644 --- a/mcpacker/model/core/scarcity_test.py +++ b/mcpacker/model/scarcity_test.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.scarcity import Scarcity +from mcpacker.model.scarcity import Scarcity from pytest import fixture diff --git a/mcpacker/model/core/season.py b/mcpacker/model/season.py similarity index 100% rename from mcpacker/model/core/season.py rename to mcpacker/model/season.py diff --git a/mcpacker/model/core/season_test.py b/mcpacker/model/season_test.py similarity index 90% rename from mcpacker/model/core/season_test.py rename to mcpacker/model/season_test.py index c5f4d2e..6753424 100644 --- a/mcpacker/model/core/season_test.py +++ b/mcpacker/model/season_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import mcpacker.model.core.season as season +import mcpacker.model.season as season # Fixtures ######################################################################################### diff --git a/mcpacker/model/core/spawn.py b/mcpacker/model/spawn.py similarity index 91% rename from mcpacker/model/core/spawn.py rename to mcpacker/model/spawn.py index 0750337..5afee1e 100644 --- a/mcpacker/model/core/spawn.py +++ b/mcpacker/model/spawn.py @@ -1,5 +1,5 @@ from collections.abc import Iterable -from mcpacker.model.core.habitat import Habitat +from mcpacker.model.habitat import Habitat # Class ############################################################################################ diff --git a/mcpacker/model/core/spawn_test.py b/mcpacker/model/spawn_test.py similarity index 83% rename from mcpacker/model/core/spawn_test.py rename to mcpacker/model/spawn_test.py index b09f095..f6566e1 100644 --- a/mcpacker/model/core/spawn_test.py +++ b/mcpacker/model/spawn_test.py @@ -1,10 +1,10 @@ -from mcpacker.model.core.ecology.biomefilter import BiomeFilter -from mcpacker.model.core.habitat import Habitat -from mcpacker.model.core.spawn import Spawn +from mcpacker.model.ecology.biomefilter import BiomeFilter +from mcpacker.model.habitat import Habitat +from mcpacker.model.spawn import Spawn from pytest import fixture -import mcpacker.model.core.ecology.flora as F -import mcpacker.model.core.ecology.heat as E +import mcpacker.model.ecology.flora as F +import mcpacker.model.ecology.heat as E # Fixtures ######################################################################################### diff --git a/mcpacker/model/core/world.py b/mcpacker/model/world.py similarity index 72% rename from mcpacker/model/core/world.py rename to mcpacker/model/world.py index 7b2f889..3c27b69 100644 --- a/mcpacker/model/core/world.py +++ b/mcpacker/model/world.py @@ -1,12 +1,12 @@ -from mcpacker.model.core.ecology.biomecatalog import BiomeCatalog -from mcpacker.model.core.fauna.mobcatalog import MobCatalog -from mcpacker.model.core.fauna.mobspawncatalog import MobSpawnCatalog -from mcpacker.model.core.flora.plantcatalog import PlantCatalog -from mcpacker.model.core.flora.plantspawncatalog import PlantSpawnCatalog -from mcpacker.model.core.geology.depositcatalog import DepositCatalog -from mcpacker.model.core.geology.mineralcatalog import MineralCatalog -from mcpacker.model.core.material.blockcatalog import BlockCatalog -from mcpacker.model.core.material.itemcatalog import ItemCatalog +from mcpacker.model.ecology.biomecatalog import BiomeCatalog +from mcpacker.model.fauna.mobcatalog import MobCatalog +from mcpacker.model.fauna.mobspawncatalog import MobSpawnCatalog +from mcpacker.model.flora.plantcatalog import PlantCatalog +from mcpacker.model.flora.plantspawncatalog import PlantSpawnCatalog +from mcpacker.model.geology.depositcatalog import DepositCatalog +from mcpacker.model.geology.mineralcatalog import MineralCatalog +from mcpacker.model.material.blockcatalog import BlockCatalog +from mcpacker.model.material.itemcatalog import ItemCatalog # Class ############################################################################################ diff --git a/mcpacker/model/core/world_test.py b/mcpacker/model/world_test.py similarity index 75% rename from mcpacker/model/core/world_test.py rename to mcpacker/model/world_test.py index 68c9414..d4365ab 100644 --- a/mcpacker/model/core/world_test.py +++ b/mcpacker/model/world_test.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.world import World +from mcpacker.model.world import World # Tests ############################################################################################ diff --git a/mcpacker/pack/mysteriousisland/addbiomes.py b/mcpacker/pack/mysteriousisland/addbiomes.py index 0ab8b67..15fa7bc 100644 --- a/mcpacker/pack/mysteriousisland/addbiomes.py +++ b/mcpacker/pack/mysteriousisland/addbiomes.py @@ -1,12 +1,12 @@ -from mcpacker.model.core.ecology.biome import Biome +from mcpacker.model.ecology.biome import Biome from mcpacker.model.modpack import ModPack -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.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 # Functions ######################################################################################## diff --git a/mcpacker/pack/mysteriousisland/addblocks.py b/mcpacker/pack/mysteriousisland/addblocks.py index 97fd63d..6de0404 100644 --- a/mcpacker/pack/mysteriousisland/addblocks.py +++ b/mcpacker/pack/mysteriousisland/addblocks.py @@ -1,11 +1,11 @@ -from mcpacker.model.core.material.block import Block -from mcpacker.model.core.material.blockcatalog import BlockCatalog -from mcpacker.model.core.material.item import Item -from mcpacker.model.core.material.loottable import LootTable -from mcpacker.model.core.material.loot import Loot -from mcpacker.model.modpack import ModPack +from mcpacker.model.material.block import Block +from mcpacker.model.material.blockcatalog import BlockCatalog +from mcpacker.model.material.item import Item +from mcpacker.model.material.loottable import LootTable +from mcpacker.model.material.loot import Loot +from mcpacker.model.modpack import ModPack -import mcpacker.model.core.material.soundtype as SO +import mcpacker.model.material.soundtype as SO # Functions ######################################################################################## diff --git a/mcpacker/pack/mysteriousisland/adddatapack.py b/mcpacker/pack/mysteriousisland/adddatapack.py index afeaf89..abeb3f4 100644 --- a/mcpacker/pack/mysteriousisland/adddatapack.py +++ b/mcpacker/pack/mysteriousisland/adddatapack.py @@ -1,4 +1,4 @@ -from mcpacker.model.modpack import ModPack +from mcpacker.model.modpack import ModPack from mcpacker.format.datapack import DataPack diff --git a/mcpacker/pack/mysteriousisland/adddeposits.py b/mcpacker/pack/mysteriousisland/adddeposits.py index af930c7..c228365 100644 --- a/mcpacker/pack/mysteriousisland/adddeposits.py +++ b/mcpacker/pack/mysteriousisland/adddeposits.py @@ -1,19 +1,19 @@ -from mcpacker.model.core.ecology.biomefilter import BiomeFilter as BF -from mcpacker.model.core.geology.deposit.geodedeposit import GeodeDeposit -from mcpacker.model.core.geology.deposit.mineraldeposit import MineralDeposit -from mcpacker.model.core.geology.inclusion import Inclusion as I +from mcpacker.model.ecology.biomefilter import BiomeFilter as BF +from mcpacker.model.geology.deposit.geodedeposit import GeodeDeposit +from mcpacker.model.geology.deposit.mineraldeposit import MineralDeposit +from mcpacker.model.geology.inclusion import Inclusion as I from mcpacker.model.modpack import ModPack -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.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.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.geology.bulk as BU +import mcpacker.model.geology.proportion as PR +import mcpacker.model.scarcity as SC # Catalog ########################################################################################## diff --git a/mcpacker/pack/mysteriousisland/adddisabledfeatures.py b/mcpacker/pack/mysteriousisland/adddisabledfeatures.py index 452e8f4..c3dee6b 100644 --- a/mcpacker/pack/mysteriousisland/adddisabledfeatures.py +++ b/mcpacker/pack/mysteriousisland/adddisabledfeatures.py @@ -1,4 +1,4 @@ -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.resourceid import ResourceId from mcpacker.model.modpack import ModPack # Helper Functions ################################################################################# diff --git a/mcpacker/pack/mysteriousisland/additems.py b/mcpacker/pack/mysteriousisland/additems.py index caf074e..94f0786 100644 --- a/mcpacker/pack/mysteriousisland/additems.py +++ b/mcpacker/pack/mysteriousisland/additems.py @@ -1,5 +1,5 @@ -from mcpacker.model.core.material.item import Item -from mcpacker.model.modpack import ModPack +from mcpacker.model.material.item import Item +from mcpacker.model.modpack import ModPack # Constants ######################################################################################## diff --git a/mcpacker/pack/mysteriousisland/addminerals.py b/mcpacker/pack/mysteriousisland/addminerals.py index baeac55..1379e24 100644 --- a/mcpacker/pack/mysteriousisland/addminerals.py +++ b/mcpacker/pack/mysteriousisland/addminerals.py @@ -1,7 +1,7 @@ -from mcpacker.model.core.geology.mineral import Mineral -from mcpacker.model.core.geology.mineralcatalog import MineralCatalog -from mcpacker.model.core.geology.replacement import Replacement -from mcpacker.model.modpack import ModPack +from mcpacker.model.geology.mineral import Mineral +from mcpacker.model.geology.mineralcatalog import MineralCatalog +from mcpacker.model.geology.replacement import Replacement +from mcpacker.model.modpack import ModPack # Constants ######################################################################################## diff --git a/mcpacker/pack/mysteriousisland/addmobs.py b/mcpacker/pack/mysteriousisland/addmobs.py index 5a83ffc..08c7517 100644 --- a/mcpacker/pack/mysteriousisland/addmobs.py +++ b/mcpacker/pack/mysteriousisland/addmobs.py @@ -1,7 +1,7 @@ -from mcpacker.model.core.fauna.mob import Mob -from mcpacker.model.modpack import ModPack +from mcpacker.model.fauna.mob import Mob +from mcpacker.model.modpack import ModPack -import mcpacker.model.core.fauna.active as AC +import mcpacker.model.fauna.active as AC # Constants ######################################################################################## diff --git a/mcpacker/pack/mysteriousisland/addmobspawns.py b/mcpacker/pack/mysteriousisland/addmobspawns.py index 249b4fd..b09d927 100644 --- a/mcpacker/pack/mysteriousisland/addmobspawns.py +++ b/mcpacker/pack/mysteriousisland/addmobspawns.py @@ -1,23 +1,23 @@ -from mcpacker.model.core.ecology.biomefilter import BiomeFilter as BF -from mcpacker.model.core.fauna.mob import Mob -from mcpacker.model.core.fauna.mobcatalog import MobCatalog -from mcpacker.model.core.fauna.mobspawn import MobSpawn -from mcpacker.model.core.habitat import Habitat -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.ecology.biomefilter import BiomeFilter as BF +from mcpacker.model.fauna.mob import Mob +from mcpacker.model.fauna.mobcatalog import MobCatalog +from mcpacker.model.fauna.mobspawn import MobSpawn +from mcpacker.model.habitat import Habitat +from mcpacker.model.resourceid import ResourceId from mcpacker.model.modpack import ModPack -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 # Constants ######################################################################################## diff --git a/mcpacker/pack/mysteriousisland/addplants.py b/mcpacker/pack/mysteriousisland/addplants.py index b882607..367e2f5 100644 --- a/mcpacker/pack/mysteriousisland/addplants.py +++ b/mcpacker/pack/mysteriousisland/addplants.py @@ -1,12 +1,12 @@ -from mcpacker.model.core.blockstate import BlockState -from mcpacker.model.core.flora.patch import Patch -from mcpacker.model.core.flora.tree import Tree +from mcpacker.model.blockstate import BlockState +from mcpacker.model.flora.patch import Patch +from mcpacker.model.flora.tree import Tree from mcpacker.model.modpack import ModPack -import mcpacker.model.core.flora.canopyshape as CA -import mcpacker.model.core.flora.density as DE -import mcpacker.model.core.flora.immersion as IM -import mcpacker.model.core.flora.trunkshape as TR +import mcpacker.model.flora.canopyshape as CA +import mcpacker.model.flora.density as DE +import mcpacker.model.flora.immersion as IM +import mcpacker.model.flora.trunkshape as TR # Constants ######################################################################################## diff --git a/mcpacker/pack/mysteriousisland/addplantspawns.py b/mcpacker/pack/mysteriousisland/addplantspawns.py index 92d4b81..34772a3 100644 --- a/mcpacker/pack/mysteriousisland/addplantspawns.py +++ b/mcpacker/pack/mysteriousisland/addplantspawns.py @@ -1,17 +1,17 @@ -from mcpacker.model.core.altitude import Altitude -from mcpacker.model.core.ecology.biomefilter import BiomeFilter as BF -from mcpacker.model.core.flora.plantspawn import PlantSpawn -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.altitude import Altitude +from mcpacker.model.ecology.biomefilter import BiomeFilter as BF +from mcpacker.model.flora.plantspawn import PlantSpawn +from mcpacker.model.resourceid import ResourceId from mcpacker.model.modpack import ModPack -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.scarcity as SC +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.scarcity as SC # Functions ######################################################################################## diff --git a/mcpacker/pack/mysteriousisland/addresourcepack.py b/mcpacker/pack/mysteriousisland/addresourcepack.py index d4c81c9..e5219e0 100644 --- a/mcpacker/pack/mysteriousisland/addresourcepack.py +++ b/mcpacker/pack/mysteriousisland/addresourcepack.py @@ -1,5 +1,5 @@ -from mcpacker.model.modpack import ModPack -from mcpacker.model.resourcepack import ResourcePack +from mcpacker.model.modpack import ModPack +from mcpacker.format.resourcepack import ResourcePack # Functions ######################################################################################## diff --git a/mcpacker/ui/runner_test.py b/mcpacker/ui/runner_test.py index 6009b78..2594052 100644 --- a/mcpacker/ui/runner_test.py +++ b/mcpacker/ui/runner_test.py @@ -1,10 +1,10 @@ -from mcpacker.model.core.ecology.biome import Biome -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.biome import Biome +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 ModPack from mcpacker.ui.runner import Runner from mcpacker.write.incontrol.spawnerwriter import SpawnerWriter @@ -13,18 +13,18 @@ from pytest import fixture from zipfile import ZipFile import mcpacker.json as json -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 diff --git a/mcpacker/write/datapack/depositwriter.py b/mcpacker/write/datapack/depositwriter.py index 92f4ada..317e8e8 100644 --- a/mcpacker/write/datapack/depositwriter.py +++ b/mcpacker/write/datapack/depositwriter.py @@ -1,6 +1,6 @@ from mcpacker.format.datapack.structure import Structure -from mcpacker.model.core.geology.deposit import Deposit -from mcpacker.model.core.resourceid import ResourceId +from mcpacker.model.geology.deposit import Deposit +from mcpacker.model.resourceid import ResourceId from mcpacker.write.writer import Writer import mcpacker.json as json diff --git a/mcpacker/write/incontrol/spawnerwriter.py b/mcpacker/write/incontrol/spawnerwriter.py index db3b495..c72f534 100644 --- a/mcpacker/write/incontrol/spawnerwriter.py +++ b/mcpacker/write/incontrol/spawnerwriter.py @@ -1,19 +1,19 @@ -from mcpacker.json import JsonBlob -from mcpacker.model.core.ecology.biomefilter import BiomeFilter -from mcpacker.model.core.fauna.active import Active -from mcpacker.model.core.fauna.mobspawn import MobSpawn -from mcpacker.model.core.habitat import Habitat -from mcpacker.model.core.scarcity import Scarcity -from mcpacker.model.core.season import Season -from mcpacker.model.modpack import ModPack -from mcpacker.write.incontrol import INCONTROL_CONFIG_DIR -from mcpacker.write.writer import Writer -from pathlib import Path +from mcpacker.json import JsonBlob +from mcpacker.model.ecology.biomefilter import BiomeFilter +from mcpacker.model.fauna.active import Active +from mcpacker.model.fauna.mobspawn import MobSpawn +from mcpacker.model.habitat import Habitat +from mcpacker.model.scarcity import Scarcity +from mcpacker.model.season import Season +from mcpacker.model.modpack import ModPack +from mcpacker.write.incontrol import INCONTROL_CONFIG_DIR +from mcpacker.write.writer import Writer +from pathlib import Path import mcpacker.json as json -import mcpacker.model.core.dimension as DI -import mcpacker.model.core.fauna.location as LO -import mcpacker.model.core.scarcity as SC +import mcpacker.model.dimension as DI +import mcpacker.model.fauna.location as LO +import mcpacker.model.scarcity as SC import mcpacker.model.time as TI import os diff --git a/mcpacker/write/incontrol/spawnerwriter_test.py b/mcpacker/write/incontrol/spawnerwriter_test.py index aedd5d4..1f5f777 100644 --- a/mcpacker/write/incontrol/spawnerwriter_test.py +++ b/mcpacker/write/incontrol/spawnerwriter_test.py @@ -1,28 +1,28 @@ -from mcpacker.model.core.ecology.biome import Biome -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.modpack import ModPack -from mcpacker.write.incontrol.spawnerwriter import SpawnerWriter -from pathlib import Path -from pytest import fixture +from mcpacker.model.ecology.biome import Biome +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 ModPack +from mcpacker.write.incontrol.spawnerwriter import SpawnerWriter +from pathlib import Path +from pytest import fixture import mcpacker.json as json -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 diff --git a/mcpacker/write/largeoredeposits/depositwriter.py b/mcpacker/write/largeoredeposits/depositwriter.py index 2b7eadf..2cc2da2 100644 --- a/mcpacker/write/largeoredeposits/depositwriter.py +++ b/mcpacker/write/largeoredeposits/depositwriter.py @@ -1,5 +1,5 @@ from mcpacker.format.largeoredeposit.mineraldepositcomposer import MineralDepositComposer -from mcpacker.model.core.geology.deposit.mineraldeposit import MineralDeposit +from mcpacker.model.geology.deposit.mineraldeposit import MineralDeposit from mcpacker.model.modpack import ModPack from mcpacker.write.writer import Writer from pathlib import Path diff --git a/mcpacker/write/staticwriter.py b/mcpacker/write/staticwriter.py index 91a48fe..5763f71 100644 --- a/mcpacker/write/staticwriter.py +++ b/mcpacker/write/staticwriter.py @@ -1,6 +1,6 @@ from mcpacker.model.modpack import ModPack -from mcpacker.write.writer import Writer -from pathlib import Path +from mcpacker.write.writer import Writer +from pathlib import Path import shutil diff --git a/mcpacker/write/writer_test.py b/mcpacker/write/writer_test.py index e1aa2df..e2d7fb3 100644 --- a/mcpacker/write/writer_test.py +++ b/mcpacker/write/writer_test.py @@ -1,7 +1,7 @@ -from mcpacker.write.writer import Writer +from mcpacker.write.writer import Writer from mcpacker.model.modpack import ModPack -from pathlib import Path -from pytest import fixture +from pathlib import Path +from pytest import fixture # Helpers ##########################################################################################