rewrite-to-python: flatten structure

pyproject.toml

@@ -4,13 +4,22 @@ version = "0.1.0"
 description = "Map data for our favourite minecraft server"
 readme = "README.md"
 authors = [
-    { name = "pvv", email = "pvv@pvv.ntnu.no" }
+    { name = "pvv", email = "projects@pvv.ntnu.no" }
 ]
 requires-python = ">=3.12"
 dependencies = []
 
 [project.scripts]
-mckart = "minecraft_kartverket.cli.main:main"
+mckart = "cli.main:main"
+
+[tool.hatch.build.targets.wheel]
+packages = [
+  "src/cli",
+  "src/lib_marker",
+  "src/bluemap_exporter",
+  "src/mapcrafter_exporter",
+  "src/marker_sets",
+]
 
 [build-system]
 requires = ["hatchling"]

src/bluemap_exporter/exporter.py

@@ -3,8 +3,8 @@ from textwrap import indent
 from typing import Any
 from pathlib import Path
 
-from minecraft_kartverket.marker_sets import WORLDS
-from minecraft_kartverket.lib_marker import Point
+from marker_sets import WORLDS
+from lib_marker import Point
 
 
 def generate_bluemap_output(output_dir: Path):

src/cli/main.py

@@ -4,8 +4,8 @@ from pathlib import Path
 from .print import pretty_print_marker_data
 from .validate import validate_marker_data
 
-from minecraft_kartverket.mapcrafter_exporter import generate_mapcrafter_output
-from minecraft_kartverket.bluemap_exporter import generate_bluemap_output
+from mapcrafter_exporter import generate_mapcrafter_output
+from bluemap_exporter import generate_bluemap_output
 
 
 def parse_args():

src/cli/print.py

@@ -1,5 +1,5 @@
-from minecraft_kartverket.lib_marker import MarkerSet, Marker, Point, Track, Area
-from minecraft_kartverket.marker_sets import WORLDS
+from lib_marker import MarkerSet, Marker, Point, Track, Area
+from marker_sets import WORLDS
 
 
 def pretty_print_marker_data() -> None:

src/cli/validate.py

@@ -1,5 +1,5 @@
-from minecraft_kartverket.marker_sets import WORLDS
-from minecraft_kartverket.lib_marker import Point, Track
+from marker_sets import WORLDS
+from lib_marker import Point, Track
 
 
 def validate_marker_data() -> None:

src/mapcrafter_exporter/exporter.py

@@ -1,8 +1,8 @@
 import json
 from pathlib import Path
 
-from minecraft_kartverket.marker_sets import WORLDS
-from minecraft_kartverket.lib_marker import Point, Track, Area
+from marker_sets import WORLDS
+from lib_marker import Point, Track, Area
 
 
 def generate_mapcrafter_output(output_dir: Path):

src/marker_sets/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import MarkerSet
+from lib_marker import MarkerSet
 
 from .nether import MARKER_SETS as nether_marker_sets
 from .overworld import MARKER_SETS as overworld_marker_sets

src/marker_sets/nether/area_names/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .grisebukta import MARKERS as grisebukta_markers
 

