diff --git a/pyproject.toml b/pyproject.toml index 8a86021..c0c4c05 100644 --- a/pyproject.toml +++ b/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"] diff --git a/src/minecraft_kartverket/bluemap_exporter/__init__.py b/src/bluemap_exporter/__init__.py similarity index 100% rename from src/minecraft_kartverket/bluemap_exporter/__init__.py rename to src/bluemap_exporter/__init__.py diff --git a/src/minecraft_kartverket/bluemap_exporter/exporter.py b/src/bluemap_exporter/exporter.py similarity index 95% rename from src/minecraft_kartverket/bluemap_exporter/exporter.py rename to src/bluemap_exporter/exporter.py index 0ab15fc..f849b91 100644 --- a/src/minecraft_kartverket/bluemap_exporter/exporter.py +++ b/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): diff --git a/src/minecraft_kartverket/cli/__init__.py b/src/cli/__init__.py similarity index 100% rename from src/minecraft_kartverket/cli/__init__.py rename to src/cli/__init__.py diff --git a/src/minecraft_kartverket/cli/main.py b/src/cli/main.py similarity index 90% rename from src/minecraft_kartverket/cli/main.py rename to src/cli/main.py index 249f742..70f0ab5 100644 --- a/src/minecraft_kartverket/cli/main.py +++ b/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(): diff --git a/src/minecraft_kartverket/cli/print.py b/src/cli/print.py similarity index 92% rename from src/minecraft_kartverket/cli/print.py rename to src/cli/print.py index ca3a1a9..45fdfb4 100644 --- a/src/minecraft_kartverket/cli/print.py +++ b/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: diff --git a/src/minecraft_kartverket/cli/validate.py b/src/cli/validate.py similarity index 98% rename from src/minecraft_kartverket/cli/validate.py rename to src/cli/validate.py index 82df3b5..44fb3ba 100644 --- a/src/minecraft_kartverket/cli/validate.py +++ b/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: diff --git a/src/minecraft_kartverket/lib_marker/__init__.py b/src/lib_marker/__init__.py similarity index 100% rename from src/minecraft_kartverket/lib_marker/__init__.py rename to src/lib_marker/__init__.py diff --git a/src/minecraft_kartverket/lib_marker/area.py b/src/lib_marker/area.py similarity index 100% rename from src/minecraft_kartverket/lib_marker/area.py rename to src/lib_marker/area.py diff --git a/src/minecraft_kartverket/lib_marker/color.py b/src/lib_marker/color.py similarity index 100% rename from src/minecraft_kartverket/lib_marker/color.py rename to src/lib_marker/color.py diff --git a/src/minecraft_kartverket/lib_marker/marker.py b/src/lib_marker/marker.py similarity index 100% rename from src/minecraft_kartverket/lib_marker/marker.py rename to src/lib_marker/marker.py diff --git a/src/minecraft_kartverket/lib_marker/marker_set.py b/src/lib_marker/marker_set.py similarity index 100% rename from src/minecraft_kartverket/lib_marker/marker_set.py rename to src/lib_marker/marker_set.py diff --git a/src/minecraft_kartverket/lib_marker/point.py b/src/lib_marker/point.py similarity index 100% rename from src/minecraft_kartverket/lib_marker/point.py rename to src/lib_marker/point.py diff --git a/src/minecraft_kartverket/lib_marker/track.py b/src/lib_marker/track.py similarity index 100% rename from src/minecraft_kartverket/lib_marker/track.py rename to src/lib_marker/track.py diff --git a/src/minecraft_kartverket/mapcrafter_exporter/__init__.py b/src/mapcrafter_exporter/__init__.py similarity index 100% rename from src/minecraft_kartverket/mapcrafter_exporter/__init__.py rename to src/mapcrafter_exporter/__init__.py diff --git a/src/minecraft_kartverket/mapcrafter_exporter/exporter.py b/src/mapcrafter_exporter/exporter.py similarity index 93% rename from src/minecraft_kartverket/mapcrafter_exporter/exporter.py rename to src/mapcrafter_exporter/exporter.py index 6d68492..6444cc2 100644 --- a/src/minecraft_kartverket/mapcrafter_exporter/exporter.py +++ b/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): diff --git a/src/minecraft_kartverket/mapcrafter_exporter/markers-template.js b/src/mapcrafter_exporter/markers-template.js similarity index 100% rename from src/minecraft_kartverket/mapcrafter_exporter/markers-template.js rename to src/mapcrafter_exporter/markers-template.js diff --git a/src/minecraft_kartverket/marker_sets/__init__.py b/src/marker_sets/__init__.py similarity index 85% rename from src/minecraft_kartverket/marker_sets/__init__.py rename to src/marker_sets/__init__.py index f2a249e..f4ad95e 100644 --- a/src/minecraft_kartverket/marker_sets/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/nether/__init__.py b/src/marker_sets/nether/__init__.py similarity index 100% rename from src/minecraft_kartverket/marker_sets/nether/__init__.py rename to src/marker_sets/nether/__init__.py diff --git a/src/minecraft_kartverket/marker_sets/nether/area_names/__init__.py b/src/marker_sets/nether/area_names/__init__.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/nether/area_names/__init__.py rename to src/marker_sets/nether/area_names/__init__.py index bbe17fd..d1ae5f1 100644 --- a/src/minecraft_kartverket/marker_sets/nether/area_names/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/nether/area_names/grisebukta.py b/src/marker_sets/nether/area_names/grisebukta.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/nether/area_names/grisebukta.py rename to src/marker_sets/nether/area_names/grisebukta.py index 64baba0..a672719 100644 --- a/src/minecraft_kartverket/marker_sets/nether/area_names/grisebukta.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/nether/ice_tracks/__init__.py b/src/marker_sets/nether/ice_tracks/__init__.py similarity index 50% rename from src/minecraft_kartverket/marker_sets/nether/ice_tracks/__init__.py rename to src/marker_sets/nether/ice_tracks/__init__.py index 16bff2f..5699220 100644 --- a/src/minecraft_kartverket/marker_sets/nether/ice_tracks/__init__.py +++ b/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( diff --git a/src/marker_sets/nether/other/__init__.py b/src/marker_sets/nether/other/__init__.py new file mode 100644 index 0000000..a1e1630 --- /dev/null +++ b/src/marker_sets/nether/other/__init__.py @@ -0,0 +1,7 @@ +from lib_marker.marker_set import MarkerSet + + +MARKER_SET = MarkerSet( + name="Other", + markers=[], +) diff --git a/src/marker_sets/nether/portals/__init__.py b/src/marker_sets/nether/portals/__init__.py new file mode 100644 index 0000000..3e036bc --- /dev/null +++ b/src/marker_sets/nether/portals/__init__.py @@ -0,0 +1,7 @@ +from lib_marker.marker_set import MarkerSet + + +MARKER_SET = MarkerSet( + name="Portals", + markers=[], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/railways/__init__.py b/src/marker_sets/nether/railways/__init__.py similarity index 50% rename from src/minecraft_kartverket/marker_sets/overworld/railways/__init__.py rename to src/marker_sets/nether/railways/__init__.py index 244f1f8..a93292a 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/railways/__init__.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/__init__.py b/src/marker_sets/overworld/__init__.py similarity index 100% rename from src/minecraft_kartverket/marker_sets/overworld/__init__.py rename to src/marker_sets/overworld/__init__.py diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py b/src/marker_sets/overworld/area_names/__init__.py similarity index 88% rename from src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py rename to src/marker_sets/overworld/area_names/__init__.py index b70435f..5a06f2c 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/area_names/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/andoya.py b/src/marker_sets/overworld/area_names/andoya.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/area_names/andoya.py rename to src/marker_sets/overworld/area_names/andoya.py index 6005d04..915b6a7 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/area_names/andoya.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/england.py b/src/marker_sets/overworld/area_names/england.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/area_names/england.py rename to src/marker_sets/overworld/area_names/england.py index 8bab149..976b6b9 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/area_names/england.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/hemmelig_mesabiom.py b/src/marker_sets/overworld/area_names/hemmelig_mesabiom.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/area_names/hemmelig_mesabiom.py rename to src/marker_sets/overworld/area_names/hemmelig_mesabiom.py index 4e0185a..dec48d3 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/area_names/hemmelig_mesabiom.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/summefjord.py b/src/marker_sets/overworld/area_names/summefjord.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/area_names/summefjord.py rename to src/marker_sets/overworld/area_names/summefjord.py index a501d91..3df83e3 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/area_names/summefjord.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/area_names/vestisodet.py b/src/marker_sets/overworld/area_names/vestisodet.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/area_names/vestisodet.py rename to src/marker_sets/overworld/area_names/vestisodet.py index bbab8e9..a36511d 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/area_names/vestisodet.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/__init__.py b/src/marker_sets/overworld/buildings/__init__.py similarity index 93% rename from src/minecraft_kartverket/marker_sets/overworld/buildings/__init__.py rename to src/marker_sets/overworld/buildings/__init__.py index 38a2785..42a3614 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/buildings/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/der_kolner_dom.py b/src/marker_sets/overworld/buildings/der_kolner_dom.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/buildings/der_kolner_dom.py rename to src/marker_sets/overworld/buildings/der_kolner_dom.py index 404e0da..97affcf 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/buildings/der_kolner_dom.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/fyret.py b/src/marker_sets/overworld/buildings/fyret.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/buildings/fyret.py rename to src/marker_sets/overworld/buildings/fyret.py index 23ee539..4bd563b 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/buildings/fyret.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/hodeskallegrotten.py b/src/marker_sets/overworld/buildings/hodeskallegrotten.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/buildings/hodeskallegrotten.py rename to src/marker_sets/overworld/buildings/hodeskallegrotten.py index 5523a19..1575943 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/buildings/hodeskallegrotten.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/isjungelkatedralen.py b/src/marker_sets/overworld/buildings/isjungelkatedralen.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/buildings/isjungelkatedralen.py rename to src/marker_sets/overworld/buildings/isjungelkatedralen.py index ffa38c7..2d7ffd4 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/buildings/isjungelkatedralen.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/jesus_christ_superstore.py b/src/marker_sets/overworld/buildings/jesus_christ_superstore.py similarity index 73% rename from src/minecraft_kartverket/marker_sets/overworld/buildings/jesus_christ_superstore.py rename to src/marker_sets/overworld/buildings/jesus_christ_superstore.py index 4af80dd..4c99d8c 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/buildings/jesus_christ_superstore.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/kystbasen.py b/src/marker_sets/overworld/buildings/kystbasen.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/buildings/kystbasen.py rename to src/marker_sets/overworld/buildings/kystbasen.py index 2d1f5db..e63f2fd 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/buildings/kystbasen.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/taarnodden.py b/src/marker_sets/overworld/buildings/taarnodden.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/buildings/taarnodden.py rename to src/marker_sets/overworld/buildings/taarnodden.py index bd2f068..0e897ba 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/buildings/taarnodden.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/tegltaarnet.py b/src/marker_sets/overworld/buildings/tegltaarnet.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/buildings/tegltaarnet.py rename to src/marker_sets/overworld/buildings/tegltaarnet.py index 239a5e4..bae379c 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/buildings/tegltaarnet.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py b/src/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py similarity index 73% rename from src/minecraft_kartverket/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py rename to src/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py index d8d0887..a4dd1d4 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/buildings/vinterstranda_hotel_og_resort.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/__init__.py b/src/marker_sets/overworld/cities/__init__.py similarity index 88% rename from src/minecraft_kartverket/marker_sets/overworld/cities/__init__.py rename to src/marker_sets/overworld/cities/__init__.py index da52afe..46c4824 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/cities/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/heimfjell.py b/src/marker_sets/overworld/cities/heimfjell.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/cities/heimfjell.py rename to src/marker_sets/overworld/cities/heimfjell.py index f561bd3..27f8e34 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/cities/heimfjell.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/holmgard.py b/src/marker_sets/overworld/cities/holmgard.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/cities/holmgard.py rename to src/marker_sets/overworld/cities/holmgard.py index c53bac0..9b831b4 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/cities/holmgard.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/tangen.py b/src/marker_sets/overworld/cities/tangen.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/cities/tangen.py rename to src/marker_sets/overworld/cities/tangen.py index 2255dc2..4a7ff59 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/cities/tangen.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/tosjodalen.py b/src/marker_sets/overworld/cities/tosjodalen.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/cities/tosjodalen.py rename to src/marker_sets/overworld/cities/tosjodalen.py index 74019ad..b55c397 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/cities/tosjodalen.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/cities/vikingelandsbyen.py b/src/marker_sets/overworld/cities/vikingelandsbyen.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/cities/vikingelandsbyen.py rename to src/marker_sets/overworld/cities/vikingelandsbyen.py index f91230a..244fd70 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/cities/vikingelandsbyen.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/__init__.py b/src/marker_sets/overworld/homes/__init__.py similarity index 94% rename from src/minecraft_kartverket/marker_sets/overworld/homes/__init__.py rename to src/marker_sets/overworld/homes/__init__.py index 7799e16..a0234a1 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py b/src/marker_sets/overworld/homes/akasienborg.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py rename to src/marker_sets/overworld/homes/akasienborg.py index 2e7e95a..800611f 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/akasienborg.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/bikkjeby.py b/src/marker_sets/overworld/homes/bikkjeby.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/homes/bikkjeby.py rename to src/marker_sets/overworld/homes/bikkjeby.py index 09c13d4..1f0e56c 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/bikkjeby.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/biosfaeren.py b/src/marker_sets/overworld/homes/biosfaeren.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/homes/biosfaeren.py rename to src/marker_sets/overworld/homes/biosfaeren.py index 4dea7ba..40a7299 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/biosfaeren.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/bjorkeholmen.py b/src/marker_sets/overworld/homes/bjorkeholmen.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/homes/bjorkeholmen.py rename to src/marker_sets/overworld/homes/bjorkeholmen.py index 0decdd2..ee0b970 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/bjorkeholmen.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/bjornebukten.py b/src/marker_sets/overworld/homes/bjornebukten.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/homes/bjornebukten.py rename to src/marker_sets/overworld/homes/bjornebukten.py index 4e7b546..eeb0d92 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/bjornebukten.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/huloyeid.py b/src/marker_sets/overworld/homes/huloyeid.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/homes/huloyeid.py rename to src/marker_sets/overworld/homes/huloyeid.py index d8c79c0..c92a6b5 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/huloyeid.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/singapore.py b/src/marker_sets/overworld/homes/singapore.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/homes/singapore.py rename to src/marker_sets/overworld/homes/singapore.py index 709e561..7f784c0 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/singapore.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/summevatn.py b/src/marker_sets/overworld/homes/summevatn.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/homes/summevatn.py rename to src/marker_sets/overworld/homes/summevatn.py index 30bf31d..381f0db 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/summevatn.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/supertheodors_fiskehus.py b/src/marker_sets/overworld/homes/supertheodors_fiskehus.py similarity index 73% rename from src/minecraft_kartverket/marker_sets/overworld/homes/supertheodors_fiskehus.py rename to src/marker_sets/overworld/homes/supertheodors_fiskehus.py index 7bb8035..ccc6434 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/supertheodors_fiskehus.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/svartskoghavn.py b/src/marker_sets/overworld/homes/svartskoghavn.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/homes/svartskoghavn.py rename to src/marker_sets/overworld/homes/svartskoghavn.py index 7f2434a..d198dec 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/svartskoghavn.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/homes/vestlandet.py b/src/marker_sets/overworld/homes/vestlandet.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/homes/vestlandet.py rename to src/marker_sets/overworld/homes/vestlandet.py index 8084f48..25d9520 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/homes/vestlandet.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/huts/__init__.py b/src/marker_sets/overworld/huts/__init__.py similarity index 84% rename from src/minecraft_kartverket/marker_sets/overworld/huts/__init__.py rename to src/marker_sets/overworld/huts/__init__.py index 15066b2..a7030ff 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/huts/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/overworld/huts/dypskiferhytta.py b/src/marker_sets/overworld/huts/dypskiferhytta.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/huts/dypskiferhytta.py rename to src/marker_sets/overworld/huts/dypskiferhytta.py index 7cc9c76..d9c31c5 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/huts/dypskiferhytta.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/huts/grensebuelvbu.py b/src/marker_sets/overworld/huts/grensebuelvbu.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/huts/grensebuelvbu.py rename to src/marker_sets/overworld/huts/grensebuelvbu.py index 42d4ac7..bc1a2f3 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/huts/grensebuelvbu.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/huts/nyverdenhytta.py b/src/marker_sets/overworld/huts/nyverdenhytta.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/huts/nyverdenhytta.py rename to src/marker_sets/overworld/huts/nyverdenhytta.py index c3a13fa..46bd005 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/huts/nyverdenhytta.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/infrastructure/__init__.py b/src/marker_sets/overworld/infrastructure/__init__.py similarity index 79% rename from src/minecraft_kartverket/marker_sets/overworld/infrastructure/__init__.py rename to src/marker_sets/overworld/infrastructure/__init__.py index 6aa3101..3fbe05e 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/infrastructure/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/overworld/infrastructure/grantrebukta.py b/src/marker_sets/overworld/infrastructure/grantrebukta.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/infrastructure/grantrebukta.py rename to src/marker_sets/overworld/infrastructure/grantrebukta.py index b36f4a9..7a45b96 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/infrastructure/grantrebukta.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/infrastructure/smalelvbro.py b/src/marker_sets/overworld/infrastructure/smalelvbro.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/infrastructure/smalelvbro.py rename to src/marker_sets/overworld/infrastructure/smalelvbro.py index 84bd86e..c7cd317 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/infrastructure/smalelvbro.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/mines/__init__.py b/src/marker_sets/overworld/mines/__init__.py similarity index 79% rename from src/minecraft_kartverket/marker_sets/overworld/mines/__init__.py rename to src/marker_sets/overworld/mines/__init__.py index 66ec9ef..8e40630 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/mines/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/overworld/mines/sandsteingruva.py b/src/marker_sets/overworld/mines/sandsteingruva.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/mines/sandsteingruva.py rename to src/marker_sets/overworld/mines/sandsteingruva.py index 16bfb95..3714841 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/mines/sandsteingruva.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/mines/slimegruva.py b/src/marker_sets/overworld/mines/slimegruva.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/mines/slimegruva.py rename to src/marker_sets/overworld/mines/slimegruva.py index 0e6b4a8..45e780b 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/mines/slimegruva.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/__init__.py b/src/marker_sets/overworld/nature/__init__.py similarity index 96% rename from src/minecraft_kartverket/marker_sets/overworld/nature/__init__.py rename to src/marker_sets/overworld/nature/__init__.py index 86f2ed1..85ea7cb 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/blindodden.py b/src/marker_sets/overworld/nature/blindodden.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/blindodden.py rename to src/marker_sets/overworld/nature/blindodden.py index f02ff56..fb1bd9a 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/blindodden.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/hulevatna.py b/src/marker_sets/overworld/nature/hulevatna.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/hulevatna.py rename to src/marker_sets/overworld/nature/hulevatna.py index b168bc0..2619f8c 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/hulevatna.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/kirkemyr.py b/src/marker_sets/overworld/nature/kirkemyr.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/kirkemyr.py rename to src/marker_sets/overworld/nature/kirkemyr.py index bd6a013..88c2d5e 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/kirkemyr.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/lamafjellet.py b/src/marker_sets/overworld/nature/lamafjellet.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/lamafjellet.py rename to src/marker_sets/overworld/nature/lamafjellet.py index 27d24fa..1ab6755 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/lamafjellet.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py b/src/marker_sets/overworld/nature/langstrand.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py rename to src/marker_sets/overworld/nature/langstrand.py index 7289c1c..b501261 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/langstrand.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/lille_isbjornelv.py b/src/marker_sets/overworld/nature/lille_isbjornelv.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/nature/lille_isbjornelv.py rename to src/marker_sets/overworld/nature/lille_isbjornelv.py index 74cf6e4..545f881 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/lille_isbjornelv.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/naturreservat.py b/src/marker_sets/overworld/nature/naturreservat.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/naturreservat.py rename to src/marker_sets/overworld/nature/naturreservat.py index e29224a..164157d 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/naturreservat.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/piratbukta.py b/src/marker_sets/overworld/nature/piratbukta.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/nature/piratbukta.py rename to src/marker_sets/overworld/nature/piratbukta.py index f281002..b3a9d7f 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/piratbukta.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/snoklippan.py b/src/marker_sets/overworld/nature/snoklippan.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/snoklippan.py rename to src/marker_sets/overworld/nature/snoklippan.py index 02279ba..c63b469 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/snoklippan.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/store_isbjornelv.py b/src/marker_sets/overworld/nature/store_isbjornelv.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/nature/store_isbjornelv.py rename to src/marker_sets/overworld/nature/store_isbjornelv.py index 6406daa..60a59fe 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/store_isbjornelv.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/storhavet_i_ost.py b/src/marker_sets/overworld/nature/storhavet_i_ost.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/nature/storhavet_i_ost.py rename to src/marker_sets/overworld/nature/storhavet_i_ost.py index a58592c..1657368 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/storhavet_i_ost.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/storhavs_kanalen.py b/src/marker_sets/overworld/nature/storhavs_kanalen.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/nature/storhavs_kanalen.py rename to src/marker_sets/overworld/nature/storhavs_kanalen.py index a3920ca..0297786 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/storhavs_kanalen.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/storsnofjella.py b/src/marker_sets/overworld/nature/storsnofjella.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/nature/storsnofjella.py rename to src/marker_sets/overworld/nature/storsnofjella.py index ee4111b..9c3c561 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/storsnofjella.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/storvatnet.py b/src/marker_sets/overworld/nature/storvatnet.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/storvatnet.py rename to src/marker_sets/overworld/nature/storvatnet.py index 6204a1f..c64715e 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/storvatnet.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/supertheodors_strand.py b/src/marker_sets/overworld/nature/supertheodors_strand.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/nature/supertheodors_strand.py rename to src/marker_sets/overworld/nature/supertheodors_strand.py index 404d00e..7610115 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/supertheodors_strand.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/trangdalen.py b/src/marker_sets/overworld/nature/trangdalen.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/trangdalen.py rename to src/marker_sets/overworld/nature/trangdalen.py index 19d8b0d..46da77c 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/trangdalen.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/turrikkelmyra.py b/src/marker_sets/overworld/nature/turrikkelmyra.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/turrikkelmyra.py rename to src/marker_sets/overworld/nature/turrikkelmyra.py index d4bfa28..b07beae 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/turrikkelmyra.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/ulveelva.py b/src/marker_sets/overworld/nature/ulveelva.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/nature/ulveelva.py rename to src/marker_sets/overworld/nature/ulveelva.py index eae44ab..6e6e887 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/ulveelva.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/nature/vestsumpland.py b/src/marker_sets/overworld/nature/vestsumpland.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/nature/vestsumpland.py rename to src/marker_sets/overworld/nature/vestsumpland.py index 26fe374..fba8d01 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/nature/vestsumpland.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/other/__init__.py b/src/marker_sets/overworld/other/__init__.py similarity index 77% rename from src/minecraft_kartverket/marker_sets/overworld/other/__init__.py rename to src/marker_sets/overworld/other/__init__.py index 79d7110..3cf8867 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/other/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/overworld/other/leirhavn.py b/src/marker_sets/overworld/other/leirhavn.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/other/leirhavn.py rename to src/marker_sets/overworld/other/leirhavn.py index 015040c..3cc4c84 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/other/leirhavn.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/other/nullpunkt.py b/src/marker_sets/overworld/other/nullpunkt.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/other/nullpunkt.py rename to src/marker_sets/overworld/other/nullpunkt.py index e77d9f1..6fcb6c6 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/other/nullpunkt.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/nether/railways/__init__.py b/src/marker_sets/overworld/railways/__init__.py similarity index 50% rename from src/minecraft_kartverket/marker_sets/nether/railways/__init__.py rename to src/marker_sets/overworld/railways/__init__.py index 244f1f8..a93292a 100644 --- a/src/minecraft_kartverket/marker_sets/nether/railways/__init__.py +++ b/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( diff --git a/src/marker_sets/overworld/roads/__init__.py b/src/marker_sets/overworld/roads/__init__.py new file mode 100644 index 0000000..322d231 --- /dev/null +++ b/src/marker_sets/overworld/roads/__init__.py @@ -0,0 +1,7 @@ +from lib_marker.marker_set import MarkerSet + + +MARKER_SET = MarkerSet( + name="Roads", + markers=[], +) diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/__init__.py b/src/marker_sets/overworld/villages/__init__.py similarity index 92% rename from src/minecraft_kartverket/marker_sets/overworld/villages/__init__.py rename to src/marker_sets/overworld/villages/__init__.py index 6f07cd5..ffb9334 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/villages/__init__.py +++ b/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 diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/bondeby.py b/src/marker_sets/overworld/villages/bondeby.py similarity index 70% rename from src/minecraft_kartverket/marker_sets/overworld/villages/bondeby.py rename to src/marker_sets/overworld/villages/bondeby.py index 6d03f2d..65348d7 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/villages/bondeby.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/gammelleirnes.py b/src/marker_sets/overworld/villages/gammelleirnes.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/villages/gammelleirnes.py rename to src/marker_sets/overworld/villages/gammelleirnes.py index 00abae0..72681b1 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/villages/gammelleirnes.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/hestelandsby.py b/src/marker_sets/overworld/villages/hestelandsby.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/villages/hestelandsby.py rename to src/marker_sets/overworld/villages/hestelandsby.py index a51482c..e289d77 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/villages/hestelandsby.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/isbjornby.py b/src/marker_sets/overworld/villages/isbjornby.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/villages/isbjornby.py rename to src/marker_sets/overworld/villages/isbjornby.py index 47a30b5..1d363a4 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/villages/isbjornby.py +++ b/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( diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/ittoqqortoormiit.py b/src/marker_sets/overworld/villages/ittoqqortoormiit.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/villages/ittoqqortoormiit.py rename to src/marker_sets/overworld/villages/ittoqqortoormiit.py index 55bb20e..27f1891 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/villages/ittoqqortoormiit.py +++ b/src/marker_sets/overworld/villages/ittoqqortoormiit.py @@ -1,4 +1,4 @@ -from minecraft_kartverket.lib_marker import Point +from lib_marker import Point MARKERS = [ Point( diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/klofteby.py b/src/marker_sets/overworld/villages/klofteby.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/villages/klofteby.py rename to src/marker_sets/overworld/villages/klofteby.py index 995112a..531616b 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/villages/klofteby.py +++ b/src/marker_sets/overworld/villages/klofteby.py @@ -1,4 +1,4 @@ -from minecraft_kartverket.lib_marker import Point +from lib_marker import Point MARKERS = [ Point( diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby.py b/src/marker_sets/overworld/villages/npc_landsby.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby.py rename to src/marker_sets/overworld/villages/npc_landsby.py index 3aef475..a041c75 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby.py +++ b/src/marker_sets/overworld/villages/npc_landsby.py @@ -1,4 +1,4 @@ -from minecraft_kartverket.lib_marker import Point +from lib_marker import Point MARKERS = [ Point( diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby_nord.py b/src/marker_sets/overworld/villages/npc_landsby_nord.py similarity index 72% rename from src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby_nord.py rename to src/marker_sets/overworld/villages/npc_landsby_nord.py index 3c0a0fd..c04507d 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/villages/npc_landsby_nord.py +++ b/src/marker_sets/overworld/villages/npc_landsby_nord.py @@ -1,4 +1,4 @@ -from minecraft_kartverket.lib_marker import Point +from lib_marker import Point MARKERS = [ Point( diff --git a/src/minecraft_kartverket/marker_sets/overworld/villages/smedby.py b/src/marker_sets/overworld/villages/smedby.py similarity index 71% rename from src/minecraft_kartverket/marker_sets/overworld/villages/smedby.py rename to src/marker_sets/overworld/villages/smedby.py index d79e278..472afdb 100644 --- a/src/minecraft_kartverket/marker_sets/overworld/villages/smedby.py +++ b/src/marker_sets/overworld/villages/smedby.py @@ -1,4 +1,4 @@ -from minecraft_kartverket.lib_marker import Point +from lib_marker import Point MARKERS = [ Point( diff --git a/src/minecraft_kartverket/marker_sets/the_end/__init__.py b/src/marker_sets/the_end/__init__.py similarity index 100% rename from src/minecraft_kartverket/marker_sets/the_end/__init__.py rename to src/marker_sets/the_end/__init__.py diff --git a/src/marker_sets/the_end/other/__init__.py b/src/marker_sets/the_end/other/__init__.py new file mode 100644 index 0000000..a1e1630 --- /dev/null +++ b/src/marker_sets/the_end/other/__init__.py @@ -0,0 +1,7 @@ +from lib_marker.marker_set import MarkerSet + + +MARKER_SET = MarkerSet( + name="Other", + markers=[], +) diff --git a/src/marker_sets/the_end/portals/__init__.py b/src/marker_sets/the_end/portals/__init__.py new file mode 100644 index 0000000..3e036bc --- /dev/null +++ b/src/marker_sets/the_end/portals/__init__.py @@ -0,0 +1,7 @@ +from lib_marker.marker_set import MarkerSet + + +MARKER_SET = MarkerSet( + name="Portals", + markers=[], +) diff --git a/src/minecraft_kartverket/__init__.py b/src/minecraft_kartverket/__init__.py deleted file mode 100644 index 8b13789..0000000 --- a/src/minecraft_kartverket/__init__.py +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/minecraft_kartverket/marker_sets/nether/other/__init__.py b/src/minecraft_kartverket/marker_sets/nether/other/__init__.py deleted file mode 100644 index d29400c..0000000 --- a/src/minecraft_kartverket/marker_sets/nether/other/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from minecraft_kartverket.lib_marker.marker_set import MarkerSet - - -MARKER_SET = MarkerSet( - name="Other", - markers=[], -) diff --git a/src/minecraft_kartverket/marker_sets/nether/portals/__init__.py b/src/minecraft_kartverket/marker_sets/nether/portals/__init__.py deleted file mode 100644 index a97fc23..0000000 --- a/src/minecraft_kartverket/marker_sets/nether/portals/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from minecraft_kartverket.lib_marker.marker_set import MarkerSet - - -MARKER_SET = MarkerSet( - name="Portals", - markers=[], -) diff --git a/src/minecraft_kartverket/marker_sets/overworld/roads/__init__.py b/src/minecraft_kartverket/marker_sets/overworld/roads/__init__.py deleted file mode 100644 index 059c94e..0000000 --- a/src/minecraft_kartverket/marker_sets/overworld/roads/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from minecraft_kartverket.lib_marker.marker_set import MarkerSet - - -MARKER_SET = MarkerSet( - name="Roads", - markers=[], -) diff --git a/src/minecraft_kartverket/marker_sets/the_end/other/__init__.py b/src/minecraft_kartverket/marker_sets/the_end/other/__init__.py deleted file mode 100644 index d29400c..0000000 --- a/src/minecraft_kartverket/marker_sets/the_end/other/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from minecraft_kartverket.lib_marker.marker_set import MarkerSet - - -MARKER_SET = MarkerSet( - name="Other", - markers=[], -) diff --git a/src/minecraft_kartverket/marker_sets/the_end/portals/__init__.py b/src/minecraft_kartverket/marker_sets/the_end/portals/__init__.py deleted file mode 100644 index a97fc23..0000000 --- a/src/minecraft_kartverket/marker_sets/the_end/portals/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from minecraft_kartverket.lib_marker.marker_set import MarkerSet - - -MARKER_SET = MarkerSet( - name="Portals", - markers=[], -)