From b96a456b030aa373ad1bb4088e7ec184b303b4a6 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Wed, 8 Oct 2025 13:27:14 -0600 Subject: [PATCH] Checkpoint progress --- code.zip => mcpacker.zip | Bin 92209 -> 92031 bytes .../datapack/locator_test.py} | 2 +- .../markdown/mobreport_test.py} | 3 +- mcpacker/emit/modpack/__init___.py | 1 - mcpacker/emit/modpack/__init___test.py | 7 + mcpacker/emit/resourcepack/__init___test.py | 7 + mcpacker/model/core/fauna/location_test.py | 7 + mcpacker/model/core/fauna/mobcatalog_test.py | 8 + .../core/geology/deposit/__init___test.py | 8 + mcpacker/model/datapack/__init___test.py | 8 + mcpacker/model/resourcepack/__init___test.py | 8 + mcpacker/pack/mysteriousisland/addbiomes.py | 216 ++++++++++++ .../{mobcatalog_test.py => addbiomes_test.py} | 2 +- .../{blockcatalog.py => addblocks.py} | 0 ...blockcatalog_test.py => addblocks_test.py} | 2 +- .../{datapack.py => adddatapack.py} | 0 .../pack/mysteriousisland/adddatapack_test.py | 7 + .../{depositcatalog.py => adddeposits.py} | 0 ...temcatalog_test.py => adddeposits_test.py} | 2 +- .../{itemcatalog.py => additems.py} | 0 ...{biomecatalog_test.py => additems_test.py} | 2 +- .../{mineralcatalog.py => addminerals.py} | 0 .../pack/mysteriousisland/addminerals_test.py | 7 + .../{mobcatalog.py => addmobs.py} | 0 .../pack/mysteriousisland/addmobs_test.py | 7 + .../{resourcepack.py => addresourcepack.py} | 0 .../mysteriousisland/addresourcepack_test.py | 7 + .../pack/mysteriousisland/biomecatalog.py | 314 ------------------ .../mysteriousisland/depositcatalog_test.py | 7 - .../mysteriousisland/mineralcatalog_test.py | 7 - mcpacker/pack/mysteriousisland/modpack.py | 18 +- mcpacker/pack/mysteriousisland/runner.py | 2 +- 32 files changed, 314 insertions(+), 345 deletions(-) rename code.zip => mcpacker.zip (50%) rename mcpacker/{pack/mysteriousisland/datapack_test.py => emit/datapack/locator_test.py} (73%) rename mcpacker/{pack/mysteriousisland/resourcepack_test.py => emit/markdown/mobreport_test.py} (72%) delete mode 100644 mcpacker/emit/modpack/__init___.py create mode 100644 mcpacker/emit/modpack/__init___test.py create mode 100644 mcpacker/emit/resourcepack/__init___test.py create mode 100644 mcpacker/model/core/fauna/location_test.py create mode 100644 mcpacker/model/core/fauna/mobcatalog_test.py create mode 100644 mcpacker/model/core/geology/deposit/__init___test.py create mode 100644 mcpacker/model/datapack/__init___test.py create mode 100644 mcpacker/model/resourcepack/__init___test.py create mode 100644 mcpacker/pack/mysteriousisland/addbiomes.py rename mcpacker/pack/mysteriousisland/{mobcatalog_test.py => addbiomes_test.py} (72%) rename mcpacker/pack/mysteriousisland/{blockcatalog.py => addblocks.py} (100%) rename mcpacker/pack/mysteriousisland/{blockcatalog_test.py => addblocks_test.py} (72%) rename mcpacker/pack/mysteriousisland/{datapack.py => adddatapack.py} (100%) create mode 100644 mcpacker/pack/mysteriousisland/adddatapack_test.py rename mcpacker/pack/mysteriousisland/{depositcatalog.py => adddeposits.py} (100%) rename mcpacker/pack/mysteriousisland/{itemcatalog_test.py => adddeposits_test.py} (72%) rename mcpacker/pack/mysteriousisland/{itemcatalog.py => additems.py} (100%) rename mcpacker/pack/mysteriousisland/{biomecatalog_test.py => additems_test.py} (72%) rename mcpacker/pack/mysteriousisland/{mineralcatalog.py => addminerals.py} (100%) create mode 100644 mcpacker/pack/mysteriousisland/addminerals_test.py rename mcpacker/pack/mysteriousisland/{mobcatalog.py => addmobs.py} (100%) create mode 100644 mcpacker/pack/mysteriousisland/addmobs_test.py rename mcpacker/pack/mysteriousisland/{resourcepack.py => addresourcepack.py} (100%) create mode 100644 mcpacker/pack/mysteriousisland/addresourcepack_test.py delete mode 100644 mcpacker/pack/mysteriousisland/biomecatalog.py delete mode 100644 mcpacker/pack/mysteriousisland/depositcatalog_test.py delete mode 100644 mcpacker/pack/mysteriousisland/mineralcatalog_test.py diff --git a/code.zip b/mcpacker.zip similarity index 50% rename from code.zip rename to mcpacker.zip index 3f69b098aff932281b94574f63327d7bf6b44b81..0c17bcc63980cdf833b690c63aa90f6ebc93451b 100644 GIT binary patch delta 26337 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 delta 27746 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 Xcje4V1n+ePf=lqvF$KOzhy(r~mPHCM diff --git a/mcpacker/pack/mysteriousisland/datapack_test.py b/mcpacker/emit/datapack/locator_test.py similarity index 73% rename from mcpacker/pack/mysteriousisland/datapack_test.py rename to mcpacker/emit/datapack/locator_test.py index 7ba8318..d9cf9aa 100644 --- a/mcpacker/pack/mysteriousisland/datapack_test.py +++ b/mcpacker/emit/datapack/locator_test.py @@ -1,4 +1,4 @@ -import mcpacker.pack.mysteriousisland.datapack +import mcpacker.emit.datapack.locator # Tests ############################################################################################ diff --git a/mcpacker/pack/mysteriousisland/resourcepack_test.py b/mcpacker/emit/markdown/mobreport_test.py similarity index 72% rename from mcpacker/pack/mysteriousisland/resourcepack_test.py rename to mcpacker/emit/markdown/mobreport_test.py index e47b200..3b12627 100644 --- a/mcpacker/pack/mysteriousisland/resourcepack_test.py +++ b/mcpacker/emit/markdown/mobreport_test.py @@ -1,7 +1,8 @@ -import mcpacker.pack.mysteriousisland.resourcepack +import mcpacker.emit.markdown.mobreport # Tests ############################################################################################ def test_syntax(): pass + diff --git a/mcpacker/emit/modpack/__init___.py b/mcpacker/emit/modpack/__init___.py deleted file mode 100644 index 31cf705..0000000 --- a/mcpacker/emit/modpack/__init___.py +++ /dev/null @@ -1 +0,0 @@ -from mcpacker.model.core.modpack diff --git a/mcpacker/emit/modpack/__init___test.py b/mcpacker/emit/modpack/__init___test.py new file mode 100644 index 0000000..16c2b27 --- /dev/null +++ b/mcpacker/emit/modpack/__init___test.py @@ -0,0 +1,7 @@ +import mcpacker.emit.modpack + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/emit/resourcepack/__init___test.py b/mcpacker/emit/resourcepack/__init___test.py new file mode 100644 index 0000000..d2c89b3 --- /dev/null +++ b/mcpacker/emit/resourcepack/__init___test.py @@ -0,0 +1,7 @@ +import mcpacker.emit.resourcepack + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/model/core/fauna/location_test.py b/mcpacker/model/core/fauna/location_test.py new file mode 100644 index 0000000..d03724a --- /dev/null +++ b/mcpacker/model/core/fauna/location_test.py @@ -0,0 +1,7 @@ +import mcpacker.model.core.fauna.location + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/model/core/fauna/mobcatalog_test.py b/mcpacker/model/core/fauna/mobcatalog_test.py new file mode 100644 index 0000000..3dbebb7 --- /dev/null +++ b/mcpacker/model/core/fauna/mobcatalog_test.py @@ -0,0 +1,8 @@ +import mcpacker.model.core.fauna.mobcatalog + + +# Tests ############################################################################################ + +def test_syntax(): + pass + diff --git a/mcpacker/model/core/geology/deposit/__init___test.py b/mcpacker/model/core/geology/deposit/__init___test.py new file mode 100644 index 0000000..e55288a --- /dev/null +++ b/mcpacker/model/core/geology/deposit/__init___test.py @@ -0,0 +1,8 @@ +import mcpacker.model.core.geology.deposit + + +# Tests ############################################################################################ + +def test_syntax(): + pass + diff --git a/mcpacker/model/datapack/__init___test.py b/mcpacker/model/datapack/__init___test.py new file mode 100644 index 0000000..1e64bad --- /dev/null +++ b/mcpacker/model/datapack/__init___test.py @@ -0,0 +1,8 @@ +import mcpacker.model.datapack + + +# Tests ############################################################################################ + +def test_syntax(): + pass + diff --git a/mcpacker/model/resourcepack/__init___test.py b/mcpacker/model/resourcepack/__init___test.py new file mode 100644 index 0000000..5adb9a2 --- /dev/null +++ b/mcpacker/model/resourcepack/__init___test.py @@ -0,0 +1,8 @@ +import mcpacker.model.resourcepack + + +# Tests ############################################################################################ + +def test_syntax(): + pass + diff --git a/mcpacker/pack/mysteriousisland/addbiomes.py b/mcpacker/pack/mysteriousisland/addbiomes.py new file mode 100644 index 0000000..231e906 --- /dev/null +++ b/mcpacker/pack/mysteriousisland/addbiomes.py @@ -0,0 +1,216 @@ +from mcpacker.model.core.ecology.biome import Biome +from mcpacker.model.core.ecology.biomefilter import BiomeFilter +from mcpacker.model.modpack import ModPack + +import mcpacker.model.core.ecology.flora as FL +import mcpacker.model.core.ecology.geology as GE +import mcpacker.model.core.ecology.heat as HE +import mcpacker.model.core.ecology.humidity as HU +import mcpacker.model.core.ecology.soil as SO +import mcpacker.model.core.ecology.water as WA + + +# Functions ######################################################################################## + +def addBiomes(pack:ModPack): + biomes = pack.world.biomes + + biomes.add(Biome("aberdeen", "minecraft:windswept_gravelly_hills", + FL.BARREN, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ROCKY, WA.INLAND + )) + + biomes.add(Biome("archangel", "minecraft:frozen_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.WET, SO.SANDY, WA.OCEAN + )) + + biomes.add(Biome("aspen", "minecraft:frozen_peaks", + FL.BARREN, GE.IGNEOUS, HE.FROZEN, HU.WET, SO.ROCKY, WA.INLAND + )) + + biomes.add(Biome("bombay", "minecraft:lukewarm_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.WET, SO.SANDY, WA.OCEAN + )) + + biomes.add(Biome("boston", "minecraft:cold_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.BOREAL, HU.WET, SO.CLAYEY, WA.OCEAN + )) + + biomes.add(Biome("bryce", "minecraft:eroded_badlands", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.CLAYEY, WA.INLAND + )) + + biomes.add(Biome("calcutta", "minecraft:mangrove_swamp", + FL.FOREST, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.WET, SO.CLAYEY, WA.INLAND + )) + + biomes.add(Biome("cornwall", "minecraft:windswept_hills", + FL.BARREN, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ROCKY, WA.INLAND + )) + + biomes.add(Biome("dallas", "minecraft:savanna", + FL.FIELD, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.SANDY, WA.INLAND + )) + + biomes.add(Biome("duluth", "minecraft:frozen_river", + FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.WET, SO.SANDY, WA.RIVER + )) + + biomes.add(Biome("durango", "minecraft:savanna_plateau", + FL.FIELD, GE.IGNEOUS, HE.SUBTROPICAL, HU.DRY, SO.SANDY, WA.INLAND + )) + + biomes.add(Biome("freiburg", "minecraft:dark_forest", + FL.CANOPY, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.CLAYEY, WA.INLAND + )) + + biomes.add(Biome("glasgow", "minecraft:windswept_forest", + FL.CLEARING, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ACIDIC, WA.INLAND + )) + + biomes.add(Biome("haarlem", "minecraft:flower_forest", + FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND + )) + + biomes.add(Biome("halifax", "minecraft:deep_cold_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.BOREAL, HU.WET, SO.SANDY, WA.OCEAN + )) + + biomes.add(Biome("hammerfest", "minecraft:ice_spikes", + FL.BARREN, GE.METAMORPHIC, HE.FROZEN, HU.WET, SO.ROCKY, WA.INLAND + )) + + biomes.add(Biome("havana", "minecraft:deep_lukewarm_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.WET, SO.SANDY, WA.OCEAN + )) + + biomes.add(Biome("hilo", "minecraft:mushroom_fields", + FL.CLEARING, GE.IGNEOUS, HE.SUBTROPICAL, HU.WET, SO.FUNGAL, WA.INLAND + )) + + biomes.add(Biome("honolulu", "minecraft:deep_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.SANDY, WA.OCEAN + )) + + biomes.add(Biome("innnesbruk", "minecraft:meadow", + FL.FIELD, GE.SEDIMENTARY, HE.BOREAL, HU.DAMP, SO.PEATY, WA.INLAND + )) + + biomes.add(Biome("irkutsk", "minecraft:taiga", + FL.FOREST, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ACIDIC, WA.INLAND + )) + + biomes.add(Biome("jackson", "minecraft:jagged_peaks", + FL.BARREN, GE.METAMORPHIC, HE.BOREAL, HU.DRY, SO.ROCKY, WA.INLAND + )) + + biomes.add(Biome("juneau", "minecraft:old_growth_spruce_taiga", + FL.FOREST, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.PEATY, WA.INLAND + )) + + biomes.add(Biome("kansascity", "minecraft:plains", + FL.FIELD, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND + )) + + biomes.add(Biome("kola", "minecraft:snowy_taiga", + FL.BARREN, GE.METAMORPHIC, HE.FROZEN, HU.DAMP, SO.ACIDIC, WA.INLAND + )) + + biomes.add(Biome("kyoto", "minecraft:cherry_grove", + FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.ROCKY, WA.INLAND + )) + + biomes.add(Biome("madras", "minecraft:sparse_jungle", + FL.CLEARING, GE.SEDIMENTARY, HE.TROPICAL, HU.WET, SO.ACIDIC, WA.INLAND + )) + + biomes.add(Biome("memphis", "minecraft:river", + FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.SANDY, WA.RIVER + )) + + biomes.add(Biome("minsk", "minecraft:old_growth_birch_forest", + FL.FOREST, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.ACIDIC, WA.INLAND + )) + + biomes.add(Biome("moab", "minecraft:windswept_savanna", + FL.FIELD, GE.IGNEOUS, HE.SUBTROPICAL, HU.DRY, SO.ROCKY, WA.INLAND + )) + + biomes.add(Biome("mobile", "minecraft:swamp", + FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.PEATY, WA.SWAMP + )) + + biomes.add(Biome("moscow", "minecraft:snowy_plains", + FL.FIELD, GE.SEDIMENTARY, HE.FROZEN, HU.DAMP, SO.LOAMY, WA.INLAND + )) + + biomes.add(Biome("nassau", "minecraft:warm_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.TROPICAL, HU.WET, SO.SANDY, WA.COAST + )) + + biomes.add(Biome("nice", "minecraft:beach", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DAMP, SO.SANDY, WA.COAST + )) + + biomes.add(Biome("nuuk", "minecraft:snowy_beach", + FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.DAMP, SO.SANDY, WA.COAST + )) + + biomes.add(Biome("perm", "minecraft:old_growth_pine_taiga", + FL.FOREST, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ACIDIC, WA.INLAND + )) + + biomes.add(Biome("phoenix", "minecraft:desert", + FL.BARREN, GE.SEDIMENTARY, HE.TROPICAL, HU.DRY, SO.SANDY, WA.INLAND + )) + + biomes.add(Biome("plymouth", "minecraft:stony_shore", + FL.BARREN, GE.METAMORPHIC, HE.TEMPERATE, HU.DAMP, SO.ROCKY, WA.COAST + )) + + biomes.add(Biome("portland", "minecraft:forest", + FL.FOREST, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND + )) + + biomes.add(Biome("quito", "minecraft:stony_peaks", + FL.BARREN, GE.IGNEOUS, HE.BOREAL, HU.DRY, SO.ROCKY, WA.INLAND + )) + + biomes.add(Biome("rangoon", "minecraft:bamboo_jungle", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.LOAMY, WA.INLAND + )) + + biomes.add(Biome("sanfrancisco", "minecraft:ocean", + FL.BARREN, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.SANDY, WA.OCEAN + )) + + biomes.add(Biome("santafe", "minecraft:wooded_badlands", + FL.CLEARING, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.CLAYEY, WA.INLAND + )) + + biomes.add(Biome("singapore", "minecraft:jungle", + FL.CANOPY, GE.SEDIMENTARY, HE.TROPICAL, HU.WET, SO.ACIDIC, WA.INLAND + )) + + biomes.add(Biome("tombstone", "minecraft:badlands", + FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.CLAYEY, WA.INLAND + )) + + biomes.add(Biome("topeka", "minecraft:sunflower_plains", + FL.FIELD, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND + )) + + biomes.add(Biome("tromso", "minecraft:deep_frozen_ocean", + FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.WET, SO.SANDY, WA.OCEAN + )) + + biomes.add(Biome("umea", "minecraft:grove", + FL.CLEARING, GE.METAMORPHIC, HE.FROZEN, HU.DAMP, SO.ACIDIC, WA.INLAND + )) + + biomes.add(Biome("warsaw", "minecraft:birch_forest", + FL.FOREST, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.ACIDIC, WA.INLAND + )) + + biomes.add(Biome("zurich", "minecraft:snowy_slopes", + FL.BARREN, GE.METAMORPHIC, HE.FROZEN, HU.DAMP, SO.ROCKY, WA.INLAND + )) diff --git a/mcpacker/pack/mysteriousisland/mobcatalog_test.py b/mcpacker/pack/mysteriousisland/addbiomes_test.py similarity index 72% rename from mcpacker/pack/mysteriousisland/mobcatalog_test.py rename to mcpacker/pack/mysteriousisland/addbiomes_test.py index bf264fb..61b73c1 100644 --- a/mcpacker/pack/mysteriousisland/mobcatalog_test.py +++ b/mcpacker/pack/mysteriousisland/addbiomes_test.py @@ -1,4 +1,4 @@ -import mcpacker.pack.mysteriousisland.mobcatalog +import mcpacker.pack.mysteriousisland.addbiomes # Class ############################################################################################ diff --git a/mcpacker/pack/mysteriousisland/blockcatalog.py b/mcpacker/pack/mysteriousisland/addblocks.py similarity index 100% rename from mcpacker/pack/mysteriousisland/blockcatalog.py rename to mcpacker/pack/mysteriousisland/addblocks.py diff --git a/mcpacker/pack/mysteriousisland/blockcatalog_test.py b/mcpacker/pack/mysteriousisland/addblocks_test.py similarity index 72% rename from mcpacker/pack/mysteriousisland/blockcatalog_test.py rename to mcpacker/pack/mysteriousisland/addblocks_test.py index 620396f..cc3c738 100644 --- a/mcpacker/pack/mysteriousisland/blockcatalog_test.py +++ b/mcpacker/pack/mysteriousisland/addblocks_test.py @@ -1,4 +1,4 @@ -import mcpacker.pack.mysteriousisland.blockcatalog +import mcpacker.pack.mysteriousisland.addblocks # Class ############################################################################################ diff --git a/mcpacker/pack/mysteriousisland/datapack.py b/mcpacker/pack/mysteriousisland/adddatapack.py similarity index 100% rename from mcpacker/pack/mysteriousisland/datapack.py rename to mcpacker/pack/mysteriousisland/adddatapack.py diff --git a/mcpacker/pack/mysteriousisland/adddatapack_test.py b/mcpacker/pack/mysteriousisland/adddatapack_test.py new file mode 100644 index 0000000..a166929 --- /dev/null +++ b/mcpacker/pack/mysteriousisland/adddatapack_test.py @@ -0,0 +1,7 @@ +import mcpacker.pack.mysteriousisland.adddatapack + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/pack/mysteriousisland/depositcatalog.py b/mcpacker/pack/mysteriousisland/adddeposits.py similarity index 100% rename from mcpacker/pack/mysteriousisland/depositcatalog.py rename to mcpacker/pack/mysteriousisland/adddeposits.py diff --git a/mcpacker/pack/mysteriousisland/itemcatalog_test.py b/mcpacker/pack/mysteriousisland/adddeposits_test.py similarity index 72% rename from mcpacker/pack/mysteriousisland/itemcatalog_test.py rename to mcpacker/pack/mysteriousisland/adddeposits_test.py index 620396f..222ce96 100644 --- a/mcpacker/pack/mysteriousisland/itemcatalog_test.py +++ b/mcpacker/pack/mysteriousisland/adddeposits_test.py @@ -1,4 +1,4 @@ -import mcpacker.pack.mysteriousisland.blockcatalog +import mcpacker.pack.mysteriousisland.adddeposits # Class ############################################################################################ diff --git a/mcpacker/pack/mysteriousisland/itemcatalog.py b/mcpacker/pack/mysteriousisland/additems.py similarity index 100% rename from mcpacker/pack/mysteriousisland/itemcatalog.py rename to mcpacker/pack/mysteriousisland/additems.py diff --git a/mcpacker/pack/mysteriousisland/biomecatalog_test.py b/mcpacker/pack/mysteriousisland/additems_test.py similarity index 72% rename from mcpacker/pack/mysteriousisland/biomecatalog_test.py rename to mcpacker/pack/mysteriousisland/additems_test.py index 196a1b0..78096b1 100644 --- a/mcpacker/pack/mysteriousisland/biomecatalog_test.py +++ b/mcpacker/pack/mysteriousisland/additems_test.py @@ -1,4 +1,4 @@ -import mcpacker.pack.mysteriousisland.biomecatalog +import mcpacker.pack.mysteriousisland.additems # Class ############################################################################################ diff --git a/mcpacker/pack/mysteriousisland/mineralcatalog.py b/mcpacker/pack/mysteriousisland/addminerals.py similarity index 100% rename from mcpacker/pack/mysteriousisland/mineralcatalog.py rename to mcpacker/pack/mysteriousisland/addminerals.py diff --git a/mcpacker/pack/mysteriousisland/addminerals_test.py b/mcpacker/pack/mysteriousisland/addminerals_test.py new file mode 100644 index 0000000..a761355 --- /dev/null +++ b/mcpacker/pack/mysteriousisland/addminerals_test.py @@ -0,0 +1,7 @@ +import mcpacker.pack.mysteriousisland.addminerals + + +# Class ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/pack/mysteriousisland/mobcatalog.py b/mcpacker/pack/mysteriousisland/addmobs.py similarity index 100% rename from mcpacker/pack/mysteriousisland/mobcatalog.py rename to mcpacker/pack/mysteriousisland/addmobs.py diff --git a/mcpacker/pack/mysteriousisland/addmobs_test.py b/mcpacker/pack/mysteriousisland/addmobs_test.py new file mode 100644 index 0000000..ad65f78 --- /dev/null +++ b/mcpacker/pack/mysteriousisland/addmobs_test.py @@ -0,0 +1,7 @@ +import mcpacker.pack.mysteriousisland.addmobs + + +# Class ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/pack/mysteriousisland/resourcepack.py b/mcpacker/pack/mysteriousisland/addresourcepack.py similarity index 100% rename from mcpacker/pack/mysteriousisland/resourcepack.py rename to mcpacker/pack/mysteriousisland/addresourcepack.py diff --git a/mcpacker/pack/mysteriousisland/addresourcepack_test.py b/mcpacker/pack/mysteriousisland/addresourcepack_test.py new file mode 100644 index 0000000..65fc08c --- /dev/null +++ b/mcpacker/pack/mysteriousisland/addresourcepack_test.py @@ -0,0 +1,7 @@ +import mcpacker.pack.mysteriousisland.addresourcepack + + +# Tests ############################################################################################ + +def test_syntax(): + pass diff --git a/mcpacker/pack/mysteriousisland/biomecatalog.py b/mcpacker/pack/mysteriousisland/biomecatalog.py deleted file mode 100644 index 421813b..0000000 --- a/mcpacker/pack/mysteriousisland/biomecatalog.py +++ /dev/null @@ -1,314 +0,0 @@ -from mcpacker.model.core.ecology.biome import Biome -from mcpacker.model.core.ecology.biomefilter import BiomeFilter -from mcpacker.model.modpack import ModPack - -import mcpacker.model.core.ecology.flora as FL -import mcpacker.model.core.ecology.geology as GE -import mcpacker.model.core.ecology.heat as HE -import mcpacker.model.core.ecology.humidity as HU -import mcpacker.model.core.ecology.soil as SO -import mcpacker.model.core.ecology.water as WA - - -# Functions ######################################################################################## - -def addBiomes(pack:ModPack): - pack.world.biomes.add( - Biome("aberdeen", "minecraft:windswept_gravelly_hills", - FL.BARREN, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ROCKY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("archangel", "minecraft:frozen_ocean", - FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.WET, SO.SANDY, WA.OCEAN - ) - ) - - pack.world.biomes.add( - Biome("aspen", "minecraft:frozen_peaks", - FL.BARREN, GE.IGNEOUS, HE.FROZEN, HU.WET, SO.ROCKY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("bombay", "minecraft:lukewarm_ocean", - FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.WET, SO.SANDY, WA.OCEAN - ) - ) - - pack.world.biomes.add( - Biome("boston", "minecraft:cold_ocean", - FL.BARREN, GE.SEDIMENTARY, HE.BOREAL, HU.WET, SO.CLAYEY, WA.OCEAN - ) - ) - - pack.world.biomes.add( - Biome("bryce", "minecraft:eroded_badlands", - FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.CLAYEY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("calcutta", "minecraft:mangrove_swamp", - FL.FOREST, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.WET, SO.CLAYEY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("cornwall", "minecraft:windswept_hills", - FL.BARREN, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ROCKY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("dallas", "minecraft:savanna", - FL.FIELD, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.SANDY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("duluth", "minecraft:frozen_river", - FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.WET, SO.SANDY, WA.RIVER - ) - ) - - pack.world.biomes.add( - Biome("durango", "minecraft:savanna_plateau", - FL.FIELD, GE.IGNEOUS, HE.SUBTROPICAL, HU.DRY, SO.SANDY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("freiburg", "minecraft:dark_forest", - FL.CANOPY, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.CLAYEY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("glasgow", "minecraft:windswept_forest", - FL.CLEARING, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ACIDIC, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("haarlem", "minecraft:flower_forest", - FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("halifax", "minecraft:deep_cold_ocean", - FL.BARREN, GE.SEDIMENTARY, HE.BOREAL, HU.WET, SO.SANDY, WA.OCEAN - ) - ) - - pack.world.biomes.add( - Biome("hammerfest", "minecraft:ice_spikes", - FL.BARREN, GE.METAMORPHIC, HE.FROZEN, HU.WET, SO.ROCKY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("havana", "minecraft:deep_lukewarm_ocean", - FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.WET, SO.SANDY, WA.OCEAN - ) - ) - - pack.world.biomes.add( - Biome("hilo", "minecraft:mushroom_fields", - FL.CLEARING, GE.IGNEOUS, HE.SUBTROPICAL, HU.WET, SO.FUNGAL, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("honolulu", "minecraft:deep_ocean", - FL.BARREN, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.SANDY, WA.OCEAN - ) - ) - - pack.world.biomes.add( - Biome("innnesbruk", "minecraft:meadow", - FL.FIELD, GE.SEDIMENTARY, HE.BOREAL, HU.DAMP, SO.PEATY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("irkutsk", "minecraft:taiga", - FL.FOREST, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ACIDIC, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("jackson", "minecraft:jagged_peaks", - FL.BARREN, GE.METAMORPHIC, HE.BOREAL, HU.DRY, SO.ROCKY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("juneau", "minecraft:old_growth_spruce_taiga", - FL.FOREST, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.PEATY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("kansascity", "minecraft:plains", - FL.FIELD, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("kola", "minecraft:snowy_taiga", - FL.BARREN, GE.METAMORPHIC, HE.FROZEN, HU.DAMP, SO.ACIDIC, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("kyoto", "minecraft:cherry_grove", - FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.ROCKY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("madras", "minecraft:sparse_jungle", - FL.CLEARING, GE.SEDIMENTARY, HE.TROPICAL, HU.WET, SO.ACIDIC, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("memphis", "minecraft:river", - FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.SANDY, WA.RIVER - ) - ) - - pack.world.biomes.add( - Biome("minsk", "minecraft:old_growth_birch_forest", - FL.FOREST, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.ACIDIC, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("moab", "minecraft:windswept_savanna", - FL.FIELD, GE.IGNEOUS, HE.SUBTROPICAL, HU.DRY, SO.ROCKY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("mobile", "minecraft:swamp", - FL.CLEARING, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.PEATY, WA.SWAMP - ) - ) - - pack.world.biomes.add( - Biome("moscow", "minecraft:snowy_plains", - FL.FIELD, GE.SEDIMENTARY, HE.FROZEN, HU.DAMP, SO.LOAMY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("nassau", "minecraft:warm_ocean", - FL.BARREN, GE.SEDIMENTARY, HE.TROPICAL, HU.WET, SO.SANDY, WA.COAST - ) - ) - - pack.world.biomes.add( - Biome("nice", "minecraft:beach", - FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DAMP, SO.SANDY, WA.COAST - ) - ) - - pack.world.biomes.add( - Biome("nuuk", "minecraft:snowy_beach", - FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.DAMP, SO.SANDY, WA.COAST - ) - ) - - pack.world.biomes.add( - Biome("perm", "minecraft:old_growth_pine_taiga", - FL.FOREST, GE.METAMORPHIC, HE.BOREAL, HU.DAMP, SO.ACIDIC, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("phoenix", "minecraft:desert", - FL.BARREN, GE.SEDIMENTARY, HE.TROPICAL, HU.DRY, SO.SANDY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("plymouth", "minecraft:stony_shore", - FL.BARREN, GE.METAMORPHIC, HE.TEMPERATE, HU.DAMP, SO.ROCKY, WA.COAST - ) - ) - - pack.world.biomes.add( - Biome("portland", "minecraft:forest", - FL.FOREST, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("quito", "minecraft:stony_peaks", - FL.BARREN, GE.IGNEOUS, HE.BOREAL, HU.DRY, SO.ROCKY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("rangoon", "minecraft:bamboo_jungle", - FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.LOAMY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("sanfrancisco", "minecraft:ocean", - FL.BARREN, GE.SEDIMENTARY, HE.TEMPERATE, HU.WET, SO.SANDY, WA.OCEAN - ) - ) - - pack.world.biomes.add( - Biome("santafe", "minecraft:wooded_badlands", - FL.CLEARING, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.CLAYEY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("singapore", "minecraft:jungle", - FL.CANOPY, GE.SEDIMENTARY, HE.TROPICAL, HU.WET, SO.ACIDIC, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("tombstone", "minecraft:badlands", - FL.BARREN, GE.SEDIMENTARY, HE.SUBTROPICAL, HU.DRY, SO.CLAYEY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("topeka", "minecraft:sunflower_plains", - FL.FIELD, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.LOAMY, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("tromso", "minecraft:deep_frozen_ocean", - FL.BARREN, GE.SEDIMENTARY, HE.FROZEN, HU.WET, SO.SANDY, WA.OCEAN - ) - ) - - pack.world.biomes.add( - Biome("umea", "minecraft:grove", - FL.CLEARING, GE.METAMORPHIC, HE.FROZEN, HU.DAMP, SO.ACIDIC, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("warsaw", "minecraft:birch_forest", - FL.FOREST, GE.SEDIMENTARY, HE.TEMPERATE, HU.DAMP, SO.ACIDIC, WA.INLAND - ) - ) - - pack.world.biomes.add( - Biome("zurich", "minecraft:snowy_slopes", - FL.BARREN, GE.METAMORPHIC, HE.FROZEN, HU.DAMP, SO.ROCKY, WA.INLAND - ) - ) diff --git a/mcpacker/pack/mysteriousisland/depositcatalog_test.py b/mcpacker/pack/mysteriousisland/depositcatalog_test.py deleted file mode 100644 index 83f154b..0000000 --- a/mcpacker/pack/mysteriousisland/depositcatalog_test.py +++ /dev/null @@ -1,7 +0,0 @@ -import mcpacker.pack.mysteriousisland.depositcatalog - - -# Class ############################################################################################ - -def test_syntax(): - pass diff --git a/mcpacker/pack/mysteriousisland/mineralcatalog_test.py b/mcpacker/pack/mysteriousisland/mineralcatalog_test.py deleted file mode 100644 index ad78de7..0000000 --- a/mcpacker/pack/mysteriousisland/mineralcatalog_test.py +++ /dev/null @@ -1,7 +0,0 @@ -import mcpacker.pack.mysteriousisland.mineralcatalog - - -# Class ############################################################################################ - -def test_syntax(): - pass diff --git a/mcpacker/pack/mysteriousisland/modpack.py b/mcpacker/pack/mysteriousisland/modpack.py index fb7488b..711f80d 100644 --- a/mcpacker/pack/mysteriousisland/modpack.py +++ b/mcpacker/pack/mysteriousisland/modpack.py @@ -1,12 +1,12 @@ -from mcpacker.model.modpack import ModPack -from mcpacker.pack.mysteriousisland.biomecatalog import addBiomes -from mcpacker.pack.mysteriousisland.blockcatalog import addBlocks -from mcpacker.pack.mysteriousisland.depositcatalog import addDeposits -from mcpacker.pack.mysteriousisland.itemcatalog import addItems -from mcpacker.pack.mysteriousisland.mineralcatalog import addMinerals -from mcpacker.pack.mysteriousisland.mobcatalog import addMobs -from mcpacker.pack.mysteriousisland.datapack import addDataPack -from mcpacker.pack.mysteriousisland.resourcepack import addResourcePack +from mcpacker.model.modpack import ModPack +from mcpacker.pack.mysteriousisland.addbiomes import addBiomes +from mcpacker.pack.mysteriousisland.addblocks import addBlocks +from mcpacker.pack.mysteriousisland.adddatapack import addDataPack +from mcpacker.pack.mysteriousisland.adddeposits import addDeposits +from mcpacker.pack.mysteriousisland.additems import addItems +from mcpacker.pack.mysteriousisland.addminerals import addMinerals +from mcpacker.pack.mysteriousisland.addmobs import addMobs +from mcpacker.pack.mysteriousisland.addresourcepack import addResourcePack # Constants ######################################################################################## diff --git a/mcpacker/pack/mysteriousisland/runner.py b/mcpacker/pack/mysteriousisland/runner.py index 8a32479..cc69d68 100644 --- a/mcpacker/pack/mysteriousisland/runner.py +++ b/mcpacker/pack/mysteriousisland/runner.py @@ -1,5 +1,5 @@ from mcpacker.pack.mysteriousisland.modpack import buildModPack -from mcpacker.ui.runner import Runner +from mcpacker.ui.runner import Runner import sys