From 11c938467f23904cfcbe91c250b1e7e33db1c87e Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Tue, 7 Oct 2025 08:57:01 -0600 Subject: [PATCH] Restructure packages --- bin/run.sh | 2 +- bin/test.sh | 2 +- bin/watch_test.sh | 2 +- {tungston => mcpacker}/__init__.py | 0 .../core => mcpacker/convert}/__init__.py | 0 .../ecology => mcpacker/emit}/__init__.py | 0 .../emit/datapack}/__init__.py | 0 mcpacker/emit/datapack/locator.py | 36 ++++ mcpacker/emit/datapack/writer.py | 12 ++ mcpacker/emit/datapack/writer_test.py | 7 + .../emit/markdown}/__init__.py | 0 .../emit}/markdown/biomereport.py | 4 +- .../emit}/markdown/biomereport_test.py | 20 +-- .../emit}/markdown/mineralreport.py | 4 +- .../emit}/markdown/mineralreport_test.py | 10 +- .../emit}/markdown/mobreport.py | 6 +- .../emit}/markdown/report.py | 2 +- .../emit}/markdown/report_test.py | 2 +- .../emit}/markdown/reportwriter.py | 4 +- .../markdown => mcpacker/model}/__init__.py | 0 .../model/core}/__init__.py | 0 {tungston => mcpacker/model}/core/altitude.py | 0 .../model}/core/altitude_test.py | 2 +- mcpacker/model/core/ecology/__init__.py | 0 .../model}/core/ecology/biome.py | 14 +- .../model}/core/ecology/biome_test.py | 14 +- .../model}/core/ecology/biomecatalog.py | 4 +- .../model}/core/ecology/biomecatalog_test.py | 18 +- .../model}/core/ecology/biomefilter.py | 4 +- .../model}/core/ecology/biomefilter_test.py | 16 +- .../model}/core/ecology/biometrait.py | 0 .../model}/core/ecology/biometrait_test.py | 4 +- .../model}/core/ecology/flora.py | 5 +- .../model}/core/ecology/flora_test.py | 2 +- .../model}/core/ecology/geology.py | 2 +- .../model}/core/ecology/geology_test.py | 2 +- .../model}/core/ecology/heat.py | 4 +- .../model}/core/ecology/heat_test.py | 2 +- .../model}/core/ecology/humidity.py | 5 +- .../model}/core/ecology/humidity_test.py | 2 +- .../model}/core/ecology/soil.py | 2 +- .../model}/core/ecology/soil_test.py | 2 +- .../model}/core/ecology/water.py | 2 +- .../model}/core/ecology/water_test.py | 2 +- mcpacker/model/core/fauna/__init__.py | 0 .../model}/core/fauna/active.py | 0 .../model}/core/fauna/active_test.py | 2 +- .../model}/core/fauna/group.py | 0 .../model}/core/fauna/group_test.py | 2 +- .../model}/core/fauna/location.py | 2 +- .../model}/core/fauna/mob.py | 4 +- .../model}/core/fauna/mob_test.py | 4 +- .../model}/core/fauna/mobcatalog.py | 2 +- .../model}/core/fauna/mobplacement.py | 6 +- .../model}/core/fauna/mobplacement_test.py | 12 +- mcpacker/model/core/flora/__init__.py | 0 mcpacker/model/core/geology/__init__.py | 0 .../model}/core/geology/bulk.py | 0 .../model}/core/geology/bulk_test.py | 2 +- .../model}/core/geology/deposit/__init__.py | 10 +- .../core/geology/deposit/metaldeposit.py | 18 +- .../core/geology/deposit/metaldeposit_test.py | 18 +- .../model}/core/geology/depositcatalog.py | 4 +- .../core/geology/depositcatalog_test.py | 20 +-- .../model}/core/geology/inclusion.py | 2 +- .../model}/core/geology/inclusion_test.py | 6 +- .../model}/core/geology/mineral.py | 4 +- .../model}/core/geology/mineral_test.py | 6 +- .../model}/core/geology/mineralcatalog.py | 2 +- .../core/geology/mineralcatalog_test.py | 6 +- .../model}/core/geology/proportion.py | 0 .../model}/core/geology/proportion_test.py | 2 +- .../model}/core/geology/replacement.py | 2 +- .../model}/core/geology/replacement_test.py | 2 +- {tungston => mcpacker/model}/core/habitat.py | 22 +-- .../model}/core/habitat_test.py | 12 +- .../model}/core/placement.py | 2 +- .../model}/core/placement_test.py | 10 +- .../model}/core/resourceid.py | 0 .../model}/core/resourceid_test.py | 2 +- {tungston => mcpacker/model}/core/scarcity.py | 1 + .../model}/core/scarcity_test.py | 3 +- {tungston => mcpacker/model}/core/season.py | 0 .../model}/core/season_test.py | 2 +- {tungston => mcpacker/model}/core/world.py | 8 +- .../model}/core/world_test.py | 2 +- mcpacker/model/datapack/__init__.py | 38 ++++ .../model}/datapack/blockstate.py | 0 .../model}/datapack/blockstate_test.py | 2 +- .../datapack/blockstateprovider/__init__.py | 0 .../blockstateprovider/simplestateprovider.py | 4 +- .../simplestateprovider_test.py | 4 +- .../datapack/configuredfeature/__init__.py | 0 .../datapack/configuredfeature/randompatch.py | 2 +- .../configuredfeature/randompatch_test.py | 6 +- .../datapack/configuredfeature/simpleblock.py | 4 +- .../configuredfeature/simpleblock_test.py | 6 +- .../model}/datapack/heightmaptype.py | 0 .../model}/datapack/heightmaptype_test.py | 2 +- mcpacker/model/datapack/mod.py | 15 ++ mcpacker/model/datapack/mod_test.py | 7 + mcpacker/model/datapack/placedfeature.py | 10 ++ .../model}/datapack/placedfeature_test.py | 3 +- .../model}/datapack/placement/__init__.py | 0 .../model}/datapack/placement/biome.py | 2 +- .../model}/datapack/placement/biome_test.py | 2 +- .../model}/datapack/placement/heightmap.py | 4 +- .../datapack/placement/heightmap_test.py | 4 +- .../model}/datapack/placement/insquare.py | 2 +- .../datapack/placement/insquare_test.py | 2 +- .../model}/datapack/placement/rarityfilter.py | 2 +- .../datapack/placement/rarityfilter_test.py | 2 +- mcpacker/pack/__init__.py | 0 mcpacker/pack/mysteriousisland/__init__.py | 0 .../structure/deposit_bed_loam_marker.nbt | Bin 0 -> 172 bytes .../structure/deposit_bif_iron_marker.nbt | Bin 0 -> 304 bytes .../deposit_epithermal_silver_marker.nbt | Bin 0 -> 286 bytes .../deposit_evaporite_nitrate_marker.nbt | Bin 0 -> 160 bytes .../deposit_evaporite_salt_marker.nbt | Bin 0 -> 172 bytes .../deposit_fulmarole_sulfur_marker.nbt | Bin 0 -> 253 bytes .../deposit_geode_amethyst_marker.nbt | Bin 0 -> 315 bytes .../structure/deposit_greisen_tin_marker.nbt | Bin 0 -> 235 bytes .../deposit_hydrothermal_emerald_marker.nbt | Bin 0 -> 362 bytes .../deposit_laterite_aluminum_marker.nbt | Bin 0 -> 375 bytes .../deposit_lavatube_diamond_marker.nbt | Bin 0 -> 227 bytes .../structure/deposit_mvt_lead_marker.nbt | Bin 0 -> 262 bytes .../deposit_porphyry_copper_marker.nbt | Bin 0 -> 340 bytes .../deposit_seam_bituminouscoal_marker.nbt | Bin 0 -> 247 bytes .../deposit_seam_peatcoal_marker.nbt | Bin 0 -> 247 bytes .../deposit_sedimentary_iron_marker.nbt | Bin 0 -> 298 bytes .../structure/deposit_skarnlapis_marker.nbt | Bin 0 -> 252 bytes .../assets/textures/block/peat_block.png | Bin 0 -> 1339 bytes .../assets/textures/item/peat_chunk.png | Bin 0 -> 1216 bytes .../pack/mysteriousisland/biomecatalog.py | 165 ++++++++++++++++++ .../mysteriousisland/biomecatalog_test.py | 2 +- .../pack/mysteriousisland/depositcatalog.py | 28 +++ .../mysteriousisland/depositcatalog_test.py | 2 +- .../pack}/mysteriousisland/mineralcatalog.py | 6 +- .../mysteriousisland/mineralcatalog_test.py | 2 +- .../pack}/mysteriousisland/mobcatalog.py | 34 ++-- .../pack}/mysteriousisland/mobcatalog_test.py | 2 +- mcpacker/pack/mysteriousisland/runner.py | 33 ++++ mcpacker/pack/mysteriousisland/world.py | 10 ++ mcpacker/ui/__init__.py | 0 {tungston/interface => mcpacker/ui}/runner.py | 2 +- .../interface => mcpacker/ui}/runner_test.py | 3 +- tungston/generator/datapack/__init__.py | 14 -- tungston/generator/datapack/placedfeature.py | 6 - .../modpack/mysteriousisland/biomecatalog.py | 165 ------------------ .../mysteriousisland/depositcatalog.py | 28 --- tungston/modpack/mysteriousisland/runner.py | 37 ---- tungston/modpack/mysteriousisland/world.py | 10 -- 152 files changed, 600 insertions(+), 495 deletions(-) rename {tungston => mcpacker}/__init__.py (100%) rename {tungston/core => mcpacker/convert}/__init__.py (100%) rename {tungston/core/ecology => mcpacker/emit}/__init__.py (100%) rename {tungston/core/fauna => mcpacker/emit/datapack}/__init__.py (100%) create mode 100644 mcpacker/emit/datapack/locator.py create mode 100644 mcpacker/emit/datapack/writer.py create mode 100644 mcpacker/emit/datapack/writer_test.py rename {tungston/core/geology => mcpacker/emit/markdown}/__init__.py (100%) rename {tungston/generator => mcpacker/emit}/markdown/biomereport.py (85%) rename {tungston/generator => mcpacker/emit}/markdown/biomereport_test.py (72%) rename {tungston/generator => mcpacker/emit}/markdown/mineralreport.py (85%) rename {tungston/generator => mcpacker/emit}/markdown/mineralreport_test.py (83%) rename {tungston/generator => mcpacker/emit}/markdown/mobreport.py (91%) rename {tungston/generator => mcpacker/emit}/markdown/report.py (97%) rename {tungston/generator => mcpacker/emit}/markdown/report_test.py (93%) rename {tungston/generator => mcpacker/emit}/markdown/reportwriter.py (91%) rename {tungston/generator/markdown => mcpacker/model}/__init__.py (100%) rename {tungston/modpack/mysteriousisland => mcpacker/model/core}/__init__.py (100%) rename {tungston => mcpacker/model}/core/altitude.py (100%) rename {tungston => mcpacker/model}/core/altitude_test.py (91%) create mode 100644 mcpacker/model/core/ecology/__init__.py rename {tungston => mcpacker/model}/core/ecology/biome.py (81%) rename {tungston => mcpacker/model}/core/ecology/biome_test.py (60%) rename {tungston => mcpacker/model}/core/ecology/biomecatalog.py (83%) rename {tungston => mcpacker/model}/core/ecology/biomecatalog_test.py (74%) rename {tungston => mcpacker/model}/core/ecology/biomefilter.py (95%) rename {tungston => mcpacker/model}/core/ecology/biomefilter_test.py (78%) rename {tungston => mcpacker/model}/core/ecology/biometrait.py (100%) rename {tungston => mcpacker/model}/core/ecology/biometrait_test.py (91%) rename {tungston => mcpacker/model}/core/ecology/flora.py (85%) rename {tungston => mcpacker/model}/core/ecology/flora_test.py (83%) rename {tungston => mcpacker/model}/core/ecology/geology.py (88%) rename {tungston => mcpacker/model}/core/ecology/geology_test.py (74%) rename {tungston => mcpacker/model}/core/ecology/heat.py (88%) rename {tungston => mcpacker/model}/core/ecology/heat_test.py (85%) rename {tungston => mcpacker/model}/core/ecology/humidity.py (83%) rename {tungston => mcpacker/model}/core/ecology/humidity_test.py (81%) rename {tungston => mcpacker/model}/core/ecology/soil.py (89%) rename {tungston => mcpacker/model}/core/ecology/soil_test.py (76%) rename {tungston => mcpacker/model}/core/ecology/water.py (88%) rename {tungston => mcpacker/model}/core/ecology/water_test.py (76%) create mode 100644 mcpacker/model/core/fauna/__init__.py rename {tungston => mcpacker/model}/core/fauna/active.py (100%) rename {tungston => mcpacker/model}/core/fauna/active_test.py (76%) rename {tungston => mcpacker/model}/core/fauna/group.py (100%) rename {tungston => mcpacker/model}/core/fauna/group_test.py (90%) rename {tungston => mcpacker/model}/core/fauna/location.py (90%) rename {tungston => mcpacker/model}/core/fauna/mob.py (90%) rename {tungston => mcpacker/model}/core/fauna/mob_test.py (91%) rename {tungston => mcpacker/model}/core/fauna/mobcatalog.py (91%) rename {tungston => mcpacker/model}/core/fauna/mobplacement.py (69%) rename {tungston => mcpacker/model}/core/fauna/mobplacement_test.py (78%) create mode 100644 mcpacker/model/core/flora/__init__.py create mode 100644 mcpacker/model/core/geology/__init__.py rename {tungston => mcpacker/model}/core/geology/bulk.py (100%) rename {tungston => mcpacker/model}/core/geology/bulk_test.py (91%) rename {tungston => mcpacker/model}/core/geology/deposit/__init__.py (58%) rename {tungston => mcpacker/model}/core/geology/deposit/metaldeposit.py (67%) rename {tungston => mcpacker/model}/core/geology/deposit/metaldeposit_test.py (74%) rename {tungston => mcpacker/model}/core/geology/depositcatalog.py (85%) rename {tungston => mcpacker/model}/core/geology/depositcatalog_test.py (68%) rename {tungston => mcpacker/model}/core/geology/inclusion.py (91%) rename {tungston => mcpacker/model}/core/geology/inclusion_test.py (78%) rename {tungston => mcpacker/model}/core/geology/mineral.py (89%) rename {tungston => mcpacker/model}/core/geology/mineral_test.py (80%) rename {tungston => mcpacker/model}/core/geology/mineralcatalog.py (93%) rename {tungston => mcpacker/model}/core/geology/mineralcatalog_test.py (83%) rename {tungston => mcpacker/model}/core/geology/proportion.py (100%) rename {tungston => mcpacker/model}/core/geology/proportion_test.py (82%) rename {tungston => mcpacker/model}/core/geology/replacement.py (95%) rename {tungston => mcpacker/model}/core/geology/replacement_test.py (94%) rename {tungston => mcpacker/model}/core/habitat.py (80%) rename {tungston => mcpacker/model}/core/habitat_test.py (81%) rename {tungston => mcpacker/model}/core/placement.py (93%) rename {tungston => mcpacker/model}/core/placement_test.py (80%) rename {tungston => mcpacker/model}/core/resourceid.py (100%) rename {tungston => mcpacker/model}/core/resourceid_test.py (89%) rename {tungston => mcpacker/model}/core/scarcity.py (99%) rename {tungston => mcpacker/model}/core/scarcity_test.py (76%) rename {tungston => mcpacker/model}/core/season.py (100%) rename {tungston => mcpacker/model}/core/season_test.py (90%) rename {tungston => mcpacker/model}/core/world.py (59%) rename {tungston => mcpacker/model}/core/world_test.py (75%) create mode 100644 mcpacker/model/datapack/__init__.py rename {tungston/generator => mcpacker/model}/datapack/blockstate.py (100%) rename {tungston/generator => mcpacker/model}/datapack/blockstate_test.py (89%) rename {tungston/generator => mcpacker/model}/datapack/blockstateprovider/__init__.py (100%) rename {tungston/generator => mcpacker/model}/datapack/blockstateprovider/simplestateprovider.py (76%) rename {tungston/generator => mcpacker/model}/datapack/blockstateprovider/simplestateprovider_test.py (81%) rename {tungston/generator => mcpacker/model}/datapack/configuredfeature/__init__.py (100%) rename {tungston/generator => mcpacker/model}/datapack/configuredfeature/randompatch.py (88%) rename {tungston/generator => mcpacker/model}/datapack/configuredfeature/randompatch_test.py (80%) rename {tungston/generator => mcpacker/model}/datapack/configuredfeature/simpleblock.py (76%) rename {tungston/generator => mcpacker/model}/datapack/configuredfeature/simpleblock_test.py (80%) rename {tungston/generator => mcpacker/model}/datapack/heightmaptype.py (100%) rename {tungston/generator => mcpacker/model}/datapack/heightmaptype_test.py (66%) create mode 100644 mcpacker/model/datapack/mod.py create mode 100644 mcpacker/model/datapack/mod_test.py create mode 100644 mcpacker/model/datapack/placedfeature.py rename {tungston/generator => mcpacker/model}/datapack/placedfeature_test.py (65%) rename {tungston/generator => mcpacker/model}/datapack/placement/__init__.py (100%) rename {tungston/generator => mcpacker/model}/datapack/placement/biome.py (83%) rename {tungston/generator => mcpacker/model}/datapack/placement/biome_test.py (86%) rename {tungston/generator => mcpacker/model}/datapack/placement/heightmap.py (77%) rename {tungston/generator => mcpacker/model}/datapack/placement/heightmap_test.py (77%) rename {tungston/generator => mcpacker/model}/datapack/placement/insquare.py (83%) rename {tungston/generator => mcpacker/model}/datapack/placement/insquare_test.py (85%) rename {tungston/generator => mcpacker/model}/datapack/placement/rarityfilter.py (87%) rename {tungston/generator => mcpacker/model}/datapack/placement/rarityfilter_test.py (85%) create mode 100644 mcpacker/pack/__init__.py create mode 100644 mcpacker/pack/mysteriousisland/__init__.py create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_bed_loam_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_bif_iron_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_epithermal_silver_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_evaporite_nitrate_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_evaporite_salt_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_fulmarole_sulfur_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_geode_amethyst_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_greisen_tin_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_hydrothermal_emerald_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_laterite_aluminum_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_lavatube_diamond_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_mvt_lead_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_porphyry_copper_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_seam_bituminouscoal_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_seam_peatcoal_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_sedimentary_iron_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/structure/deposit_skarnlapis_marker.nbt create mode 100644 mcpacker/pack/mysteriousisland/assets/textures/block/peat_block.png create mode 100644 mcpacker/pack/mysteriousisland/assets/textures/item/peat_chunk.png create mode 100644 mcpacker/pack/mysteriousisland/biomecatalog.py rename {tungston/modpack => mcpacker/pack}/mysteriousisland/biomecatalog_test.py (70%) create mode 100644 mcpacker/pack/mysteriousisland/depositcatalog.py rename {tungston/modpack => mcpacker/pack}/mysteriousisland/depositcatalog_test.py (70%) rename {tungston/modpack => mcpacker/pack}/mysteriousisland/mineralcatalog.py (95%) rename {tungston/modpack => mcpacker/pack}/mysteriousisland/mineralcatalog_test.py (70%) rename {tungston/modpack => mcpacker/pack}/mysteriousisland/mobcatalog.py (88%) rename {tungston/modpack => mcpacker/pack}/mysteriousisland/mobcatalog_test.py (71%) create mode 100644 mcpacker/pack/mysteriousisland/runner.py create mode 100644 mcpacker/pack/mysteriousisland/world.py create mode 100644 mcpacker/ui/__init__.py rename {tungston/interface => mcpacker/ui}/runner.py (93%) rename {tungston/interface => mcpacker/ui}/runner_test.py (74%) delete mode 100644 tungston/generator/datapack/__init__.py delete mode 100644 tungston/generator/datapack/placedfeature.py delete mode 100644 tungston/modpack/mysteriousisland/biomecatalog.py delete mode 100644 tungston/modpack/mysteriousisland/depositcatalog.py delete mode 100644 tungston/modpack/mysteriousisland/runner.py delete mode 100644 tungston/modpack/mysteriousisland/world.py diff --git a/bin/run.sh b/bin/run.sh index cb1ffc5..dfdcfa2 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -1 +1 @@ -python -m tungston.modpack.mysteriousisland.runner $* +python -m mcpacker.pack.mysteriousisland.runner $* diff --git a/bin/test.sh b/bin/test.sh index 6fd1cfa..a95426b 100755 --- a/bin/test.sh +++ b/bin/test.sh @@ -1,2 +1,2 @@ source bin/activate.sh -pytest tungston -vv $* +pytest mcpacker -vv $* diff --git a/bin/watch_test.sh b/bin/watch_test.sh index 2cb9d1c..fb1f816 100755 --- a/bin/watch_test.sh +++ b/bin/watch_test.sh @@ -1,2 +1,2 @@ source bin/activate.sh -watch -c "pytest -q --color=yes --tb=short tungston" +watch -c "pytest -q --color=yes --tb=short mcpacker" diff --git a/tungston/__init__.py b/mcpacker/__init__.py similarity index 100% rename from tungston/__init__.py rename to mcpacker/__init__.py diff --git a/tungston/core/__init__.py b/mcpacker/convert/__init__.py similarity index 100% rename from tungston/core/__init__.py rename to mcpacker/convert/__init__.py diff --git a/tungston/core/ecology/__init__.py b/mcpacker/emit/__init__.py similarity index 100% rename from tungston/core/ecology/__init__.py rename to mcpacker/emit/__init__.py diff --git a/tungston/core/fauna/__init__.py b/mcpacker/emit/datapack/__init__.py similarity index 100% rename from tungston/core/fauna/__init__.py rename to mcpacker/emit/datapack/__init__.py diff --git a/mcpacker/emit/datapack/locator.py b/mcpacker/emit/datapack/locator.py new file mode 100644 index 0000000..2b05e63 --- /dev/null +++ b/mcpacker/emit/datapack/locator.py @@ -0,0 +1,36 @@ +from os.path import join + + +# Class ############################################################################################ + +class Locator: + + def __init__(self, basePath:str): + self.basePath = basePath + + def biomeModifier(self) -> str: + return join(self.basePath, "data", self.mod, "neoforge", "biome_modifier") + + def blockTag(self) -> str: + return join(self.basePath, "data", self.mod, "tags", "blocks") + + def configuredFeature(self) -> str: + return join(self.basePath, "data", self.mod, "worldgen", "configured_feature") + + def function(self) -> str: + return join(self.basePath, "data", self.mod, "functions") + + def placedFeature(self) -> str: + return join(self.basePath, "data", self.mod, "worldgen", "placed_feature") + + def structure(self) -> str: + return join(self.basePath, "data", self.mod, "worldgen", "structure") + + def structureNbt(self) -> str: + return join(self.basePath, "data", self.mod, "structure") + + def structureSet(self) -> str: + return join(self.basePath, "data", self.mod, "worldgen", "structure_set") + + def templatePool(self) -> str: + return join(self.basePath, "data", self.mod, "worldgen", "template_pool") diff --git a/mcpacker/emit/datapack/writer.py b/mcpacker/emit/datapack/writer.py new file mode 100644 index 0000000..058383a --- /dev/null +++ b/mcpacker/emit/datapack/writer.py @@ -0,0 +1,12 @@ +from mcpacker.model.core.world import World + + +# Class ############################################################################################ + +class Writer: + + def __init__(self, world:World): + self.world = world + + def write(self): + raise NotImplementedError() diff --git a/mcpacker/emit/datapack/writer_test.py b/mcpacker/emit/datapack/writer_test.py new file mode 100644 index 0000000..af3bcc3 --- /dev/null +++ b/mcpacker/emit/datapack/writer_test.py @@ -0,0 +1,7 @@ +import mcpacker.emit.datapack.writer + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/tungston/core/geology/__init__.py b/mcpacker/emit/markdown/__init__.py similarity index 100% rename from tungston/core/geology/__init__.py rename to mcpacker/emit/markdown/__init__.py diff --git a/tungston/generator/markdown/biomereport.py b/mcpacker/emit/markdown/biomereport.py similarity index 85% rename from tungston/generator/markdown/biomereport.py rename to mcpacker/emit/markdown/biomereport.py index fbe7492..bcdab5e 100644 --- a/tungston/generator/markdown/biomereport.py +++ b/mcpacker/emit/markdown/biomereport.py @@ -1,5 +1,5 @@ -from tungston.core.world import World -from tungston.generator.markdown.report import Report +from mcpacker.emit.markdown.report import Report +from mcpacker.model.core.world import World # Class ############################################################################################ diff --git a/tungston/generator/markdown/biomereport_test.py b/mcpacker/emit/markdown/biomereport_test.py similarity index 72% rename from tungston/generator/markdown/biomereport_test.py rename to mcpacker/emit/markdown/biomereport_test.py index 629e655..0a0fb81 100644 --- a/tungston/generator/markdown/biomereport_test.py +++ b/mcpacker/emit/markdown/biomereport_test.py @@ -1,15 +1,15 @@ +from mcpacker.emit.markdown.biomereport import BiomeReport +from mcpacker.model.core.ecology.biome import Biome +from mcpacker.model.core.ecology.biomecatalog import BiomeCatalog +from mcpacker.model.core.world import World from pytest import fixture -from tungston.core.ecology.biome import Biome -from tungston.core.ecology.biomecatalog import BiomeCatalog -from tungston.core.world import World -from tungston.generator.markdown.biomereport import BiomeReport -import tungston.core.ecology.flora as F -import tungston.core.ecology.geology as G -import tungston.core.ecology.heat as E -import tungston.core.ecology.humidity as U -import tungston.core.ecology.soil as S -import tungston.core.ecology.water as W +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 textwrap diff --git a/tungston/generator/markdown/mineralreport.py b/mcpacker/emit/markdown/mineralreport.py similarity index 85% rename from tungston/generator/markdown/mineralreport.py rename to mcpacker/emit/markdown/mineralreport.py index 7c119a6..2c262ef 100644 --- a/tungston/generator/markdown/mineralreport.py +++ b/mcpacker/emit/markdown/mineralreport.py @@ -1,5 +1,5 @@ -from tungston.core.world import World -from tungston.generator.markdown.report import Report +from mcpacker.emit.markdown.report import Report +from mcpacker.model.core.world import World # Class ############################################################################################ diff --git a/tungston/generator/markdown/mineralreport_test.py b/mcpacker/emit/markdown/mineralreport_test.py similarity index 83% rename from tungston/generator/markdown/mineralreport_test.py rename to mcpacker/emit/markdown/mineralreport_test.py index f3431f2..aa0d348 100644 --- a/tungston/generator/markdown/mineralreport_test.py +++ b/mcpacker/emit/markdown/mineralreport_test.py @@ -1,9 +1,9 @@ +from mcpacker.emit.markdown.mineralreport import MineralReport +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.core.world import World from pytest import fixture -from tungston.core.geology.mineral import Mineral -from tungston.core.geology.mineralcatalog import MineralCatalog -from tungston.core.geology.replacement import Replacement -from tungston.core.world import World -from tungston.generator.markdown.mineralreport import MineralReport import textwrap diff --git a/tungston/generator/markdown/mobreport.py b/mcpacker/emit/markdown/mobreport.py similarity index 91% rename from tungston/generator/markdown/mobreport.py rename to mcpacker/emit/markdown/mobreport.py index 49d5532..1beb34a 100644 --- a/tungston/generator/markdown/mobreport.py +++ b/mcpacker/emit/markdown/mobreport.py @@ -1,6 +1,6 @@ -from tungston.core.world import World -from tungston.core.ecology.biometrait import BiomeTrait -from tungston.generator.markdown.report import Report +from mcpacker.emit.markdown.report import Report +from mcpacker.model.core.ecology.biometrait import BiomeTrait +from mcpacker.model.core.world import World # Class ############################################################################################ diff --git a/tungston/generator/markdown/report.py b/mcpacker/emit/markdown/report.py similarity index 97% rename from tungston/generator/markdown/report.py rename to mcpacker/emit/markdown/report.py index 87d1add..db3f3f4 100644 --- a/tungston/generator/markdown/report.py +++ b/mcpacker/emit/markdown/report.py @@ -1,5 +1,5 @@ from collections.abc import Iterator -from tungston.core.world import World +from mcpacker.model.core.world import World # Constants ######################################################################################## diff --git a/tungston/generator/markdown/report_test.py b/mcpacker/emit/markdown/report_test.py similarity index 93% rename from tungston/generator/markdown/report_test.py rename to mcpacker/emit/markdown/report_test.py index e66c133..214c8fb 100644 --- a/tungston/generator/markdown/report_test.py +++ b/mcpacker/emit/markdown/report_test.py @@ -1,5 +1,5 @@ +from mcpacker.emit.markdown.report import Report from pytest import fixture -from tungston.generator.markdown.report import Report # Fixtures ######################################################################################### diff --git a/tungston/generator/markdown/reportwriter.py b/mcpacker/emit/markdown/reportwriter.py similarity index 91% rename from tungston/generator/markdown/reportwriter.py rename to mcpacker/emit/markdown/reportwriter.py index b7a9120..6a17735 100644 --- a/tungston/generator/markdown/reportwriter.py +++ b/mcpacker/emit/markdown/reportwriter.py @@ -1,7 +1,7 @@ -from tungston.generator.markdown.report import Report +from mcpacker.emit.markdown.report import Report -import shutil import os +import shutil # Class ############################################################################################ diff --git a/tungston/generator/markdown/__init__.py b/mcpacker/model/__init__.py similarity index 100% rename from tungston/generator/markdown/__init__.py rename to mcpacker/model/__init__.py diff --git a/tungston/modpack/mysteriousisland/__init__.py b/mcpacker/model/core/__init__.py similarity index 100% rename from tungston/modpack/mysteriousisland/__init__.py rename to mcpacker/model/core/__init__.py diff --git a/tungston/core/altitude.py b/mcpacker/model/core/altitude.py similarity index 100% rename from tungston/core/altitude.py rename to mcpacker/model/core/altitude.py diff --git a/tungston/core/altitude_test.py b/mcpacker/model/core/altitude_test.py similarity index 91% rename from tungston/core/altitude_test.py rename to mcpacker/model/core/altitude_test.py index 48fd2b6..6d33692 100644 --- a/tungston/core/altitude_test.py +++ b/mcpacker/model/core/altitude_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.altitude as A +import mcpacker.model.core.altitude as A # Fixtures ######################################################################################### diff --git a/mcpacker/model/core/ecology/__init__.py b/mcpacker/model/core/ecology/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tungston/core/ecology/biome.py b/mcpacker/model/core/ecology/biome.py similarity index 81% rename from tungston/core/ecology/biome.py rename to mcpacker/model/core/ecology/biome.py index 7c842b9..5466ba6 100644 --- a/tungston/core/ecology/biome.py +++ b/mcpacker/model/core/ecology/biome.py @@ -1,10 +1,10 @@ -from tungston.core.ecology.biometrait import BiomeTrait -from tungston.core.ecology.flora import Flora -from tungston.core.ecology.geology import Geology -from tungston.core.ecology.heat import Heat -from tungston.core.ecology.humidity import Humidity -from tungston.core.ecology.soil import Soil -from tungston.core.ecology.water import Water +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 #################################################################################################### diff --git a/tungston/core/ecology/biome_test.py b/mcpacker/model/core/ecology/biome_test.py similarity index 60% rename from tungston/core/ecology/biome_test.py rename to mcpacker/model/core/ecology/biome_test.py index ce6e6d5..1c492f2 100644 --- a/tungston/core/ecology/biome_test.py +++ b/mcpacker/model/core/ecology/biome_test.py @@ -1,12 +1,12 @@ +from mcpacker.model.core.ecology.biome import Biome from pytest import fixture -from tungston.core.ecology.biome import Biome -import tungston.core.ecology.flora as F -import tungston.core.ecology.geology as G -import tungston.core.ecology.heat as E -import tungston.core.ecology.humidity as U -import tungston.core.ecology.soil as S -import tungston.core.ecology.water as W +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 # Fixtures ######################################################################################### diff --git a/tungston/core/ecology/biomecatalog.py b/mcpacker/model/core/ecology/biomecatalog.py similarity index 83% rename from tungston/core/ecology/biomecatalog.py rename to mcpacker/model/core/ecology/biomecatalog.py index 1ad5c47..2f981fc 100644 --- a/tungston/core/ecology/biomecatalog.py +++ b/mcpacker/model/core/ecology/biomecatalog.py @@ -1,5 +1,5 @@ -from tungston.core.ecology.biome import Biome -from tungston.core.ecology.biomefilter import BiomeFilter +from mcpacker.model.core.ecology.biome import Biome +from mcpacker.model.core.ecology.biomefilter import BiomeFilter # Classes ########################################################################################## diff --git a/tungston/core/ecology/biomecatalog_test.py b/mcpacker/model/core/ecology/biomecatalog_test.py similarity index 74% rename from tungston/core/ecology/biomecatalog_test.py rename to mcpacker/model/core/ecology/biomecatalog_test.py index 720ece0..8d9742c 100644 --- a/tungston/core/ecology/biomecatalog_test.py +++ b/mcpacker/model/core/ecology/biomecatalog_test.py @@ -1,14 +1,14 @@ -from tungston.core.ecology.biome import Biome -from tungston.core.ecology.biomecatalog import BiomeCatalog -from tungston.core.ecology.biomefilter import BiomeFilter +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 pytest import fixture -import tungston.core.ecology.flora as F -import tungston.core.ecology.geology as G -import tungston.core.ecology.heat as E -import tungston.core.ecology.humidity as U -import tungston.core.ecology.soil as S -import tungston.core.ecology.water as W +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 # Fixtures ######################################################################################### diff --git a/tungston/core/ecology/biomefilter.py b/mcpacker/model/core/ecology/biomefilter.py similarity index 95% rename from tungston/core/ecology/biomefilter.py rename to mcpacker/model/core/ecology/biomefilter.py index f02a0ea..39c38a4 100644 --- a/tungston/core/ecology/biomefilter.py +++ b/mcpacker/model/core/ecology/biomefilter.py @@ -1,5 +1,5 @@ -from tungston.core.ecology.biome import Biome -from tungston.core.ecology.biometrait import BiomeTrait +from mcpacker.model.core.ecology.biome import Biome +from mcpacker.model.core.ecology.biometrait import BiomeTrait # Class ############################################################################################ diff --git a/tungston/core/ecology/biomefilter_test.py b/mcpacker/model/core/ecology/biomefilter_test.py similarity index 78% rename from tungston/core/ecology/biomefilter_test.py rename to mcpacker/model/core/ecology/biomefilter_test.py index 35c4a8b..affa22c 100644 --- a/tungston/core/ecology/biomefilter_test.py +++ b/mcpacker/model/core/ecology/biomefilter_test.py @@ -1,13 +1,13 @@ -from tungston.core.ecology.biome import Biome -from tungston.core.ecology.biomefilter import BiomeFilter +from mcpacker.model.core.ecology.biome import Biome +from mcpacker.model.core.ecology.biomefilter import BiomeFilter from pytest import fixture -import tungston.core.ecology.flora as F -import tungston.core.ecology.geology as G -import tungston.core.ecology.heat as E -import tungston.core.ecology.humidity as U -import tungston.core.ecology.soil as S -import tungston.core.ecology.water as W +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 # Fixtures ######################################################################################### diff --git a/tungston/core/ecology/biometrait.py b/mcpacker/model/core/ecology/biometrait.py similarity index 100% rename from tungston/core/ecology/biometrait.py rename to mcpacker/model/core/ecology/biometrait.py diff --git a/tungston/core/ecology/biometrait_test.py b/mcpacker/model/core/ecology/biometrait_test.py similarity index 91% rename from tungston/core/ecology/biometrait_test.py rename to mcpacker/model/core/ecology/biometrait_test.py index e2d6f90..c846f99 100644 --- a/tungston/core/ecology/biometrait_test.py +++ b/mcpacker/model/core/ecology/biometrait_test.py @@ -1,7 +1,7 @@ -from tungston.core.ecology.biometrait import BiomeTrait +from mcpacker.model.core.ecology.biometrait import BiomeTrait from pytest import fixture -import tungston.core.ecology.biometrait as biomeTrait +import mcpacker.model.core.ecology.biometrait as biomeTrait # Fixtures ######################################################################################### diff --git a/tungston/core/ecology/flora.py b/mcpacker/model/core/ecology/flora.py similarity index 85% rename from tungston/core/ecology/flora.py rename to mcpacker/model/core/ecology/flora.py index 83e0baa..eb688a9 100644 --- a/tungston/core/ecology/flora.py +++ b/mcpacker/model/core/ecology/flora.py @@ -1,6 +1,6 @@ -from tungston.core.ecology.biometrait import BiomeTrait +from mcpacker.model.core.ecology.biometrait import BiomeTrait -import tungston.core.ecology.biometrait as biomeTrait +import mcpacker.model.core.ecology.biometrait as biomeTrait # Class ############################################################################################ @@ -22,6 +22,7 @@ BARREN = Flora("barren") ALL = [CANOPY, FOREST, CLEARING, FIELD, BARREN] + # Helpers ########################################################################################## def within(start:Flora, end:Flora) -> list[Flora]: diff --git a/tungston/core/ecology/flora_test.py b/mcpacker/model/core/ecology/flora_test.py similarity index 83% rename from tungston/core/ecology/flora_test.py rename to mcpacker/model/core/ecology/flora_test.py index 63b8fa3..ba60b27 100644 --- a/tungston/core/ecology/flora_test.py +++ b/mcpacker/model/core/ecology/flora_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.ecology.flora as flora +import mcpacker.model.core.ecology.flora as flora # Tests ############################################################################################ diff --git a/tungston/core/ecology/geology.py b/mcpacker/model/core/ecology/geology.py similarity index 88% rename from tungston/core/ecology/geology.py rename to mcpacker/model/core/ecology/geology.py index f3e8869..bb685b5 100644 --- a/tungston/core/ecology/geology.py +++ b/mcpacker/model/core/ecology/geology.py @@ -1,4 +1,4 @@ -from tungston.core.ecology.biometrait import BiomeTrait +from mcpacker.model.core.ecology.biometrait import BiomeTrait # Class ############################################################################################ diff --git a/tungston/core/ecology/geology_test.py b/mcpacker/model/core/ecology/geology_test.py similarity index 74% rename from tungston/core/ecology/geology_test.py rename to mcpacker/model/core/ecology/geology_test.py index 454e0db..2c0086b 100644 --- a/tungston/core/ecology/geology_test.py +++ b/mcpacker/model/core/ecology/geology_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.ecology.geology as geology +import mcpacker.model.core.ecology.geology as geology # Tests ############################################################################################ diff --git a/tungston/core/ecology/heat.py b/mcpacker/model/core/ecology/heat.py similarity index 88% rename from tungston/core/ecology/heat.py rename to mcpacker/model/core/ecology/heat.py index e2ed46d..82d36f6 100644 --- a/tungston/core/ecology/heat.py +++ b/mcpacker/model/core/ecology/heat.py @@ -1,6 +1,6 @@ -from tungston.core.ecology.biometrait import BiomeTrait +from mcpacker.model.core.ecology.biometrait import BiomeTrait -import tungston.core.ecology.biometrait as biomeTrait +import mcpacker.model.core.ecology.biometrait as biomeTrait # Class ############################################################################################ diff --git a/tungston/core/ecology/heat_test.py b/mcpacker/model/core/ecology/heat_test.py similarity index 85% rename from tungston/core/ecology/heat_test.py rename to mcpacker/model/core/ecology/heat_test.py index 22d7026..fd44f3e 100644 --- a/tungston/core/ecology/heat_test.py +++ b/mcpacker/model/core/ecology/heat_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.ecology.heat as heat +import mcpacker.model.core.ecology.heat as heat # Tests ############################################################################################ diff --git a/tungston/core/ecology/humidity.py b/mcpacker/model/core/ecology/humidity.py similarity index 83% rename from tungston/core/ecology/humidity.py rename to mcpacker/model/core/ecology/humidity.py index 3cd46c7..dacaa3a 100644 --- a/tungston/core/ecology/humidity.py +++ b/mcpacker/model/core/ecology/humidity.py @@ -1,6 +1,6 @@ -from tungston.core.ecology.biometrait import BiomeTrait +from mcpacker.model.core.ecology.biometrait import BiomeTrait -import tungston.core.ecology.biometrait as biomeTrait +import mcpacker.model.core.ecology.biometrait as biomeTrait # Class ############################################################################################ @@ -20,6 +20,7 @@ DRY = Humidity("dry") ALL = [WET, DAMP, DRY] + # Helpers ########################################################################################## def within(start:Humidity, end:Humidity) -> list[Humidity]: diff --git a/tungston/core/ecology/humidity_test.py b/mcpacker/model/core/ecology/humidity_test.py similarity index 81% rename from tungston/core/ecology/humidity_test.py rename to mcpacker/model/core/ecology/humidity_test.py index 9d3999b..cf5c12f 100644 --- a/tungston/core/ecology/humidity_test.py +++ b/mcpacker/model/core/ecology/humidity_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.ecology.humidity as humidity +import mcpacker.model.core.ecology.humidity as humidity # Tests ############################################################################################ diff --git a/tungston/core/ecology/soil.py b/mcpacker/model/core/ecology/soil.py similarity index 89% rename from tungston/core/ecology/soil.py rename to mcpacker/model/core/ecology/soil.py index e72d178..946693e 100644 --- a/tungston/core/ecology/soil.py +++ b/mcpacker/model/core/ecology/soil.py @@ -1,4 +1,4 @@ -from tungston.core.ecology.biometrait import BiomeTrait +from mcpacker.model.core.ecology.biometrait import BiomeTrait # Class ############################################################################################ diff --git a/tungston/core/ecology/soil_test.py b/mcpacker/model/core/ecology/soil_test.py similarity index 76% rename from tungston/core/ecology/soil_test.py rename to mcpacker/model/core/ecology/soil_test.py index f11a625..1ecd0e5 100644 --- a/tungston/core/ecology/soil_test.py +++ b/mcpacker/model/core/ecology/soil_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.ecology.soil as soil +import mcpacker.model.core.ecology.soil as soil # Tests ############################################################################################ diff --git a/tungston/core/ecology/water.py b/mcpacker/model/core/ecology/water.py similarity index 88% rename from tungston/core/ecology/water.py rename to mcpacker/model/core/ecology/water.py index a288715..6bdffc2 100644 --- a/tungston/core/ecology/water.py +++ b/mcpacker/model/core/ecology/water.py @@ -1,4 +1,4 @@ -from tungston.core.ecology.biometrait import BiomeTrait +from mcpacker.model.core.ecology.biometrait import BiomeTrait # Class ############################################################################################ diff --git a/tungston/core/ecology/water_test.py b/mcpacker/model/core/ecology/water_test.py similarity index 76% rename from tungston/core/ecology/water_test.py rename to mcpacker/model/core/ecology/water_test.py index b7d5c4f..3754bcf 100644 --- a/tungston/core/ecology/water_test.py +++ b/mcpacker/model/core/ecology/water_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.ecology.water as water +import mcpacker.model.core.ecology.water as water # Tests ############################################################################################ diff --git a/mcpacker/model/core/fauna/__init__.py b/mcpacker/model/core/fauna/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tungston/core/fauna/active.py b/mcpacker/model/core/fauna/active.py similarity index 100% rename from tungston/core/fauna/active.py rename to mcpacker/model/core/fauna/active.py diff --git a/tungston/core/fauna/active_test.py b/mcpacker/model/core/fauna/active_test.py similarity index 76% rename from tungston/core/fauna/active_test.py rename to mcpacker/model/core/fauna/active_test.py index 4746b96..2141ad4 100644 --- a/tungston/core/fauna/active_test.py +++ b/mcpacker/model/core/fauna/active_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.fauna.active as active +import mcpacker.model.core.fauna.active as active # Tests ############################################################################################ diff --git a/tungston/core/fauna/group.py b/mcpacker/model/core/fauna/group.py similarity index 100% rename from tungston/core/fauna/group.py rename to mcpacker/model/core/fauna/group.py diff --git a/tungston/core/fauna/group_test.py b/mcpacker/model/core/fauna/group_test.py similarity index 90% rename from tungston/core/fauna/group_test.py rename to mcpacker/model/core/fauna/group_test.py index 4d7069b..84aee8d 100644 --- a/tungston/core/fauna/group_test.py +++ b/mcpacker/model/core/fauna/group_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.fauna.group as group +import mcpacker.model.core.fauna.group as group # Fixtures ######################################################################################### diff --git a/tungston/core/fauna/location.py b/mcpacker/model/core/fauna/location.py similarity index 90% rename from tungston/core/fauna/location.py rename to mcpacker/model/core/fauna/location.py index f8f705b..be9f056 100644 --- a/tungston/core/fauna/location.py +++ b/mcpacker/model/core/fauna/location.py @@ -1,4 +1,4 @@ -from tungston.core.ecology.biometrait import BiomeTrait +from mcpacker.model.core.ecology.biometrait import BiomeTrait # Class ############################################################################################ diff --git a/tungston/core/fauna/mob.py b/mcpacker/model/core/fauna/mob.py similarity index 90% rename from tungston/core/fauna/mob.py rename to mcpacker/model/core/fauna/mob.py index 6743cab..66528a3 100644 --- a/tungston/core/fauna/mob.py +++ b/mcpacker/model/core/fauna/mob.py @@ -1,6 +1,6 @@ -from tungston.core.fauna.active import Active +from mcpacker.model.core.fauna.active import Active -import tungston.core.fauna.active as AC +import mcpacker.model.core.fauna.active as AC # Class ############################################################################################ diff --git a/tungston/core/fauna/mob_test.py b/mcpacker/model/core/fauna/mob_test.py similarity index 91% rename from tungston/core/fauna/mob_test.py rename to mcpacker/model/core/fauna/mob_test.py index 3f1b1fc..5b5bff3 100644 --- a/tungston/core/fauna/mob_test.py +++ b/mcpacker/model/core/fauna/mob_test.py @@ -1,7 +1,7 @@ -from tungston.core.fauna.mob import Mob +from mcpacker.model.core.fauna.mob import Mob from pytest import fixture -import tungston.core.fauna.active as AC +import mcpacker.model.core.fauna.active as AC # Fixtures ######################################################################################### diff --git a/tungston/core/fauna/mobcatalog.py b/mcpacker/model/core/fauna/mobcatalog.py similarity index 91% rename from tungston/core/fauna/mobcatalog.py rename to mcpacker/model/core/fauna/mobcatalog.py index fcda846..b1928f0 100644 --- a/tungston/core/fauna/mobcatalog.py +++ b/mcpacker/model/core/fauna/mobcatalog.py @@ -1,5 +1,5 @@ from collections.abc import Iterator -from tungston.core.fauna.mobplacement import MobPlacement +from mcpacker.model.core.fauna.mobplacement import MobPlacement # Class ############################################################################################ diff --git a/tungston/core/fauna/mobplacement.py b/mcpacker/model/core/fauna/mobplacement.py similarity index 69% rename from tungston/core/fauna/mobplacement.py rename to mcpacker/model/core/fauna/mobplacement.py index ef200e9..366f0da 100644 --- a/tungston/core/fauna/mobplacement.py +++ b/mcpacker/model/core/fauna/mobplacement.py @@ -1,6 +1,6 @@ -from tungston.core.habitat import Habitat -from tungston.core.fauna.mob import Mob -from tungston.core.placement import Placement +from mcpacker.model.core.habitat import Habitat +from mcpacker.model.core.fauna.mob import Mob +from mcpacker.model.core.placement import Placement # Class ############################################################################################ diff --git a/tungston/core/fauna/mobplacement_test.py b/mcpacker/model/core/fauna/mobplacement_test.py similarity index 78% rename from tungston/core/fauna/mobplacement_test.py rename to mcpacker/model/core/fauna/mobplacement_test.py index 66a2eed..8036f91 100644 --- a/tungston/core/fauna/mobplacement_test.py +++ b/mcpacker/model/core/fauna/mobplacement_test.py @@ -1,11 +1,11 @@ +from mcpacker.model.core.ecology.biomefilter import BiomeFilter +from mcpacker.model.core.fauna.mob import Mob +from mcpacker.model.core.fauna.mobplacement import MobPlacement +from mcpacker.model.core.habitat import Habitat from pytest import fixture -from tungston.core.ecology.biomefilter import BiomeFilter -from tungston.core.fauna.mob import Mob -from tungston.core.fauna.mobplacement import MobPlacement -from tungston.core.habitat import Habitat -import tungston.core.ecology.flora as F -import tungston.core.ecology.heat as E +import mcpacker.model.core.ecology.flora as F +import mcpacker.model.core.ecology.heat as E # Fixtures ######################################################################################### diff --git a/mcpacker/model/core/flora/__init__.py b/mcpacker/model/core/flora/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mcpacker/model/core/geology/__init__.py b/mcpacker/model/core/geology/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tungston/core/geology/bulk.py b/mcpacker/model/core/geology/bulk.py similarity index 100% rename from tungston/core/geology/bulk.py rename to mcpacker/model/core/geology/bulk.py diff --git a/tungston/core/geology/bulk_test.py b/mcpacker/model/core/geology/bulk_test.py similarity index 91% rename from tungston/core/geology/bulk_test.py rename to mcpacker/model/core/geology/bulk_test.py index c61dc30..5b0cc4a 100644 --- a/tungston/core/geology/bulk_test.py +++ b/mcpacker/model/core/geology/bulk_test.py @@ -1,5 +1,5 @@ +from mcpacker.model.core.geology.bulk import Bulk from pytest import fixture -from tungston.core.geology.bulk import Bulk # Fixture ########################################################################################## diff --git a/tungston/core/geology/deposit/__init__.py b/mcpacker/model/core/geology/deposit/__init__.py similarity index 58% rename from tungston/core/geology/deposit/__init__.py rename to mcpacker/model/core/geology/deposit/__init__.py index 0492ab0..0883fe3 100644 --- a/tungston/core/geology/deposit/__init__.py +++ b/mcpacker/model/core/geology/deposit/__init__.py @@ -1,9 +1,9 @@ -from tungston.core.ecology.biomefilter import BiomeFilter -from tungston.core.geology.bulk import Bulk -from tungston.core.geology.mineral import Mineral -from tungston.core.scarcity import Scarcity +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 -import tungston.core.scarcity as scarcity +import mcpacker.model.core.scarcity as scarcity # Class ############################################################################################ diff --git a/tungston/core/geology/deposit/metaldeposit.py b/mcpacker/model/core/geology/deposit/metaldeposit.py similarity index 67% rename from tungston/core/geology/deposit/metaldeposit.py rename to mcpacker/model/core/geology/deposit/metaldeposit.py index 51335ab..9053b54 100644 --- a/tungston/core/geology/deposit/metaldeposit.py +++ b/mcpacker/model/core/geology/deposit/metaldeposit.py @@ -1,13 +1,13 @@ -from tungston.core.ecology.biomefilter import BiomeFilter -from tungston.core.geology.bulk import Bulk -from tungston.core.geology.deposit import Deposit -from tungston.core.geology.inclusion import Inclusion -from tungston.core.geology.proportion import Proportion -from tungston.core.scarcity import Scarcity +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 -import tungston.core.geology.bulk as BU -import tungston.core.geology.proportion as PR -import tungston.core.scarcity as SC +import mcpacker.model.core.geology.bulk as BU +import mcpacker.model.core.geology.proportion as PR +import mcpacker.model.core.scarcity as SC # Class ############################################################################################ diff --git a/tungston/core/geology/deposit/metaldeposit_test.py b/mcpacker/model/core/geology/deposit/metaldeposit_test.py similarity index 74% rename from tungston/core/geology/deposit/metaldeposit_test.py rename to mcpacker/model/core/geology/deposit/metaldeposit_test.py index a171427..22d44cb 100644 --- a/tungston/core/geology/deposit/metaldeposit_test.py +++ b/mcpacker/model/core/geology/deposit/metaldeposit_test.py @@ -1,14 +1,14 @@ +from mcpacker.model.core.ecology.biomefilter import BiomeFilter +from mcpacker.model.core.geology.deposit.metaldeposit import MetalDeposit +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 pytest import fixture -from tungston.core.ecology.biomefilter import BiomeFilter -from tungston.core.geology.deposit.metaldeposit import MetalDeposit -from tungston.core.geology.inclusion import Inclusion -from tungston.core.geology.mineral import Mineral -from tungston.core.geology.replacement import Replacement -import tungston.core.ecology.flora as FL -import tungston.core.geology.bulk as BU -import tungston.core.geology.proportion as PR -import tungston.core.scarcity as SC +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 # Fixtures ######################################################################################### diff --git a/tungston/core/geology/depositcatalog.py b/mcpacker/model/core/geology/depositcatalog.py similarity index 85% rename from tungston/core/geology/depositcatalog.py rename to mcpacker/model/core/geology/depositcatalog.py index b47c9d3..c516a54 100644 --- a/tungston/core/geology/depositcatalog.py +++ b/mcpacker/model/core/geology/depositcatalog.py @@ -1,5 +1,5 @@ -from tungston.core.geology.mineralcatalog import MineralCatalog -from tungston.core.geology.deposit import Deposit +from mcpacker.model.core.geology.deposit import Deposit +from mcpacker.model.core.geology.mineralcatalog import MineralCatalog from typing import Iterator diff --git a/tungston/core/geology/depositcatalog_test.py b/mcpacker/model/core/geology/depositcatalog_test.py similarity index 68% rename from tungston/core/geology/depositcatalog_test.py rename to mcpacker/model/core/geology/depositcatalog_test.py index faa27a5..6cdfbb1 100644 --- a/tungston/core/geology/depositcatalog_test.py +++ b/mcpacker/model/core/geology/depositcatalog_test.py @@ -1,15 +1,15 @@ +from mcpacker.model.core.ecology.biomefilter import BiomeFilter +from mcpacker.model.core.geology.deposit import Deposit +from mcpacker.model.core.geology.deposit.metaldeposit import MetalDeposit +from mcpacker.model.core.geology.depositcatalog import DepositCatalog +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 pytest import fixture -from tungston.core.ecology.biomefilter import BiomeFilter -from tungston.core.geology.deposit import Deposit -from tungston.core.geology.deposit.metaldeposit import MetalDeposit -from tungston.core.geology.depositcatalog import DepositCatalog -from tungston.core.geology.inclusion import Inclusion -from tungston.core.geology.mineral import Mineral -from tungston.core.geology.replacement import Replacement -import tungston.core.ecology.flora as FL -import tungston.core.geology.bulk as BU -import tungston.core.scarcity as SC +import mcpacker.model.core.ecology.flora as FL +import mcpacker.model.core.geology.bulk as BU +import mcpacker.model.core.scarcity as SC # Fixtures ######################################################################################### diff --git a/tungston/core/geology/inclusion.py b/mcpacker/model/core/geology/inclusion.py similarity index 91% rename from tungston/core/geology/inclusion.py rename to mcpacker/model/core/geology/inclusion.py index 8eb07a5..2d2ecc3 100644 --- a/tungston/core/geology/inclusion.py +++ b/mcpacker/model/core/geology/inclusion.py @@ -1,4 +1,4 @@ -from tungston.core.geology.mineral import Mineral +from mcpacker.model.core.geology.mineral import Mineral # Class ############################################################################################ diff --git a/tungston/core/geology/inclusion_test.py b/mcpacker/model/core/geology/inclusion_test.py similarity index 78% rename from tungston/core/geology/inclusion_test.py rename to mcpacker/model/core/geology/inclusion_test.py index ac0c59a..39084f7 100644 --- a/tungston/core/geology/inclusion_test.py +++ b/mcpacker/model/core/geology/inclusion_test.py @@ -1,7 +1,7 @@ +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 pytest import fixture -from tungston.core.geology.inclusion import Inclusion -from tungston.core.geology.mineral import Mineral -from tungston.core.geology.replacement import Replacement # Fixtures #########################################################################################I diff --git a/tungston/core/geology/mineral.py b/mcpacker/model/core/geology/mineral.py similarity index 89% rename from tungston/core/geology/mineral.py rename to mcpacker/model/core/geology/mineral.py index 8fcc054..fde358e 100644 --- a/tungston/core/geology/mineral.py +++ b/mcpacker/model/core/geology/mineral.py @@ -1,5 +1,5 @@ -from tungston.core.geology.replacement import Replacement -from tungston.core.resourceid import ResourceId +from mcpacker.model.core.geology.replacement import Replacement +from mcpacker.model.core.resourceid import ResourceId # Class ############################################################################################ diff --git a/tungston/core/geology/mineral_test.py b/mcpacker/model/core/geology/mineral_test.py similarity index 80% rename from tungston/core/geology/mineral_test.py rename to mcpacker/model/core/geology/mineral_test.py index fe281ef..e00b160 100644 --- a/tungston/core/geology/mineral_test.py +++ b/mcpacker/model/core/geology/mineral_test.py @@ -1,8 +1,8 @@ -from tungston.core.geology.mineral import Mineral -from tungston.core.geology.replacement import Replacement +from mcpacker.model.core.geology.mineral import Mineral +from mcpacker.model.core.geology.replacement import Replacement from pytest import fixture -import tungston.core.geology.mineral as mineral +import mcpacker.model.core.geology.mineral as mineral # Fixtures ######################################################################################### diff --git a/tungston/core/geology/mineralcatalog.py b/mcpacker/model/core/geology/mineralcatalog.py similarity index 93% rename from tungston/core/geology/mineralcatalog.py rename to mcpacker/model/core/geology/mineralcatalog.py index d5440b5..d55bb87 100644 --- a/tungston/core/geology/mineralcatalog.py +++ b/mcpacker/model/core/geology/mineralcatalog.py @@ -1,4 +1,4 @@ -from tungston.core.geology.mineral import Mineral +from mcpacker.model.core.geology.mineral import Mineral from typing import Iterator diff --git a/tungston/core/geology/mineralcatalog_test.py b/mcpacker/model/core/geology/mineralcatalog_test.py similarity index 83% rename from tungston/core/geology/mineralcatalog_test.py rename to mcpacker/model/core/geology/mineralcatalog_test.py index 4eadafc..0d9f537 100644 --- a/tungston/core/geology/mineralcatalog_test.py +++ b/mcpacker/model/core/geology/mineralcatalog_test.py @@ -1,6 +1,6 @@ -from tungston.core.geology.mineral import Mineral -from tungston.core.geology.mineralcatalog import MineralCatalog -from tungston.core.geology.replacement import Replacement +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 pytest import fixture diff --git a/tungston/core/geology/proportion.py b/mcpacker/model/core/geology/proportion.py similarity index 100% rename from tungston/core/geology/proportion.py rename to mcpacker/model/core/geology/proportion.py diff --git a/tungston/core/geology/proportion_test.py b/mcpacker/model/core/geology/proportion_test.py similarity index 82% rename from tungston/core/geology/proportion_test.py rename to mcpacker/model/core/geology/proportion_test.py index ce8a8fc..a9bf5b8 100644 --- a/tungston/core/geology/proportion_test.py +++ b/mcpacker/model/core/geology/proportion_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.geology.proportion as proportion +import mcpacker.model.core.geology.proportion as proportion # Tests ############################################################################################ diff --git a/tungston/core/geology/replacement.py b/mcpacker/model/core/geology/replacement.py similarity index 95% rename from tungston/core/geology/replacement.py rename to mcpacker/model/core/geology/replacement.py index 604b4ce..cce2906 100644 --- a/tungston/core/geology/replacement.py +++ b/mcpacker/model/core/geology/replacement.py @@ -1,4 +1,4 @@ -from tungston.core.resourceid import ResourceId +from mcpacker.model.core.resourceid import ResourceId # Constants ######################################################################################## diff --git a/tungston/core/geology/replacement_test.py b/mcpacker/model/core/geology/replacement_test.py similarity index 94% rename from tungston/core/geology/replacement_test.py rename to mcpacker/model/core/geology/replacement_test.py index 844e374..0782b74 100644 --- a/tungston/core/geology/replacement_test.py +++ b/mcpacker/model/core/geology/replacement_test.py @@ -1,5 +1,5 @@ from pytest import fixture -from tungston.core.geology.replacement import Replacement +from mcpacker.model.core.geology.replacement import Replacement # Fixtures ######################################################################################### diff --git a/tungston/core/habitat.py b/mcpacker/model/core/habitat.py similarity index 80% rename from tungston/core/habitat.py rename to mcpacker/model/core/habitat.py index dbe4e8f..0a39747 100644 --- a/tungston/core/habitat.py +++ b/mcpacker/model/core/habitat.py @@ -1,15 +1,15 @@ -from tungston.core.altitude import Altitude -from tungston.core.ecology.biomefilter import BiomeFilter -from tungston.core.fauna.group import Group -from tungston.core.fauna.location import Location -from tungston.core.scarcity import Scarcity -from tungston.core.season import Season +from mcpacker.model.core.altitude import Altitude +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 -import tungston.core.altitude as A -import tungston.core.fauna.group as G -import tungston.core.fauna.location as L -import tungston.core.scarcity as C -import tungston.core.season as E +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 # Class ############################################################################################ diff --git a/tungston/core/habitat_test.py b/mcpacker/model/core/habitat_test.py similarity index 81% rename from tungston/core/habitat_test.py rename to mcpacker/model/core/habitat_test.py index 95cd64e..89b368b 100644 --- a/tungston/core/habitat_test.py +++ b/mcpacker/model/core/habitat_test.py @@ -1,11 +1,11 @@ +from mcpacker.model.core.ecology.biomefilter import BiomeFilter +from mcpacker.model.core.habitat import Habitat from pytest import fixture -from tungston.core.ecology.biomefilter import BiomeFilter -from tungston.core.habitat import Habitat -import tungston.core.ecology.flora as FL -import tungston.core.ecology.heat as HE -import tungston.core.season as SE -import tungston.core.scarcity as SC +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 # Fixtures ######################################################################################### diff --git a/tungston/core/placement.py b/mcpacker/model/core/placement.py similarity index 93% rename from tungston/core/placement.py rename to mcpacker/model/core/placement.py index 8cd9890..fe60368 100644 --- a/tungston/core/placement.py +++ b/mcpacker/model/core/placement.py @@ -1,4 +1,4 @@ -from tungston.core.habitat import Habitat +from mcpacker.model.core.habitat import Habitat # Class ############################################################################################ diff --git a/tungston/core/placement_test.py b/mcpacker/model/core/placement_test.py similarity index 80% rename from tungston/core/placement_test.py rename to mcpacker/model/core/placement_test.py index 054b4e5..a7cbd06 100644 --- a/tungston/core/placement_test.py +++ b/mcpacker/model/core/placement_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.placement import Placement from pytest import fixture -from tungston.core.ecology.biomefilter import BiomeFilter -from tungston.core.habitat import Habitat -from tungston.core.placement import Placement -import tungston.core.ecology.flora as F -import tungston.core.ecology.heat as E +import mcpacker.model.core.ecology.flora as F +import mcpacker.model.core.ecology.heat as E # Fixtures ######################################################################################### diff --git a/tungston/core/resourceid.py b/mcpacker/model/core/resourceid.py similarity index 100% rename from tungston/core/resourceid.py rename to mcpacker/model/core/resourceid.py diff --git a/tungston/core/resourceid_test.py b/mcpacker/model/core/resourceid_test.py similarity index 89% rename from tungston/core/resourceid_test.py rename to mcpacker/model/core/resourceid_test.py index 20cc7a3..93ef156 100644 --- a/tungston/core/resourceid_test.py +++ b/mcpacker/model/core/resourceid_test.py @@ -1,4 +1,4 @@ -from tungston.core.resourceid import ResourceId +from mcpacker.model.core.resourceid import ResourceId # Tests ############################################################################################ diff --git a/tungston/core/scarcity.py b/mcpacker/model/core/scarcity.py similarity index 99% rename from tungston/core/scarcity.py rename to mcpacker/model/core/scarcity.py index 7088d66..291d1ef 100644 --- a/tungston/core/scarcity.py +++ b/mcpacker/model/core/scarcity.py @@ -14,6 +14,7 @@ class Scarcity: def __repr__(self) -> str: return f"Scarcity<{self.name}>" + # Constants ######################################################################################## ABSENT = Scarcity("absent") diff --git a/tungston/core/scarcity_test.py b/mcpacker/model/core/scarcity_test.py similarity index 76% rename from tungston/core/scarcity_test.py rename to mcpacker/model/core/scarcity_test.py index 89926d5..c62c8cb 100644 --- a/tungston/core/scarcity_test.py +++ b/mcpacker/model/core/scarcity_test.py @@ -1,8 +1,7 @@ -from tungston.core.scarcity import Scarcity +from mcpacker.model.core.scarcity import Scarcity from pytest import fixture - # Tests ############################################################################################ def test_syntax(): diff --git a/tungston/core/season.py b/mcpacker/model/core/season.py similarity index 100% rename from tungston/core/season.py rename to mcpacker/model/core/season.py diff --git a/tungston/core/season_test.py b/mcpacker/model/core/season_test.py similarity index 90% rename from tungston/core/season_test.py rename to mcpacker/model/core/season_test.py index c3e4199..9fbd5d5 100644 --- a/tungston/core/season_test.py +++ b/mcpacker/model/core/season_test.py @@ -1,6 +1,6 @@ from pytest import fixture -import tungston.core.season as season +import mcpacker.model.core.season as season # Fixtures ######################################################################################### diff --git a/tungston/core/world.py b/mcpacker/model/core/world.py similarity index 59% rename from tungston/core/world.py rename to mcpacker/model/core/world.py index b1fc9cb..2b05340 100644 --- a/tungston/core/world.py +++ b/mcpacker/model/core/world.py @@ -1,7 +1,7 @@ -from tungston.core.ecology.biomecatalog import BiomeCatalog -from tungston.core.fauna.mobcatalog import MobCatalog -from tungston.core.geology.mineralcatalog import MineralCatalog -from tungston.core.geology.depositcatalog import DepositCatalog +from mcpacker.model.core.ecology.biomecatalog import BiomeCatalog +from mcpacker.model.core.fauna.mobcatalog import MobCatalog +from mcpacker.model.core.geology.depositcatalog import DepositCatalog +from mcpacker.model.core.geology.mineralcatalog import MineralCatalog # Class ############################################################################################ diff --git a/tungston/core/world_test.py b/mcpacker/model/core/world_test.py similarity index 75% rename from tungston/core/world_test.py rename to mcpacker/model/core/world_test.py index ddb0b63..68c9414 100644 --- a/tungston/core/world_test.py +++ b/mcpacker/model/core/world_test.py @@ -1,4 +1,4 @@ -from tungston.core.world import World +from mcpacker.model.core.world import World # Tests ############################################################################################ diff --git a/mcpacker/model/datapack/__init__.py b/mcpacker/model/datapack/__init__.py new file mode 100644 index 0000000..c11094f --- /dev/null +++ b/mcpacker/model/datapack/__init__.py @@ -0,0 +1,38 @@ +from mcpacker.model.datapack.mod import Mod + + +# Class ############################################################################################ + +class Datapack: + + def __init__(self, name:str, mods:list[Mod]): + self.name = name + self._mods = {} + self._defaultMod = None + + for mod in mods: + if not self._defaultMod: + self._defaultMod = mod + + self.add(mod) + + def add(self, mod:Mod) -> "Datapack": + self._mods[mod.name] = mod + return self + + def get(self, modName:str) -> Mod: + return self._mods.get(modName, None) + + @property + def defaultMod(self) -> Mod: + return self._defaultMod + + @defaultMod.setter + def setDefaultMod(self, mod:Mod) -> "Datapack": + existingMod = self.get(mod.name) + if not existingMod: + self.add(mod) + elif existingMod != mod: + raise Exception(f"Datapack already has a mod named {mod.name}") + + self._defaultMod = mod diff --git a/tungston/generator/datapack/blockstate.py b/mcpacker/model/datapack/blockstate.py similarity index 100% rename from tungston/generator/datapack/blockstate.py rename to mcpacker/model/datapack/blockstate.py diff --git a/tungston/generator/datapack/blockstate_test.py b/mcpacker/model/datapack/blockstate_test.py similarity index 89% rename from tungston/generator/datapack/blockstate_test.py rename to mcpacker/model/datapack/blockstate_test.py index a5790bf..39299fe 100644 --- a/tungston/generator/datapack/blockstate_test.py +++ b/mcpacker/model/datapack/blockstate_test.py @@ -1,5 +1,5 @@ +from mcpacker.model.datapack.blockstate import BlockState from pytest import fixture -from tungston.generator.datapack.blockstate import BlockState # Fixtures ######################################################################################### diff --git a/tungston/generator/datapack/blockstateprovider/__init__.py b/mcpacker/model/datapack/blockstateprovider/__init__.py similarity index 100% rename from tungston/generator/datapack/blockstateprovider/__init__.py rename to mcpacker/model/datapack/blockstateprovider/__init__.py diff --git a/tungston/generator/datapack/blockstateprovider/simplestateprovider.py b/mcpacker/model/datapack/blockstateprovider/simplestateprovider.py similarity index 76% rename from tungston/generator/datapack/blockstateprovider/simplestateprovider.py rename to mcpacker/model/datapack/blockstateprovider/simplestateprovider.py index 6403472..03aa8c9 100644 --- a/tungston/generator/datapack/blockstateprovider/simplestateprovider.py +++ b/mcpacker/model/datapack/blockstateprovider/simplestateprovider.py @@ -1,5 +1,5 @@ -from tungston.generator.datapack.blockstate import BlockState -from tungston.generator.datapack.blockstateprovider import BlockStateProvider +from mcpacker.model.datapack.blockstate import BlockState +from mcpacker.model.datapack.blockstateprovider import BlockStateProvider from typing import Any diff --git a/tungston/generator/datapack/blockstateprovider/simplestateprovider_test.py b/mcpacker/model/datapack/blockstateprovider/simplestateprovider_test.py similarity index 81% rename from tungston/generator/datapack/blockstateprovider/simplestateprovider_test.py rename to mcpacker/model/datapack/blockstateprovider/simplestateprovider_test.py index 86de4e7..5823498 100644 --- a/tungston/generator/datapack/blockstateprovider/simplestateprovider_test.py +++ b/mcpacker/model/datapack/blockstateprovider/simplestateprovider_test.py @@ -1,5 +1,5 @@ -from tungston.generator.datapack.blockstate import BlockState -from tungston.generator.datapack.blockstateprovider.simplestateprovider import SimpleStateProvider +from mcpacker.model.datapack.blockstate import BlockState +from mcpacker.model.datapack.blockstateprovider.simplestateprovider import SimpleStateProvider from pytest import fixture diff --git a/tungston/generator/datapack/configuredfeature/__init__.py b/mcpacker/model/datapack/configuredfeature/__init__.py similarity index 100% rename from tungston/generator/datapack/configuredfeature/__init__.py rename to mcpacker/model/datapack/configuredfeature/__init__.py diff --git a/tungston/generator/datapack/configuredfeature/randompatch.py b/mcpacker/model/datapack/configuredfeature/randompatch.py similarity index 88% rename from tungston/generator/datapack/configuredfeature/randompatch.py rename to mcpacker/model/datapack/configuredfeature/randompatch.py index 8d5ad04..1923824 100644 --- a/tungston/generator/datapack/configuredfeature/randompatch.py +++ b/mcpacker/model/datapack/configuredfeature/randompatch.py @@ -1,4 +1,4 @@ -from tungston.generator.datapack.configuredfeature.configuredfeature import ConfiguredFeature +from mcpacker.model.datapack.configuredfeature import ConfiguredFeature from typing import Any diff --git a/tungston/generator/datapack/configuredfeature/randompatch_test.py b/mcpacker/model/datapack/configuredfeature/randompatch_test.py similarity index 80% rename from tungston/generator/datapack/configuredfeature/randompatch_test.py rename to mcpacker/model/datapack/configuredfeature/randompatch_test.py index 27e1aaf..d3c915a 100644 --- a/tungston/generator/datapack/configuredfeature/randompatch_test.py +++ b/mcpacker/model/datapack/configuredfeature/randompatch_test.py @@ -1,7 +1,7 @@ +from mcpacker.model.datapack.blockstate import BlockState +from mcpacker.model.datapack.blockstateprovider.simplestateprovider import SimpleStateProvider +from mcpacker.model.datapack.configuredfeature.simpleblock import SimpleBlock from pytest import fixture -from tungston.generator.datapack.blockstate import BlockState -from tungston.generator.datapack.blockstateprovider.simplestateprovider import SimpleStateProvider -from tungston.generator.datapack.configuredfeature.simpleblock import SimpleBlock # Fixtures ######################################################################################### diff --git a/tungston/generator/datapack/configuredfeature/simpleblock.py b/mcpacker/model/datapack/configuredfeature/simpleblock.py similarity index 76% rename from tungston/generator/datapack/configuredfeature/simpleblock.py rename to mcpacker/model/datapack/configuredfeature/simpleblock.py index a7d5879..63feaaa 100644 --- a/tungston/generator/datapack/configuredfeature/simpleblock.py +++ b/mcpacker/model/datapack/configuredfeature/simpleblock.py @@ -1,5 +1,5 @@ -from tungston.generator.datapack.blockstateprovider import BlockStateProvider -from tungston.generator.datapack.configuredfeature import ConfiguredFeature +from mcpacker.model.datapack.blockstateprovider import BlockStateProvider +from mcpacker.model.datapack.configuredfeature import ConfiguredFeature from typing import Any diff --git a/tungston/generator/datapack/configuredfeature/simpleblock_test.py b/mcpacker/model/datapack/configuredfeature/simpleblock_test.py similarity index 80% rename from tungston/generator/datapack/configuredfeature/simpleblock_test.py rename to mcpacker/model/datapack/configuredfeature/simpleblock_test.py index 27e1aaf..d3c915a 100644 --- a/tungston/generator/datapack/configuredfeature/simpleblock_test.py +++ b/mcpacker/model/datapack/configuredfeature/simpleblock_test.py @@ -1,7 +1,7 @@ +from mcpacker.model.datapack.blockstate import BlockState +from mcpacker.model.datapack.blockstateprovider.simplestateprovider import SimpleStateProvider +from mcpacker.model.datapack.configuredfeature.simpleblock import SimpleBlock from pytest import fixture -from tungston.generator.datapack.blockstate import BlockState -from tungston.generator.datapack.blockstateprovider.simplestateprovider import SimpleStateProvider -from tungston.generator.datapack.configuredfeature.simpleblock import SimpleBlock # Fixtures ######################################################################################### diff --git a/tungston/generator/datapack/heightmaptype.py b/mcpacker/model/datapack/heightmaptype.py similarity index 100% rename from tungston/generator/datapack/heightmaptype.py rename to mcpacker/model/datapack/heightmaptype.py diff --git a/tungston/generator/datapack/heightmaptype_test.py b/mcpacker/model/datapack/heightmaptype_test.py similarity index 66% rename from tungston/generator/datapack/heightmaptype_test.py rename to mcpacker/model/datapack/heightmaptype_test.py index 0328339..fd72efc 100644 --- a/tungston/generator/datapack/heightmaptype_test.py +++ b/mcpacker/model/datapack/heightmaptype_test.py @@ -1,4 +1,4 @@ -from tungston.generator.datapack.heightmaptype import HeightMapType +from mcpacker.model.datapack.heightmaptype import HeightMapType # Tests ############################################################################################ diff --git a/mcpacker/model/datapack/mod.py b/mcpacker/model/datapack/mod.py new file mode 100644 index 0000000..cd8826f --- /dev/null +++ b/mcpacker/model/datapack/mod.py @@ -0,0 +1,15 @@ +class Mod: + + def __init__(self): + self.biomeModifiers = [] + self.configuredFeatures = [] + self.functions = [] + self.functionTags = [] + self.lootModifiers = [] + self.lootTables = [] + self.placedFeatures = [] + self.recipes = [] + self.structures = [] + self.structureSets = [] + self.tags = [] + self.templatePools = [] diff --git a/mcpacker/model/datapack/mod_test.py b/mcpacker/model/datapack/mod_test.py new file mode 100644 index 0000000..84accb5 --- /dev/null +++ b/mcpacker/model/datapack/mod_test.py @@ -0,0 +1,7 @@ +import mcpacker.model.datapack.mod + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/model/datapack/placedfeature.py b/mcpacker/model/datapack/placedfeature.py new file mode 100644 index 0000000..a81836e --- /dev/null +++ b/mcpacker/model/datapack/placedfeature.py @@ -0,0 +1,10 @@ +from mcpacker.model.datapack.placement import Placement + + +# Class ############################################################################################ + +class PlacedFeature: + + def __init__(self, gameId:str, placements:list[Placement]): + self.gameId = gameId + self.placements = placements diff --git a/tungston/generator/datapack/placedfeature_test.py b/mcpacker/model/datapack/placedfeature_test.py similarity index 65% rename from tungston/generator/datapack/placedfeature_test.py rename to mcpacker/model/datapack/placedfeature_test.py index 27bf6fa..d9b4542 100644 --- a/tungston/generator/datapack/placedfeature_test.py +++ b/mcpacker/model/datapack/placedfeature_test.py @@ -1,4 +1,5 @@ -from tungston.generator.datapack.placedfeature import PlacedFeature +from mcpacker.model.datapack.placedfeature import PlacedFeature + # Tests ############################################################################################ diff --git a/tungston/generator/datapack/placement/__init__.py b/mcpacker/model/datapack/placement/__init__.py similarity index 100% rename from tungston/generator/datapack/placement/__init__.py rename to mcpacker/model/datapack/placement/__init__.py diff --git a/tungston/generator/datapack/placement/biome.py b/mcpacker/model/datapack/placement/biome.py similarity index 83% rename from tungston/generator/datapack/placement/biome.py rename to mcpacker/model/datapack/placement/biome.py index c9a4f01..cf0f727 100644 --- a/tungston/generator/datapack/placement/biome.py +++ b/mcpacker/model/datapack/placement/biome.py @@ -1,4 +1,4 @@ -from tungston.generator.datapack.placement import Placement +from mcpacker.model.datapack.placement import Placement from typing import Any # Class ############################################################################################ diff --git a/tungston/generator/datapack/placement/biome_test.py b/mcpacker/model/datapack/placement/biome_test.py similarity index 86% rename from tungston/generator/datapack/placement/biome_test.py rename to mcpacker/model/datapack/placement/biome_test.py index f479a2a..db26ea0 100644 --- a/tungston/generator/datapack/placement/biome_test.py +++ b/mcpacker/model/datapack/placement/biome_test.py @@ -1,5 +1,5 @@ +from mcpacker.model.datapack.placement.biome import Biome from pytest import fixture -from tungston.generator.datapack.placement.biome import Biome # Fixtures ######################################################################################### diff --git a/tungston/generator/datapack/placement/heightmap.py b/mcpacker/model/datapack/placement/heightmap.py similarity index 77% rename from tungston/generator/datapack/placement/heightmap.py rename to mcpacker/model/datapack/placement/heightmap.py index 51b00a3..2514931 100644 --- a/tungston/generator/datapack/placement/heightmap.py +++ b/mcpacker/model/datapack/placement/heightmap.py @@ -1,5 +1,5 @@ -from tungston.generator.datapack.placement import Placement -from tungston.generator.datapack.heightmaptype import HeightMapType +from mcpacker.model.datapack.heightmaptype import HeightMapType +from mcpacker.model.datapack.placement import Placement from typing import Any # Class ############################################################################################ diff --git a/tungston/generator/datapack/placement/heightmap_test.py b/mcpacker/model/datapack/placement/heightmap_test.py similarity index 77% rename from tungston/generator/datapack/placement/heightmap_test.py rename to mcpacker/model/datapack/placement/heightmap_test.py index aaa9e46..1d3fb04 100644 --- a/tungston/generator/datapack/placement/heightmap_test.py +++ b/mcpacker/model/datapack/placement/heightmap_test.py @@ -1,6 +1,6 @@ +from mcpacker.model.datapack.heightmaptype import WORLD_SURFACE +from mcpacker.model.datapack.placement.heightmap import HeightMap from pytest import fixture -from tungston.generator.datapack.placement.heightmap import HeightMap -from tungston.generator.datapack.heightmaptype import WORLD_SURFACE # Fixtures ######################################################################################### diff --git a/tungston/generator/datapack/placement/insquare.py b/mcpacker/model/datapack/placement/insquare.py similarity index 83% rename from tungston/generator/datapack/placement/insquare.py rename to mcpacker/model/datapack/placement/insquare.py index 8e88b76..0e16b99 100644 --- a/tungston/generator/datapack/placement/insquare.py +++ b/mcpacker/model/datapack/placement/insquare.py @@ -1,4 +1,4 @@ -from tungston.generator.datapack.placement import Placement +from mcpacker.model.datapack.placement import Placement from typing import Any # Class ############################################################################################ diff --git a/tungston/generator/datapack/placement/insquare_test.py b/mcpacker/model/datapack/placement/insquare_test.py similarity index 85% rename from tungston/generator/datapack/placement/insquare_test.py rename to mcpacker/model/datapack/placement/insquare_test.py index f8ea5cc..d11b769 100644 --- a/tungston/generator/datapack/placement/insquare_test.py +++ b/mcpacker/model/datapack/placement/insquare_test.py @@ -1,5 +1,5 @@ +from mcpacker.model.datapack.placement.insquare import InSquare from pytest import fixture -from tungston.generator.datapack.placement.insquare import InSquare # Fixtures ######################################################################################### diff --git a/tungston/generator/datapack/placement/rarityfilter.py b/mcpacker/model/datapack/placement/rarityfilter.py similarity index 87% rename from tungston/generator/datapack/placement/rarityfilter.py rename to mcpacker/model/datapack/placement/rarityfilter.py index fc07430..c34f349 100644 --- a/tungston/generator/datapack/placement/rarityfilter.py +++ b/mcpacker/model/datapack/placement/rarityfilter.py @@ -1,4 +1,4 @@ -from tungston.generator.datapack.placement import Placement +from mcpacker.model.datapack.placement import Placement from typing import Any # Class ############################################################################################ diff --git a/tungston/generator/datapack/placement/rarityfilter_test.py b/mcpacker/model/datapack/placement/rarityfilter_test.py similarity index 85% rename from tungston/generator/datapack/placement/rarityfilter_test.py rename to mcpacker/model/datapack/placement/rarityfilter_test.py index 64e2c95..c73aeae 100644 --- a/tungston/generator/datapack/placement/rarityfilter_test.py +++ b/mcpacker/model/datapack/placement/rarityfilter_test.py @@ -1,5 +1,5 @@ +from mcpacker.model.datapack.placement.rarityfilter import RarityFilter from pytest import fixture -from tungston.generator.datapack.placement.rarityfilter import RarityFilter # Fixtures ######################################################################################### diff --git a/mcpacker/pack/__init__.py b/mcpacker/pack/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mcpacker/pack/mysteriousisland/__init__.py b/mcpacker/pack/mysteriousisland/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mcpacker/pack/mysteriousisland/assets/structure/deposit_bed_loam_marker.nbt b/mcpacker/pack/mysteriousisland/assets/structure/deposit_bed_loam_marker.nbt new file mode 100644 index 0000000000000000000000000000000000000000..6c1fef3e1a178e81bf6dc18757ecf7ae6907c294 GIT binary patch literal 172 zcmV;d08{@TiwFP!00000|20iP4uU`o99ckE55~JM;q2LX@@fiH-H5wnw`$_+Ef|_i zI&EjB7O0UY_hkcMLZQf~UZZS>&^?mXX=P9(Az|g}Fk?uIA;Z5i-LFR)ScGRwh5SfQ z#;$!ycjwq78f1>Nu%{SCj^a2~D6iBxe?!icWQwoYi<@q9u)*d)LT8T21rKcX^}db# aah`my$x51D6_@uSL60BdzY_`C0000-6;Ag6 literal 0 HcmV?d00001 diff --git a/mcpacker/pack/mysteriousisland/assets/structure/deposit_bif_iron_marker.nbt b/mcpacker/pack/mysteriousisland/assets/structure/deposit_bif_iron_marker.nbt new file mode 100644 index 0000000000000000000000000000000000000000..48398d3b780acdfcaba075de76e14debbd808a89 GIT binary patch literal 304 zcmV-00nh#)iwFP!00000|D}`7PQx$|gx5bQNjOyE!UbL=XU>Qd*UC+{)M{!6dugRU zJ+_*t0*o6(Br6;3=bgzUt^q2LUY}3^KwL#wGTtj#tb5z;d>x+d1r(kXVW`6nF<3us zm@W?28IfVw$gmkqPK*6POJ*3J^25?h&d*Jd2+hUen?!twe^`7&gwz<;+t|LhH;_a5JbLi7*}|S%Q34dxYg)8*H80P~*uO zgsE|NX=rE7%DPMM(H_tpt?Rq@59R0-dd<0tSPk`yvjaNP=u22^RIAM!6vjH*!vBUy zRG#8XmS{-F-uSECJ}FYK=)ATDU>O2W$ z<7n%Kw9-K&D~|m6|KlhHKn^mP0}23$vEYz#&tbW3UHuUXKHUpg1X6^YbBE|%7#qfw z!fi&(Fv*EYelp24Gv}53!7H8eN~f7QFYym%?mlu#M_kX9-0(`z-0wQ+l#aN*^O4D6 z)vFeXFn$A>fqYRN!n!jSYp-@x267f*EIeEajcaw~{H3-rU57rH0ns*$p*OZEnW%zk z2lQv~$?<9Le5*gdl&1qDiRtn#|X zOge4ev@Ot}6#r!hU{+-+=iXp@3u$;tYtzP|5+!BxmT*&&HBjJRh3$6}1y&^?mXX=P9(Az|g}Fk?uIA;Z5i-LFR)ScGRwh5SfQ z#;$!ycjwq78f1>Nu%{SCj^a2~D6iBxe?!icWQwoYi<@q9u)*d)LT8T21rKcX^}db# aah`my$x51D6_@uSL60BdzY_`C0000-6;Ag6 literal 0 HcmV?d00001 diff --git a/mcpacker/pack/mysteriousisland/assets/structure/deposit_fulmarole_sulfur_marker.nbt b/mcpacker/pack/mysteriousisland/assets/structure/deposit_fulmarole_sulfur_marker.nbt new file mode 100644 index 0000000000000000000000000000000000000000..242eee48097cf1d013720bc01bd14c7f8bc9f5c7 GIT binary patch literal 253 zcmVm9I6Wqs`e-K5SB4W7Pj=g_wEjv0w4!r)Qu1T{L0)C{++|ap>E2PDcos`kQpm2xxG_h+n7PX z;Qnw}W-!9=o?!{hB#VWaSQaMKj4OOZgb@jS4NR<_ftl39=W}KYH4lu4`0$?L3Cz+r zUCP3QEKJD4P*z}uGan2yF(20VHetlPcb+gqo-o5%R$x9$J{a-|%;)Zt!(%IJvX=by z&o&@F-}z{ z-`gm1M|->)yZ`^cxmGu%t@6VDf<3)UE5E2Ss?h+?ZamvVN54u-U6n__*;S6%{|pFJ N@CV?lkWoqn007l!mrDQu literal 0 HcmV?d00001 diff --git a/mcpacker/pack/mysteriousisland/assets/structure/deposit_greisen_tin_marker.nbt b/mcpacker/pack/mysteriousisland/assets/structure/deposit_greisen_tin_marker.nbt new file mode 100644 index 0000000000000000000000000000000000000000..6e07802319590dc37e7f47111a5cfeacb5415a72 GIT binary patch literal 235 zcmVRp%{w?2t$*Dl=}Y{y7$1p^aJe0phW z-Pmh~WCCQqIfn_e07?|eJ;(rPW0Iq2_Y%`%6RN+o$hVcjB(Y`6=Uic~A@v0c-O~7< z(Jw{`7>SPg!We;$ddD~;(fRfsE%4F;FFoX?K6@YYG6F9%mKW!#iuS~t#K9B##Ba2&=@RVxAw#$4GbQt*@(dd)U;OINW*!HJ)zSa64WD001{obS?k@ literal 0 HcmV?d00001 diff --git a/mcpacker/pack/mysteriousisland/assets/structure/deposit_hydrothermal_emerald_marker.nbt b/mcpacker/pack/mysteriousisland/assets/structure/deposit_hydrothermal_emerald_marker.nbt new file mode 100644 index 0000000000000000000000000000000000000000..6226e4ffa41413cb05ae811478ddb5b73ab5015c GIT binary patch literal 362 zcmV-w0hRtAiwFP!00000|BaMQZ^IxAh8-YXn@Ov7*lnl%f}MNbdD>~$h$e1_Mxg@K zX#4deQ)&7^2$4_-e#~ndhYDZ;%!*&60ML)p57xgIFk4IAeA~)@y-+Bv;|~4Yd(geM z!67^ZrWu-GiX&5;Gew*s8BC5AOEBat>M^arT*OS`%tg#J&d?04RLr5)sTu|*Rl~rf zY8aSQJS?U)!dz&v+x{u8_ZeYQ`xK{Qhf3|Kw@Oi8Bj=v0o_a+NY!WMABil*T zK7CD9CrwzKAXymk?ab_gTmZ~LIQ5Mj0Q!}OCHnguCacC&J6D9K1&7>u=`rj>1@DZD z1@U5Vn-K|yQ96ufvO9G6eT$2gqRyf~$k5C3O&-PeTfizk?v2NGVKVkR`h?qGPr zOHh5~!_3*W*9eoE;hCGmw37{bkNr_Ioq>3lEy8oFG*(uw{jxIBIxK5tJ;c|qs%_Ca zbwJdcK%!N8vosb<+3Z8=&c2Qmh7^rF2}2H@-F80;!v9OF23vkd*nhAGwQMRxYF2J55npHUyGn~~_~ z7Dfwn@X_jKBsy*TD1ny}cqxIGZt_yiOq-W(@>0LqwP0s0$S&3C%Kp;HF+7`!nCba- z^$5MSIT5BO>!=83&&$Z(5$eG_7+bvumui0rTOTN?jL5NNOYxmxvNCKo6r%MGm?r1N dF3`<7s#XcfHiIiU- zkWGiywLv;@i0|HeNNfN~C>%Xd0YI!(s3Ptqyqr4IT-+v{J`}8+*B(P3Ce+oqG$3GD z68>l8$cPLkM@P*tYD!1^%`6u3BxWv8V&?M53@@4CB{RI#l$V@l=Dbvfml!iGWtPA5 zh-oHAXX)(&SHkO6cj!IFudCKj9CVMc?TN9m`pZ|&8%9VMd+K|%j&6v24h&l2b7d^n z9qRT6d$*dpVg5nf)By-qYh+KJ(2XDS?NfVwjBt<8 literal 0 HcmV?d00001 diff --git a/mcpacker/pack/mysteriousisland/assets/structure/deposit_porphyry_copper_marker.nbt b/mcpacker/pack/mysteriousisland/assets/structure/deposit_porphyry_copper_marker.nbt new file mode 100644 index 0000000000000000000000000000000000000000..44f125f580d26cf0e4d3e88fc2164917f69b837f GIT binary patch literal 340 zcmV-a0jvHWiwFP!00000|BaPROT;h`h9@7Z+x4&@9{m^I_UzfC*CpGITI?pJ2@3vt zQ`gxFW;0U=O_?XW59Ebz02;8d|3U)*^IGL)=XV2Fhat4@ag)Cu46I^u3G+UmFk^^x zfF1=rqXmqqFzOG*F*P4zYCh_m#51ozI%@C>MqSUN{`b1U+?)A|(U(lNDJJh(6)-fx=ySLGOo@(}V5p!M z74$L%Z_kWQ`+q#xhDEslx-^G*w=HAUI?q*SKV%anct%dVjEO4PW*53K_dMp>?>b4( x*^3j$aTxmP&5GS}7hUkcDvk5H@A%hw>+9;X4>oloc0UozI%@C>MqSUN{`b1U+?)A|(U(lNDJJh(6)-fx=ySLGOo@(}V5p!M z74$L%Z_kWQ`+q#xhDEslx-^G*w=HAUI?q*SKV%anct%dVjEO4PW*53K_dMp>?>b4( x*^3j$aTxmP&5GS}7hUkcDvk5H@A%hw>+9;X4>oloc0UR%xj5-NM~raNRL%($|ZGRfsxbnx_@=>;f&I zN5Bmu%1i_GK9cDpZm79F#E1n9=Oc1b-A6G@v%r}c&Y2j_xyea&MlsBE9(9IuCWdpC zIca_miQ$~p0v}>HA7Z#Y6nWH{+8q-M&a0Nyl(L#KBN;|6$daY38HUReSEt&2{>K#V z#vjwd{aFtfBaXi;xd!#7PYBzSvDkV25qBXvi$I0PsqpFb1&3UDnkvRSyLTQ__chvR wqQP*z9}llO>UZ?PI18{%M$ZS2-^Oa&cVFXV*C%3sAq0B(1tXkP(QyR;0Dnk~%K!iX literal 0 HcmV?d00001 diff --git a/mcpacker/pack/mysteriousisland/assets/structure/deposit_skarnlapis_marker.nbt b/mcpacker/pack/mysteriousisland/assets/structure/deposit_skarnlapis_marker.nbt new file mode 100644 index 0000000000000000000000000000000000000000..a428118f1fbbb6590693125ed0a00e4af71ee97f GIT binary patch literal 252 zcmVfVQ0M&kAj5en zJZ98|$r6~mJXxHfCk!Rz$*wldq~xKAzNWNPf|g3qqL|hL=9w17v?9H$gnw86>rruL zs&|#}?`N*SYo}Wl;bC-Xj{H;a8E<=Ix$1Qz8#y!$M*sTeuUuKS?8RBWhF7<6t2^U& zuIC^zXDdbw`^!Ksw_5ZU_ue=Qyoa(r%ASwLYFk&|!(megV)r{DsPP9?Nx@2f0{{T( CB75Kf literal 0 HcmV?d00001 diff --git a/mcpacker/pack/mysteriousisland/assets/textures/block/peat_block.png b/mcpacker/pack/mysteriousisland/assets/textures/block/peat_block.png new file mode 100644 index 0000000000000000000000000000000000000000..45e5138dcb99a7e8fa29a91cac608bfdf16a2434 GIT binary patch literal 1339 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|Hl#*)ruq6Z zXaU(A46KY&46Gm}KyB>GgvoJ z{{kks$pQg=(sVFlfq9nrC$0|8LS1&Oo zKPgqOBDVmfi@~PC3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D zKnEM>87SFtDJUq|6s4qD1-ZCEwF7y!N*N_31y=g{<>lpi<;HsXMd|v6mX?82 z^wAX}91J$YH$NpatW*(61fO>kSI`uESNej#7`@2-1& z=JKIpS*EpDrycxJy77SOozl?I{8rVoC9`s`9M0Kv#x(K7I``!_qW@}UXgD7JH0fFE zx_5f#SM3U1ykmRW|$Ztcl`zbMc$BKiC!UMRz(i0Zo2m9bA%~!cDUR#_~dw^&S1i+rOp1U zOpdITSX9Tq)K1ZgedV!2`LG~Y(Z3fOUL15#_ZCQedvXe2uSz0Q%N>(AKeihbC{@cMZKufh*cl#D^8f~TvW J%Q~loCIDO0ye1AfjnEKjFOT9D}DX)@^Za$W4-*MbbUihOG|wN zBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o3raHc^AtelCMM;Vme?vOfh>Xps5^5D z;1=Z-LwyDGpMFJRfxe-hfj%}(C7Edm=b`8V$w0J$eFd@11{gF}&PBk8$}bAZ&(E>L z5p_2D=n4@I2AkoVpOTqY>5^EIY6psCT|)z11EUaFEJL&-sX@{Wa+g(PP-=00PAMo@ z?97d9^f3g{H8|(z78Iox7lSmILe(RSp{tL;W&yGwRD+E^C{~bS36ccBqQEp@#|88X zEIrwAy_;l_2Tb?co-U3d7J^47Ir<-R5NM5;c9CXLY?OYOwx{~T|Ns1Xw<;!T2zf3w zi~W8(b#|k=?ObyX6}fac7AW|7oJCM*E-~nFJ(JEciF-n zM$;84c^v*2)C3mJeYx#J^zUZDt-;}r(-}0*sqZw~9Tp#|?YCb#RVwm<>IumQU-yRQ zw$87z*n5Jx!G%s=4Fx50Mu6GPy|?zxSJH zKDj4XUBq8DwWRoIs|mxyD;xUmugj1>$(w9(Lzzj#VdcYyi16aX`K3$?1e{NBvJ|oy lZZ&2&`onzUai&l9z44{f+bp6P8fJmArl+f)%Q~loCIFT8ce(%o literal 0 HcmV?d00001 diff --git a/mcpacker/pack/mysteriousisland/biomecatalog.py b/mcpacker/pack/mysteriousisland/biomecatalog.py new file mode 100644 index 0000000..57c40c3 --- /dev/null +++ b/mcpacker/pack/mysteriousisland/biomecatalog.py @@ -0,0 +1,165 @@ +from mcpacker.model.core.ecology.biome import Biome +from mcpacker.model.core.ecology.biomecatalog import BiomeCatalog +from mcpacker.model.core.ecology.biomefilter import BiomeFilter + +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 + +# Constants ######################################################################################## + +CATALOG = BiomeCatalog([ + Biome("aberdeen", "minecraft:windswept_gravelly_hills", + FL.BARREN, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ROCKY, WA.INLAND + ), + Biome("archangel", "minecraft:frozen_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.WET, SO.SANDY, WA.OCEAN + ), + Biome("aspen", "minecraft:frozen_peaks", + FL.BARREN, GE.IGNEOUS, HE.FROZEN, HU.WET, SO.ROCKY, WA.INLAND + ), + Biome("bombay", "minecraft:lukewarm_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.WET, SO.SANDY, WA.OCEAN + ), + Biome("boston", "minecraft:cold_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.BOREAL, HU.WET, SO.CLAYEY, WA.OCEAN + ), + Biome("bryce", "minecraft:eroded_badlands", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.CLAYEY, WA.INLAND + ), + Biome("calcutta", "minecraft:mangrove_swamp", + FL.FOREST, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.WET, SO.CLAYEY, WA.INLAND + ), + Biome("cornwall", "minecraft:windswept_hills", + FL.BARREN, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ROCKY, WA.INLAND + ), + Biome("dallas", "minecraft:savanna", + FL.FIELD, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.SANDY, WA.INLAND + ), + Biome("duluth", "minecraft:frozen_river", + FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.WET, SO.SANDY, WA.RIVER + ), + Biome("durango", "minecraft:savanna_plateau", + FL.FIELD, GE.IGNEOUS, HE.SUBTROPICAL, HU.DRY, SO.SANDY, WA.INLAND + ), + Biome("freiburg", "minecraft:dark_forest", + FL.CANOPY, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.CLAYEY, WA.INLAND + ), + Biome("glasgow", "minecraft:windswept_forest", + FL.CLEARING, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ACIDIC, WA.INLAND + ), + Biome("haarlem", "minecraft:flower_forest", + FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND + ), + Biome("halifax", "minecraft:deep_cold_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.BOREAL, HU.WET, SO.SANDY, WA.OCEAN + ), + Biome("hammerfest", "minecraft:ice_spikes", + FL.BARREN, GE.METAMORPHIC, HE.FROZEN, HU.WET, SO.ROCKY, WA.INLAND + ), + Biome("havana", "minecraft:deep_lukewarm_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.WET, SO.SANDY, WA.OCEAN + ), + Biome("hilo", "minecraft:mushroom_fields", + FL.CLEARING, GE.IGNEOUS, HE.SUBTROPICAL, HU.WET, SO.FUNGAL, WA.INLAND + ), + Biome("honolulu", "minecraft:deep_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.SANDY, WA.OCEAN + ), + Biome("innnesbruk", "minecraft:meadow", + FL.FIELD, GE.SEDIMENTARY, HE.BOREAL, HU.DAMP, SO.PEATY, WA.INLAND + ), + Biome("irkutsk", "minecraft:taiga", + FL.FOREST, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ACIDIC, WA.INLAND + ), + Biome("jackson", "minecraft:jagged_peaks", + FL.BARREN, GE.METAMORPHIC, HE.BOREAL, HU.DRY, SO.ROCKY, WA.INLAND + ), + Biome("juneau", "minecraft:old_growth_spruce_taiga", + FL.FOREST, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.PEATY, WA.INLAND + ), + Biome("kansascity", "minecraft:plains", + FL.FIELD, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND + ), + Biome("kola", "minecraft:snowy_taiga", + FL.BARREN, GE.METAMORPHIC, HE.FROZEN, HU.DAMP, SO.ACIDIC, WA.INLAND + ), + Biome("kyoto", "minecraft:cherry_grove", + FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.ROCKY, WA.INLAND + ), + Biome("madras", "minecraft:sparse_jungle", + FL.CLEARING, GE.SEDIMENTARY, HE.TROPICAL, HU.WET, SO.ACIDIC, WA.INLAND + ), + Biome("memphis", "minecraft:river", + FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.SANDY, WA.RIVER + ), + Biome("minsk", "minecraft:old_growth_birch_forest", + FL.FOREST, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.ACIDIC, WA.INLAND + ), + Biome("moab", "minecraft:windswept_savanna", + FL.FIELD, GE.IGNEOUS, HE.SUBTROPICAL, HU.DRY, SO.ROCKY, WA.INLAND + ), + Biome("mobile", "minecraft:swamp", + FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.PEATY, WA.SWAMP + ), + Biome("moscow", "minecraft:snowy_plains", + FL.FIELD, GE.SEDIMENTARY, HE.FROZEN, HU.DAMP, SO.LOAMY, WA.INLAND + ), + Biome("nassau", "minecraft:warm_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.TROPICAL, HU.WET, SO.SANDY, WA.COAST + ), + Biome("nice", "minecraft:beach", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DAMP, SO.SANDY, WA.COAST + ), + Biome("nuuk", "minecraft:beach", + FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.DAMP, SO.SANDY, WA.COAST + ), + Biome("perm", "minecraft:old_growth_pine_taiga", + FL.FOREST, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ACIDIC, WA.INLAND + ), + Biome("phoenix", "minecraft:desert", + FL.BARREN, GE.SEDIMENTARY, HE.TROPICAL, HU.DRY, SO.SANDY, WA.INLAND + ), + Biome("plymouth", "minecraft:stony_shore", + FL.BARREN, GE.METAMORPHIC, HE.TEMPERATE, HU.DAMP, SO.ROCKY, WA.COAST + ), + Biome("portland", "minecraft:forest", + FL.FOREST, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND + ), + Biome("quito", "minecraft:stony_peaks", + FL.BARREN, GE.IGNEOUS, HE.BOREAL, HU.DRY, SO.ROCKY, WA.INLAND + ), + Biome("rangoon", "minecraft:bamboo_jungle", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.LOAMY, WA.INLAND + ), + Biome("sanfrancisco", "minecraft:ocean", + FL.BARREN, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.SANDY, WA.OCEAN + ), + Biome("santafe", "minecraft:wooded_badlands", + FL.CLEARING, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.CLAYEY, WA.INLAND + ), + Biome("singapore", "minecraft:jungle", + FL.CANOPY, GE.SEDIMENTARY, HE.TROPICAL, HU.WET, SO.ACIDIC, WA.INLAND + ), + Biome("tombstone", "minecraft:badlands", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.CLAYEY, WA.INLAND + ), + Biome("topeka", "minecraft:sunflower_plains", + FL.FIELD, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND + ), + Biome("tromso", "minecraft:deep_frozen_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.WET, SO.SANDY, WA.OCEAN + ), + Biome("umea", "minecraft:grove", + FL.CLEARING, GE.METAMORPHIC, HE.FROZEN, HU.DAMP, SO.ACIDIC, WA.INLAND + ), + Biome("warsaw", "minecraft:birch_forest", + FL.FOREST, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.ACIDIC, WA.INLAND + ), + Biome("zurich", "minecraft:snowy_slopes", + FL.BARREN, GE.METAMORPHIC, HE.FROZEN, HU.DAMP, SO.ROCKY, WA.INLAND + ), +]) diff --git a/tungston/modpack/mysteriousisland/biomecatalog_test.py b/mcpacker/pack/mysteriousisland/biomecatalog_test.py similarity index 70% rename from tungston/modpack/mysteriousisland/biomecatalog_test.py rename to mcpacker/pack/mysteriousisland/biomecatalog_test.py index f13729a..196a1b0 100644 --- a/tungston/modpack/mysteriousisland/biomecatalog_test.py +++ b/mcpacker/pack/mysteriousisland/biomecatalog_test.py @@ -1,4 +1,4 @@ -import tungston.modpack.mysteriousisland.biomecatalog +import mcpacker.pack.mysteriousisland.biomecatalog # Class ############################################################################################ diff --git a/mcpacker/pack/mysteriousisland/depositcatalog.py b/mcpacker/pack/mysteriousisland/depositcatalog.py new file mode 100644 index 0000000..5e2c8c5 --- /dev/null +++ b/mcpacker/pack/mysteriousisland/depositcatalog.py @@ -0,0 +1,28 @@ +from mcpacker.model.core.ecology.biomefilter import BiomeFilter as BF +from mcpacker.model.core.geology.deposit.metaldeposit import MetalDeposit +from mcpacker.model.core.geology.depositcatalog import DepositCatalog +from mcpacker.model.core.geology.inclusion import Inclusion as I +from mcpacker.pack.mysteriousisland.mineralcatalog import CATALOG as M + +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.scarcity as SC + +# Catalog ########################################################################################## + +CATALOG = C = DepositCatalog() + +C.add(MetalDeposit( + name = "bif_iron", + scarcity = SC.COMMON, + biomeFilter = BF([GE.METAMORPHIC, (HE.BOREAL, HE.FROZEN), HU.DAMP]), + inclusions = [I(M.get("iron"), 50), I(M.get("quartz"), 45), I(M.get("uranium"), 5)], + bulk = BU.LARGE, + proportion = 0.2, +)) diff --git a/tungston/modpack/mysteriousisland/depositcatalog_test.py b/mcpacker/pack/mysteriousisland/depositcatalog_test.py similarity index 70% rename from tungston/modpack/mysteriousisland/depositcatalog_test.py rename to mcpacker/pack/mysteriousisland/depositcatalog_test.py index 74f962d..83f154b 100644 --- a/tungston/modpack/mysteriousisland/depositcatalog_test.py +++ b/mcpacker/pack/mysteriousisland/depositcatalog_test.py @@ -1,4 +1,4 @@ -import tungston.modpack.mysteriousisland.depositcatalog +import mcpacker.pack.mysteriousisland.depositcatalog # Class ############################################################################################ diff --git a/tungston/modpack/mysteriousisland/mineralcatalog.py b/mcpacker/pack/mysteriousisland/mineralcatalog.py similarity index 95% rename from tungston/modpack/mysteriousisland/mineralcatalog.py rename to mcpacker/pack/mysteriousisland/mineralcatalog.py index 7019286..e97be34 100644 --- a/tungston/modpack/mysteriousisland/mineralcatalog.py +++ b/mcpacker/pack/mysteriousisland/mineralcatalog.py @@ -1,6 +1,6 @@ -from tungston.core.geology.mineral import Mineral -from tungston.core.geology.mineralcatalog import MineralCatalog -from tungston.core.geology.replacement import Replacement +from mcpacker.model.core.geology.mineral import Mineral +from mcpacker.model.core.geology.mineralcatalog import MineralCatalog +from mcpacker.model.core.geology.replacement import Replacement # Constants ######################################################################################## diff --git a/tungston/modpack/mysteriousisland/mineralcatalog_test.py b/mcpacker/pack/mysteriousisland/mineralcatalog_test.py similarity index 70% rename from tungston/modpack/mysteriousisland/mineralcatalog_test.py rename to mcpacker/pack/mysteriousisland/mineralcatalog_test.py index ce62f21..ad78de7 100644 --- a/tungston/modpack/mysteriousisland/mineralcatalog_test.py +++ b/mcpacker/pack/mysteriousisland/mineralcatalog_test.py @@ -1,4 +1,4 @@ -import tungston.modpack.mysteriousisland.mineralcatalog +import mcpacker.pack.mysteriousisland.mineralcatalog # Class ############################################################################################ diff --git a/tungston/modpack/mysteriousisland/mobcatalog.py b/mcpacker/pack/mysteriousisland/mobcatalog.py similarity index 88% rename from tungston/modpack/mysteriousisland/mobcatalog.py rename to mcpacker/pack/mysteriousisland/mobcatalog.py index 4fb78a0..e18d8a9 100644 --- a/tungston/modpack/mysteriousisland/mobcatalog.py +++ b/mcpacker/pack/mysteriousisland/mobcatalog.py @@ -1,21 +1,21 @@ -from tungston.core.ecology.biomefilter import BiomeFilter as BF -from tungston.core.habitat import Habitat -from tungston.core.fauna.mob import Mob -from tungston.core.fauna.mobcatalog import MobCatalog -from tungston.core.fauna.mobplacement import MobPlacement +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.mobplacement import MobPlacement +from mcpacker.model.core.habitat import Habitat -import tungston.core.altitude as AL -import tungston.core.ecology.flora as FL -import tungston.core.ecology.geology as GE -import tungston.core.ecology.heat as HE -import tungston.core.ecology.humidity as HU -import tungston.core.ecology.soil as SO -import tungston.core.ecology.water as WA -import tungston.core.fauna.active as AC -import tungston.core.fauna.group as GR -import tungston.core.fauna.location as LO -import tungston.core.scarcity as SC -import tungston.core.season as SE +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 # Constants ######################################################################################## diff --git a/tungston/modpack/mysteriousisland/mobcatalog_test.py b/mcpacker/pack/mysteriousisland/mobcatalog_test.py similarity index 71% rename from tungston/modpack/mysteriousisland/mobcatalog_test.py rename to mcpacker/pack/mysteriousisland/mobcatalog_test.py index 9c71fa0..bf264fb 100644 --- a/tungston/modpack/mysteriousisland/mobcatalog_test.py +++ b/mcpacker/pack/mysteriousisland/mobcatalog_test.py @@ -1,4 +1,4 @@ -import tungston.modpack.mysteriousisland.mobcatalog +import mcpacker.pack.mysteriousisland.mobcatalog # Class ############################################################################################ diff --git a/mcpacker/pack/mysteriousisland/runner.py b/mcpacker/pack/mysteriousisland/runner.py new file mode 100644 index 0000000..e07e2f6 --- /dev/null +++ b/mcpacker/pack/mysteriousisland/runner.py @@ -0,0 +1,33 @@ +from mcpacker.emit.markdown.biomereport import BiomeReport +from mcpacker.emit.markdown.mineralreport import MineralReport +from mcpacker.emit.markdown.mobreport import MobReport +from mcpacker.emit.markdown.reportwriter import ReportWriter +from mcpacker.pack.mysteriousisland.world import WORLD +from mcpacker.ui.runner import Runner as BaseRunner + +import sys + + +# Constants ######################################################################################## + +REPORT_PATH = "./output/markdown/mysteriousisland" + + +# Class ############################################################################################ + +class Runner(BaseRunner): + + def _command_writeReports(self): + writer = ReportWriter([ + BiomeReport(self.world), + MineralReport(self.world), + MobReport(self.world), + ]) + writer.write(REPORT_PATH) + + + +# Script ########################################################################################### + +if __name__ == "__main__": + Runner(WORLD).run(sys.argv) diff --git a/mcpacker/pack/mysteriousisland/world.py b/mcpacker/pack/mysteriousisland/world.py new file mode 100644 index 0000000..5e22509 --- /dev/null +++ b/mcpacker/pack/mysteriousisland/world.py @@ -0,0 +1,10 @@ +from mcpacker.model.core.world import World +from mcpacker.pack.mysteriousisland.biomecatalog import CATALOG as biomeCatalog +from mcpacker.pack.mysteriousisland.depositcatalog import CATALOG as depositCatalog +from mcpacker.pack.mysteriousisland.mineralcatalog import CATALOG as mineralCatalog +from mcpacker.pack.mysteriousisland.mobcatalog import CATALOG as mobCatalog + + +# Constants ######################################################################################## + +WORLD = World(biomeCatalog, depositCatalog, mineralCatalog, mobCatalog) diff --git a/mcpacker/ui/__init__.py b/mcpacker/ui/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tungston/interface/runner.py b/mcpacker/ui/runner.py similarity index 93% rename from tungston/interface/runner.py rename to mcpacker/ui/runner.py index a4c6f3a..60d831e 100644 --- a/tungston/interface/runner.py +++ b/mcpacker/ui/runner.py @@ -1,4 +1,4 @@ -from tungston.core.world import World +from mcpacker.model.core.world import World import inspect import sys diff --git a/tungston/interface/runner_test.py b/mcpacker/ui/runner_test.py similarity index 74% rename from tungston/interface/runner_test.py rename to mcpacker/ui/runner_test.py index d7bdb8a..37faf31 100644 --- a/tungston/interface/runner_test.py +++ b/mcpacker/ui/runner_test.py @@ -1,4 +1,5 @@ -from tungston.interface.runner import Runner +from mcpacker.ui.runner import Runner + # Tests ############################################################################################ diff --git a/tungston/generator/datapack/__init__.py b/tungston/generator/datapack/__init__.py deleted file mode 100644 index 442773f..0000000 --- a/tungston/generator/datapack/__init__.py +++ /dev/null @@ -1,14 +0,0 @@ -import os - - -# Class ############################################################################################ - -class Datapack: - - def __init__(self, path:str): - self.path = path - - @property - def name(self) -> str: - return os.path.basename(self.path) - diff --git a/tungston/generator/datapack/placedfeature.py b/tungston/generator/datapack/placedfeature.py deleted file mode 100644 index ca8ef54..0000000 --- a/tungston/generator/datapack/placedfeature.py +++ /dev/null @@ -1,6 +0,0 @@ -# Class ############################################################################################ - -class PlacedFeature: - - def __init__(self, gameId:str): - self.gameId = gameId diff --git a/tungston/modpack/mysteriousisland/biomecatalog.py b/tungston/modpack/mysteriousisland/biomecatalog.py deleted file mode 100644 index bf04c00..0000000 --- a/tungston/modpack/mysteriousisland/biomecatalog.py +++ /dev/null @@ -1,165 +0,0 @@ -from tungston.core.ecology.biome import Biome -from tungston.core.ecology.biomecatalog import BiomeCatalog -from tungston.core.ecology.biomefilter import BiomeFilter - -import tungston.core.ecology.flora as F -import tungston.core.ecology.geology as G -import tungston.core.ecology.heat as E -import tungston.core.ecology.humidity as U -import tungston.core.ecology.soil as S -import tungston.core.ecology.water as W - -# Constants ######################################################################################## - -CATALOG = BiomeCatalog([ - Biome("aberdeen", "minecraft:windswept_gravelly_hills", - F.BARREN, G.METAMORPHIC, E.BOREAL, U.DAMP, S.ROCKY, W.INLAND - ), - Biome("archangel", "minecraft:frozen_ocean", - F.BARREN, G.SEDIMENTARY, E.FROZEN, U.WET, S.SANDY, W.OCEAN - ), - Biome("aspen", "minecraft:frozen_peaks", - F.BARREN, G.IGNEOUS, E.FROZEN, U.WET, S.ROCKY, W.INLAND - ), - Biome("bombay", "minecraft:lukewarm_ocean", - F.BARREN, G.SEDIMENTARY, E.SUBTROPICAL, U.WET, S.SANDY, W.OCEAN - ), - Biome("boston", "minecraft:cold_ocean", - F.BARREN, G.SEDIMENTARY, E.BOREAL, U.WET, S.CLAYEY, W.OCEAN - ), - Biome("bryce", "minecraft:eroded_badlands", - F.BARREN, G.SEDIMENTARY, E.SUBTROPICAL, U.DRY, S.CLAYEY, W.INLAND - ), - Biome("calcutta", "minecraft:mangrove_swamp", - F.FOREST, G.SEDIMENTARY, E.SUBTROPICAL, U.WET, S.CLAYEY, W.INLAND - ), - Biome("cornwall", "minecraft:windswept_hills", - F.BARREN, G.METAMORPHIC, E.BOREAL, U.DAMP, S.ROCKY, W.INLAND - ), - Biome("dallas", "minecraft:savanna", - F.FIELD, G.SEDIMENTARY, E.SUBTROPICAL, U.DRY, S.SANDY, W.INLAND - ), - Biome("duluth", "minecraft:frozen_river", - F.BARREN, G.SEDIMENTARY, E.FROZEN, U.WET, S.SANDY, W.RIVER - ), - Biome("durango", "minecraft:savanna_plateau", - F.FIELD, G.IGNEOUS, E.SUBTROPICAL, U.DRY, S.SANDY, W.INLAND - ), - Biome("freiburg", "minecraft:dark_forest", - F.CANOPY, G.SEDIMENTARY, E.TEMPERATE, U.WET, S.CLAYEY, W.INLAND - ), - Biome("glasgow", "minecraft:windswept_forest", - F.CLEARING, G.METAMORPHIC, E.BOREAL, U.DAMP, S.ACIDIC, W.INLAND - ), - Biome("haarlem", "minecraft:flower_forest", - F.CLEARING, G.SEDIMENTARY, E.TEMPERATE, U.DAMP, S.LOAMY, W.INLAND - ), - Biome("halifax", "minecraft:deep_cold_ocean", - F.BARREN, G.SEDIMENTARY, E.BOREAL, U.WET, S.SANDY, W.OCEAN - ), - Biome("hammerfest", "minecraft:ice_spikes", - F.BARREN, G.METAMORPHIC, E.FROZEN, U.WET, S.ROCKY, W.INLAND - ), - Biome("havana", "minecraft:deep_lukewarm_ocean", - F.BARREN, G.SEDIMENTARY, E.SUBTROPICAL, U.WET, S.SANDY, W.OCEAN - ), - Biome("hilo", "minecraft:mushroom_fields", - F.CLEARING, G.IGNEOUS, E.SUBTROPICAL, U.WET, S.FUNGAL, W.INLAND - ), - Biome("honolulu", "minecraft:deep_ocean", - F.BARREN, G.SEDIMENTARY, E.TEMPERATE, U.WET, S.SANDY, W.OCEAN - ), - Biome("innnesbruk", "minecraft:meadow", - F.FIELD, G.SEDIMENTARY, E.BOREAL, U.DAMP, S.PEATY, W.INLAND - ), - Biome("irkutsk", "minecraft:taiga", - F.FOREST, G.METAMORPHIC, E.BOREAL, U.DAMP, S.ACIDIC, W.INLAND - ), - Biome("jackson", "minecraft:jagged_peaks", - F.BARREN, G.METAMORPHIC, E.BOREAL, U.DRY, S.ROCKY, W.INLAND - ), - Biome("juneau", "minecraft:old_growth_spruce_taiga", - F.FOREST, G.METAMORPHIC, E.BOREAL, U.DAMP, S.PEATY, W.INLAND - ), - Biome("kansascity", "minecraft:plains", - F.FIELD, G.SEDIMENTARY, E.TEMPERATE, U.DAMP, S.LOAMY, W.INLAND - ), - Biome("kola", "minecraft:snowy_taiga", - F.BARREN, G.METAMORPHIC, E.FROZEN, U.DAMP, S.ACIDIC, W.INLAND - ), - Biome("kyoto", "minecraft:cherry_grove", - F.CLEARING, G.SEDIMENTARY, E.TEMPERATE, U.DAMP, S.ROCKY, W.INLAND - ), - Biome("madras", "minecraft:sparse_jungle", - F.CLEARING, G.SEDIMENTARY, E.TROPICAL, U.WET, S.ACIDIC, W.INLAND - ), - Biome("memphis", "minecraft:river", - F.CLEARING, G.SEDIMENTARY, E.TEMPERATE, U.WET, S.SANDY, W.RIVER - ), - Biome("minsk", "minecraft:old_growth_birch_forest", - F.FOREST, G.SEDIMENTARY, E.TEMPERATE, U.DAMP, S.ACIDIC, W.INLAND - ), - Biome("moab", "minecraft:windswept_savanna", - F.FIELD, G.IGNEOUS, E.SUBTROPICAL, U.DRY, S.ROCKY, W.INLAND - ), - Biome("mobile", "minecraft:swamp", - F.CLEARING, G.SEDIMENTARY, E.TEMPERATE, U.WET, S.PEATY, W.SWAMP - ), - Biome("moscow", "minecraft:snowy_plains", - F.FIELD, G.SEDIMENTARY, E.FROZEN, U.DAMP, S.LOAMY, W.INLAND - ), - Biome("nassau", "minecraft:warm_ocean", - F.BARREN, G.SEDIMENTARY, E.TROPICAL, U.WET, S.SANDY, W.COAST - ), - Biome("nice", "minecraft:beach", - F.BARREN, G.SEDIMENTARY, E.SUBTROPICAL, U.DAMP, S.SANDY, W.COAST - ), - Biome("nuuk", "minecraft:beach", - F.BARREN, G.SEDIMENTARY, E.FROZEN, U.DAMP, S.SANDY, W.COAST - ), - Biome("perm", "minecraft:old_growth_pine_taiga", - F.FOREST, G.METAMORPHIC, E.BOREAL, U.DAMP, S.ACIDIC, W.INLAND - ), - Biome("phoenix", "minecraft:desert", - F.BARREN, G.SEDIMENTARY, E.TROPICAL, U.DRY, S.SANDY, W.INLAND - ), - Biome("plymouth", "minecraft:stony_shore", - F.BARREN, G.METAMORPHIC, E.TEMPERATE, U.DAMP, S.ROCKY, W.COAST - ), - Biome("portland", "minecraft:forest", - F.FOREST, G.SEDIMENTARY, E.TEMPERATE, U.DAMP, S.LOAMY, W.INLAND - ), - Biome("quito", "minecraft:stony_peaks", - F.BARREN, G.IGNEOUS, E.BOREAL, U.DRY, S.ROCKY, W.INLAND - ), - Biome("rangoon", "minecraft:bamboo_jungle", - F.BARREN, G.SEDIMENTARY, E.SUBTROPICAL, U.DRY, S.LOAMY, W.INLAND - ), - Biome("sanfrancisco", "minecraft:ocean", - F.BARREN, G.SEDIMENTARY, E.TEMPERATE, U.WET, S.SANDY, W.OCEAN - ), - Biome("santafe", "minecraft:wooded_badlands", - F.CLEARING, G.SEDIMENTARY, E.SUBTROPICAL, U.DRY, S.CLAYEY, W.INLAND - ), - Biome("singapore", "minecraft:jungle", - F.CANOPY, G.SEDIMENTARY, E.TROPICAL, U.WET, S.ACIDIC, W.INLAND - ), - Biome("tombstone", "minecraft:badlands", - F.BARREN, G.SEDIMENTARY, E.SUBTROPICAL, U.DRY, S.CLAYEY, W.INLAND - ), - Biome("topeka", "minecraft:sunflower_plains", - F.FIELD, G.SEDIMENTARY, E.TEMPERATE, U.DAMP, S.LOAMY, W.INLAND - ), - Biome("tromso", "minecraft:deep_frozen_ocean", - F.BARREN, G.SEDIMENTARY, E.FROZEN, U.WET, S.SANDY, W.OCEAN - ), - Biome("umea", "minecraft:grove", - F.CLEARING, G.METAMORPHIC, E.FROZEN, U.DAMP, S.ACIDIC, W.INLAND - ), - Biome("warsaw", "minecraft:birch_forest", - F.FOREST, G.SEDIMENTARY, E.TEMPERATE, U.DAMP, S.ACIDIC, W.INLAND - ), - Biome("zurich", "minecraft:snowy_slopes", - F.BARREN, G.METAMORPHIC, E.FROZEN, U.DAMP, S.ROCKY, W.INLAND - ), -]) diff --git a/tungston/modpack/mysteriousisland/depositcatalog.py b/tungston/modpack/mysteriousisland/depositcatalog.py deleted file mode 100644 index c05931a..0000000 --- a/tungston/modpack/mysteriousisland/depositcatalog.py +++ /dev/null @@ -1,28 +0,0 @@ -from tungston.core.ecology.biomefilter import BiomeFilter as BF -from tungston.core.geology.deposit.metaldeposit import MetalDeposit -from tungston.core.geology.depositcatalog import DepositCatalog -from tungston.core.geology.inclusion import Inclusion as I -from tungston.modpack.mysteriousisland.mineralcatalog import CATALOG as M - -import tungston.core.altitude as AL -import tungston.core.ecology.flora as FL -import tungston.core.ecology.geology as GE -import tungston.core.ecology.heat as HE -import tungston.core.ecology.humidity as HU -import tungston.core.ecology.soil as SO -import tungston.core.ecology.water as WA -import tungston.core.geology.bulk as BU -import tungston.core.scarcity as SC - -# Catalog ########################################################################################## - -CATALOG = C = DepositCatalog() - -C.add(MetalDeposit( - name = "bif_iron", - scarcity = SC.COMMON, - biomeFilter = BF([GE.METAMORPHIC, (HE.BOREAL, HE.FROZEN), HU.DAMP]), - inclusions = [I(M.get("iron"), 50), I(M.get("quartz"), 45), I(M.get("uranium"), 5)], - bulk = BU.LARGE, - proportion = 0.2, -)) diff --git a/tungston/modpack/mysteriousisland/runner.py b/tungston/modpack/mysteriousisland/runner.py deleted file mode 100644 index 513ecf3..0000000 --- a/tungston/modpack/mysteriousisland/runner.py +++ /dev/null @@ -1,37 +0,0 @@ -from tungston.interface.runner import Runner as BaseRunner -from tungston.core.world import World -from tungston.modpack.mysteriousisland.biomecatalog import CATALOG as biomes -from tungston.modpack.mysteriousisland.depositcatalog import CATALOG as deposits -from tungston.modpack.mysteriousisland.mineralcatalog import CATALOG as minerals -from tungston.modpack.mysteriousisland.mobcatalog import CATALOG as mobs -from tungston.generator.markdown.reportwriter import ReportWriter -from tungston.generator.markdown.biomereport import BiomeReport -from tungston.generator.markdown.mineralreport import MineralReport -from tungston.generator.markdown.mobreport import MobReport - -import sys - - -# Constants ######################################################################################## - -REPORT_PATH = "./output/markdown/mysteriousisland" - - -# Class ############################################################################################ - -class Runner(BaseRunner): - - def _command_writeReports(self): - writer = ReportWriter([ - BiomeReport(self.world), - MineralReport(self.world), - MobReport(self.world), - ]) - writer.write(REPORT_PATH) - - - -# Script ########################################################################################### - -if __name__ == "__main__": - Runner(World(biomes, deposits, minerals, mobs)).run(sys.argv) diff --git a/tungston/modpack/mysteriousisland/world.py b/tungston/modpack/mysteriousisland/world.py deleted file mode 100644 index eacad72..0000000 --- a/tungston/modpack/mysteriousisland/world.py +++ /dev/null @@ -1,10 +0,0 @@ -from tungston.core.world import World -from tungston.modpacks.mysteriousisland.biomecatalog import CATALOG as biomeCatalog -from tungston.modpacks.mysteriousisland.depositcatalog import CATALOG as depositCatalog -from tungston.modpacks.mysteriousisland.mineralcatalog import CATALOG as mineralCatalog -from tungston.modpacks.mysteriousisland.mobcatalog import CATALOG as mobCatalog - - -# Constants ######################################################################################## - -WORLD = World(biomeCatalog, depositCatalog, mineralCatalog, mobCatalog)