src/marker_sets/nether/area_names/grisebukta.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/nether/ice_tracks/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 
 MARKER_SET = MarkerSet(

src/marker_sets/nether/other/__init__.py

@@ -0,0 +1,7 @@
+from lib_marker.marker_set import MarkerSet
+
+
+MARKER_SET = MarkerSet(
+    name="Other",
+    markers=[],
+)

src/marker_sets/nether/portals/__init__.py

@@ -0,0 +1,7 @@
+from lib_marker.marker_set import MarkerSet
+
+
+MARKER_SET = MarkerSet(
+    name="Portals",
+    markers=[],
+)

src/marker_sets/nether/railways/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 
 MARKER_SET = MarkerSet(

src/marker_sets/overworld/area_names/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .andoya import MARKERS as andoya_markers
 from .england import MARKERS as england_markers

src/marker_sets/overworld/area_names/andoya.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/area_names/england.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/area_names/hemmelig_mesabiom.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/area_names/summefjord.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/area_names/vestisodet.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/buildings/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .der_kolner_dom import MARKERS as der_kolner_dom_markers
 from .fyret import MARKERS as fyret_markers

src/marker_sets/overworld/buildings/der_kolner_dom.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/buildings/fyret.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/buildings/hodeskallegrotten.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/buildings/isjungelkatedralen.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/buildings/jesus_christ_superstore.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/buildings/kystbasen.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/buildings/taarnodden.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/buildings/tegltaarnet.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/cities/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .heimfjell import MARKERS as heimfjell_markers
 from .holmgard import MARKERS as holmgard_markers

src/marker_sets/overworld/cities/heimfjell.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/cities/holmgard.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/cities/tangen.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/cities/tosjodalen.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/cities/vikingelandsbyen.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .biosfaeren import MARKERS as biosfaeren_markers
 from .akasienborg import MARKERS as akasienborg_markers

src/marker_sets/overworld/homes/akasienborg.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/bikkjeby.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/biosfaeren.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/bjorkeholmen.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/bjornebukten.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/huloyeid.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/singapore.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/summevatn.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/supertheodors_fiskehus.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/svartskoghavn.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/homes/vestlandet.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/huts/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .dypskiferhytta import MARKERS as dypskiferhytta_markers
 from .grensebuelvbu import MARKERS as grensebuelvbu_markers

src/marker_sets/overworld/huts/dypskiferhytta.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/huts/grensebuelvbu.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/huts/nyverdenhytta.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/infrastructure/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .grantrebukta import MARKERS as grantrebukta_markers
 from .smalelvbro import MARKERS as smalelvbro_markers

src/marker_sets/overworld/infrastructure/grantrebukta.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/infrastructure/smalelvbro.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/mines/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .sandsteingruva import MARKERS as sandsteingruva_markers
 from .slimegruva import MARKERS as slimegruva_markers

src/marker_sets/overworld/mines/sandsteingruva.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/mines/slimegruva.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .blindodden import MARKERS as blindodden_markers
 from .hulevatna import MARKERS as hulevatna_markers

src/marker_sets/overworld/nature/blindodden.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/hulevatna.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/kirkemyr.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/lamafjellet.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/langstrand.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/lille_isbjornelv.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/naturreservat.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/piratbukta.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/snoklippan.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/store_isbjornelv.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/storhavet_i_ost.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/storhavs_kanalen.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/storsnofjella.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/storvatnet.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/supertheodors_strand.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/trangdalen.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/turrikkelmyra.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/ulveelva.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/nature/vestsumpland.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/other/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .leirhavn import MARKERS as leirhavn_markers
 from .nullpunkt import MARKERS as nullpunkt_markers

src/marker_sets/overworld/other/leirhavn.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/other/nullpunkt.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/railways/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 
 MARKER_SET = MarkerSet(

src/marker_sets/overworld/roads/__init__.py

@@ -0,0 +1,7 @@
+from lib_marker.marker_set import MarkerSet
+
+
+MARKER_SET = MarkerSet(
+    name="Roads",
+    markers=[],
+)

src/marker_sets/overworld/villages/__init__.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker.marker_set import MarkerSet
+from lib_marker.marker_set import MarkerSet
 
 from .bondeby import MARKERS as bondeby_markers
 from .gammelleirnes import MARKERS as gammelleirnes_markers

src/marker_sets/overworld/villages/bondeby.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/villages/gammelleirnes.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/villages/hestelandsby.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(

src/marker_sets/overworld/villages/isbjornby.py

@@ -1,4 +1,4 @@
-from minecraft_kartverket.lib_marker import Point
+from lib_marker import Point
 
 MARKERS = [
     Point(